Merge pull request #1004 from catenax-ng/main

sync

CHANGELOG.md

@@ -10,6 +10,8 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 
 ### Added
 - #859 added autocomplete on subset of assets in notification creation/edit view
+- #997 added publish assets state check to parts table
+- #XXX added border to dashboard notifications table and view all count
 
 ### Changed
 - #778 return empty PageResult when no contract agreement Ids are found instead of http 404 in /contacts API
@@ -20,6 +22,16 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - #837 Moved data import and IrsResponseMappers under same interface and shared methods
 - #947 Updating irs-helm from 7.1.1 to 7.1.2 to use latest catena-x policy
 - #963 update irs-client-lib.version from 2.0.3 to 2.0.4-SNAPSHOT to fix /contracts api
+- #989 changed german word "Eigen" to "Eigene"
+- #992 improved uux in selection of columns in table settings
+- #994 moved search bar above new and existing configurations
+- #994 disable inputs of newly added bpn configurations
+- #995 disable creation and editof notifications for admin role
+- #991 make menu table headers unvisible to not block column and filters of tables
+- #915 Updated user manual documentation (chapters and screenshots)
+- #998 fixed bug where global search bar could search for BPN and adjusted placeholder label to reflect column names
+- #913 Changed severity icons
+- #978 Fixed edc policy creation with edc version 0.7.0
 
 ## [11.0.0 - 08.05.2024]
 ### Added

DEPENDENCIES_BACKEND

@@ -262,10 +262,10 @@ maven/mavencentral/org.eclipse.tractusx.edc/callback-spi/0.6.0, Apache-2.0, appr
 maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.6.0, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.edc/edr-api/0.6.0, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.edc/edr-spi/0.6.0, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.0.1, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.0.1, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.0.1, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.0.1, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.0.4-20240515.103302-1, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.0.4-20240515.103302-1, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.0.4-20240515.103302-1, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.0.4-20240515.103302-1, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.traceability/tx-backend/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.traceability/tx-models/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.flywaydb/flyway-core/9.22.3, Apache-2.0, approved, #10349

DEPENDENCIES_FRONTEND

@@ -813,7 +813,7 @@ npm/npmjs/-/path-to-regexp/6.2.0, MIT, approved, clearlydefined
 npm/npmjs/-/path-type/4.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/pend/1.2.0, MIT, approved, clearlydefined
 npm/npmjs/-/performance-now/2.1.0, MIT, approved, clearlydefined
-npm/npmjs/-/picocolors/1.0.0, ISC, approved, clearlydefined
+npm/npmjs/-/picocolors/1.0.0, ISC, approved, #14718
 npm/npmjs/-/picomatch/2.3.1, MIT, approved, clearlydefined
 npm/npmjs/-/pidtree/0.6.0, MIT, approved, clearlydefined
 npm/npmjs/-/pify/2.3.0, MIT, approved, clearlydefined

charts/traceability-foss/Chart.yaml

@@ -42,7 +42,7 @@ dependencies:
     condition: pgadmin4.enabled
   - name: item-relationship-service
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 7.1.2
+    version: 7.1.3
     condition: item-relationship-service.enabled
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc

charts/traceability-foss/charts/backend/Chart.yaml

@@ -33,7 +33,7 @@ dependencies:
     condition: pgadmin4.enabled
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.18.0
+    version: 7.1.3
     condition: irs-helm.enabled
   - name: irs-edc-consumer
     repository: https://eclipse-tractusx.github.io/item-relationship-service

docs/src/docs/user/user-manual.adoc

@@ -68,15 +68,11 @@ Lists the five newest quality investigations and alerts to get an overview of th
 
 === Parts
 
-Navigates to the own manufactured parts and batches list view.
+Navigates to the parts and batches list view.
 
-=== Other parts
+=== Quality topics
 
-Navigates to the supplier and customer parts and batches list view.
-
-=== Inbox
-
-Navigates to the inbox (sent/received) quality notifications.
+Navigates to the inbox of (sent/received) quality notifications.
 
 
 === About
@@ -149,20 +145,21 @@ Supported languages:
 
 == Parts
 
-List view of the own manufactured (asBuilt) or planned (asPlanned) parts and batches.
-You can adjust the view of tables by activating/deactivating the tables.
+List view of the own manufactured (asBuilt) or planned (asPlanned) parts and batches as well as supplier/customer parts.
+You can adjust the view of tables by clicking on the fullscreen icon to maximize or minimize the view to the half of the full width.
 
 image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/parts-list-view.png[]
 
 === Parts table
 
 A table view split into the different BOM lifecycle phases (AsBuilt / AsPlanned) of a part. By default, both tables are displayed.
-Adjustment of the view of tables can be done by activating/deactivating the tables via the buttons „AS BUILT“ and „AS PLANNED“.
+Adjustment of the view of tables can be done by activating/deactivating the fullscreen width of the tables.
 
 Between the views, there is a slider to adjust the view to make either the left or the right table more visible.
-Alternatively, you can use the view toggle to adjust the visibility of the tables.
 
 Both tables can be sorted, filtered, and searched.
+
+Pre-filtration buttons can be toggled to only show own/supplier/customer parts in the table.
 The global search bar at the top returns part results from both tables.
 
 Choosing the filter input field for any column and typing in any character will show filter suggestions.
@@ -183,14 +180,17 @@ Gives detailed information on the assets registered in the Digital Twin Registry
 This includes data based on the aspect models of use case traceability: AsPlanned, SerialPart, Batch.
 Parts that have a quality alert are highlighted yellow.
 
-=== Parts selection -> Create quality alert
+=== Create quality notification from parts
 
 Select one or multiple child components/parts/batches that are built into your part.
-Selection will enable you to create a quality alert (notification) to your customers. For this action, a button appears at the top right of the table as soon as an asset has been selected.
-The quality alert will be added to a queue (queued & requested inbox) and not directly sent to the customers.
+Selection will enable you to create a quality notification to customers (alert) or to suppliers (investigation) . For this action, click on the corresponding icon on the top left of a parts table.
+The quality notification will be added to a queue (quality notifications) and not directly sent to the customer/supplier.
+It is also possible to create a quality notification without the selection of parts.
 
 Once the quality alert is created you will get a pop-up and can directly navigate to the inbox for further action.
 
+Parts which exist in a quality notification will be highlighted as a yellow colored row in the parts table.
+
 === Parts selection -> Publish assets
 
 Select one or multiple parts that are in the AsBuilt lifecycle. A button will appear on the right of the lifecycle view selection:
@@ -245,7 +245,7 @@ If you want to discard your changes, press the "ESC" - button, click anywhere el
 
 The settings will be stored in the local storage of the browser and will be persisted until they get deleted.
 
-=== Part details
+=== Own Part details
 
 To open the detail view, click on the three dots icon of the desired item and select "View details".
 More detailed information on the asset is listed as well as a part tree that visually shows the parts relations.
@@ -298,82 +298,9 @@ By clicking on the "publish" icon, you can publish the currently opened part fro
 a tooltip will provide information explaining the reason. You can trigger the tooltip by hovering above the button
 
 
-
-== Other parts
-
-List view of the supplied/delivered parts and batches (Supplier parts / Customer parts).
-You can adjust the view of tables by activating/deactivating the tables.
-
-image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/other-parts-list-view.png[]
-
-=== Other parts table
-
-A table view split into the different BOM lifecycle phases (AsBuilt / AsPlanned) of a part. By default, both tables are displayed.
-Adjustment of the view of tables can be done by activating/deactivating the tables via the buttons „AS BUILT“ and „AS PLANNED“.
-
-Between the views, there is a slider to adjust the view to make either the left or the right table more visible.
-Alternatively, you can use the view toggle to adjust the visibility of the tables.
-
-Additionally, it's possible to switch between tabs above each of the table views to display either supplier or customer parts.
-
-Both tables can be sorted, filtered and searched. The global search bar at the top returns other part results from both tables.
-
-Choosing the filter input field for any column and typing in any character will show filter suggestions.
-
-image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/other-parts-autosuggestion-filtering.png[]
-
-=== AsBuilt lifecycle
-
-List view of other parts with AsBuilt lifecycle.
-Gives detailed information on the assets registered in the Digital Twin Registry of Catena-X for all connected companies.
-This includes data based on the aspect models of use case traceability: AsBuilt,
-SerialPart, Batch.
-Parts that have a quality notification are highlighted yellow.
-
-=== AsPlanned lifecycle
-
-List view of other parts with AsPlanned lifecycle.
-Gives detailed information on the assets registered in the Digital Twin Registry of Catena-X for all connected companies.
-This includes data based on the aspect models of use case traceability: AsPlanned,
-SerialPart, Batch.
-Parts that have a quality notification are highlighted yellow.
-
-=== Table column settings
-
-On the right upper site of a table there is a settings icon in which you can set the table columns to a desired view.
-With a click on it a dialog opens where you can change the settings of the corresponding table:
-
-image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/table-settings-dialog.png[]
-
-Hide/show table columns by clicking on the checkbox or the column name.
-It is possible to hide/show all columns by clicking on the "All" - checkbox.
-
-The reset icon resets the table columns to its default view.
-
-Reorder the table columns by selecting a list item (click on the right of the column name).
-By selecting the column, you can reorder it with the up and down arrow icons to move it in the front or back of other columns.
-
-Apply your changes by clicking on the "Save" - button.
-If you want to discard your changes, press the "ESC" - button, click anywhere else except in the dialog or close it explicitly with the close icon on the upper right of the dialog.
-
-The settings will be stored in the local storage of the browser and will be persisted until they get deleted.
-
-=== Supplier parts
-
-List view of supplied parts and batches.
-Supplier parts that have a quality investigation are highlighted yellow.
-
-==== Supplier parts select / Quality investigation
-
-Select one or multiple supplier parts.
-Selection will enable you to create a quality investigation (notification) to your supplier.
-The quality investigation will be added to a queue (queued & requested inbox) and not directly be sent to the supplier.
-
-Once the quality investigation is created you will get a pop-up and can directly navigate to the inbox for further action.
-
 === Supplier part details
 
-To open the detail view, click on the three dots icon of the desired item and select "View details".
+To open the detail view, click on the three dots icon of the desired item from the parts table and select "View details".
 More detailed information on the asset is listed.
 
 image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/src/images/arc42/user-guide/supplier-parts-list-detailed-view.png[]
@@ -406,17 +333,17 @@ image::https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main
 ==== Overview
 
 General production information.
-Information on the quality status of the supplier part/batch.
+Information on the quality status of the customer part/batch.
 
 ==== Manufacturer data
 
-Detailed information on the IDs for the supplier part/batch.
+Detailed information on the IDs for the customer part/batch.
 
 ==== Customer data
 
 Information about the identifiers at the customer for the respective part/batch.
 
-== Inbox
+== Quality notifications
 
 Inbox for received/sent quality notifications.
 

frontend/cypress/integration/pages/AdminPage.ts

@@ -6,7 +6,6 @@
 }
 
 export class AdminPage {
-
   static visit() {
     cy.get('[data-testid="user-menu"]').click();
     cy.get('[data-testid="user-menu-administration-button"]').click();

frontend/cypress/support/step_definitions/quality-investigations.ts

@@ -235,9 +235,9 @@ Then('selected {string} has been {string} as expected', function(notificationTyp
       break;
     }
     case 'approved': {
-      cy.wait(10000);
+      cy.wait(20000);
       // same as "requested"
-      cy.get('[title="Requested"]', { timeout: 20000 }).should('be.visible');
+      cy.get('[title="Requested"]', { timeout: 30000 }).should('be.visible');
       break;
     }
     case 'accepted': {

frontend/src/app/modules/core/known-route.ts

@@ -54,7 +54,7 @@ const getNotificationInboxRoute = (
   link: urlType,
   queryParams: notificationStatusGroup
     ? {
-      tabIndex: '0',
+      tabIndex: notificationStatusGroup === NotificationStatusGroup.RECEIVED ? '1' : '0',
     }
     : undefined,
 });

frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.html

@@ -32,13 +32,6 @@
 
     <div class="bpn-config">
       <div class="bpn--add-new">
-        <app-input
-          [label]="'pageAdmin.bpnConfig.search' | i18n"
-          [formControl]="searchControl"
-          class="bpn-config--search"
-          suffixIcon="search"
-          suffixIconColor="primary"
-        ></app-input>
 
         <div *ngIf="newEntryGroup" [formGroup]="newEntryGroup" class="bpn-config--form">
           <app-input
@@ -81,6 +74,19 @@
         >
           {{ 'actions.saveChanges' | i18n }}
         </app-button>
+
+      </div>
+
+      <div class="flex w-full justify-start"
+           *ngIf="newBpnConfig.controls.length > 0 || editBpnConfig.controls.length > 0">
+
+        <app-input
+          [label]="'pageAdmin.bpnConfig.search' | i18n"
+          [formControl]="searchControl"
+          class="bpn-config--search"
+          suffixIcon="search"
+          suffixIconColor="primary"
+        ></app-input>
       </div>
 
       <div *ngIf="newBpnConfig.controls.length" class="bpn--container">
@@ -94,11 +100,13 @@ <h3>{{ 'pageAdmin.bpnConfig.newEntries' | i18n }}</h3>
                     [label]="'pageAdmin.bpnConfig.bpn' | i18n"
                     class="bpn-config--input"
                     formControlName="bpn"
+                    [isDisabled]="true"
                   ></app-input>
                   <app-input
                     [label]="'pageAdmin.bpnConfig.url' | i18n"
                     class="bpn-config--input"
                     formControlName="url"
+                    [isDisabled]="true"
                   ></app-input>
 
                   <app-button
@@ -125,7 +133,7 @@ <h3>{{ 'pageAdmin.bpnConfig.existingEntries' | i18n }}</h3>
             <ng-container *ngFor="let bpnConfig of editBpnConfig.controls; let i = index" [formGroupName]="i">
               <ng-container *ngIf="listOfHiddenElements$ | async as list">
                 <div
-                  *ngIf="!list.includes(bpnConfig.value.bpn)"
+                  *ngIf="!list.includes(bpnConfig.value.bpn) && newBpnConfig?.controls['bpn']?.value !== bpnConfig.value.bpn"
                   [ngClass]="getStylingClass(bpnConfig)"
                   [class.bpn-config--delete_animation]="isBeingDeleted(bpnConfig)"
                   [attr.data-testid]="'bpn-url-container-' + i"

frontend/src/app/modules/page/admin/presentation/bpn-configuration/bpn-configuration.component.scss

@@ -39,7 +39,8 @@
 }
 
 .bpn-config--search {
-  padding: 10px 20px;
+  margin-top: 20px;
+  padding: 10px 20px 0 20px;
   width: 90%;
 }
 
@@ -48,7 +49,6 @@
 }
 
 .bpn--container {
-  margin-top: 20px;
   width: 100%;
 }