chore: tanstack + eslint upgrade AB#32202 (#6372)

* chore: tanstack + eslint upgrade AB#32202 * fix: replace deprecated method AB#32202
global-121 · Jan 9, 2025 · 1492a64 · 1492a64
1 parent d633899
commit 1492a64
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 108 deletions.
diff --git a/interfaces/Portalicious/package-lock.json b/interfaces/Portalicious/package-lock.json
diff --git a/interfaces/Portalicious/package.json b/interfaces/Portalicious/package.json
@@ -39,7 +39,7 @@
     "@azure/msal-browser": "3.28.0",
     "@microsoft/applicationinsights-web": "^3.3.4",
     "@primeng/themes": "^19.0.2",
-    "@tanstack/angular-query-experimental": "^5.62.8",
+    "@tanstack/angular-query-experimental": "^5.62.16",
     "angular-mentions": "^1.5.0",
     "chart.js": "^4.4.7",
     "chartjs-plugin-datalabels": "^2.2.0",
@@ -62,15 +62,15 @@
     "@microsoft/applicationinsights-debugplugin-js": "^3.3.4",
     "@prettier/plugin-xml": "^3.4.1",
     "@savvywombat/tailwindcss-grid-areas": "^4.0.0",
-    "@tanstack/eslint-plugin-query": "^5.62.1",
+    "@tanstack/eslint-plugin-query": "^5.62.16",
     "@types/jasmine": "~5.1.5",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.14",
     "angular-eslint": "^19.0.2",
     "autoprefixer": "^10.4.20",
     "dotenv": "^16.4.7",
     "eslint": "^9.16.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-no-relative-import-paths": "^1.5.5",
+    "eslint-plugin-no-relative-import-paths": "^1.6.1",
     "eslint-plugin-perfectionist": "^3.9.1",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-regexp": "^2.7.0",
@@ -89,7 +89,7 @@
     "shx": "^0.3.4",
     "tailwindcss": "^3.4.17",
     "typescript": "~5.6.0",
-    "typescript-eslint": "^8.19.0"
+    "typescript-eslint": "^8.19.1"
   },
   "overrides": {
     "ngx-filesize": {

diff --git a/interfaces/Portalicious/src/app/domains/domain-api.service.ts b/interfaces/Portalicious/src/app/domains/domain-api.service.ts
@@ -1,7 +1,7 @@
 import { inject, isSignal, Signal } from '@angular/core';
 
 import {
-  injectQueryClient,
+  QueryClient,
   queryOptions,
   UndefinedInitialDataOptions,
 } from '@tanstack/angular-query-experimental';
@@ -18,7 +18,7 @@ import {
 export abstract class DomainApiService {
   protected httpWrapperService = inject(HttpWrapperService);
   protected paginateQueryService = inject(PaginateQueryService);
-  protected queryClient = injectQueryClient();
+  protected queryClient = inject(QueryClient);
 
   protected pathToQueryKey = (
     path: (number | Signal<number | string | undefined> | string)[],

diff --git a/interfaces/Portalicious/src/app/guards/found-resource.guard.ts b/interfaces/Portalicious/src/app/guards/found-resource.guard.ts
@@ -1,7 +1,7 @@
 import { inject, signal } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivateFn, Router } from '@angular/router';
 
-import { injectQueryClient } from '@tanstack/angular-query-experimental';
+import { QueryClient } from '@tanstack/angular-query-experimental';
 
 import { PaymentApiService } from '~/domains/payment/payment.api.service';
 import { ProjectApiService } from '~/domains/project/project.api.service';
@@ -17,7 +17,7 @@ export const foundResourceGuard: (
   return async function projectPermissionsCanActivateFn(
     route: ActivatedRouteSnapshot,
   ) {
-    const queryClient = injectQueryClient();
+    const queryClient = inject(QueryClient);
     const router = inject(Router);
 
     const registrationApiService = inject(RegistrationApiService);

diff --git a/...ect-payment/components/import-reconciliation-data/import-reconciliation-data.component.ts b/...ect-payment/components/import-reconciliation-data/import-reconciliation-data.component.ts
@@ -10,7 +10,7 @@ import {
 import {
   injectMutation,
   injectQuery,
-  injectQueryClient,
+  QueryClient,
 } from '@tanstack/angular-query-experimental';
 import { ButtonModule } from 'primeng/button';
 
@@ -38,7 +38,7 @@ export class ImportReconciliationDataComponent {
   projectId = input.required<string>();
   paymentId = input.required<string>();
 
-  private queryClient = injectQueryClient();
+  private queryClient = inject(QueryClient);
   private authService = inject(AuthService);
   private downloadService = inject(DownloadService);
   private metricApiService = inject(MetricApiService);

diff --git a/...s/src/app/pages/project-registration-debit-cards/project-registration-debit-cards.page.ts b/...s/src/app/pages/project-registration-debit-cards/project-registration-debit-cards.page.ts
@@ -11,7 +11,7 @@ import { FormsModule } from '@angular/forms';
 import {
   injectMutation,
   injectQuery,
-  injectQueryClient,
+  QueryClient,
 } from '@tanstack/angular-query-experimental';
 import { AccordionModule } from 'primeng/accordion';
 import { ButtonModule } from 'primeng/button';
@@ -55,7 +55,7 @@ export class ProjectRegistrationDebitCardsPageComponent {
 
   private readonly registrationApiService = inject(RegistrationApiService);
   private readonly toastService = inject(ToastService);
-  private readonly queryClient = injectQueryClient();
+  private readonly queryClient = inject(QueryClient);
 
   registration = injectQuery(
     this.registrationApiService.getRegistrationById(

diff --git a/...s/project-registrations/components/import-registrations/import-registrations.component.ts b/...s/project-registrations/components/import-registrations/import-registrations.component.ts
@@ -8,7 +8,7 @@ import {
 
 import {
   injectMutation,
-  injectQueryClient,
+  QueryClient,
 } from '@tanstack/angular-query-experimental';
 import { ButtonModule } from 'primeng/button';
 
@@ -31,7 +31,7 @@ import { ToastService } from '~/services/toast.service';
 export class ImportRegistrationsComponent {
   projectId = input.required<string>();
 
-  private queryClient = injectQueryClient();
+  private queryClient = inject(QueryClient);
   private downloadService = inject(DownloadService);
   private registrationApiService = inject(RegistrationApiService);
   private toastService = inject(ToastService);

diff --git a/interfaces/Portalicious/src/app/services/auth/strategies/msal-auth/msal-auth.strategy.ts b/interfaces/Portalicious/src/app/services/auth/strategies/msal-auth/msal-auth.strategy.ts
@@ -7,7 +7,7 @@ import {
   PopupRequest,
   RedirectRequest,
 } from '@azure/msal-browser';
-import { injectQueryClient } from '@tanstack/angular-query-experimental';
+import { QueryClient } from '@tanstack/angular-query-experimental';
 
 import { AppRoutes } from '~/app.routes';
 import { UserApiService } from '~/domains/user/user.api.service';
@@ -33,7 +33,7 @@ export class MsalAuthStrategy implements IAuthStrategy {
   private readonly msalService = inject(MsalService);
   private readonly router = inject(Router);
   private readonly userApiService = inject(UserApiService);
-  private queryClient = injectQueryClient();
+  private queryClient = inject(QueryClient);
 
   constructor() {
     this.msalService.initialize();

diff --git a/interfaces/Portalicious/src/app/services/export.service.ts b/interfaces/Portalicious/src/app/services/export.service.ts
@@ -5,7 +5,7 @@ import {
 } from '@angular/common/http';
 import { inject, Injectable, Signal } from '@angular/core';
 
-import { injectQueryClient } from '@tanstack/angular-query-experimental';
+import { QueryClient } from '@tanstack/angular-query-experimental';
 import * as XLSX from 'xlsx';
 
 import { ExportType } from '@121-service/src/metrics/enum/export-type.enum';
@@ -25,7 +25,7 @@ import { addDaysToDate, dateToIsoString } from '~/utils/date';
   providedIn: 'root',
 })
 export class ExportService {
-  private queryClient = injectQueryClient();
+  private queryClient = inject(QueryClient);
 
   private paginateQueryService = inject(PaginateQueryService);
   private eventApiService = inject(EventApiService);

diff --git a/interfaces/Portalicious/src/app/services/messaging.service.ts b/interfaces/Portalicious/src/app/services/messaging.service.ts
@@ -1,6 +1,6 @@
 import { inject, Injectable, Signal } from '@angular/core';
 
-import { injectQueryClient } from '@tanstack/angular-query-experimental';
+import { QueryClient } from '@tanstack/angular-query-experimental';
 
 import { RegistrationStatusEnum } from '@121-service/src/registration/enum/registration-status.enum';
 import { LocalizedString } from '@121-service/src/shared/types/localized-string.type';
@@ -27,7 +27,7 @@ export type MessageInputData =
   providedIn: 'root',
 })
 export class MessagingService {
-  private queryClient = injectQueryClient();
+  private queryClient = inject(QueryClient);
 
   private notificationApiService = inject(NotificationApiService);
   private projectApiService = inject(ProjectApiService);

diff --git a/interfaces/Portalicious/src/app/services/registration-attribute.service.ts b/interfaces/Portalicious/src/app/services/registration-attribute.service.ts
@@ -7,7 +7,7 @@ import {
 } from '@angular/forms';
 
 import {
-  injectQueryClient,
+  QueryClient,
   queryOptions,
 } from '@tanstack/angular-query-experimental';
 
@@ -84,7 +84,7 @@ export interface NormalizedRegistrationAttribute {
   providedIn: 'root',
 })
 export class RegistrationAttributeService {
-  private readonly queryClient = injectQueryClient();
+  private readonly queryClient = inject(QueryClient);
 
   private readonly authService = inject(AuthService);
   private readonly projectApiService = inject(ProjectApiService);