fix: misc fixes

Signed-off-by: Mason Hu <[email protected]>

src/api/auth-groups.tsx

@@ -3,7 +3,7 @@ import type { LxdApiResponse } from "types/apiResponse";
 import type { LxdGroup } from "types/permissions";
 import { withEntitlementsQuery } from "util/entitlements/api";
 
-export const groupEntitlements = ["can_edit", "can_delete"];
+export const groupEntitlements = ["can_delete", "can_edit"];
 
 export const fetchGroups = (
   isFineGrained: boolean | null,

src/api/auth-identities.tsx

@@ -3,7 +3,7 @@ import type { LxdApiResponse } from "types/apiResponse";
 import type { LxdIdentity, TlsIdentityTokenDetail } from "types/permissions";
 import { withEntitlementsQuery } from "util/entitlements/api";
 
-export const identitiesEntitlements = ["can_edit", "can_delete"];
+export const identitiesEntitlements = ["can_delete", "can_edit"];
 
 export const fetchIdentities = (
   isFineGrained: boolean | null,

src/api/auth-idp-groups.tsx

@@ -3,7 +3,7 @@ import type { LxdApiResponse } from "types/apiResponse";
 import type { IdpGroup } from "types/permissions";
 import { withEntitlementsQuery } from "util/entitlements/api";
 
-const idpGroupEntitlements = ["can_edit", "can_delete"];
+const idpGroupEntitlements = ["can_delete", "can_edit"];
 
 export const fetchIdpGroups = (
   isFineGrained: boolean | null,

src/pages/permissions/PermissionIdpGroups.tsx

@@ -127,7 +127,7 @@ const PermissionIdpGroups: FC = () => {
                   title={
                     canEditGroup(idpGroup)
                       ? "Edit details"
-                      : "You do not have permission to edit this IDP group"
+                      : "You do not have permission to modify this IDP group"
                   }
                   disabled={!canEditGroup(idpGroup)}
                 >

src/pages/permissions/actions/BulkDeleteIdentitiesBtn.tsx

@@ -83,7 +83,7 @@ const BulkDeleteIdentitiesBtn: FC<Props & ButtonProps> = ({
               ))}
             </ul>
             You do not have permission to delete the following{" "}
-            {pluralize("identity", deletableIdentities.length)}:
+            {pluralize("identity", restrictedIdentities.length)}:
             <ul>
               {restrictedIdentities.map((identity) => (
                 <li key={identity.name}>{identity.name}</li>

src/pages/permissions/actions/EditIdentityGroupsBtn.tsx

@@ -27,10 +27,10 @@ const EditIdentityGroupsBtn: FC<Props & ButtonProps> = ({
   );
 
   const getRestrictedWarning = () => {
-    const test = restrictedIdentities
+    const restrictedList = restrictedIdentities
       .map((identity) => `\n- ${identity.name}`)
       .join("");
-    return `You do not have permission to modify ${restrictedIdentities.length > 1 ? "some of the selected" : "the selected"} ${pluralize("identity", restrictedIdentities.length)}:${test}`;
+    return `You do not have permission to modify ${restrictedIdentities.length > 1 ? "some of the selected" : "the selected"} ${pluralize("identity", restrictedIdentities.length)}:${restrictedList}`;
   };
 
   return (

src/pages/permissions/panels/EditGroupIdentitiesPanel.tsx

@@ -252,15 +252,6 @@ const EditGroupIdentitiesPanel: FC<Props> = ({ groups }) => {
     defaultSort: "name",
   });
 
-  const confirmButtonText = modifiedIdentities.size
-    ? `Apply ${modifiedIdentities.size} identity ${pluralize("change", modifiedIdentities.size)}`
-    : "Modify identities";
-
-  const panelTitle =
-    groups.length > 1
-      ? `Change identities for ${groups.length} groups`
-      : `Change identities for ${groups[0]?.name}`;
-
   const content = (
     <ScrollableTable
       dependencies={[identities, modifiedIdentities.size, notify.notification]}
@@ -287,6 +278,15 @@ const EditGroupIdentitiesPanel: FC<Props> = ({ groups }) => {
     </ScrollableTable>
   );
 
+  const confirmButtonText = modifiedIdentities.size
+    ? `Apply ${modifiedIdentities.size} identity ${pluralize("change", modifiedIdentities.size)}`
+    : "Modify identities";
+
+  const panelTitle =
+    groups.length > 1
+      ? `Change identities for ${groups.length} groups`
+      : `Change identities for ${groups[0]?.name}`;
+
   return (
     <>
       <SidePanel isOverlay loading={isLoading} hasError={!identities}>

src/util/entitlements/groups.tsx

@@ -5,12 +5,12 @@ import { LxdGroup } from "types/permissions";
 export const useGroupEntitlements = () => {
   const { isFineGrained } = useAuth();
 
-  const canEditGroup = (group?: LxdGroup) =>
-    hasEntitlement(isFineGrained, "can_edit", group?.access_entitlements);
-
   const canDeleteGroup = (group?: LxdGroup) =>
     hasEntitlement(isFineGrained, "can_delete", group?.access_entitlements);
 
+  const canEditGroup = (group?: LxdGroup) =>
+    hasEntitlement(isFineGrained, "can_edit", group?.access_entitlements);
+
   return {
     canDeleteGroup,
     canEditGroup,

src/util/entitlements/identities.tsx

@@ -5,12 +5,12 @@ import { LxdIdentity } from "types/permissions";
 export const useIdentityEntitlements = () => {
   const { isFineGrained } = useAuth();
 
-  const canEditIdentity = (identity?: LxdIdentity) =>
-    hasEntitlement(isFineGrained, "can_edit", identity?.access_entitlements);
-
   const canDeleteIdentity = (identity?: LxdIdentity) =>
     hasEntitlement(isFineGrained, "can_delete", identity?.access_entitlements);
 
+  const canEditIdentity = (identity?: LxdIdentity) =>
+    hasEntitlement(isFineGrained, "can_edit", identity?.access_entitlements);
+
   return {
     canDeleteIdentity,
     canEditIdentity,

src/util/entitlements/idp-groups.tsx

@@ -5,12 +5,12 @@ import { IdpGroup } from "types/permissions";
 export const useIdpGroupEntitlements = () => {
   const { isFineGrained } = useAuth();
 
-  const canEditGroup = (group?: IdpGroup) =>
-    hasEntitlement(isFineGrained, "can_edit", group?.access_entitlements);
-
   const canDeleteGroup = (group?: IdpGroup) =>
     hasEntitlement(isFineGrained, "can_delete", group?.access_entitlements);
 
+  const canEditGroup = (group?: IdpGroup) =>
+    hasEntitlement(isFineGrained, "can_edit", group?.access_entitlements);
+
   return {
     canDeleteGroup,
     canEditGroup,