Merge pull request #1333 from eclipse-tractusx/chore/908-fix-notifica…

…tion-detail chore(release): 908 - Changed notification detail view.
eclipse-tractusx · Jul 30, 2024 · 31263dc · 31263dc
2 parents 6a8df39 + 26948a0
commit 31263dc
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,10 +8,14 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 _**For better traceability add the corresponding GitHub issue number in each changelog entry, please.**_
 ## [UNRELEASED - DD.MM.YYYY]
 
+### Added
+- #908 Add owner field to affected parts view in notification details
+
 ### Changed
 - #1252 adapt IRS example response for integration tests to reflect current state
 - #1122 Fixed editing notification sendTo attribute
 - #1328 Fixed semanticDataModel translation and part name within notification detail / edit view.
+- #908 Renamed header in notification detail for parts from Supplier Parts to Affected parts
 
 ## [13.0.1 - 26.07.2024]
 

diff --git a/frontend/src/app/modules/page/notifications/detail/notification-detail.component.ts b/frontend/src/app/modules/page/notifications/detail/notification-detail.component.ts
@@ -195,8 +195,8 @@ export class NotificationDetailComponent implements AfterViewInit, OnDestroy {
   private setTableConfigs(data: Notification): void {
     this.isReceived = !data.isFromSender;
 
-    const displayedColumns = [ 'id', 'semanticDataModel', 'nameAtManufacturer', 'semanticModelId' ];
-    const sortableColumns = { id: true, semanticDataModel: true, nameAtManufacturer: true, semanticModelId: true };
+    const displayedColumns = [ 'id', 'owner', 'semanticDataModel', 'nameAtManufacturer', 'semanticModelId' ];
+    const sortableColumns = { id: true, owner: true, semanticDataModel: true, nameAtManufacturer: true, semanticModelId: true };
 
     const tableConfig = {
       displayedColumns,

diff --git a/frontend/src/app/modules/shared/components/table/table.component.html b/frontend/src/app/modules/shared/components/table/table.component.html
@@ -421,14 +421,17 @@ <h3>{{ 'table.noResultFound' | i18n }}</h3>
         <td
           *matCellDef="let element" mat-cell class="table--cell" data-testid="table-component--cell-data"
           [ngClass]="{'max-width-column': labelId === 'contracts' && column === 'contractId' }">
-          <ng-container *ngIf="!isDateElement(column)"
+          <ng-container *ngIf="!isDateElement(column) && !isOwnerElement(column)"
                         [ngTemplateOutlet]="tableConfig?.cellRenderers?.[column] ? tableConfig?.cellRenderers?.[column] : (column === 'constraints' ? constraintsFormat : (column === 'contractType' ? contractTypeFormat : autoFormat))"
             [ngTemplateOutletContext]="{ value: element[column], row: element }"
           >
           </ng-container>
           <ng-container *ngIf="isDateElement(column)">
             {{ (element[column] | date:'yyyy-MM-dd HH:mm') }}
           </ng-container>
+          <ng-container *ngIf="isOwnerElement(column)">
+            {{'table.owner.' + element[column]?.toLowerCase() | i18n}}
+          </ng-container>
         </td>
       </ng-container>
     </ng-template>

diff --git a/frontend/src/app/modules/shared/components/table/table.component.ts b/frontend/src/app/modules/shared/components/table/table.component.ts
@@ -430,6 +430,11 @@ export class TableComponent {
     return isDateFilter(key);
   }
 
+  public isOwnerElement(key: string) {
+    const OWNER_KEY = [ 'owner'];
+    return OWNER_KEY.includes(key);
+  }
+
   protected readonly MainAspectType = MainAspectType;
   protected readonly ContractType = ContractType;
 }
diff --git a/frontend/src/assets/locales/de/page.alert.json b/frontend/src/assets/locales/de/page.alert.json
@@ -8,7 +8,7 @@
 
     "subHeadline": {
       "affectedParts": "Betroffene Produkte",
-      "supplierParts": "Produkte von Lieferanten"
+      "supplierParts": "Betroffene Produkte"
     }
   }
 }
diff --git a/frontend/src/assets/locales/de/page.investigation.json b/frontend/src/assets/locales/de/page.investigation.json
@@ -8,7 +8,7 @@
 
     "subHeadline": {
       "affectedParts": "Betroffene Produkte",
-      "supplierParts": "Produkte von Lieferanten"
+      "supplierParts": "Betroffene Produkte"
     }
   }
 }
diff --git a/frontend/src/assets/locales/en/page.alert.json b/frontend/src/assets/locales/en/page.alert.json
@@ -8,7 +8,7 @@
 
     "subHeadline": {
       "affectedParts": "Affected parts",
-      "supplierParts": "Supplier parts"
+      "supplierParts": "Affected parts"
     }
   }
 }
diff --git a/frontend/src/assets/locales/en/page.investigation.json b/frontend/src/assets/locales/en/page.investigation.json
@@ -8,7 +8,7 @@
 
     "subHeadline": {
       "affectedParts": "Affected parts",
-      "supplierParts": "Supplier parts"
+      "supplierParts": "Affected parts"
     }
   }
 }