Merge remote-tracking branch 'origin/main' into feat/left-menu-updates

Author: nsemets

.github/scripts/check-coverage-thresholds.js

@@ -14,7 +14,7 @@ for (const key of ['branches', 'functions', 'lines', 'statements']) {
   if (current > threshold) {
     errors.push(
       `Coverage for ${key} (${current}%) is above the threshold (${threshold}%).\n\tPlease update the coverageThreshold.global.${key} in the jest.config.js to ${current}!`
-    )
+    );
     failed = true;
   }
 }
@@ -26,6 +26,6 @@ if (failed) {
   console.log('Please update the coverage thresholds in jest.config.js.');
   console.log('You will need to commit again once you have updated the jst.config.js file.');
   console.log('This is only necessary until we hit 100% coverage.\n\n');
-  errors.forEach(err => console.error(`${err}\n`));
+  errors.forEach((err) => console.error(`${err}\n`));
   process.exit(1);
-}
+}

jest.config.js

@@ -53,7 +53,6 @@ module.exports = {
     '<rootDir>/src/app/features/project/',
     '<rootDir>/src/app/features/registries/',
     '<rootDir>/src/app/features/settings/addons/',
-    '<rootDir>/src/app/features/settings/developer-apps/',
     '<rootDir>/src/app/features/settings/notifications/',
     '<rootDir>/src/app/features/settings/settings-container.component.ts',
     '<rootDir>/src/app/features/settings/tokens/components/',

package-lock.json

@@ -43,6 +43,7 @@ export const routes: Routes = [
       },
       {
         path: 'register',
+        canActivate: [redirectIfLoggedInGuard],
         loadComponent: () =>
           import('./features/auth/pages/sign-up/sign-up.component').then((mod) => mod.SignUpComponent),
         data: { skipBreadcrumbs: true },

src/app/app.routes.ts

@@ -42,7 +42,7 @@ export class HeaderComponent {
       command: () => {
         this.loaderService.show();
         this.actions.logout();
-        this.router.navigate(['/home']).then(() => window.location.reload());
+        this.router.navigate(['/']).then(() => window.location.reload());
       },
     },
   ];

src/app/core/components/header/header.component.ts

@@ -14,7 +14,7 @@
 
         <span>{{ item.label | translate }}</span>
 
-        @if (item.items) {
+        @if (hasVisibleChildren | wrapFn: item) {
           <osf-icon
             class="ml-auto pt-1"
             [iconClass]="item.expanded ? `fas fa-chevron-down fa-sm` : `fas fa-chevron-right fa-sm`"

src/app/core/components/nav-menu/nav-menu.component.html

@@ -17,10 +17,11 @@ import { RouteContext } from '@osf/core/models';
 import { ProviderSelectors } from '@osf/core/store/provider';
 import { AuthSelectors } from '@osf/features/auth/store';
 import { IconComponent } from '@osf/shared/components';
+import { WrapFnPipe } from '@osf/shared/pipes';
 
 @Component({
   selector: 'osf-nav-menu',
-  imports: [RouterLinkActive, RouterLink, PanelMenuModule, TranslatePipe, IconComponent],
+  imports: [RouterLinkActive, RouterLink, PanelMenuModule, TranslatePipe, IconComponent, WrapFnPipe],
   templateUrl: './nav-menu.component.html',
   styleUrl: './nav-menu.component.scss',
 })
@@ -92,4 +93,7 @@ export class NavMenuComponent {
       this.closeMenu.emit();
     }
   }
+
+  protected readonly hasVisibleChildren = (item: MenuItem): boolean =>
+    Array.isArray(item.items) && item.items.some((child) => !!child.visible);
 }

src/app/core/components/nav-menu/nav-menu.component.ts

@@ -303,7 +303,7 @@ export const MENU_ITEMS: MenuItem[] = [
     items: [
       {
         id: 'collections-moderation',
-        routerLink: '/collections/ibdgc/moderation',
+        routerLink: 'moderation',
         label: 'navigation.moderation',
         visible: false,
         routerLinkActiveOptions: { exact: true },

src/app/core/constants/nav-items.constant.ts

@@ -2,3 +2,4 @@ export * from './http.helper';
 export * from './i18n.helper';
 export * from './nav-menu.helper';
 export * from './types.helper';
+export * from './url-param.helper';

src/app/core/helpers/index.ts

@@ -12,7 +12,15 @@ export function filterMenuItems(items: MenuItem[], isAuthenticated: boolean): Me
   return items.map((item) => {
     const isAuthenticatedItem = AUTHENTICATED_MENU_ITEMS.includes(item.id || '');
 
-    const updatedItem = { ...item, visible: isAuthenticatedItem ? isAuthenticated : item.visible };
+    let updatedItem: MenuItem = { ...item, visible: isAuthenticatedItem ? isAuthenticated : item.visible };
+
+    if (item.id === 'home') {
+      updatedItem = {
+        ...updatedItem,
+        routerLink: isAuthenticated ? '/dashboard' : '/',
+        routerLinkActiveOptions: isAuthenticated ? { exact: false } : { exact: true },
+      };
+    }
 
     if (item.items) {
       updatedItem.items = filterMenuItems(item.items, isAuthenticated);