fix: init

RedHatInsights · Dec 16, 2024 · 78b8e42 · 78b8e42
1 parent 999361a
commit 78b8e42
Show file tree

Hide file tree

Showing 14 changed files with 129 additions and 54 deletions.
diff --git a/locales/translation-template.json b/locales/translation-template.json
@@ -1739,8 +1739,8 @@
     "description": "Add label"
   },
   "usersAndUserGroupsAddToGroup": {
-    "defaultMessage": "Remove from user group",
-    "description": "Remove from user group label"
+    "defaultMessage": "Add to user group",
+    "description": "Add to user group label"
   },
   "usersAndUserGroupsAddUserDescription": {
     "defaultMessage": "Select a user group to add <b>{numUsers} {plural}</b> to. These are all the user groups in your account. To manage user groups, go to user groups.",
@@ -1774,6 +1774,10 @@
     "defaultMessage": "No description",
     "description": "No description label"
   },
+  "usersAndUserGroupsRemoveFromGroup": {
+    "defaultMessage": "Remove from user group",
+    "description": "Remove from user group label"
+  },
   "usersAndUserGroupsYes": {
     "defaultMessage": "Yes",
     "description": "Yes is Org Admin label"

diff --git a/src/Messages.js b/src/Messages.js
@@ -2386,7 +2386,7 @@ export default defineMessages({
     defaultMessage: 'Delete user group',
   },
   usersAndUserGroupsRemoveFromGroup: {
-    id: 'usersAndUserGroupsAddToGroup',
+    id: 'usersAndUserGroupsRemoveFromGroup',
     description: 'Remove from user group label',
     defaultMessage: 'Remove from user group',
   },

diff --git a/src/Routing.tsx b/src/Routing.tsx
@@ -51,9 +51,25 @@ const getRoutes = ({ enableServiceAccounts, isITLess, isWorkspacesFlag, isCommon
     path: pathnames['users-and-user-groups'].path,
     element: UsersAndUserGroups,
     childRoutes: [
-      isCommonAuthModel && {
-        path: pathnames['invite-group-users'].path,
-        element: InviteUsersModalCommonAuth,
+      {
+        path: pathnames['users-new'].path,
+        element: AddGroupWizard,
+        childRoutes: [
+          isCommonAuthModel && {
+            path: pathnames['invite-group-users'].path,
+            element: InviteUsersModalCommonAuth,
+          },
+        ],
+      },
+      {
+        path: pathnames['user-groups'].path,
+        element: AddGroupWizard,
+        childRoutes: [
+          {
+            path: pathnames['create-user-group'].path,
+            element: AddGroupWizard,
+          },
+        ],
       },
     ],
   },

diff --git a/src/locales/data.json b/src/locales/data.json
@@ -435,7 +435,7 @@
     "usersAndUserGroups": "Users and User Groups",
     "usersAndUserGroupsActive": "Active",
     "usersAndUserGroupsAdd": "Add",
-    "usersAndUserGroupsAddToGroup": "Remove from user group",
+    "usersAndUserGroupsAddToGroup": "Add to user group",
     "usersAndUserGroupsAddUserDescription": "Select a user group to add <b>{numUsers} {plural}</b> to. These are all the user groups in your account. To manage user groups, go to user groups.",
     "usersAndUserGroupsCancel": "Cancel",
     "usersAndUserGroupsDeleteUserGroup": "Delete user group",
@@ -444,6 +444,7 @@
     "usersAndUserGroupsInactive": "Inactive",
     "usersAndUserGroupsNo": "No",
     "usersAndUserGroupsNoDescription": "No description",
+    "usersAndUserGroupsRemoveFromGroup": "Remove from user group",
     "usersAndUserGroupsYes": "Yes",
     "usersDescription": "These are all of the users in your Red Hat organization.",
     "usersEmptyStateSubtitle": "This filter criteria matches no users.{br}Try changing your filter input.",

diff --git a/src/locales/translations.json b/src/locales/translations.json
@@ -111,10 +111,13 @@
   "createRoleErrorTitle": "Failed adding role",
   "createRoleFromScratch": "Create a role from scratch",
   "createUserGroup": "Create user group",
+<<<<<<< Updated upstream
   "createWorkspace": "Create workspace",
   "createWorkspaceErrorDescription": "The workspace was not created successfuly.",
   "createWorkspaceErrorTitle": "Failed creating {name} workspace",
   "createWorkspaceSuccessTitle": "New {name} workspace have been successfully created",
+=======
+>>>>>>> Stashed changes
   "creatingGroup": "Creating a group",
   "creatingRoleCanceled": "Creating role was canceled by the user",
   "deactivateUsersButton": "Deactivate users",
@@ -434,7 +437,7 @@
   "usersAndUserGroups": "Users and User Groups",
   "usersAndUserGroupsActive": "Active",
   "usersAndUserGroupsAdd": "Add",
-  "usersAndUserGroupsAddToGroup": "Remove from user group",
+  "usersAndUserGroupsAddToGroup": "Add to user group",
   "usersAndUserGroupsAddUserDescription": "Select a user group to add <b>{numUsers} {plural}</b> to. These are all the user groups in your account. To manage user groups, go to user groups.",
   "usersAndUserGroupsCancel": "Cancel",
   "usersAndUserGroupsDeleteUserGroup": "Delete user group",
@@ -443,6 +446,7 @@
   "usersAndUserGroupsInactive": "Inactive",
   "usersAndUserGroupsNo": "No",
   "usersAndUserGroupsNoDescription": "No description",
+  "usersAndUserGroupsRemoveFromGroup": "Remove from user group",
   "usersAndUserGroupsYes": "Yes",
   "usersDescription": "These are all of the users in your Red Hat organization.",
   "usersEmptyStateSubtitle": "This filter criteria matches no users.{br}Try changing your filter input.",

diff --git a/...s/access-management/AddUserGroupModal.tsx → ...access-management/AddUserToGroupModal.tsx b/...s/access-management/AddUserGroupModal.tsx → ...access-management/AddUserToGroupModal.tsx
@@ -6,13 +6,13 @@ import { addMembersToGroup } from '../../redux/actions/group-actions';
 import { FormattedMessage, useIntl } from 'react-intl';
 import messages from '../../Messages';
 
-interface AddUserGroupModalProps {
+interface AddUserToGroupModalProps {
   isOpen: boolean;
   setIsOpen: (isOpen: boolean) => void;
   selectedUsers: any[];
 }
 
-export const AddUserGroupModal: React.FunctionComponent<AddUserGroupModalProps> = ({ isOpen, setIsOpen, selectedUsers }) => {
+export const AddUserToGroupModal: React.FunctionComponent<AddUserToGroupModalProps> = ({ isOpen, setIsOpen, selectedUsers }) => {
   const [selectedGroups, setSelectedGroups] = React.useState<any[]>([]);
   const handleUserGroupsChange = (groups: any[]) => setSelectedGroups(groups);
   const dispatch = useDispatch();
@@ -62,4 +62,4 @@ export const AddUserGroupModal: React.FunctionComponent<AddUserGroupModalProps>
   );
 };
 
-export default AddUserGroupModal;
+export default AddUserToGroupModal;
diff --git a/src/smart-components/access-management/UserGroupsTable.tsx b/src/smart-components/access-management/UserGroupsTable.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback, useMemo, useState, Fragment } from 'react';
+import React, { useEffect, useCallback, useMemo, useState, Fragment, Suspense } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { useDataViewSelection, useDataViewPagination } from '@patternfly/react-data-view/dist/dynamic/Hooks';
 import { BulkSelect, BulkSelectValue } from '@patternfly/react-component-groups/dist/dynamic/BulkSelect';
@@ -9,7 +9,7 @@ import { ButtonVariant, EmptyState, EmptyStateBody, EmptyStateHeader, EmptyState
 import { ActionsColumn } from '@patternfly/react-table';
 import { mappedProps } from '../../helpers/shared/helpers';
 import { RBACStore } from '../../redux/store';
-import { useSearchParams } from 'react-router-dom';
+import { Outlet, useSearchParams } from 'react-router-dom';
 import { fetchGroups, removeGroups } from '../../redux/actions/group-actions';
 import { formatDistanceToNow } from 'date-fns';
 import { FormattedMessage, useIntl } from 'react-intl';
@@ -18,7 +18,8 @@ import { Group } from '../../redux/reducers/group-reducer';
 import { DataViewTrObject, DataViewState, EventTypes, useDataViewEventsContext } from '@patternfly/react-data-view';
 import { SearchIcon } from '@patternfly/react-icons';
 import { ResponsiveAction, ResponsiveActions, SkeletonTableBody, WarningModal } from '@patternfly/react-component-groups';
-import AddGroupWizard from '../group/add-group/add-group-wizard';
+import pathnames from '../../utilities/pathnames';
+import useAppNavigate from '../../hooks/useAppNavigate';
 
 const COLUMNS: string[] = ['User group name', 'Description', 'Users', 'Service accounts', 'Roles', 'Workspaces', 'Last modified'];
 
@@ -48,11 +49,11 @@ const UserGroupsTable: React.FunctionComponent<UserGroupsTableProps> = ({
   focusedGroup,
 }) => {
   const [isDeleteModalOpen, setIsDeleteModalOpen] = React.useState(false);
-  const [isAddGroupWizardOpen, setIsAddGroupWizardOpen] = React.useState(false);
   const [currentGroups, setCurrentGroups] = React.useState<Group[]>([]);
   const dispatch = useDispatch();
   const [activeState, setActiveState] = useState<DataViewState | undefined>(DataViewState.loading);
   const intl = useIntl();
+  const navigate = useAppNavigate();
   const { trigger } = useDataViewEventsContext();
 
   const handleDeleteModalToggle = (groups: Group[]) => {
@@ -229,11 +230,6 @@ const UserGroupsTable: React.FunctionComponent<UserGroupsTableProps> = ({
 
   return (
     <Fragment>
-      {isAddGroupWizardOpen && (
-        <div data-ouia-component-id="add-group-wizard">
-          <AddGroupWizard pagination={{ limit: 20 }} filters={{}} enableRoles={false} setIsWizardOpen={setIsAddGroupWizardOpen} />
-        </div>
-      )}
       {isDeleteModalOpen && (
         <WarningModal
           ouiaId={`${ouiaId}-remove-user-modal`}
@@ -275,7 +271,7 @@ const UserGroupsTable: React.FunctionComponent<UserGroupsTableProps> = ({
           }
           actions={
             <ResponsiveActions breakpoint="lg" ouiaId={`${ouiaId}-actions-dropdown`}>
-              <ResponsiveAction isPinned isPersistent onClick={() => setIsAddGroupWizardOpen(true)}>
+              <ResponsiveAction isPinned isPersistent onClick={() => navigate(pathnames['create-user-group'].link)}>
                 {intl.formatMessage(messages.createUserGroup)}
               </ResponsiveAction>
               <ResponsiveAction
@@ -306,6 +302,28 @@ const UserGroupsTable: React.FunctionComponent<UserGroupsTableProps> = ({
         />
         <DataViewToolbar ouiaId={`${ouiaId}-footer-toolbar`} pagination={paginationComponent} />
       </DataView>
+      <Suspense>
+        <Outlet
+          context={{
+            [pathnames['create-user-group'].path]: {
+              afterSubmit: () => {
+                navigate({
+                  pathname: pathnames['users-and-user-groups'].link,
+                  search: '?activeTab=user-groups',
+                });
+              },
+              onCancel: () =>
+                navigate({
+                  pathname: pathnames['users-and-user-groups'].link,
+                  search: '?activeTab=user-groups',
+                }),
+              enableRoles: false,
+              pagination: { limit: 20 },
+              filters: {},
+            },
+          }}
+        />
+      </Suspense>
     </Fragment>
   );
 };

diff --git a/src/smart-components/access-management/UsersTable.tsx b/src/smart-components/access-management/UsersTable.tsx
@@ -246,6 +246,7 @@ const UsersTable: React.FunctionComponent<UsersTableProps> = ({ onAddUserClick,
       <Suspense>
         <Outlet
           context={{
+            bar: 'foo',
             fetchData: () => {
               appNavigate(paths['users-and-user-groups'].link);
             },

diff --git a/src/smart-components/access-management/users-and-user-groups.tsx b/src/smart-components/access-management/users-and-user-groups.tsx
@@ -1,27 +1,27 @@
 import React, { useEffect } from 'react';
 import { useIntl } from 'react-intl';
-import { PageSection, PageSectionVariants, Tab, TabContent, Tabs } from '@patternfly/react-core';
+import { PageSection, PageSectionVariants, Tab, Tabs } from '@patternfly/react-core';
 import ContentHeader from '@patternfly/react-component-groups/dist/dynamic/ContentHeader';
 import Messages from '../../Messages';
-import UsersTable from './UsersTable';
-import UserGroupsTable from './UserGroupsTable';
-import { useLocation, useNavigate } from 'react-router-dom';
-import AddUserGroupModal from './AddUserGroupModal';
+// import UsersTable from './UsersTable';
+// import UserGroupsTable from './UserGroupsTable';
+import { Outlet, useLocation, useNavigate } from 'react-router-dom';
 import { User } from '../../redux/reducers/user-reducer';
-import { Group } from '../../redux/reducers/group-reducer';
-import GroupDetailsDrawer from './GroupDetailsDrawer';
-import { DataViewEventsProvider } from '@patternfly/react-data-view';
-import UserDetailsDrawer from './UserDetailsDrawer';
+// import { Group } from '../../redux/reducers/group-reducer';
+// import GroupDetailsDrawer from './GroupDetailsDrawer';
+// import { DataViewEventsProvider } from '@patternfly/react-data-view';
+// import UserDetailsDrawer from './UserDetailsDrawer';
+import AddUserToGroupModal from './AddUserToGroupModal';
 
 const TAB_NAMES = ['users', 'user-groups'];
 
 const UsersAndUserGroups: React.FunctionComponent = () => {
   const intl = useIntl();
   const [activeTabKey, setActiveTabKey] = React.useState<number>(0);
-  const [isAddUserGroupModalOpen, setIsAddUserGroupModalOpen] = React.useState<boolean>(false);
-  const [selectedUsers, setSelectedUsers] = React.useState<User[]>([]);
-  const [focusedUser, setFocusedUser] = React.useState<User | undefined>(undefined);
-  const [focusedGroup, setFocusedGroup] = React.useState<Group | undefined>(undefined);
+  const [isAddUserToGroupModalOpen, setIsAddUserToGroupModalOpen] = React.useState<boolean>(false);
+  const [selectedUsers] = React.useState<User[]>([]);
+  // const [focusedUser, setFocusedUser] = React.useState<User | undefined>(undefined);
+  // const [focusedGroup, setFocusedGroup] = React.useState<Group | undefined>(undefined);
   const usersRef = React.createRef<HTMLElement>();
   const groupsRef = React.createRef<HTMLElement>();
 
@@ -40,12 +40,12 @@ const UsersAndUserGroups: React.FunctionComponent = () => {
     updateURL(TAB_NAMES[activeTab]);
   };
 
-  const handleOpenAddUserModal = (selected: User[]) => {
-    if (selected.length > 0) {
-      setSelectedUsers(selected);
-      setIsAddUserGroupModalOpen(true);
-    }
-  };
+  // const handleOpenAddUserToGroupModal = (selected: User[]) => {
+  //   if (selected.length > 0) {
+  //     setSelectedUsers(selected);
+  //     setIsAddUserToGroupModalOpen(true);
+  //   }
+  // };
 
   useEffect(() => {
     const params = new URLSearchParams(location.search);
@@ -55,7 +55,7 @@ const UsersAndUserGroups: React.FunctionComponent = () => {
 
   return (
     <React.Fragment>
-      <AddUserGroupModal isOpen={isAddUserGroupModalOpen} setIsOpen={setIsAddUserGroupModalOpen} selectedUsers={selectedUsers} />
+      <AddUserToGroupModal isOpen={isAddUserToGroupModalOpen} setIsOpen={setIsAddUserToGroupModalOpen} selectedUsers={selectedUsers} />
       <ContentHeader title={intl.formatMessage(Messages.usersAndUserGroups)} subtitle={intl.formatMessage(Messages.usersAndUserGroupsDescription)} />
       <PageSection type="tabs" variant={PageSectionVariants.light} isWidthLimited>
         <Tabs
@@ -80,11 +80,11 @@ const UsersAndUserGroups: React.FunctionComponent = () => {
         </Tabs>
       </PageSection>
       <PageSection padding={{ default: 'noPadding' }}>
-        {activeTabKey === 0 && (
+        {/* {activeTabKey === 0 && (
           <DataViewEventsProvider>
             <UserDetailsDrawer ouiaId="user-details-drawer" setFocusedUser={setFocusedUser} focusedUser={focusedUser}>
               <TabContent eventKey={0} id="usersTab" ref={usersRef} aria-label="Users tab">
-                <UsersTable onAddUserClick={handleOpenAddUserModal} focusedUser={focusedUser} />
+                <UsersTable onAddUserClick={handleOpenAddUserToGroupModal} focusedUser={focusedUser} />
               </TabContent>
             </UserDetailsDrawer>
           </DataViewEventsProvider>
@@ -97,7 +97,8 @@ const UsersAndUserGroups: React.FunctionComponent = () => {
               </TabContent>
             </GroupDetailsDrawer>
           </DataViewEventsProvider>
-        )}
+        )} */}
+        <Outlet />
       </PageSection>
     </React.Fragment>
   );

diff --git a/src/smart-components/group/add-group/add-group-wizard.js b/src/smart-components/group/add-group/add-group-wizard.js
@@ -58,7 +58,7 @@ export const onCancel = (emptyCallback, nonEmptyCallback, setGroupData) => (form
   }
 };
 
-const AddGroupWizard = ({ postMethod, pagination, filters, orderBy, enableRoles = true, setIsWizardOpen }) => {
+const AddGroupWizard = ({ postMethod, pagination, filters, orderBy, enableRoles = true, setIsWizardOpen, ...rest }) => {
   const dispatch = useDispatch();
   const intl = useIntl();
   const container = useRef(document.createElement('div'));
@@ -74,6 +74,7 @@ const AddGroupWizard = ({ postMethod, pagination, filters, orderBy, enableRoles
     error: undefined,
     hideForm: false,
   });
+  console.log('pagination', pagination, enableRoles, rest);
 
   const redirectToGroups = () => {
     dispatch(

diff --git a/src/smart-components/group/group.js b/src/smart-components/group/group.js
@@ -73,9 +73,11 @@ const Group = () => {
   const [showDefaultGroupChangedInfo, setShowDefaultGroupChangedInfo] = useState(false);
 
   useEffect(() => {
+    console.log('AAA2');
     dispatch(fetchSystemGroup({ chrome }));
     const currId = !isPlatformDefault ? groupId : systemGroupUuid;
     if (currId) {
+      console.log('BBB2', isPlatformDefault, currId, groupId, systemGroupUuid);
       dispatch(fetchGroup(currId));
       chrome.appObjectId(currId);
     }

diff --git a/src/smart-components/group/role/add-group-roles.js b/src/smart-components/group/role/add-group-roles.js
@@ -59,11 +59,13 @@ const AddGroupRoles = ({
 
   const onSubmit = () => {
     const rolesList = selectedRoles.map((role) => role.uuid);
-    if (isDefault && !isChanged) {
-      onDefaultGroupChanged(true);
-      dispatch(invalidateSystemGroup());
-    }
-    addRolesToGroup(groupId, rolesList).then(afterSubmit);
+    addRolesToGroup(groupId, rolesList).then(() => {
+      if (isDefault && !isChanged) {
+        onDefaultGroupChanged(true);
+        dispatch(invalidateSystemGroup());
+      }
+      afterSubmit();
+    });
     setSelectedRoles([]);
     return navigate(closeUrl);
   };