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 11, 2024 · 860a600 · 860a600
1 parent a12e604
commit 860a600
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/src/components/UserSettings.tsx b/src/components/UserSettings.tsx
@@ -53,6 +53,10 @@ import RebuildAutoMembership from "./modals/RebuildAutoMembership";
 import UnlockUser from "./modals/UnlockUser";
 import ResetPassword from "./modals/ResetPassword";
 import IssueNewCertificate from "./modals/IssueNewCertificate";
+import StagePreservedUsers from "./modals/StagePreservedUsers";
+// Navigation
+import { useNavigate } from "react-router-dom";
+import { URL_PREFIX } from "src/navigation/NavRoutes";
 
 export interface PropsToUserSettings {
   originalUser: Partial<User>;
@@ -78,6 +82,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") {
@@ -173,6 +180,12 @@ const UserSettings = (props: PropsToUserSettings) => {
     setIsNewCertificateModalOpen(false);
   };
 
+  // Preserved users - 'Stage' option
+  const [isStageModalOpen, setIsStageModalOpen] = React.useState(false);
+  const onCloseStageModal = () => {
+    setIsStageModalOpen(false);
+  };
+
   // Kebab
   const [isKebabOpen, setIsKebabOpen] = useState(false);
 
@@ -230,7 +243,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
@@ -523,6 +538,13 @@ const UserSettings = (props: PropsToUserSettings) => {
         showPrincipalFields={false}
         onRefresh={props.onRefresh}
       />
+      <StagePreservedUsers
+        show={isStageModalOpen}
+        handleModalToggle={onCloseStageModal}
+        selectedUsersData={selectedUsersData}
+        navigateFunc={navigate}
+        navigateTo={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
@@ -162,7 +162,16 @@ const StagePreservedUsers = (props: PropsToPreservedUsers) => {
             // Show alert: success
             alerts.addAlert("stage-users-success", "Users staged", "success");
 
+            // Close modal
             closeModal();
+
+            // Navigate to selected page
+            if (
+              props.navigateFunc !== undefined &&
+              props.navigateTo !== undefined
+            ) {
+              props.navigateFunc(props.navigateTo);
+            }
           }
         } 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);
             }
           });