fix(moderators): fixed moderators and contributors search

Author: nsemets

src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.ts

@@ -37,8 +37,8 @@ import {
   DeleteContributor,
   UpdateBibliographyFilter,
   UpdateContributor,
+  UpdateContributorsSearchValue,
   UpdatePermissionFilter,
-  UpdateSearchValue,
 } from '@osf/shared/stores';
 
 @Component({
@@ -70,13 +70,14 @@ export class ContributorsDialogComponent implements OnInit {
     const initialContributors = this.initialContributors();
     if (!currentUserId) return false;
 
-    return initialContributors.some((contributor: ContributorModel) => {
-      return contributor.userId === currentUserId && contributor.permission === ContributorPermission.Admin;
-    });
+    return initialContributors.some(
+      (contributor: ContributorModel) =>
+        contributor.userId === currentUserId && contributor.permission === ContributorPermission.Admin
+    );
   });
 
   actions = createDispatchMap({
-    updateSearchValue: UpdateSearchValue,
+    updateSearchValue: UpdateContributorsSearchValue,
     updatePermissionFilter: UpdatePermissionFilter,
     updateBibliographyFilter: UpdateBibliographyFilter,
     deleteContributor: DeleteContributor,

src/app/features/moderation/components/moderators-list/moderators-list.component.ts

@@ -26,7 +26,6 @@ import { UserSelectors } from '@core/store/user';
 import { SearchInputComponent } from '@osf/shared/components';
 import { ResourceType } from '@osf/shared/enums';
 import { CustomConfirmationService, ToastService } from '@osf/shared/services';
-import { UpdateSearchValue } from '@osf/shared/stores';
 
 import { AddModeratorType, ModeratorPermission } from '../../enums';
 import { ModeratorDialogAddModel, ModeratorModel } from '../../models';
@@ -36,6 +35,7 @@ import {
   LoadModerators,
   ModeratorsSelectors,
   UpdateModerator,
+  UpdateModeratorsSearchValue,
 } from '../../store/moderators';
 import { AddModeratorDialogComponent } from '../add-moderator-dialog/add-moderator-dialog.component';
 import { InviteModeratorDialogComponent } from '../invite-moderator-dialog/invite-moderator-dialog.component';
@@ -83,7 +83,7 @@ export class ModeratorsListComponent implements OnInit {
 
   actions = createDispatchMap({
     loadModerators: LoadModerators,
-    updateSearchValue: UpdateSearchValue,
+    updateSearchValue: UpdateModeratorsSearchValue,
     addModerators: AddModerator,
     updateModerator: UpdateModerator,
     deleteModerator: DeleteModerator,

src/app/features/moderation/store/moderators/moderators.actions.ts

@@ -43,7 +43,7 @@ export class DeleteModerator {
   ) {}
 }
 
-export class UpdateSearchValue {
+export class UpdateModeratorsSearchValue {
   static readonly type = `${ACTION_SCOPE} Update Search Value`;
 
   constructor(public searchValue: string | null) {}

src/app/features/moderation/store/moderators/moderators.state.ts

@@ -16,7 +16,7 @@ import {
   LoadModerators,
   SearchUsers,
   UpdateModerator,
-  UpdateSearchValue,
+  UpdateModeratorsSearchValue,
 } from './moderators.actions';
 import { MODERATORS_STATE_DEFAULTS, ModeratorsStateModel } from './moderators.model';
 
@@ -54,8 +54,8 @@ export class ModeratorsState {
     );
   }
 
-  @Action(UpdateSearchValue)
-  updateSearchValue(ctx: StateContext<ModeratorsStateModel>, action: UpdateSearchValue) {
+  @Action(UpdateModeratorsSearchValue)
+  updateModeratorsSearchValue(ctx: StateContext<ModeratorsStateModel>, action: UpdateModeratorsSearchValue) {
     ctx.patchState({
       moderators: { ...ctx.getState().moderators, searchValue: action.searchValue },
     });

src/app/features/project/contributors/contributors.component.ts

@@ -53,8 +53,8 @@ import {
   GetResourceDetails,
   UpdateBibliographyFilter,
   UpdateContributor,
+  UpdateContributorsSearchValue,
   UpdatePermissionFilter,
-  UpdateSearchValue,
   ViewOnlyLinkSelectors,
 } from '@osf/shared/stores';
 
@@ -124,7 +124,7 @@ export class ContributorsComponent implements OnInit {
     getViewOnlyLinks: FetchViewOnlyLinks,
     getResourceDetails: GetResourceDetails,
     getContributors: GetAllContributors,
-    updateSearchValue: UpdateSearchValue,
+    updateSearchValue: UpdateContributorsSearchValue,
     updatePermissionFilter: UpdatePermissionFilter,
     updateBibliographyFilter: UpdateBibliographyFilter,
     deleteContributor: DeleteContributor,

src/app/shared/stores/contributors/contributors.actions.ts

@@ -10,7 +10,7 @@ export class GetAllContributors {
   ) {}
 }
 
-export class UpdateSearchValue {
+export class UpdateContributorsSearchValue {
   static readonly type = '[Contributors] Update Search Value';
 
   constructor(public searchValue: string | null) {}

src/app/shared/stores/contributors/contributors.state.ts

@@ -16,8 +16,8 @@ import {
   SearchUsers,
   UpdateBibliographyFilter,
   UpdateContributor,
+  UpdateContributorsSearchValue,
   UpdatePermissionFilter,
-  UpdateSearchValue,
 } from './contributors.actions';
 import { CONTRIBUTORS_STATE_DEFAULTS, ContributorsStateModel } from './contributors.model';
 
@@ -141,8 +141,8 @@ export class ContributorsState {
       );
   }
 
-  @Action(UpdateSearchValue)
-  updateSearchValue(ctx: StateContext<ContributorsStateModel>, action: UpdateSearchValue) {
+  @Action(UpdateContributorsSearchValue)
+  updateContributorsSearchValue(ctx: StateContext<ContributorsStateModel>, action: UpdateContributorsSearchValue) {
     ctx.patchState({ contributorsList: { ...ctx.getState().contributorsList, searchValue: action.searchValue } });
   }