From bc239c0708be4b2fa2f857a028134be0c14b764a Mon Sep 17 00:00:00 2001 From: nsemets Date: Mon, 4 Aug 2025 20:30:11 +0300 Subject: [PATCH] fix(moderation-provider): fixed moderation provider param --- src/app/features/collections/collections.routes.ts | 2 +- .../collection-moderation-submissions.component.ts | 2 +- .../components/moderators-list/moderators-list.component.ts | 2 +- .../preprint-moderation-settings.component.ts | 4 +++- .../preprint-submissions/preprint-submissions.component.ts | 2 +- .../preprint-withdrawal-submissions.component.ts | 2 +- .../registry-pending-submissions.component.ts | 2 +- .../registry-submissions/registry-submissions.component.ts | 2 +- src/app/features/preprints/preprints.routes.ts | 2 +- src/app/features/registries/registries.routes.ts | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/app/features/collections/collections.routes.ts b/src/app/features/collections/collections.routes.ts index b34f680cc..4b12f927b 100644 --- a/src/app/features/collections/collections.routes.ts +++ b/src/app/features/collections/collections.routes.ts @@ -43,7 +43,7 @@ export const collectionsRoutes: Routes = [ canDeactivate: [ConfirmLeavingGuard], }, { - path: ':collectionId/moderation', + path: ':providerId/moderation', loadChildren: () => import('@osf/features/moderation/collection-moderation.routes').then((m) => m.collectionModerationRoutes), }, diff --git a/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts b/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts index 7b959bcc8..310f57472 100644 --- a/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts +++ b/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts @@ -195,7 +195,7 @@ export class CollectionModerationSubmissionsComponent { } private initializeCollectionProvider(): void { - const id = this.route.parent?.snapshot.paramMap.get('collectionId'); + const id = this.route.parent?.snapshot.paramMap.get('providerId'); if (!id) { this.router.navigate(['/not-found']); diff --git a/src/app/features/moderation/components/moderators-list/moderators-list.component.ts b/src/app/features/moderation/components/moderators-list/moderators-list.component.ts index 0d930b4d1..3581085f5 100644 --- a/src/app/features/moderation/components/moderators-list/moderators-list.component.ts +++ b/src/app/features/moderation/components/moderators-list/moderators-list.component.ts @@ -49,7 +49,7 @@ export class ModeratorsListComponent implements OnInit { private readonly toastService = inject(ToastService); readonly providerId = toSignal( - this.route.parent?.params.pipe(map((params) => params['collectionId'])) ?? of(undefined) + this.route.parent?.params.pipe(map((params) => params['providerId'])) ?? of(undefined) ); readonly resourceType: Signal = toSignal( this.route.data.pipe(map((params) => params['resourceType'])) ?? of(undefined) diff --git a/src/app/features/moderation/components/preprint-moderation-settings/preprint-moderation-settings.component.ts b/src/app/features/moderation/components/preprint-moderation-settings/preprint-moderation-settings.component.ts index 05022ef15..b3c0a50ba 100644 --- a/src/app/features/moderation/components/preprint-moderation-settings/preprint-moderation-settings.component.ts +++ b/src/app/features/moderation/components/preprint-moderation-settings/preprint-moderation-settings.component.ts @@ -33,7 +33,9 @@ export class PreprintModerationSettingsComponent implements OnInit { private readonly fb = inject(FormBuilder); private readonly actions = createDispatchMap({ getPreprintProvider: GetPreprintProvider }); - readonly providerId = toSignal(this.route.parent?.params.pipe(map((params) => params['id'])) ?? of(undefined)); + readonly providerId = toSignal( + this.route.parent?.params.pipe(map((params) => params['providerId'])) ?? of(undefined) + ); settingsForm!: FormGroup; sections = PREPRINT_SETTINGS_SECTIONS; diff --git a/src/app/features/moderation/components/preprint-submissions/preprint-submissions.component.ts b/src/app/features/moderation/components/preprint-submissions/preprint-submissions.component.ts index 1f0223c57..38b765dd1 100644 --- a/src/app/features/moderation/components/preprint-submissions/preprint-submissions.component.ts +++ b/src/app/features/moderation/components/preprint-submissions/preprint-submissions.component.ts @@ -50,7 +50,7 @@ export class PreprintSubmissionsComponent implements OnInit { private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); private readonly providerId = toSignal( - this.route.parent?.params.pipe(map((params) => params['id'])) ?? of(undefined) + this.route.parent?.params.pipe(map((params) => params['providerId'])) ?? of(undefined) ); readonly actions = createDispatchMap({ getPreprintSubmissions: GetPreprintSubmissions }); diff --git a/src/app/features/moderation/components/preprint-withdrawal-submissions/preprint-withdrawal-submissions.component.ts b/src/app/features/moderation/components/preprint-withdrawal-submissions/preprint-withdrawal-submissions.component.ts index 38baf7fb9..43a4ff581 100644 --- a/src/app/features/moderation/components/preprint-withdrawal-submissions/preprint-withdrawal-submissions.component.ts +++ b/src/app/features/moderation/components/preprint-withdrawal-submissions/preprint-withdrawal-submissions.component.ts @@ -50,7 +50,7 @@ export class PreprintWithdrawalSubmissionsComponent implements OnInit { private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); private readonly providerId = toSignal( - this.route.parent?.params.pipe(map((params) => params['id'])) ?? of(undefined) + this.route.parent?.params.pipe(map((params) => params['providerId'])) ?? of(undefined) ); readonly actions = createDispatchMap({ getPreprintWithdrawalSubmissions: GetPreprintWithdrawalSubmissions }); diff --git a/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts b/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts index e76b06997..c81fc8f0b 100644 --- a/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts +++ b/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts @@ -53,7 +53,7 @@ export class RegistryPendingSubmissionsComponent implements OnInit { private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); private readonly providerId = toSignal( - this.route.parent?.params.pipe(map((params) => params['id'])) ?? of(undefined) + this.route.parent?.params.pipe(map((params) => params['providerId'])) ?? of(undefined) ); readonly actions = createDispatchMap({ getRegistrySubmissions: GetRegistrySubmissions }); diff --git a/src/app/features/moderation/components/registry-submissions/registry-submissions.component.ts b/src/app/features/moderation/components/registry-submissions/registry-submissions.component.ts index 88a11e68c..dd3a7400b 100644 --- a/src/app/features/moderation/components/registry-submissions/registry-submissions.component.ts +++ b/src/app/features/moderation/components/registry-submissions/registry-submissions.component.ts @@ -50,7 +50,7 @@ export class RegistrySubmissionsComponent implements OnInit { private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); private readonly providerId = toSignal( - this.route.parent?.params.pipe(map((params) => params['id'])) ?? of(undefined) + this.route.parent?.params.pipe(map((params) => params['providerId'])) ?? of(undefined) ); readonly actions = createDispatchMap({ getRegistrySubmissions: GetRegistrySubmissions }); diff --git a/src/app/features/preprints/preprints.routes.ts b/src/app/features/preprints/preprints.routes.ts index 3580625c6..d058c687b 100644 --- a/src/app/features/preprints/preprints.routes.ts +++ b/src/app/features/preprints/preprints.routes.ts @@ -88,7 +88,7 @@ export const preprintsRoutes: Routes = [ ), }, { - path: ':id/moderation', + path: ':providerId/moderation', loadChildren: () => import('@osf/features/moderation/preprint-moderation.routes').then((mod) => mod.preprintModerationRoutes), }, diff --git a/src/app/features/registries/registries.routes.ts b/src/app/features/registries/registries.routes.ts index ace160f71..08d982518 100644 --- a/src/app/features/registries/registries.routes.ts +++ b/src/app/features/registries/registries.routes.ts @@ -45,7 +45,7 @@ export const registriesRoutes: Routes = [ loadComponent: () => import('@osf/features/registries/pages').then((c) => c.MyRegistrationsComponent), }, { - path: ':id/moderation', + path: ':providerId/moderation', loadChildren: () => import('@osf/features/moderation/registry-moderation.routes').then((c) => c.registryModerationRoutes), },