Fix/649 moderation tab (#400)

* fix(users): added 5 more columns options

* fix(summary): fixed charts numbers display

* fix(institutions): updates

* fix(users-state): removed unused code

* fix(collections): updated imports

* fix(provider): updated collection and registration providers

* fix(registry-provider): updated provider for registrations

* fix(moderation-tab): updated provider setup

* fix(tests): fixed unit tests

* fix(conflict): removed code from conflict

* fix(banner): fixed code in banner component

* fix(collections): fixed visibility of collections tab

* fix(collections): fixed subjects bug

* fix(moderators): fixed moderators and contributors search

Author: nsemets

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;