UX Tweaks

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/lockout/LockoutTab.tsx

@@ -42,7 +42,7 @@ export const LockoutTab = ({
                   onCheckedChange={onChange}
                   isChecked={value}
                 >
-                  Lockout {value ? "Enabled" : "Disabled"}
+                  Lockout
                 </Switch>
               </FormControl>
             );

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityAuthLockoutFields.tsx

@@ -67,9 +67,6 @@ export const LockoutFields = ({
           )}
         </OrgPermissionCan>
       </div>
-      <IdentityAuthFieldDisplay label="Lockout">
-        {data.lockoutEnabled ? "Enabled" : "Disabled"}
-      </IdentityAuthFieldDisplay>
       <IdentityAuthFieldDisplay label="Lockout Threshold">
         {data.lockoutThreshold}
       </IdentityAuthFieldDisplay>

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityLdapAuthContent.tsx

@@ -102,6 +102,10 @@ export const ViewIdentityLdapAuthContent = ({
           </Tooltip>
         )}
       </IdentityAuthFieldDisplay>
+      <IdentityAuthFieldDisplay label="Lockout">
+        {data.lockoutEnabled ? "Enabled" : "Disabled"}
+      </IdentityAuthFieldDisplay>
+      {data.lockoutEnabled && (
         <LockoutFields
           identityId={identityId}
           lockedOut={lockedOut}
@@ -109,6 +113,7 @@ export const ViewIdentityLdapAuthContent = ({
           data={data}
           onResetAllLockouts={onResetAllLockouts}
         />
+      )}
     </ViewIdentityContentWrapper>
   );
 };

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityUniversalAuthContent.tsx

@@ -90,6 +90,10 @@ export const ViewIdentityUniversalAuthContent = ({
       <IdentityAuthFieldDisplay label="Client Secret Trusted IPs">
         {data.clientSecretTrustedIps.map((ip) => ip.ipAddress).join(", ")}
       </IdentityAuthFieldDisplay>
+      <IdentityAuthFieldDisplay label="Lockout">
+        {data.lockoutEnabled ? "Enabled" : "Disabled"}
+      </IdentityAuthFieldDisplay>
+      {data.lockoutEnabled && (
         <LockoutFields
           identityId={identityId}
           lockedOut={lockedOut}
@@ -97,6 +101,7 @@ export const ViewIdentityUniversalAuthContent = ({
           data={data}
           onResetAllLockouts={onResetAllLockouts}
         />
+      )}
       <div className="col-span-2 my-3">
         <div className="mb-3 border-b border-mineshaft-500 pb-2">
           <span className="text-bunker-300">Client ID</span>