Fix/649 moderation tab

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

@@ -12,12 +12,13 @@ import { toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, NavigationEnd, Router, RouterLink, RouterLinkActive } from '@angular/router';
 
 import { MENU_ITEMS } from '@core/constants';
+import { ProviderSelectors } from '@core/store/provider';
 import { filterMenuItems, updateMenuItems } from '@osf/core/helpers';
 import { RouteContext } from '@osf/core/models';
 import { AuthService } from '@osf/core/services';
 import { UserSelectors } from '@osf/core/store/user';
 import { IconComponent } from '@osf/shared/components';
-import { CurrentResourceType } from '@osf/shared/enums';
+import { CurrentResourceType, ReviewPermissions } from '@osf/shared/enums';
 import { getViewOnlyParam } from '@osf/shared/helpers';
 import { WrapFnPipe } from '@osf/shared/pipes';
 import { CurrentResourceSelectors } from '@osf/shared/stores';
@@ -37,14 +38,15 @@ export class NavMenuComponent {
 
   private readonly isAuthenticated = select(UserSelectors.isAuthenticated);
   private readonly currentResource = select(CurrentResourceSelectors.getCurrentResource);
+  private readonly provider = select(ProviderSelectors.getCurrentProvider);
 
   readonly mainMenuItems = computed(() => {
     const isAuthenticated = this.isAuthenticated();
     const filtered = filterMenuItems(MENU_ITEMS, isAuthenticated);
 
     const routeContext: RouteContext = {
       resourceId: this.currentResourceId(),
-      providerId: this.currentProviderId(),
+      providerId: this.provider()?.id,
       isProject:
         this.currentResource()?.type === CurrentResourceType.Projects &&
         this.currentResourceId() === this.currentResource()?.id,
@@ -53,6 +55,12 @@ export class NavMenuComponent {
         this.currentResourceId() === this.currentResource()?.id,
       isPreprint: this.isPreprintRoute(),
       preprintReviewsPageVisible: this.canUserViewReviews(),
+      registrationModerationPageVisible:
+        this.provider()?.type === CurrentResourceType.Registrations &&
+        this.provider()?.permissions?.includes(ReviewPermissions.ViewSubmissions),
+      collectionModerationPageVisible:
+        this.provider()?.type === CurrentResourceType.Collections &&
+        this.provider()?.permissions?.includes(ReviewPermissions.ViewSubmissions),
       isCollections: this.isCollectionsRoute() || false,
       currentUrl: this.router.url,
       isViewOnly: !!getViewOnlyParam(this.router),

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

@@ -329,7 +329,7 @@ export const MENU_ITEMS: MenuItem[] = [
         routerLink: 'moderation',
         label: 'navigation.moderation',
         visible: false,
-        routerLinkActiveOptions: { exact: true },
+        routerLinkActiveOptions: { exact: false },
       },
     ],
   },

src/app/core/helpers/nav-menu.helper.ts

@@ -61,7 +61,7 @@ export function updateMenuItems(menuItems: MenuItem[], ctx: RouteContext): MenuI
     }
 
     if (item.id === 'collections') {
-      return { ...item, visible: ctx.isCollections };
+      return updateCollectionMenuItem(item, ctx);
     }
 
     return item;
@@ -137,6 +137,15 @@ function updateRegistryMenuItem(item: MenuItem, ctx: RouteContext): MenuItem {
       }
       return { ...subItem, visible: false, expanded: false };
     }
+
+    if (subItem.id === 'registries-moderation') {
+      return {
+        ...subItem,
+        visible: ctx.registrationModerationPageVisible,
+        routerLink: ['/registries', ctx.providerId, 'moderation'],
+      };
+    }
+
     return subItem;
   });
 
@@ -169,3 +178,20 @@ function updatePreprintMenuItem(item: MenuItem, ctx: RouteContext): MenuItem {
 
   return { ...item, expanded: ctx.isPreprint, items };
 }
+
+function updateCollectionMenuItem(item: MenuItem, ctx: RouteContext): MenuItem {
+  const isCollections = ctx.isCollections;
+
+  const items = (item.items || []).map((subItem) => {
+    if (subItem.id === 'collections-moderation') {
+      return {
+        ...subItem,
+        visible: isCollections && ctx.collectionModerationPageVisible,
+        routerLink: ['/collections', ctx.providerId, 'moderation'],
+      };
+    }
+    return subItem;
+  });
+
+  return { ...item, items, visible: ctx.isCollections };
+}

src/app/core/models/route-context.model.ts

@@ -5,6 +5,8 @@ export interface RouteContext {
   isRegistry: boolean;
   isPreprint: boolean;
   preprintReviewsPageVisible?: boolean;
+  registrationModerationPageVisible?: boolean;
+  collectionModerationPageVisible?: boolean;
   isCollections: boolean;
   currentUrl?: string;
   isViewOnly?: boolean;

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

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

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

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

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

@@ -1,13 +1,13 @@
 import { Selector } from '@ngxs/store';
 
-import { ProviderModel } from '@osf/shared/models';
+import { ProviderShortInfoModel } 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 {
+  static getCurrentProvider(state: ProviderStateModel): ProviderShortInfoModel | null {
     return state.currentProvider;
   }
 }

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

@@ -2,7 +2,7 @@ import { Action, State, StateContext } from '@ngxs/store';
 
 import { Injectable } from '@angular/core';
 
-import { SetCurrentProvider } from './provider.actions';
+import { ClearCurrentProvider, SetCurrentProvider } from './provider.actions';
 import { PROVIDER_STATE_INITIAL, ProviderStateModel } from './provider.model';
 
 @State<ProviderStateModel>({
@@ -13,8 +13,11 @@ import { PROVIDER_STATE_INITIAL, ProviderStateModel } from './provider.model';
 export class ProviderState {
   @Action(SetCurrentProvider)
   setCurrentProvider(ctx: StateContext<ProviderStateModel>, action: SetCurrentProvider) {
-    ctx.patchState({
-      currentProvider: action.provider,
-    });
+    ctx.patchState({ currentProvider: action.provider });
+  }
+
+  @Action(ClearCurrentProvider)
+  clearCurrentProvider(ctx: StateContext<ProviderStateModel>) {
+    ctx.setState(PROVIDER_STATE_INITIAL);
   }
 }

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

@@ -45,10 +45,6 @@ export class UpdateProfileSettingsUser {
   constructor(public payload: Partial<User>) {}
 }
 
-export class SetUserAsModerator {
-  static readonly type = '[User] Set User As Moderator';
-}
-
 export class AcceptTermsOfServiceByUser {
   static readonly type = '[User] Accept Terms Of Service';
 }

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

@@ -58,11 +58,6 @@ export class UserSelectors {
     return state.currentUser.data?.social;
   }
 
-  @Selector([UserState])
-  static isCurrentUserModerator(state: UserStateModel): boolean {
-    return !!state.currentUser.data?.isModerator;
-  }
-
   @Selector([UserState])
   static getCanViewReviews(state: UserStateModel): boolean {
     return state.currentUser.data?.canViewReviews || false;

src/app/core/store/user/user.state.ts

@@ -18,7 +18,6 @@ import {
   GetCurrentUser,
   GetCurrentUserSettings,
   SetCurrentUser,
-  SetUserAsModerator,
   UpdateProfileSettingsEducation,
   UpdateProfileSettingsEmployment,
   UpdateProfileSettingsSocialLinks,
@@ -234,26 +233,6 @@ export class UserState {
     );
   }
 
-  @Action(SetUserAsModerator)
-  setUserAsModerator(ctx: StateContext<UserStateModel>) {
-    const state = ctx.getState();
-    const currentUser = state.currentUser.data;
-
-    if (!currentUser) {
-      return;
-    }
-
-    ctx.patchState({
-      currentUser: {
-        ...state.currentUser,
-        data: {
-          ...currentUser,
-          isModerator: true,
-        },
-      },
-    });
-  }
-
   @Action(AcceptTermsOfServiceByUser)
   acceptTermsOfServiceByUser(ctx: StateContext<UserStateModel>) {
     const state = ctx.getState();

src/app/features/admin-institutions/pages/institutions-projects/institutions-projects.component.ts

@@ -167,7 +167,7 @@ export class InstitutionsProjectsComponent implements OnInit, OnDestroy {
         .pipe(takeUntilDestroyed(this.destroyRef))
         .subscribe(() => this.toastService.showSuccess('adminInstitutions.institutionUsers.messageSent'));
     } else {
-      const projectId = (userRowData['title'] as TableCellLink).url.split('/').pop() || '';
+      const projectId = (userRowData['link'] as TableCellLink).url.split('/').pop() || '';
 
       this.actions
         .requestProjectAccess({

src/app/features/collections/collections.routes.ts

@@ -6,7 +6,14 @@ import { authGuard } from '@osf/core/guards';
 import { AddToCollectionState } from '@osf/features/collections/store/add-to-collection';
 import { CollectionsModerationState } from '@osf/features/moderation/store/collections-moderation';
 import { ConfirmLeavingGuard } from '@shared/guards';
-import { BookmarksState, CitationsState, ContributorsState, NodeLinksState, ProjectsState } from '@shared/stores';
+import {
+  BookmarksState,
+  CitationsState,
+  ContributorsState,
+  NodeLinksState,
+  ProjectsState,
+  SubjectsState,
+} from '@shared/stores';
 import { CollectionsState } from '@shared/stores/collections';
 
 export const collectionsRoutes: Routes = [
@@ -58,7 +65,14 @@ export const collectionsRoutes: Routes = [
             '@osf/features/moderation/components/collection-submission-overview/collection-submission-overview.component'
           ).then((mod) => mod.CollectionSubmissionOverviewComponent),
         providers: [
-          provideStates([NodeLinksState, CitationsState, CollectionsModerationState, CollectionsState, BookmarksState]),
+          provideStates([
+            NodeLinksState,
+            CitationsState,
+            CollectionsModerationState,
+            CollectionsState,
+            BookmarksState,
+            SubjectsState,
+          ]),
         ],
       },
     ],

src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts

@@ -37,7 +37,7 @@ import { TagsInputComponent, TextInputComponent, TruncatedTextComponent } from '
 import { InputLimits } from '@shared/constants';
 import { ResourceType } from '@shared/enums';
 import { LicenseModel } from '@shared/models';
-import { Project } from '@shared/models/projects';
+import { ProjectModel } from '@shared/models/projects';
 import { InterpolatePipe } from '@shared/pipes';
 import { ToastService } from '@shared/services';
 import { ClearProjects, GetAllContributors, UpdateProjectMetadata } from '@shared/stores';
@@ -189,7 +189,7 @@ export class ProjectMetadataStepComponent {
     this.metadataSaved.emit();
   }
 
-  private updateProjectMetadata(selectedProject: Project): void {
+  private updateProjectMetadata(selectedProject: ProjectModel): void {
     const metadata = this.formService.buildMetadataPayload(this.projectMetadataForm, selectedProject);
 
     this.actions

src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts

@@ -10,7 +10,7 @@ import { ChangeDetectionStrategy, Component, computed, input, output, signal } f
 import { AddToCollectionSteps } from '@osf/features/collections/enums';
 import { SetSelectedProject } from '@osf/shared/stores';
 import { ProjectSelectorComponent } from '@shared/components';
-import { Project } from '@shared/models/projects';
+import { ProjectModel } from '@shared/models/projects';
 import { CollectionsSelectors, GetUserCollectionSubmissions } from '@shared/stores/collections';
 import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors';
 
@@ -32,7 +32,7 @@ export class SelectProjectStepComponent {
   stepChange = output<number>();
   projectSelected = output<void>();
 
-  currentSelectedProject = signal<Project | null>(null);
+  currentSelectedProject = signal<ProjectModel | null>(null);
 
   excludedProjectIds = computed(() => {
     const submissions = this.currentUserSubmissions();
@@ -44,7 +44,7 @@ export class SelectProjectStepComponent {
     getUserCollectionSubmissions: GetUserCollectionSubmissions,
   });
 
-  handleProjectChange(project: Project | null): void {
+  handleProjectChange(project: ProjectModel | null): void {
     if (project) {
       this.currentSelectedProject.set(project);
       this.actions.setSelectedProject(project);
@@ -53,7 +53,7 @@ export class SelectProjectStepComponent {
     }
   }
 
-  handleProjectsLoaded(projects: Project[]): void {
+  handleProjectsLoaded(projects: ProjectModel[]): void {
     const collectionId = this.collectionId();
     if (collectionId && projects.length) {
       const projectIds = projects.map((project) => project.id);

src/app/features/collections/components/collections-discover/collections-discover.component.ts

@@ -12,12 +12,11 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 
-import { CollectionsHelpDialogComponent, CollectionsMainContentComponent } from '@osf/features/collections/components';
-import { CollectionsQuerySyncService } from '@osf/features/collections/services';
-import { LoadingSpinnerComponent, SearchInputComponent } from '@shared/components';
-import { HeaderStyleHelper } from '@shared/helpers';
-import { CollectionsFilters } from '@shared/models';
-import { BrandService } from '@shared/services';
+import { ClearCurrentProvider } from '@core/store/provider';
+import { LoadingSpinnerComponent, SearchInputComponent } from '@osf/shared/components';
+import { HeaderStyleHelper } from '@osf/shared/helpers';
+import { CollectionsFilters } from '@osf/shared/models';
+import { BrandService } from '@osf/shared/services';
 import {
   ClearCollections,
   ClearCollectionSubmissions,
@@ -27,7 +26,11 @@ import {
   SearchCollectionSubmissions,
   SetPageNumber,
   SetSearchValue,
-} from '@shared/stores/collections';
+} from '@osf/shared/stores';
+
+import { CollectionsQuerySyncService } from '../../services';
+import { CollectionsHelpDialogComponent } from '../collections-help-dialog/collections-help-dialog.component';
+import { CollectionsMainContentComponent } from '../collections-main-content';
 
 @Component({
   selector: 'osf-collections-discover',
@@ -72,6 +75,7 @@ export class CollectionsDiscoverComponent {
     setPageNumber: SetPageNumber,
     clearCollections: ClearCollections,
     clearCollectionsSubmissions: ClearCollectionSubmissions,
+    clearCurrentProvider: ClearCurrentProvider,
   });
 
   constructor() {

src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts

@@ -4,8 +4,6 @@ import { Chip } from 'primeng/chip';
 
 import { ChangeDetectionStrategy, Component, computed } from '@angular/core';
 
-import { collectionFilterTypes } from '@osf/features/collections/constants/filter-types.const';
-import { CollectionFilterType } from '@osf/features/collections/enums';
 import {
   CollectionsSelectors,
   SetCollectedTypeFilters,
@@ -20,6 +18,9 @@ import {
   SetVolumeFilters,
 } from '@shared/stores/collections';
 
+import { collectionFilterTypes } from '../../constants';
+import { CollectionFilterType } from '../../enums';
+
 @Component({
   selector: 'osf-collections-filter-chips',
   imports: [Chip],

src/app/features/collections/components/collections-filters/collections-filters.component.scss

@@ -1,8 +1,7 @@
-@use "styles/variables" as var;
 @use "styles/mixins" as mix;
 
 .filters {
-  border: 1px solid var.$grey-2;
+  border: 1px solid var(--grey-2);
   border-radius: mix.rem(12px);
   padding: 0 mix.rem(20px);
   display: flex;