Merge remote-tracking branch 'origin/main' into feat/sign-up

Author: nsemets

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

@@ -50,13 +50,13 @@
           </div>
         }
       }
-
       @if (item.id === 'registry-details' && isRegistryRoute()) {
-        <p-panelMenu [model]="registrationMenuItems" [multiple]="false" class="border-none">
+        <p-panelMenu [model]="registrationMenuItems()" [multiple]="false" class="border-none">
           <ng-template #item let-item>
             <a
-              [routerLink]="item.routerLink ? ['/registries', currentResourceId(), item.routerLink] : null"
+              [routerLink]="item.routerLink"
               [routerLinkActive]="item.routerLink ? 'active' : ''"
+              [queryParams]="item.queryParams"
               [routerLinkActiveOptions]="{ exact: true }"
               class="nav-link flex align-items-center"
               (click)="goToLink(item)"

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

@@ -11,8 +11,10 @@ import { Component, computed, inject, output } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, NavigationEnd, Router, RouterLink, RouterLinkActive } from '@angular/router';
 
-import { PROJECT_MENU_ITEMS, REGISTRATION_MENU_ITEMS } from '@core/constants';
+import { MODERATION_MENU_ITEM, PROJECT_MENU_ITEMS, REGISTRATION_MENU_ITEMS } from '@core/constants';
 import { NavigationService } from '@core/services';
+import { ProviderSelectors } from '@osf/core/store/provider';
+import { UserSelectors } from '@osf/core/store/user';
 import { AuthSelectors } from '@osf/features/auth/store';
 import { IconComponent } from '@osf/shared/components';
 
@@ -32,7 +34,30 @@ export class NavMenuComponent {
   private readonly isAuthenticated = select(AuthSelectors.isAuthenticated);
 
   protected readonly myProjectMenuItems = PROJECT_MENU_ITEMS;
-  protected readonly registrationMenuItems = REGISTRATION_MENU_ITEMS;
+  protected readonly registrationMenuItems = computed(() => {
+    const menu = [...REGISTRATION_MENU_ITEMS];
+    if (this.isUserModerator()) {
+      const menuItems = menu[0].items ?? [];
+      if (!menuItems.some((item) => item.label === MODERATION_MENU_ITEM.label)) {
+        menuItems.push(MODERATION_MENU_ITEM);
+      }
+    }
+    const withRouterLinks = menu.map((section) => ({
+      ...section,
+      items: section.items?.map((item) => {
+        const isModerationPage = item.state && item.state['isModeration'];
+        const routeId = isModerationPage ? this.provider()?.id : this.currentResourceId();
+        return {
+          ...item,
+          routerLink: item.routerLink ? ['/registries', routeId, item.routerLink] : null,
+          queryParams: isModerationPage ? { resourceId: this.currentResourceId() } : {},
+        };
+      }),
+    }));
+    return withRouterLinks;
+  });
+  protected readonly isUserModerator = select(UserSelectors.isCurrentUserModerator);
+  protected readonly provider = select(ProviderSelectors.getCurrentProvider);
 
   protected readonly mainMenuItems = computed(() => {
     const isAuthenticated = this.isAuthenticated();
@@ -69,14 +94,12 @@ export class NavMenuComponent {
 
   private getRouteInfo() {
     const urlSegments = this.router.url.split('/').filter((segment) => segment);
-
-    const resourceId = this.route.firstChild?.snapshot.params['id'] || null;
+    const resourceFromQueryParams = this.route.snapshot.queryParams['resourceId'];
+    const resourceId = this.route.firstChild?.snapshot.params['id'] || resourceFromQueryParams;
     const section = this.route.firstChild?.firstChild?.snapshot.url[0]?.path || 'overview';
-
     const isCollectionsWithId = urlSegments[0] === 'collections' && urlSegments[1] && urlSegments[1] !== '';
     const isRegistryRoute = urlSegments[0] === 'registries' && !!urlSegments[2];
     const isRegistryRouteDetails = urlSegments[0] === 'registries' && urlSegments[2] === 'overview';
-
     return {
       resourceId,
       section,

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

@@ -284,3 +284,11 @@ export const REGISTRATION_MENU_ITEMS: MenuItem[] = [
     ],
   },
 ];
+
+export const MODERATION_MENU_ITEM: MenuItem = {
+  label: 'navigation.moderation',
+  routerLink: 'moderation',
+  state: {
+    isModeration: true,
+  },
+};

src/app/core/constants/ngxs-states.constant.ts

@@ -1,5 +1,5 @@
+import { ProviderState } from '@core/store/provider';
 import { UserState } from '@core/store/user';
-import { AuthState } from '@osf/features/auth/store';
 import { MeetingsState } from '@osf/features/meetings/store';
 import { ProjectMetadataState } from '@osf/features/project/metadata/store';
 import { ProjectOverviewState } from '@osf/features/project/overview/store';
@@ -13,9 +13,9 @@ import { MyResourcesState } from '@shared/stores/my-resources';
 import { RegionsState } from '@shared/stores/regions';
 
 export const STATES = [
-  AuthState,
   AddonsState,
   UserState,
+  ProviderState,
   MyResourcesState,
   InstitutionsState,
   DeveloperAppsState,

src/app/core/interceptors/auth.interceptor.ts

@@ -11,7 +11,7 @@ export const authInterceptor: HttpInterceptorFn = (
 ): Observable<HttpEvent<unknown>> => {
   const cookieService = inject(CookieService);
   // TODO: remove this after the migration to the new auth approach is complete
-  const authToken = 'UlO9O9GNKgVzJD7pUeY53jiQTKJ4U2znXVWNvh0KZQruoENuILx0IIYf9LoDz7Duq72EIm';
+  const authToken = '2rjFZwmdDG4rtKj7hGkEMO6XyHBM2lN7XBbsA1e8OqcFhOWu6Z7fQZiheu9RXtzSeVrgOt';
   // UlO9O9GNKgVzJD7pUeY53jiQTKJ4U2znXVWNvh0KZQruoENuILx0IIYf9LoDz7Duq72EIm kyrylo
   // 2rjFZwmdDG4rtKj7hGkEMO6XyHBM2lN7XBbsA1e8OqcFhOWu6Z7fQZiheu9RXtzSeVrgOt roman nastyuk
   // yZ485nN6MfhqvGrfU4Xk5BEnq0T6LM50nQ6H9VrYaMTaZUQNTuxnIwlp0Wpz879RCsK9GQ NM stage3

src/app/core/models/user.models.ts

@@ -16,6 +16,7 @@ export interface User {
   iri?: string;
   defaultRegionId: string;
   allowIndexing: boolean | undefined;
+  isModerator?: boolean;
 }
 
 export interface UserSettings {

src/app/core/store/provider/index.ts

@@ -0,0 +1,4 @@
+export * from './provider.actions';
+export * from './provider.model';
+export * from './provider.selectors';
+export * from './provider.state';

src/app/core/store/provider/provider.actions.ts

@@ -0,0 +1,6 @@
+import { ProviderModel } from '@osf/shared/models';
+
+export class SetCurrentProvider {
+  static readonly type = '[Provider] Set Current Provider';
+  constructor(public provider: ProviderModel) {}
+}

src/app/core/store/provider/provider.model.ts

@@ -0,0 +1,9 @@
+import { ProviderModel } from '@osf/shared/models';
+
+export interface ProviderStateModel {
+  currentProvider: ProviderModel | null;
+}
+
+export const PROVIDER_STATE_INITIAL: ProviderStateModel = {
+  currentProvider: null,
+};

src/app/core/store/provider/provider.selectors.ts

@@ -0,0 +1,13 @@
+import { Selector } from '@ngxs/store';
+
+import { ProviderModel } from '@osf/shared/models';
+
+import { ProviderStateModel } from './provider.model';
+import { ProviderState } from './provider.state';
+
+export class ProviderSelectors {
+  @Selector([ProviderState])
+  static getCurrentProvider(state: ProviderStateModel): ProviderModel | null {
+    return state.currentProvider;
+  }
+}