Merge pull request #535 from aneoconsulting/fix/update-api

fix: update api version
aneoconsulting · Aug 28, 2023 · 9a467ad · 9a467ad
2 parents 08bac5d + 12db3bd
commit 9a467ad
Show file tree

Hide file tree

Showing 25 changed files with 959 additions and 364 deletions.
diff --git a/apps/app/src/app/applications/feature/applications-list/applications-list.page.html b/apps/app/src/app/applications/feature/applications-list/applications-list.page.html
@@ -19,8 +19,8 @@ <h1 i18n>Applications</h1>
     </clr-dg-action-bar>
 
     <clr-dg-column
-      [clrDgField]="OrderByField.APPLICATION_RAW_FIELD_NAME.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.APPLICATION_RAW_FIELD_NAME)"
+      [clrDgField]="OrderByField.APPLICATION_RAW_ENUM_FIELD_NAME.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.APPLICATION_RAW_ENUM_FIELD_NAME)"
     >
       <span i18n> Name </span>
       <clr-dg-filter [clrDgFilter]="nameFilterComponent">
@@ -33,8 +33,8 @@ <h1 i18n>Applications</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.APPLICATION_RAW_FIELD_VERSION.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.APPLICATION_RAW_FIELD_VERSION)"
+      [clrDgField]="OrderByField.APPLICATION_RAW_ENUM_FIELD_VERSION.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.APPLICATION_RAW_ENUM_FIELD_VERSION)"
     >
       <span i18n> Version </span>
       <clr-dg-filter [clrDgFilter]="versionFilterComponent">
@@ -47,8 +47,8 @@ <h1 i18n>Applications</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.APPLICATION_RAW_FIELD_NAMESPACE.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.APPLICATION_RAW_FIELD_NAMESPACE)"
+      [clrDgField]="OrderByField.APPLICATION_RAW_ENUM_FIELD_NAMESPACE.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.APPLICATION_RAW_ENUM_FIELD_NAMESPACE)"
     >
       <span i18n> Namespace </span>
       <clr-dg-filter [clrDgFilter]="namespaceFilterComponent">
@@ -61,8 +61,8 @@ <h1 i18n>Applications</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.APPLICATION_RAW_FIELD_SERVICE.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.APPLICATION_RAW_FIELD_SERVICE)"
+      [clrDgField]="OrderByField.APPLICATION_RAW_ENUM_FIELD_SERVICE.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.APPLICATION_RAW_ENUM_FIELD_SERVICE)"
     >
       <span i18n> Service </span>
       <clr-dg-filter [clrDgFilter]="serviceFilterComponent">

diff --git a/apps/app/src/app/applications/feature/applications-list/applications-list.page.ts b/apps/app/src/app/applications/feature/applications-list/applications-list.page.ts
@@ -1,7 +1,6 @@
 import {
   ApplicationRaw,
-  ApplicationRawField,
-  ListApplicationsRequest,
+  ApplicationRawEnumField,
   ListApplicationsResponse,
   SortDirection,
 } from '@aneoconsultingfr/armonik.api.angular';
@@ -32,6 +31,13 @@ import { SettingsService } from '../../../shared/util';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ApplicationsListComponent {
+  constructor(
+    private _router: Router,
+    private _activatedRoute: ActivatedRoute,
+    private _settingsService: SettingsService,
+    private _grpcApplicationsService: GrpcApplicationsService
+  ) {}
+
   private _state: ClrDatagridStateInterface = {};
   private _intervalValue = this._settingsService.intervalQueryParam(
     this._activatedRoute.snapshot.queryParams
@@ -97,13 +103,6 @@ export class ApplicationsListComponent {
     'service'
   );
 
-  constructor(
-    private _router: Router,
-    private _activatedRoute: ActivatedRoute,
-    private _settingsService: SettingsService,
-    private _grpcApplicationsService: GrpcApplicationsService
-  ) {}
-
   public get refreshIntervalValue() {
     return this._intervalValue;
   }
@@ -123,7 +122,7 @@ export class ApplicationsListComponent {
   }
 
   public get OrderByField() {
-    return ApplicationRawField;
+    return ApplicationRawEnumField;
   }
 
   public get intervals() {
@@ -142,7 +141,9 @@ export class ApplicationsListComponent {
     this._subjectDatagrid.next(this._state);
   }
 
-  public defaultSortOrder(field: ApplicationRawField): ClrDatagridSortOrder {
+  public defaultSortOrder(
+    field: ApplicationRawEnumField
+  ): ClrDatagridSortOrder {
     const orderBy = Number(
       this._activatedRoute.snapshot.queryParamMap.get('orderBy')
     );

diff --git a/apps/app/src/app/partitions/feature/partitions-list/partitions-list.page.html b/apps/app/src/app/partitions/feature/partitions-list/partitions-list.page.html
@@ -18,8 +18,8 @@ <h1 i18n>Partitions</h1>
       </app-action-bar>
     </clr-dg-action-bar>
     <clr-dg-column
-      [clrDgField]="OrderByField.PARTITION_RAW_FIELD_ID.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_FIELD_ID)"
+      [clrDgField]="OrderByField.PARTITION_RAW_ENUM_FIELD_ID.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_ENUM_FIELD_ID)"
     >
       <span i18n>Id</span>
       <clr-dg-filter [clrDgFilter]="idFilter">
@@ -28,8 +28,8 @@ <h1 i18n>Partitions</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.PARTITION_RAW_FIELD_PARENT_PARTITION_IDS.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_FIELD_PARENT_PARTITION_IDS)"
+      [clrDgField]="OrderByField.PARTITION_RAW_ENUM_FIELD_PARENT_PARTITION_IDS.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_ENUM_FIELD_PARENT_PARTITION_IDS)"
     >
       <span i18n>Parent</span>
       <clr-dg-filter [clrDgFilter]="idParentFilter">
@@ -42,8 +42,8 @@ <h1 i18n>Partitions</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.PARTITION_RAW_FIELD_POD_RESERVED.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_FIELD_POD_RESERVED)"
+      [clrDgField]="OrderByField.PARTITION_RAW_ENUM_FIELD_POD_RESERVED.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_ENUM_FIELD_POD_RESERVED)"
     >
       <span i18n>Reserved pods</span>
       <clr-dg-filter [clrDgFilter]="reservedPodFilter">
@@ -56,8 +56,8 @@ <h1 i18n>Partitions</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.PARTITION_RAW_FIELD_POD_MAX.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_FIELD_POD_MAX)"
+      [clrDgField]="OrderByField.PARTITION_RAW_ENUM_FIELD_POD_MAX.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_ENUM_FIELD_POD_MAX)"
     >
       <span i18n>Maximum pods</span>
       <clr-dg-filter [clrDgFilter]="maxPodFilter">
@@ -70,8 +70,8 @@ <h1 i18n>Partitions</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.PARTITION_RAW_FIELD_PREEMPTION_PERCENTAGE.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_FIELD_PREEMPTION_PERCENTAGE)"
+      [clrDgField]="OrderByField.PARTITION_RAW_ENUM_FIELD_PREEMPTION_PERCENTAGE.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_ENUM_FIELD_PREEMPTION_PERCENTAGE)"
     >
       <span i18n>Percentage</span>
       <clr-dg-filter [clrDgFilter]="percentageFilter">
@@ -84,8 +84,8 @@ <h1 i18n>Partitions</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.PARTITION_RAW_FIELD_PRIORITY.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_FIELD_PRIORITY)"
+      [clrDgField]="OrderByField.PARTITION_RAW_ENUM_FIELD_PRIORITY.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.PARTITION_RAW_ENUM_FIELD_PRIORITY)"
     >
       <span i18n>Priority</span>
       <clr-dg-filter [clrDgFilter]="priorityFilter">

diff --git a/apps/app/src/app/partitions/feature/partitions-list/partitions-list.page.ts b/apps/app/src/app/partitions/feature/partitions-list/partitions-list.page.ts
@@ -1,9 +1,8 @@
 import {
   GetPartitionResponse,
-  ListPartitionsRequest,
   ListPartitionsResponse,
   PartitionRaw,
-  PartitionRawField,
+  PartitionRawEnumField,
 } from '@aneoconsultingfr/armonik.api.angular';
 import { Component } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
@@ -35,6 +34,13 @@ import {
   styleUrls: ['./partitions-list.page.scss'],
 })
 export class PartitionsListComponent {
+  constructor(
+    private _settingsService: SettingsService,
+    private _activatedRoute: ActivatedRoute,
+    private _grpcPartitionsService: GrpcPartitionsService,
+    private _router: Router
+  ) {}
+
   private _state: ClrDatagridStateInterface = {};
   private _intervalValue = this._settingsService.intervalQueryParam(
     this._activatedRoute.snapshot.queryParams
@@ -131,13 +137,6 @@ export class PartitionsListComponent {
     'priority'
   );
 
-  constructor(
-    private _settingsService: SettingsService,
-    private _activatedRoute: ActivatedRoute,
-    private _grpcPartitionsService: GrpcPartitionsService,
-    private _router: Router
-  ) {}
-
   public get refreshIntervalValue() {
     return this._intervalValue;
   }
@@ -157,7 +156,7 @@ export class PartitionsListComponent {
   }
 
   public get OrderByField() {
-    return PartitionRawField;
+    return PartitionRawEnumField;
   }
 
   public get intervals(): number[] {
@@ -226,7 +225,7 @@ export class PartitionsListComponent {
     return partition.id ?? '';
   }
 
-  public defaultSortOrder(field: PartitionRawField): ClrDatagridSortOrder {
+  public defaultSortOrder(field: PartitionRawEnumField): ClrDatagridSortOrder {
     const orderBy = Number(
       this._activatedRoute.snapshot.queryParamMap.get('orderBy')
     );

diff --git a/apps/app/src/app/results/feature/results-list/results-list.page.html b/apps/app/src/app/results/feature/results-list/results-list.page.html
@@ -19,8 +19,8 @@ <h1 i18n>Results</h1>
     </clr-dg-action-bar>
 
     <clr-dg-column
-      [clrDgField]="OrderByField.RESULT_RAW_FIELD_NAME.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.RESULT_RAW_FIELD_NAME)"
+      [clrDgField]="OrderByField.RESULT_RAW_ENUM_FIELD_NAME.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.RESULT_RAW_ENUM_FIELD_NAME)"
     >
       <span i18n> Name </span>
       <clr-dg-filter [clrDgFilter]="nameFilterComponent">
@@ -33,9 +33,9 @@ <h1 i18n>Results</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.RESULT_RAW_FIELD_OWNER_TASK_ID.toString()"
+      [clrDgField]="OrderByField.RESULT_RAW_ENUM_FIELD_OWNER_TASK_ID.toString()"
       [clrDgSortOrder]="
-        defaultSortOrder(OrderByField.RESULT_RAW_FIELD_OWNER_TASK_ID)
+        defaultSortOrder(OrderByField.RESULT_RAW_ENUM_FIELD_OWNER_TASK_ID)
       "
     >
       <span i18n> Task ID </span>
@@ -49,9 +49,9 @@ <h1 i18n>Results</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.RESULT_RAW_FIELD_SESSION_ID.toString()"
+      [clrDgField]="OrderByField.RESULT_RAW_ENUM_FIELD_SESSION_ID.toString()"
       [clrDgSortOrder]="
-        defaultSortOrder(OrderByField.RESULT_RAW_FIELD_SESSION_ID)
+        defaultSortOrder(OrderByField.RESULT_RAW_ENUM_FIELD_SESSION_ID)
       "
     >
       <span i18n> Session ID </span>
@@ -65,8 +65,8 @@ <h1 i18n>Results</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.RESULT_RAW_FIELD_STATUS.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.RESULT_RAW_FIELD_STATUS)"
+      [clrDgField]="OrderByField.RESULT_RAW_ENUM_FIELD_STATUS.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.RESULT_RAW_ENUM_FIELD_STATUS)"
     >
       <span i18n> Status </span>
       <clr-dg-filter [clrDgFilter]="statusFilterComponent">
@@ -80,9 +80,9 @@ <h1 i18n>Results</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.RESULT_RAW_FIELD_CREATED_AT.toString()"
+      [clrDgField]="OrderByField.RESULT_RAW_ENUM_FIELD_CREATED_AT.toString()"
       [clrDgSortOrder]="
-        defaultSortOrder(OrderByField.RESULT_RAW_FIELD_CREATED_AT)
+        defaultSortOrder(OrderByField.RESULT_RAW_ENUM_FIELD_CREATED_AT)
       "
     >
       <span i18n> Created at </span>

diff --git a/apps/app/src/app/results/feature/results-list/results-list.page.ts b/apps/app/src/app/results/feature/results-list/results-list.page.ts
@@ -1,6 +1,7 @@
 import {
   ListResultsResponse,
   ResultRaw,
+  ResultRawEnumField,
   ResultRawField,
   ResultStatus,
   SortDirection,
@@ -36,6 +37,13 @@ import { SettingsService } from '../../../shared/util';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ResultsListComponent implements OnInit {
+  constructor(
+    private _router: Router,
+    private _activatedRoute: ActivatedRoute,
+    private _settingsService: SettingsService,
+    private _grpcResultsService: GrpcResultsService
+  ) {}
+
   private _state: ClrDatagridStateInterface = {};
   private _intervalValue = this._settingsService.intervalQueryParam(
     this._activatedRoute.snapshot.queryParams
@@ -113,13 +121,6 @@ export class ResultsListComponent implements OnInit {
     'createdAfter'
   );
 
-  constructor(
-    private _router: Router,
-    private _activatedRoute: ActivatedRoute,
-    private _settingsService: SettingsService,
-    private _grpcResultsService: GrpcResultsService
-  ) {}
-
   ngOnInit(): void {
     this.statusList = [
       ...Object.keys(ResultStatus)
@@ -152,7 +153,7 @@ export class ResultsListComponent implements OnInit {
   }
 
   public get OrderByField() {
-    return ResultRawField;
+    return ResultRawEnumField;
   }
 
   public get ResultsStatusEnum() {
@@ -192,7 +193,7 @@ export class ResultsListComponent implements OnInit {
     this._subjectDatagrid.next(this._state);
   }
 
-  public defaultSortOrder(field: ResultRawField): ClrDatagridSortOrder {
+  public defaultSortOrder(field: ResultRawEnumField): ClrDatagridSortOrder {
     const orderBy = Number(
       this._activatedRoute.snapshot.queryParamMap.get('orderBy')
     );

diff --git a/apps/app/src/app/sessions/feature/sessions-list/sessions-list.page.html b/apps/app/src/app/sessions/feature/sessions-list/sessions-list.page.html
@@ -62,9 +62,9 @@ <h1 i18n>Sessions</h1>
     </clr-dg-action-bar>
 
     <clr-dg-column
-      [clrDgField]="OrderByField.SESSION_RAW_FIELD_SESSION_ID.toString()"
+      [clrDgField]="OrderByField.SESSION_RAW_ENUM_FIELD_SESSION_ID.toString()"
       [clrDgSortOrder]="
-      defaultSortOrder(OrderByField.SESSION_RAW_FIELD_SESSION_ID)
+      defaultSortOrder(OrderByField.SESSION_RAW_ENUM_FIELD_SESSION_ID)
     "
     >
       <span i18n> Session ID </span>
@@ -78,8 +78,8 @@ <h1 i18n>Sessions</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.SESSION_RAW_FIELD_STATUS.toString()"
-      [clrDgSortOrder]="defaultSortOrder(OrderByField.SESSION_RAW_FIELD_STATUS)"
+      [clrDgField]="OrderByField.SESSION_RAW_ENUM_FIELD_STATUS.toString()"
+      [clrDgSortOrder]="defaultSortOrder(OrderByField.SESSION_RAW_ENUM_FIELD_STATUS)"
     >
       <span i18n> Status </span>
       <clr-dg-filter [clrDgFilter]="statusFilterComponent">
@@ -93,9 +93,9 @@ <h1 i18n>Sessions</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.SESSION_RAW_FIELD_CREATED_AT.toString()"
+      [clrDgField]="OrderByField.SESSION_RAW_ENUM_FIELD_CREATED_AT.toString()"
       [clrDgSortOrder]="
-      defaultSortOrder(OrderByField.SESSION_RAW_FIELD_CREATED_AT)
+      defaultSortOrder(OrderByField.SESSION_RAW_ENUM_FIELD_CREATED_AT)
     "
     >
       <span i18n> Created at </span>
@@ -110,9 +110,9 @@ <h1 i18n>Sessions</h1>
       </clr-dg-filter>
     </clr-dg-column>
     <clr-dg-column
-      [clrDgField]="OrderByField.SESSION_RAW_FIELD_CANCELLED_AT.toString()"
+      [clrDgField]="OrderByField.SESSION_RAW_ENUM_FIELD_CANCELLED_AT.toString()"
       [clrDgSortOrder]="
-      defaultSortOrder(OrderByField.SESSION_RAW_FIELD_CANCELLED_AT)
+      defaultSortOrder(OrderByField.SESSION_RAW_ENUM_FIELD_CANCELLED_AT)
     "
     >
       <span i18n> Closed at </span>