chore(contracts): 985 implement contract reference to notification or…

… part
eclipse-tractusx · Jun 28, 2024 · fef0d52 · fef0d52
1 parent 7e0bf11
commit fef0d52
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 21 deletions.
diff --git a/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.ts b/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.ts
@@ -159,7 +159,7 @@ export class ContractsComponent {
       ...this.contractFilter,
       contractType: filterList,
     };
-    this.contractsFacade.setContracts(this.pagination.page, this.pagination.pageSize, [ this.pagination.sorting ], this.contractFilter);
+    this.contractsFacade.setContracts(0, this.pagination.pageSize, [ this.pagination.sorting ], this.contractFilter);
   }
 
   ngOnDestroy() {

diff --git a/...pp/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.html b/...pp/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.html
@@ -20,22 +20,15 @@
   <app-view-selector data-testid="as-built-button"
                      [isSelected]="activeContractTypes?.includes(ContractType.ASSET_AS_BUILT)"
                      label="As built Activator" variant="flat" color="accent"
-                     (click)="emitQuickFilter(ContractType.ASSET_AS_BUILT)"
-                     (keydown)="emitQuickFilter(ContractType.ASSET_AS_BUILT)">
-    {{ 'quickFilter.asBuilt' | i18n }}
-  </app-view-selector>
-  <app-view-selector data-testid="as-planned-button"
-                     [isSelected]="activeContractTypes?.includes(ContractType.ASSET_AS_PLANNED)"
-                     label="As planned activator" variant="flat" color="accent"
-                     (click)="emitQuickFilter(ContractType.ASSET_AS_PLANNED)"
-                     (keydown)="emitQuickFilter(ContractType.ASSET_AS_PLANNED)">
-    {{ 'quickFilter.asPlanned' | i18n }}
+                     (click)="emitQuickFilter([ContractType.ASSET_AS_BUILT, ContractType.ASSET_AS_PLANNED])"
+                     (keydown)="emitQuickFilter([ContractType.ASSET_AS_BUILT, ContractType.ASSET_AS_PLANNED])">
+    {{ 'quickFilter.parts' | i18n }}
   </app-view-selector>
   <app-view-selector data-testid="notification-button"
                      [isSelected]="activeContractTypes?.includes(ContractType.NOTIFICATION)"
                      label="Notification Activator" variant="flat" color="accent"
-                     (click)="emitQuickFilter(ContractType.NOTIFICATION)"
-                     (keydown)="emitQuickFilter(ContractType.NOTIFICATION)">
+                     (click)="emitQuickFilter([ContractType.NOTIFICATION])"
+                     (keydown)="emitQuickFilter([ContractType.NOTIFICATION])">
     {{ 'quickFilter.notification' | i18n }}
   </app-view-selector>
 </div>
diff --git a/...modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.spec.ts b/...modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.spec.ts
@@ -24,15 +24,15 @@ describe('BomLifecycleActivatorComponent', () => {
     const { fixture } = await renderQuickFilter();
     const { componentInstance } = fixture;
     componentInstance.activeContractTypes = [];
-    componentInstance.emitQuickFilter(ContractType.ASSET_AS_BUILT);
+    componentInstance.emitQuickFilter([ ContractType.ASSET_AS_BUILT ]);
     expect(componentInstance.activeContractTypes).toEqual([ ContractType.ASSET_AS_BUILT ]);
   });
 
   it('should unset state when called again', async () => {
     const { fixture } = await renderQuickFilter();
     const { componentInstance } = fixture;
     componentInstance.activeContractTypes = [ ContractType.ASSET_AS_PLANNED ];
-    componentInstance.emitQuickFilter(ContractType.ASSET_AS_PLANNED);
+    componentInstance.emitQuickFilter([ ContractType.ASSET_AS_PLANNED ]);
     expect(componentInstance.activeContractTypes).toEqual([]);
   });
 });
diff --git a/.../app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.ts b/.../app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.ts
@@ -29,11 +29,12 @@ export class ContractsQuickFilterComponent {
   activeContractTypes: ContractType[] = [];
   @Output() buttonClickEvent = new EventEmitter<any>();
 
-  emitQuickFilter(contractType: ContractType) {
-    if (this.activeContractTypes?.includes(contractType)) {
-      this.activeContractTypes = this.activeContractTypes.filter(type => type !== contractType);
+  emitQuickFilter(contractTypeList: ContractType[]) {
+    if (this.activeContractTypes?.includes(contractTypeList[0])) {
+      this.activeContractTypes = this.activeContractTypes.filter(type => type !== contractTypeList[0]);
+      this.activeContractTypes = this.activeContractTypes.filter(type => type !== contractTypeList?.[1]);
     } else {
-      this.activeContractTypes.push(contractType);
+      this.activeContractTypes.push(...contractTypeList);
     }
     this.buttonClickEvent.emit(this.activeContractTypes);
   }

diff --git a/frontend/src/assets/locales/de/common.json b/frontend/src/assets/locales/de/common.json
@@ -399,7 +399,8 @@
     "customer" : "KUNDE",
     "asBuilt" : "As built",
     "asPlanned" : "As planned",
-    "notification" : "Qualitätsthemen"
+    "notification" : "Qualitätsthemen",
+    "parts" : "Produkte"
   },
   "multiSelect": {
     "filterLabel": "Filter",

diff --git a/frontend/src/assets/locales/en/common.json b/frontend/src/assets/locales/en/common.json
@@ -398,7 +398,8 @@
     "customer" : "CUSTOMER",
     "asBuilt" : "As built",
     "asPlanned" : "As planned",
-    "notification" : "Quality incidents"
+    "notification" : "Quality incidents",
+    "parts" : "Parts"
   },
   "multiSelect": {
     "filterLabel": "Filter",