From 5650cd0a25fadeeae08141cfd6ebbde6270101ae Mon Sep 17 00:00:00 2001 From: Ogollah Date: Wed, 22 Jan 2025 16:29:11 +0300 Subject: [PATCH] change section order --- .../users/manage-users/user-list/user-list.component.tsx | 4 ++-- .../users/manage-users/user-management.workspace.tsx | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/esm-admin-app/src/components/users/manage-users/user-list/user-list.component.tsx b/packages/esm-admin-app/src/components/users/manage-users/user-list/user-list.component.tsx index 69dce574..59096112 100644 --- a/packages/esm-admin-app/src/components/users/manage-users/user-list/user-list.component.tsx +++ b/packages/esm-admin-app/src/components/users/manage-users/user-list/user-list.component.tsx @@ -40,8 +40,8 @@ const UserList: React.FC = () => { .toLowerCase(); const fullName = user.person.display.toLowerCase(); return ( - user.username.toLowerCase().includes(debouncedSearchTerm.toLowerCase()) || - user.systemId.toLowerCase().includes(debouncedSearchTerm.toLowerCase()) || + user.username?.toLowerCase().includes(debouncedSearchTerm.toLowerCase()) || + user.systemId?.toLowerCase().includes(debouncedSearchTerm.toLowerCase()) || fullName.includes(debouncedSearchTerm.toLowerCase()) || rolesDisplay.includes(debouncedSearchTerm.toLowerCase()) ); diff --git a/packages/esm-admin-app/src/components/users/manage-users/user-management.workspace.tsx b/packages/esm-admin-app/src/components/users/manage-users/user-management.workspace.tsx index 3f61ea46..f42bb2cc 100644 --- a/packages/esm-admin-app/src/components/users/manage-users/user-management.workspace.tsx +++ b/packages/esm-admin-app/src/components/users/manage-users/user-management.workspace.tsx @@ -360,8 +360,8 @@ const ManageUserWorkspace: React.FC = ({ const steps = useMemo( () => [ { id: 'demographic', label: t('demographicInformation', 'Demographic Info') }, - { id: 'provider', label: t('providerAccount', 'Provider Account') }, { id: 'login', label: t('loginInformation', 'Login Info') }, + { id: 'provider', label: t('providerAccount', 'Provider Account') }, { id: 'roles', label: t('roles', 'Roles Info') }, { id: 'additionalRoles', label: t('additionalRoles', 'Additional Roles') }, ], @@ -741,7 +741,6 @@ const ManageUserWorkspace: React.FC = ({ )} )} - {activeSection === 'login' && ( @@ -1073,7 +1072,7 @@ const ManageUserWorkspace: React.FC = ({