diff --git a/services/web/frontend/stylesheets/modules/admin-tools/manage-projects-page.scss b/services/web/frontend/stylesheets/modules/admin-tools/manage-projects-page.scss new file mode 100644 index 0000000000..358047669b --- /dev/null +++ b/services/web/frontend/stylesheets/modules/admin-tools/manage-projects-page.scss @@ -0,0 +1,7 @@ +.project-ds-nav-page { + .manage-projects-page { + .nav-item-projects { + display: initial !important; + } + } +} diff --git a/services/web/frontend/stylesheets/modules/all.scss b/services/web/frontend/stylesheets/modules/all.scss index 73c4982388..a98ccb6122 100644 --- a/services/web/frontend/stylesheets/modules/all.scss +++ b/services/web/frontend/stylesheets/modules/all.scss @@ -11,3 +11,4 @@ @import 'labs'; @import 'admin-tools/user-list'; @import 'admin-tools/user-list-ds-nav'; +@import 'admin-tools/manage-projects-page'; diff --git a/services/web/modules/admin-tools/app/src/UserListController.mjs b/services/web/modules/admin-tools/app/src/UserListController.mjs index 7b70dc217a..8b775d8235 100644 --- a/services/web/modules/admin-tools/app/src/UserListController.mjs +++ b/services/web/modules/admin-tools/app/src/UserListController.mjs @@ -290,8 +290,8 @@ function _sortAndPaginate(users, sort, page) { function _formatUserInfo(user, maxDate) { let authMethods = [] if (availableAuthMethods.includes('local') && user.hashedPassword) authMethods.push('local') - if (availableAuthMethods.includes('saml') && user.samlIdentifiers.length > 0) authMethods.push('saml') - if (availableAuthMethods.includes('oidc') && user.thirdPartyIdentifiers.length > 0) authMethods.push('oidc') + if (availableAuthMethods.includes('saml') && user.samlIdentifiers?.length) authMethods.push('saml') + if (availableAuthMethods.includes('oidc') && user.thirdPartyIdentifiers?.length) authMethods.push('oidc') // If none of the above, mark as LDAP if (availableAuthMethods.includes('ldap') && authMethods.length === 0 && user.loginCount !== 0) authMethods.push('ldap') diff --git a/services/web/modules/admin-tools/frontend/js/project-list/components/project-list-ds-nav.tsx b/services/web/modules/admin-tools/frontend/js/project-list/components/project-list-ds-nav.tsx index 6b3e84c128..d4f4a0a78c 100644 --- a/services/web/modules/admin-tools/frontend/js/project-list/components/project-list-ds-nav.tsx +++ b/services/web/modules/admin-tools/frontend/js/project-list/components/project-list-ds-nav.tsx @@ -56,11 +56,13 @@ export function ProjectListDsNav() { return (