From ebe8130308a218c66b198aca851459a8b1d327f1 Mon Sep 17 00:00:00 2001
From: Mason Hu <mason.hu@canonical.com>
Date: Tue, 18 Feb 2025 10:20:31 +0200
Subject: [PATCH] fix: misc fixes

Signed-off-by: Mason Hu <mason.hu@canonical.com>
---
 src/pages/permissions/PermissionIdpGroups.tsx  |  2 +-
 .../actions/BulkDeleteIdentitiesBtn.tsx        |  2 +-
 .../actions/EditIdentityGroupsBtn.tsx          |  4 ++--
 .../panels/EditGroupIdentitiesPanel.tsx        | 18 +++++++++---------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/pages/permissions/PermissionIdpGroups.tsx b/src/pages/permissions/PermissionIdpGroups.tsx
index 6036c36b1e..f46dff37a9 100644
--- a/src/pages/permissions/PermissionIdpGroups.tsx
+++ b/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)}
                 >
diff --git a/src/pages/permissions/actions/BulkDeleteIdentitiesBtn.tsx b/src/pages/permissions/actions/BulkDeleteIdentitiesBtn.tsx
index eb57c22a18..5bb853f58f 100644
--- a/src/pages/permissions/actions/BulkDeleteIdentitiesBtn.tsx
+++ b/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>
diff --git a/src/pages/permissions/actions/EditIdentityGroupsBtn.tsx b/src/pages/permissions/actions/EditIdentityGroupsBtn.tsx
index 10e3da0e62..35280b0256 100644
--- a/src/pages/permissions/actions/EditIdentityGroupsBtn.tsx
+++ b/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 (
diff --git a/src/pages/permissions/panels/EditGroupIdentitiesPanel.tsx b/src/pages/permissions/panels/EditGroupIdentitiesPanel.tsx
index d5caee4f11..ac4a0d03a9 100644
--- a/src/pages/permissions/panels/EditGroupIdentitiesPanel.tsx
+++ b/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}>