Add 'Stage' option ('Preserved users')

The 'Stage' option allows to move a given user from 'Preserved' to 'Stage'. Signed-off-by: Carla Martinez <carlmart@redhat.com>
freeipa · Jan 19, 2024 · f1c92f9 · f1c92f9
1 parent 2b98ce4
commit f1c92f9
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 16 deletions.
diff --git a/src/components/UserSettings.tsx b/src/components/UserSettings.tsx
@@ -55,8 +55,12 @@ import UnlockUser from "./modals/UnlockUser";
 import ResetPassword from "./modals/ResetPassword";
 import IssueNewCertificate from "./modals/IssueNewCertificate";
 import AddOtpToken from "./modals/AddOtpToken";
+import StagePreservedUsers from "./modals/StagePreservedUsers";
 // Utils
 import { API_VERSION_BACKUP } from "src/utils/utils";
+// Navigation
+import { useNavigate } from "react-router-dom";
+import { URL_PREFIX } from "src/navigation/NavRoutes";
 
 export interface PropsToUserSettings {
   originalUser: Partial<User>;
@@ -82,6 +86,9 @@ const UserSettings = (props: PropsToUserSettings) => {
   // Alerts to show in the UI
   const alerts = useAlerts();
 
+  // Navigate
+  const navigate = useNavigate();
+
   // RTK hook: save user (acive/preserved and stage)
   let [saveUser] = useSaveUserMutation();
   if (props.from === "stage-users") {
@@ -233,6 +240,12 @@ const UserSettings = (props: PropsToUserSettings) => {
     });
   };
 
+  // Preserved users - 'Stage' option
+  const [isStageModalOpen, setIsStageModalOpen] = React.useState(false);
+  const onCloseStageModal = () => {
+    setIsStageModalOpen(false);
+  };
+
   // Kebab
   const [isKebabOpen, setIsKebabOpen] = useState(false);
 
@@ -302,7 +315,9 @@ const UserSettings = (props: PropsToUserSettings) => {
   ];
 
   const preservedDropdownItems = [
-    <DropdownItem key="stage">Stage</DropdownItem>,
+    <DropdownItem key="stage" onClick={() => setIsStageModalOpen(true)}>
+      Stage
+    </DropdownItem>,
     <DropdownItem key="restore">Restore</DropdownItem>,
     <DropdownItem key="delete" onClick={() => setIsDeleteModalOpen(true)}>
       Delete
@@ -603,6 +618,13 @@ const UserSettings = (props: PropsToUserSettings) => {
           onClose={onCloseAddOtpTokenModal}
         />
       )}
+      <StagePreservedUsers
+        show={isStageModalOpen}
+        handleModalToggle={onCloseStageModal}
+        selectedUsers={selectedUsers}
+        updateSelectedUsers={setSelectedUsers}
+        onSuccess={() => navigate(URL_PREFIX + "/preserved-users")}
+      />
     </>
   );
 };

diff --git a/src/components/modals/RestorePreservedUsers.tsx b/src/components/modals/RestorePreservedUsers.tsx
@@ -27,6 +27,8 @@ import ErrorModal from "./ErrorModal";
 import { ErrorData } from "src/utils/datatypes/globalDataTypes";
 // Hooks
 import useAlerts from "src/hooks/useAlerts";
+// Navigation
+import { NavigateFunction } from "react-router-dom";
 
 interface SelectedUsersData {
   selectedUsers: string[];
@@ -38,6 +40,8 @@ export interface PropsToPreservedUsers {
   handleModalToggle: () => void;
   selectedUsersData: SelectedUsersData;
   onRefresh?: () => void;
+  navigateFunc?: NavigateFunction;
+  navigateTo?: string;
 }
 
 const RestorePreservedUsers = (props: PropsToPreservedUsers) => {

diff --git a/src/components/modals/StagePreservedUsers.tsx b/src/components/modals/StagePreservedUsers.tsx
@@ -27,9 +27,16 @@ import ErrorModal from "./ErrorModal";
 import { ErrorData } from "src/utils/datatypes/globalDataTypes";
 // Hooks
 import useAlerts from "src/hooks/useAlerts";
-import { PropsToPreservedUsers } from "./RestorePreservedUsers";
 
-const StagePreservedUsers = (props: PropsToPreservedUsers) => {
+export interface PropsToStagePreservedUsers {
+  show: boolean;
+  handleModalToggle: () => void;
+  selectedUsers: string[];
+  updateSelectedUsers: (newSelectedUsers: string[]) => void;
+  onSuccess: () => void;
+}
+
+const StagePreservedUsers = (props: PropsToStagePreservedUsers) => {
   // Set dispatch (Redux)
   const dispatch = useAppDispatch();
 
@@ -55,7 +62,7 @@ const StagePreservedUsers = (props: PropsToPreservedUsers) => {
       id: "stage-users-table",
       pfComponent: (
         <UsersDisplayTable
-          usersToDisplay={props.selectedUsersData.selectedUsers}
+          usersToDisplay={props.selectedUsers}
           from={"preserved-users"}
         />
       ),
@@ -115,7 +122,7 @@ const StagePreservedUsers = (props: PropsToPreservedUsers) => {
 
     setBtnSpinning(true);
 
-    props.selectedUsersData.selectedUsers.map((uid) => {
+    props.selectedUsers.map((uid) => {
       const payloadItem = {
         method: "user_stage",
         params: [[uid], {}],
@@ -147,22 +154,21 @@ const StagePreservedUsers = (props: PropsToPreservedUsers) => {
             handleAPIError(error);
           } else {
             // Update data from Redux
-            props.selectedUsersData.selectedUsers.map((user) => {
+            props.selectedUsers.map((user) => {
               dispatch(removePreservedUser(user[0]));
             });
 
             // Reset selected values
-            props.selectedUsersData.updateSelectedUsers([]);
-
-            // Refresh data
-            if (props.onRefresh !== undefined) {
-              props.onRefresh();
-            }
+            props.updateSelectedUsers([]);
 
             // Show alert: success
             alerts.addAlert("stage-users-success", "Users staged", "success");
 
+            // Close modal
             closeModal();
+
+            // Navigate to selected page
+            props.onSuccess();
           }
         } else if (error) {
           // Handle error

diff --git a/src/components/tables/UsersDisplayTable.tsx b/src/components/tables/UsersDisplayTable.tsx
@@ -53,7 +53,7 @@ const UsersDisplayTable = (props: PropsToDisplayUsersTable) => {
       case "stage-users":
         stageUsersListCopy.map((user) => {
           props.usersToDisplay.map((selected) => {
-            if (user.uid === selected || user.uid[0] === selected) {
+            if (user.uid[0] === selected[0] || user.uid[0] === selected) {
               usersToDisplay.push(user);
             }
           });
@@ -63,7 +63,7 @@ const UsersDisplayTable = (props: PropsToDisplayUsersTable) => {
       case "preserved-users":
         preservedUsersListCopy.map((user) => {
           props.usersToDisplay.map((selected) => {
-            if (user.uid === selected || user.uid[0] === selected) {
+            if (user.uid[0] === selected[0] || user.uid[0] === selected) {
               usersToDisplay.push(user);
             }
           });

diff --git a/src/pages/PreservedUsers/PreservedUsers.tsx b/src/pages/PreservedUsers/PreservedUsers.tsx
@@ -502,8 +502,9 @@ const PreservedUsers = () => {
       <StagePreservedUsers
         show={showStageModal}
         handleModalToggle={onStageModalToggle}
-        selectedUsersData={selectedUsersData}
-        onRefresh={refreshUsersData}
+        selectedUsers={selectedUsers}
+        updateSelectedUsers={setSelectedUsers}
+        onSuccess={refreshUsersData}
       />
     </Page>
   );