portalicious: strings instead of numbers in query params

AB#32359
global-121 · Dec 20, 2024 · cb2e40f · cb2e40f
1 parent 9b76da7
commit cb2e40f
Show file tree

Hide file tree

Showing 46 changed files with 150 additions and 155 deletions.
diff --git a/interfaces/Portalicious/src/app/components/logo/logo.component.ts b/interfaces/Portalicious/src/app/components/logo/logo.component.ts
@@ -23,7 +23,7 @@ import { TranslatableStringPipe } from '~/pipes/translatable-string.pipe';
 export class LogoComponent {
   private projectApiService = inject(ProjectApiService);
 
-  projectId = input<number>();
+  projectId = input<string>();
   projectTitle = computed(() => this.project.data()?.titlePortal);
 
   public project = injectQuery(

diff --git a/interfaces/Portalicious/src/app/components/page-layout/components/header/header.component.ts b/interfaces/Portalicious/src/app/components/page-layout/components/header/header.component.ts
@@ -45,7 +45,7 @@ import { AuthService } from '~/services/auth.service';
 })
 export class HeaderComponent {
   private authService = inject(AuthService);
-  projectId = input<number>();
+  projectId = input<string>();
 
   userName = computed(() => this.authService.user?.username);
 

diff --git a/...us/src/app/components/page-layout/components/payment-header/payment-header.component.html b/...us/src/app/components/page-layout/components/payment-header/payment-header.component.html
diff --git a/...alicious/src/app/components/page-layout/components/project-menu/project-menu.component.ts b/...alicious/src/app/components/page-layout/components/project-menu/project-menu.component.ts
@@ -23,22 +23,22 @@ import { AuthService } from '~/services/auth.service';
 })
 export class ProjectMenuComponent {
   private authService = inject(AuthService);
-  projectId = input.required<number>();
+  projectId = input.required<string>();
 
   navMenuItems = computed<MenuItem[]>(() => [
     {
       label: $localize`:@@page-title-project-registrations:Registrations`,
-      routerLink: `/${AppRoutes.project}/${this.projectId().toString()}/${AppRoutes.projectRegistrations}`,
+      routerLink: `/${AppRoutes.project}/${this.projectId()}/${AppRoutes.projectRegistrations}`,
       icon: 'pi pi-file-edit',
     },
     {
       label: $localize`:@@page-title-project-payments:Payments`,
-      routerLink: `/${AppRoutes.project}/${this.projectId().toString()}/${AppRoutes.projectPayments}`,
+      routerLink: `/${AppRoutes.project}/${this.projectId()}/${AppRoutes.projectPayments}`,
       icon: 'pi pi-money-bill',
     },
     {
       label: $localize`:@@page-title-project-monitoring:Monitoring`,
-      routerLink: `/${AppRoutes.project}/${this.projectId().toString()}/${AppRoutes.projectMonitoring}`,
+      routerLink: `/${AppRoutes.project}/${this.projectId()}/${AppRoutes.projectMonitoring}`,
       icon: 'pi pi-chart-bar',
       visible: this.authService.hasPermission({
         projectId: this.projectId(),
@@ -47,7 +47,7 @@ export class ProjectMenuComponent {
     },
     {
       label: $localize`:@@page-title-project-team:Team`,
-      routerLink: `/${AppRoutes.project}/${this.projectId().toString()}/${AppRoutes.projectTeam}`,
+      routerLink: `/${AppRoutes.project}/${this.projectId()}/${AppRoutes.projectTeam}`,
       styleClass: 'ms-auto',
       icon: 'pi pi-users',
       visible: this.authService.hasPermission({

diff --git a/interfaces/Portalicious/src/app/components/page-layout/page-layout.component.ts b/interfaces/Portalicious/src/app/components/page-layout/page-layout.component.ts
@@ -43,7 +43,7 @@ export class PageLayoutComponent {
   parentPageTitle = input<string>();
   parentPageLink = input<RouterLink['routerLink']>();
 
-  projectId = input<number>();
+  projectId = input<string>();
 
   isPending = input<boolean>();
 

diff --git a/...p/components/registration-page-layout/components/add-note-form/add-note-form.component.ts b/...p/components/registration-page-layout/components/add-note-form/add-note-form.component.ts
@@ -45,7 +45,7 @@ export class AddNoteFormComponent {
   private toastService = inject(ToastService);
 
   formVisible = model.required<boolean>();
-  projectId = input.required<number>();
+  projectId = input.required<string>();
   registrationReferenceId = input.required<string>();
   registrationName = input<null | string>();
 

diff --git a/...ents/registration-page-layout/components/registration-menu/registration-menu.component.ts b/...ents/registration-page-layout/components/registration-menu/registration-menu.component.ts
@@ -24,11 +24,12 @@ import { RegistrationApiService } from '~/domains/registration/registration.api.
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class RegistrationMenuComponent {
+  readonly projectId = input.required<string>();
+  readonly registrationId = input.required<string>();
+
   readonly registrationApiService = inject(RegistrationApiService);
   readonly projectApiService = inject(ProjectApiService);
 
-  projectId = input.required<number>();
-  registrationId = input.required<number>();
   registration = injectQuery(
     this.registrationApiService.getRegistrationById(
       this.projectId,

diff --git a/...licious/src/app/components/registration-page-layout/registration-page-layout.component.ts b/...licious/src/app/components/registration-page-layout/registration-page-layout.component.ts
@@ -46,13 +46,13 @@ import { AuthService } from '~/services/auth.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class RegistrationPageLayoutComponent {
+  readonly projectId = input.required<string>();
+  readonly registrationId = input.required<string>();
+
   readonly registrationApiService = inject(RegistrationApiService);
   readonly projectApiService = inject(ProjectApiService);
   private authService = inject(AuthService);
 
-  projectId = input.required<number>();
-  registrationId = input.required<number>();
-
   project = injectQuery(this.projectApiService.getProject(this.projectId));
   registration = injectQuery(
     this.registrationApiService.getRegistrationById(

diff --git a/...aces/Portalicious/src/app/components/registrations-table/registrations-table.component.ts b/...aces/Portalicious/src/app/components/registrations-table/registrations-table.component.ts
@@ -39,7 +39,7 @@ import { TranslatableStringService } from '~/services/translatable-string.servic
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class RegistrationsTableComponent {
-  projectId = input.required<number>();
+  projectId = input.required<string>();
   contextMenuItems = input<MenuItem[]>();
   localStorageKey = input<string>();
   overrideFilters = input<Exclude<PaginateQuery['filter'], undefined>>({});

diff --git a/interfaces/Portalicious/src/app/domains/event/event.api.service.ts b/interfaces/Portalicious/src/app/domains/event/event.api.service.ts
@@ -3,7 +3,7 @@ import { Injectable, Signal } from '@angular/core';
 
 import { DomainApiService } from '~/domains/domain-api.service';
 
-const BASE_ENDPOINT = (projectId: Signal<number>) => [
+const BASE_ENDPOINT = (projectId: Signal<number | string>) => [
   'programs',
   projectId,
   'events',
@@ -17,7 +17,7 @@ export class EventApiService extends DomainApiService {
     projectId,
     params,
   }: {
-    projectId: Signal<number>;
+    projectId: Signal<number | string>;
     params: HttpParamsOptions['fromObject'];
   }) {
     return this.generateQueryOptions<Blob>({
@@ -27,7 +27,7 @@ export class EventApiService extends DomainApiService {
     });
   }
 
-  public invalidateCache(projectId: Signal<number>): Promise<void> {
+  public invalidateCache(projectId: Signal<number | string>): Promise<void> {
     return this.queryClient.invalidateQueries({
       queryKey: this.pathToQueryKey(BASE_ENDPOINT(projectId)),
     });

diff --git a/...al-service-provider-configuration/financial-service-provider-configuration.api.service.ts b/...al-service-provider-configuration/financial-service-provider-configuration.api.service.ts
@@ -3,7 +3,7 @@ import { Injectable, Signal } from '@angular/core';
 import { DomainApiService } from '~/domains/domain-api.service';
 import { FinancialServiceProviderConfiguration } from '~/domains/financial-service-provider-configuration/financial-service-provider-configuration.model';
 
-const BASE_ENDPOINT = (projectId: Signal<number>) => [
+const BASE_ENDPOINT = (projectId: Signal<number | string>) => [
   'programs',
   projectId,
   'financial-service-provider-configurations',
@@ -13,7 +13,9 @@ const BASE_ENDPOINT = (projectId: Signal<number>) => [
   providedIn: 'root',
 })
 export class FinancialServiceProviderConfigurationApiService extends DomainApiService {
-  getFinancialServiceProviderConfigurations(projectId: Signal<number>) {
+  getFinancialServiceProviderConfigurations(
+    projectId: Signal<number | string>,
+  ) {
     return this.generateQueryOptions<FinancialServiceProviderConfiguration[]>({
       path: BASE_ENDPOINT(projectId),
     });

diff --git a/interfaces/Portalicious/src/app/domains/metric/metric.api.service.ts b/interfaces/Portalicious/src/app/domains/metric/metric.api.service.ts
@@ -9,7 +9,7 @@ import {
   ProjectMetrics,
 } from '~/domains/metric/metric.model';
 
-const BASE_ENDPOINT = (projectId: Signal<number>) => [
+const BASE_ENDPOINT = (projectId: Signal<number | string>) => [
   'programs',
   projectId,
   'metrics',
@@ -19,7 +19,7 @@ const BASE_ENDPOINT = (projectId: Signal<number>) => [
   providedIn: 'root',
 })
 export class MetricApiService extends DomainApiService {
-  getProjectSummaryMetrics(projectId: Signal<number>) {
+  getProjectSummaryMetrics(projectId: Signal<number | string>) {
     return this.generateQueryOptions<ProjectMetrics>({
       path: [...BASE_ENDPOINT(projectId), 'program-stats-summary'],
     });
@@ -30,7 +30,7 @@ export class MetricApiService extends DomainApiService {
     type,
     params,
   }: {
-    projectId: Signal<number>;
+    projectId: Signal<number | string>;
     type: ExportType;
     params: HttpParamsOptions['fromObject'];
   }) {
@@ -46,8 +46,8 @@ export class MetricApiService extends DomainApiService {
     projectId,
     payment,
   }: {
-    projectId: Signal<number>;
-    payment: Signal<number>;
+    projectId: Signal<number | string>;
+    payment: Signal<number | string>;
   }) {
     return this.generateQueryOptions<
       { data: PaymentMetricDetails[] },
@@ -64,7 +64,7 @@ export class MetricApiService extends DomainApiService {
     });
   }
 
-  public invalidateCache(projectId: Signal<number>): Promise<void> {
+  public invalidateCache(projectId: Signal<number | string>): Promise<void> {
     return this.queryClient.invalidateQueries({
       queryKey: this.pathToQueryKey(BASE_ENDPOINT(projectId)),
     });

diff --git a/interfaces/Portalicious/src/app/domains/notification/notification.api.service.ts b/interfaces/Portalicious/src/app/domains/notification/notification.api.service.ts
@@ -8,7 +8,7 @@ import {
 import { TranslatableStringService } from '~/services/translatable-string.service';
 import { getLanguageEnumFromLocale, Locale } from '~/utils/locale';
 
-const BASE_ENDPOINT = (projectId: Signal<number>) => [
+const BASE_ENDPOINT = (projectId: Signal<number | string>) => [
   'notifications',
   projectId,
 ];
@@ -22,13 +22,13 @@ export class NotificationApiService extends DomainApiService {
     TranslatableStringService,
   );
 
-  getMessageTemplates(projectId: Signal<number | undefined>) {
+  getMessageTemplates(projectId: Signal<number | string | undefined>) {
     return this.generateQueryOptions<
       MessageTemplate[],
       MessageTemplateWithTranslatedLabel[]
     >({
       path: [
-        ...BASE_ENDPOINT(projectId as Signal<number>),
+        ...BASE_ENDPOINT(projectId as Signal<number | string>),
         'message-templates',
       ],
       processResponse: (response) => {
@@ -53,7 +53,9 @@ export class NotificationApiService extends DomainApiService {
     });
   }
 
-  public invalidateMessageTemplates(projectId: Signal<number>): Promise<void> {
+  public invalidateMessageTemplates(
+    projectId: Signal<number | string>,
+  ): Promise<void> {
     const path = [...BASE_ENDPOINT(projectId), 'message-templates'];
 
     return this.queryClient.invalidateQueries({

diff --git a/interfaces/Portalicious/src/app/domains/payment/payment.api.service.ts b/interfaces/Portalicious/src/app/domains/payment/payment.api.service.ts
@@ -16,7 +16,7 @@ import {
 import { PaginateQuery } from '~/services/paginate-query.service';
 import { Dto } from '~/utils/dto-type';
 
-const BASE_ENDPOINT = (projectId: Signal<number>) => [
+const BASE_ENDPOINT = (projectId: Signal<number | string>) => [
   'programs',
   projectId,
   'payments',
@@ -26,23 +26,23 @@ const BASE_ENDPOINT = (projectId: Signal<number>) => [
   providedIn: 'root',
 })
 export class PaymentApiService extends DomainApiService {
-  getPayments(projectId: Signal<number>) {
+  getPayments(projectId: Signal<number | string>) {
     return this.generateQueryOptions<Payment[]>({
       path: [...BASE_ENDPOINT(projectId)],
     });
   }
 
   getPayment(
-    projectId: Signal<number | undefined>,
-    paymentId: Signal<number | undefined>,
+    projectId: Signal<number | string | undefined>,
+    paymentId: Signal<number | string | undefined>,
   ) {
     return this.generateQueryOptions<PaymentAggregate>({
-      path: [...BASE_ENDPOINT(projectId as Signal<number>), paymentId],
+      path: [...BASE_ENDPOINT(projectId as Signal<number | string>), paymentId],
       enabled: () => !!projectId() && !!paymentId(),
     });
   }
 
-  getPaymentStatus(projectId: Signal<number>) {
+  getPaymentStatus(projectId: Signal<number | string>) {
     return this.generateQueryOptions<PaymentStatus>({
       path: [...BASE_ENDPOINT(projectId), 'status'],
       refetchInterval: 3000,
@@ -55,7 +55,7 @@ export class PaymentApiService extends DomainApiService {
     paymentData,
     dryRun = true,
   }: {
-    projectId: Signal<number>;
+    projectId: Signal<number | string>;
     paginateQuery: PaginateQuery;
     paymentData: Dto<CreatePaymentDto>;
     dryRun?: boolean;
@@ -80,12 +80,12 @@ export class PaymentApiService extends DomainApiService {
     paymentId,
     referenceIds,
   }: {
-    projectId: Signal<number>;
-    paymentId: number;
+    projectId: Signal<number | string>;
+    paymentId: number | string;
     referenceIds: string[];
   }) {
     const body: Dto<RetryPaymentDto> = {
-      payment: paymentId,
+      payment: Number(paymentId),
       referenceIds: {
         referenceIds,
       },
@@ -104,16 +104,16 @@ export class PaymentApiService extends DomainApiService {
     projectId,
     paymentId,
   }: {
-    projectId: Signal<number>;
-    paymentId: string;
+    projectId: Signal<number | string>;
+    paymentId: number | string;
   }) {
     return this.generateQueryOptions<Dto<FspInstructions[]>>({
       path: [...BASE_ENDPOINT(projectId), paymentId, 'fsp-instructions'],
       staleTime: 0,
     });
   }
 
-  getReconciliationDataTemplates(projectId: Signal<number>) {
+  getReconciliationDataTemplates(projectId: Signal<number | string>) {
     return this.generateQueryOptions<Dto<GetImportTemplateResponseDto>[]>({
       path: [
         ...BASE_ENDPOINT(projectId),
@@ -128,8 +128,8 @@ export class PaymentApiService extends DomainApiService {
     paymentId,
     file,
   }: {
-    projectId: Signal<number>;
-    paymentId: Signal<number>;
+    paymentId: Signal<number | string>;
+    projectId: Signal<number | string>;
     file: File;
   }) {
     const formData = new FormData();
@@ -148,8 +148,8 @@ export class PaymentApiService extends DomainApiService {
   }
 
   public invalidateCache(
-    projectId: Signal<number>,
-    paymentId?: Signal<number>,
+    projectId: Signal<number | string>,
+    paymentId?: Signal<number | string>,
   ): Promise<void> {
     const path = [...BASE_ENDPOINT(projectId)];