Merge branch 'main' into bug/xxx-fix-testdata

Author: ds-lcapellino

.github/workflows/e2e-tests-xray_frontend.yml

@@ -33,6 +33,8 @@ on:
 jobs:
   install:
     runs-on: ubuntu-latest
+    outputs:
+      http_result: ${{ steps.download.outputs.http_response }}
     defaults:
       run:
         working-directory: frontend
@@ -53,6 +55,7 @@ jobs:
 
       # Fetch feature files
       - name: Fetch .feature files from Jira Xray
+        id: download
         env:
           JIRA_USERNAME: ${{ secrets.ASSOCIATION_TX_JIRA_USERNAME }}
           JIRA_PASSWORD: ${{ secrets.ASSOCIATION_TX_JIRA_PASSWORD }}
@@ -86,7 +89,7 @@ jobs:
   cypress-run-chrome:
     timeout-minutes: 15
     runs-on: ubuntu-latest
-    if: ${{ steps.download.outputs.http_response == '200' }}
+    if: ${{ needs.install.outputs.http_result == '200' }}
     defaults:
       run:
         working-directory: frontend
@@ -130,14 +133,14 @@ jobs:
 
 
       - name: Cypress run all tests
-        uses: cypress-io/[email protected].1 # use the explicit version number
+        uses: cypress-io/[email protected].2 # use the explicit version number
         with:
           browser: chrome
           working-directory: frontend
           # using wait-on parameter causes "Error: connect ECONNREFUSED 127.0.0.1:4200"
         env:
-          CYPRESS_SUPERVISOR_LOGIN: ${{ secrets.ASSOCIATION_SUPERVISOR_CLIENT_ID }}
-          CYPRESS_SUPERVISOR_PW: ${{ secrets.ASSOCIATION_SUPERVISOR_PASSWORD }}
+          CYPRESS_SUPERVISOR_LOGIN: ${{ secrets.ASSOCIATION_SUPERVISOR_TX_A_CLIENT_ID }}
+          CYPRESS_SUPERVISOR_PW: ${{ secrets.ASSOCIATION_SUPERVISOR_TX_A_PASSWORD }}
           CYPRESS_ADMIN_LOGIN: ${{ secrets.TRACE_X_ADMIN_LOGIN }}
           CYPRESS_ADMIN_PW: ${{ secrets.TRACE_X_ADMIN_PW }}
           CYPRESS_USER_LOGIN: ${{ secrets.TRACE_X_USER_LOGIN }}

.github/workflows/xray-cucumber-association.yaml

@@ -47,6 +47,7 @@ jobs:
         env:
           JIRA_USERNAME: ${{ secrets.ASSOCIATION_TX_JIRA_USERNAME }}
           JIRA_PASSWORD: ${{ secrets.ASSOCIATION_TX_JIRA_PASSWORD }}
+        working-directory: tx-cucumber-tests
           # JIRA filter 11349: project = "[TR] FOSS - Open Source (Impl.)" AND issuetype = Test AND "Test Type" = Cucumber AND status = Ready AND labels = INTEGRATION_TEST AND (environment ~ DEV OR environment ~ "INT")
           # Downloads all feature files of cucumber tests inside TRI project
         run: |
@@ -66,19 +67,20 @@ jobs:
       # Required step due to fact that jira will name feature files differently with each feature added and that will cause duplicate test runs
       - name: Cleanup repository feature files
         if: ${{ steps.download.outputs.http_response == '200' }}
-        #working-directory: tx-cucumber-tests
+        working-directory: tx-cucumber-tests
         run: |
-          rm -r tx-cucumber-tests/src/test/resources/features/*
+          rm -r src/test/resources/features/*
 
       - name: Build with Maven
         if: ${{ steps.download.outputs.http_response == '200' }}
         env:
-          KEYCLOAK_HOST: ${{ secrets.ASSOCIATION_KEYCLOAK_HOST }}
-          SUPERVISOR_CLIENT_ID: ${{ secrets.ASSOCIATION_SUPERVISOR_CLIENT_ID }}
-          SUPERVISOR_PASSWORD: ${{ secrets.ASSOCIATION_SUPERVISOR_PASSWORD }}
-          E2E_TXA_HOST: ${{ secrets.ASSOCIATION_E2E_TXA_HOST }}
-          E2E_TXB_HOST: ${{ secrets.ASSOCIATION_E2E_TXB_HOST }}
-        #working-directory: tx-cucumber-tests
+          ASSOCIATION_KEYCLOAK_HOST: ${{ secrets.ASSOCIATION_KEYCLOAK_HOST }}
+          ASSOCIATION_SUPERVISOR_TX_A_CLIENT_ID: ${{ secrets.ASSOCIATION_SUPERVISOR_TX_A_CLIENT_ID }}
+          ASSOCIATION_SUPERVISOR_TX_A_PASSWORD: ${{ secrets.ASSOCIATION_SUPERVISOR_TX_A_PASSWORD }}
+          ASSOCIATION_SUPERVISOR_TX_B_CLIENT_ID: ${{ secrets.ASSOCIATION_SUPERVISOR_TX_B_CLIENT_ID }}
+          ASSOCIATION_SUPERVISOR_TX_B_PASSWORD: ${{ secrets.ASSOCIATION_SUPERVISOR_TX_B_PASSWORD }}
+          ASSOCIATION_E2E_TXA_HOST: ${{ secrets.ASSOCIATION_E2E_TXA_HOST }}
+          ASSOCIATION_E2E_TXB_HOST: ${{ secrets.ASSOCIATION_E2E_TXB_HOST }}
         run: |
           unzip -o tx-cucumber-tests/features.zip -d tx-cucumber-tests/src/test/resources/features
           mvn -pl tx-models,tx-cucumber-tests --batch-mode clean install  -D"cucumber.filter.tags"="@trace-x-automated" -P association

CHANGELOG.md

@@ -7,22 +7,47 @@ 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
-- #XXX Updated node:alpine 18 to 20 to fix cves
+- #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
+- #1151 Display of null values within contracts in datepicker to be empty if null
+- #1318 fix testdata v14 where parts had the wrong bpn
+
+### Removed
+- #1227 Removed scrollbar on approval dialog
+
+## [13.0.1 - 26.07.2024]
+
+### Added
+- #511 Added installation guide for local frontend with umbrella chart
+- #XXXX added tests for notification-detail.facade.ts
+
+### Changed
+- #1318 fix dashboard count for other parts
 - #1070 Convert png to svg according to TRG 1.04 - Diagrams as code / Editable static files
-- #XXX updated Swagger-ui documentation
-- #XXX update IRS chart version from 7.3.1 to 7.4.0
-- #XXX updated publish documentation action
 - #1222 Removed image publishing to GHCR
 - #1222 Adjust backend baseimage in Dockerfile to major version eclipse-temurin:21-jre-alpine
-- #XXX update springboot to 3.2.8 from 3.2.5
-- #XXX define uid and gid of backend Dockerfile directly in user, instead of variables
 - #1244 upgraded registry from 0.4.1 to 0.5.0
 - #XXX update e2e-tests-xray_frontend.yml to support association int environment
-- #1318 fix testdata v14 where parts had the wrong bpn
+- #XXX Updated node:alpine 18 to 20 to fix cves
+- #XXX update springboot to 3.2.8 from 3.2.5
+- #XXX define uid and gid of backend Dockerfile directly in user, instead of variables
+- #XXX updated Swagger-ui documentation
+- #XXX update IRS chart version from 7.3.1 to 7.4.0
+- #XXX updated publish documentation action
 
-### Added
-- #511 Added installation guide for local frontend with umbrella chart
+### Known knowns
+- #786 Implemented short term solution for securing EDC Callback APIs
+- #1122 Editing notifications changes createdBy BPN
+- #1310 Part tree fullscreen error message
+- #1308 Part name in notification always undefined
+- #1307 First message different for sender and receiver
 
 ## [13.0.0 - 19.07.2024]
 

COMPATIBILITY_MATRIX.md

@@ -1,13 +1,13 @@
 # Compatibility matrix Trace-X
 
-## Trace-X UNRELEASED [x.x.x](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/x.x.x) - 2024-xx-xx
+## Trace-X UNRELEASED [13.0.1](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/13.0.1) - 2024-07-26
 
 ### Catena-X Release?
 
-- [?] yes
+- [x] yes
 - [ ] no
 
-### Helm Version [x.x.x](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/helm-charts-x.x.x)
+### Helm Version [1.3.43](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/helm-charts-1.3.43)
 
 | Dependency       | Name of Service              | Version              | Helm     | Comments                                            |
 |------------------|------------------------------|----------------------|----------|-----------------------------------------------------|

DEPENDENCIES_BACKEND

@@ -50,6 +50,7 @@ maven/mavencentral/com.jayway.jsonpath/json-path/2.9.0, Apache-2.0, approved, cl
 maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.3, Apache-2.0, approved, #11701
+maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.40, Apache-2.0, approved, #15156
 maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.43.4, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.12.0, Apache-2.0, approved, #11159
 maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #15227

README.md

@@ -9,7 +9,7 @@
 [![Kics](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/kics.yml/badge.svg)](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/kics.yml)
 [![Trivy](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/trivy.yml/badge.svg)](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/trivy.yml)
 [![Eclipse DASH IP Check](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/eclipse-dash.yml/badge.svg)](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/eclipse-dash.yml)
-[![[BE] Dependency check](https://github.com/catenax-ng/tx-traceability-foss/actions/workflows/dependency-check.yml/badge.svg)](https://github.com/catenax-ng/tx-traceability-foss/actions/workflows/dependency-check.yml)
+[![[BE] Dependency check](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/dependency-check.yml/badge.svg)](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/dependency-check.yml)
 
 ## Trace-X is a system for tracking parts along the supply chain.
 

charts/traceability-foss/CHANGELOG.md

@@ -5,12 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## Unreleased
 
+## [1.3.43] - 2024-07-19
 ### Changed
-
 - #1222 enabled read-only filesystem by default for backend
 
 ### Added
-
 - added /tmp volume to backend container
 
 ## [1.3.42] - 2024-07-19

dev/README.md

@@ -6,7 +6,7 @@
 
 - Hint you need to copy the access token for argo cd into the specific environment for requests against argo (argocd.token) in insomnia: argo_access_token
 
-Here you can find the [Trace-X Insomnia Collection](https://github.com/catenax-ng/tx-traceability-foss/blob/main/tx-backend/collection/tracex.json). Use this [README](https://github.com/catenax-ng/tx-traceability-foss/blob/main/tx-backend/collection/README.md) to find out how to setup Insomnia with the Trace-X Collection.
+Here you can find the [Trace-X Insomnia Collection](https://github.com/eclipse-tractusx/traceability-foss/blob/main/tx-backend/collection/tracex.json). Use this [README](https://github.com/eclipse-tractusx/traceability-foss/blob/main/tx-backend/collection/README.md) to find out how to setup Insomnia with the Trace-X Collection.
 
 In the Collection you will find a directory named 'Argo', in which you can delete & sync all necessary application components. Go through every directory inside the 'Argo' directory and execute every request inside the Directory 'DELETE'. To make this step easier, you can install the Insomnia Plugin ['multiple requests'](https://insomnia.rest/plugins/insomnia-plugin-multiple-requests). With this Plugin you can execute all requests inside the 'DELETE' Directory by right-clicking the directory and choosing 'send Requests'.