Merge pull request #205 from catenax-ng/main

edc update 0.4.1 and irs 6.0.1

.github/workflows/helm-test.yaml

@@ -78,8 +78,8 @@ jobs:
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo add irs-helm https://eclipse-tractusx.github.io/item-relationship-service
-          helm repo add irs-edc-consumer https://eclipse-tractusx.github.io/item-relationship-service
           helm repo add postgresql https://charts.bitnami.com/bitnami
+          helm repo add tractusx-connector https://eclipse-tractusx.github.io/charts/dev
           helm repo add runix https://helm.runix.net
           ct install --charts charts/traceability-foss --helm-extra-set-args "--set backend.image.repository=${{ env.REGISTRY }}/${{ env.APP_NAME}} --set backend.image.tag=${{ env.TAG }} --set frontend.image.repository=${{ env.REGISTRY }}/traceability-foss --set frontend.image.tag=${{ env.TAG }} --set postgresql.enabled=false"
         if: steps.list-changed.outputs.changed == 'true'

.github/workflows/pull-request_backend.yml

@@ -24,7 +24,7 @@ jobs:
           cache: 'maven'
 
       - name: Run unit & integration tests
-        run: mvn -pl tx-models,tx-backend,tx-coverage -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B verify -PiT
+        run: mvn -pl tx-models,tx-backend,tx-coverage -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B verify
 
       - name: Publish integration test results
         uses: EnricoMi/publish-unit-test-result-action@v2

.github/workflows/sonar-scan-backend.yml

@@ -33,7 +33,7 @@ jobs:
           restore-keys: ${{ runner.os }}-sonar
 
       - name: Run unit & integration tests
-        run: mvn -pl tx-models,tx-backend,tx-coverage -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B verify -PiT
+        run: mvn -pl tx-models,tx-backend,tx-coverage -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B verify
 
       - name: Verify Sonar Scan
         env:

AUTHORS.md

@@ -18,3 +18,5 @@ The following people have contributed to this repository:
 - Thomas Braun, ZF Friedrichshafen AG, https://github.com/tbraun-zf
 - Maximilian Wesener, doubleSlash Net-Business GmbH, https://github.com/ds-mwesener
 - László Graf, msg systems Romania, https://www.msg-systems.ro
+- Martin Maul, doubleSlash Net-Business GmbH, https://github.com/ds-mmaul
+- Lucas Capellino, doubleSlash Net-Business GmbH, https://github.com/ds-lcapellino

CHANGELOG.md

@@ -7,8 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased]
 
 ### Added
+- Added back button in notification detailed view
+- EDC SPI Dependency for using provided models
 
 ### Changed
+- Changed Layout in notification detailed view
+- Changed request parameter for registerjob request to irs to match requirements of irs
+- Migration of edc 0.4.1 endpoints and api flow
 
 ### Removed
 

DEPENDENCIES_BACKEND

@@ -1,13 +1,18 @@
 maven/mavencentral/ch.qos.logback/logback-classic/1.4.7, EPL-1.0 OR LGPL-2.1-only, approved, #3435
 maven/mavencentral/ch.qos.logback/logback-core/1.4.7, EPL-1.0 OR LGPL-2.1-only, approved, #3373
+maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.2, Apache-2.0, approved, #8912
 maven/mavencentral/com.auth0/java-jwt/4.4.0, MIT, approved, #8459
 maven/mavencentral/com.electronwill.night-config/core/3.6.6, LGPL-3.0-only, approved, #3767
 maven/mavencentral/com.electronwill.night-config/toml/3.6.6, LGPL-3.0-only, approved, #3766
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.3, Apache-2.0, approved, #5303
+maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.2, Apache-2.0 AND MIT, approved, #4303
 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.3, Apache-2.0 AND MIT, approved, #4303
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.2, Apache-2.0, approved, #4105
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.3, Apache-2.0, approved, #4105
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.0, Apache-2.0, approved, #5933
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.3, Apache-2.0, approved, #5933
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.14.3, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.15.1, Apache-2.0, approved, #9179
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.14.3, Apache-2.0, approved, #8597
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.3, Apache-2.0, approved, #4699
 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.14.3, Apache-2.0, approved, #5938
@@ -27,6 +32,8 @@ maven/mavencentral/com.zaxxer/HikariCP/5.0.1, Apache-2.0, approved, clearlydefin
 maven/mavencentral/commons-fileupload/commons-fileupload/1.5, Apache-2.0, approved, #7109
 maven/mavencentral/commons-io/commons-io/2.11.0, Apache-2.0, approved, CQ23745
 maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
+maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.1, Apache-2.0, approved, #9178
+maven/mavencentral/dev.failsafe/failsafe/3.3.1, Apache-2.0, approved, #9268
 maven/mavencentral/io.github.classgraph/classgraph/4.8.149, MIT, approved, CQ22530
 maven/mavencentral/io.github.openfeign.form/feign-form-spring/3.8.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.github.openfeign.form/feign-form/3.8.0, Apache-2.0, approved, clearlydefined
@@ -55,6 +62,7 @@ maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.8, Apache-2.0,
 maven/mavencentral/io.swagger/swagger-annotations/1.6.10, Apache-2.0, approved, #3792
 maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
 maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
+maven/mavencentral/jakarta.json/jakarta.json-api/2.1.1, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7907
 maven/mavencentral/jakarta.persistence/jakarta.persistence-api/3.0.0, EPL-2.0 OR BSD-3-Clause AND (EPL-2.0 OR BSD-3-Clause AND BSD-3-Clause), approved, #9177
 maven/mavencentral/jakarta.persistence/jakarta.persistence-api/3.1.0, EPL-2.0 OR BSD-3-Clause AND (EPL-2.0 OR BSD-3-Clause AND BSD-3-Clause), approved, #7696
 maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.0, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697
@@ -84,18 +92,60 @@ maven/mavencentral/org.attoparser/attoparser/2.0.6.RELEASE, Apache-2.0, approved
 maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.69, MIT, approved, clearlydefined
 maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.69, MIT, approved, clearlydefined
 maven/mavencentral/org.bouncycastle/bcutil-jdk15on/1.69, MIT, approved, clearlydefined
+maven/mavencentral/org.eclipse.edc/aggregate-service-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/asset-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/catalog-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/connector-core/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/core-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-api-configuration/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog-api/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-http-core/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation-api/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process-api/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transform/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/http-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/http/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jersey-core/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jetty-core/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/json-ld-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/json-ld/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-model/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transform-spi/0.1.0, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/web-spi/0.1.0, Apache-2.0, approved, technology.edc
 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.5.1, Apache-2.0, approved, #7296
+maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
 maven/mavencentral/org.hibernate.orm/hibernate-core/6.1.7.Final, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-only) AND (CC-PDDC AND LGPL-2.1-only) AND (EPL-2.0 OR BSD-3-Clause), approved, #5939
 maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.0.Final, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jboss.logging/jboss-logging/3.4.3.Final, Apache-2.0, approved, CQ21255
 maven/mavencentral/org.jboss.logging/jboss-logging/3.5.0.Final, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.7.22, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.5.31, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.10, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.7.22, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.5.31, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.10, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.7.22, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.20, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.7.22, Apache-2.0, approved, clearlydefined

DEPENDENCIES_FRONTEND

@@ -603,7 +603,7 @@ npm/npmjs/-/license-webpack-plugin/4.0.2, ISC AND MIT AND (BSD-3-Clause AND ISC
 npm/npmjs/-/lilconfig/2.0.6, MIT, approved, clearlydefined
 npm/npmjs/-/lilconfig/2.1.0, MIT, approved, #7313
 npm/npmjs/-/lines-and-columns/1.2.4, MIT, approved, clearlydefined
-npm/npmjs/-/lint-staged/13.2.1, MIT, approved, clearlydefined
+npm/npmjs/-/lint-staged/13.2.1, MIT, approved, #9206
 npm/npmjs/-/listr2/3.14.0, MIT, approved, clearlydefined
 npm/npmjs/-/listr2/5.0.8, MIT, approved, clearlydefined
 npm/npmjs/-/loader-runner/4.3.0, MIT, approved, clearlydefined
@@ -742,7 +742,7 @@ npm/npmjs/-/onetime/6.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/open/8.4.1, MIT, approved, #7102
 npm/npmjs/-/open/8.4.2, MIT, approved, #7102
 npm/npmjs/-/opener/1.5.2, MIT OR WTFPL OR (MIT AND WTFPL), approved, clearlydefined
-npm/npmjs/-/optionator/0.9.1, MIT, approved, clearlydefined
+npm/npmjs/-/optionator/0.9.1, MIT, approved, #9208
 npm/npmjs/-/ora/5.4.1, MIT, approved, clearlydefined
 npm/npmjs/-/os-tmpdir/1.0.2, MIT, approved, clearlydefined
 npm/npmjs/-/ospath/1.2.2, MIT, approved, clearlydefined

README.md

@@ -134,15 +134,15 @@ persistence layer, thus [Docker Engine](https://docs.docker.com/engine/) is requ
 To run integration tests invoke following command:
 
 ```sh
-mvn clean verify -PiT
+mvn clean verify
 ```
 
 #### Running all tests
 
 To run all tests invoke following command:
 
 ```sh
-mvn -DskipTests=false clean verify -PiT
+mvn -DskipTests=false clean verify
 ```
 
 *Please note that this task depends on `integrationTest` task, so it's required to have [Docker Engine](https://docs.docker.com/engine/) running.*

charts/traceability-foss/Chart.yaml

@@ -39,9 +39,14 @@ dependencies:
     condition: pgadmin4.enabled
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 5.3.0
+    version: 6.0.1
     condition: irs-helm.enabled
-  - name: irs-edc-consumer
-    repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 1.1.2
-    condition: irs-edc-consumer.enabled
+  - condition: tractusx-connector.enabled
+    name: tractusx-connector
+    repository: https://eclipse-tractusx.github.io/charts/dev
+    version: 0.4.1
+  - condition: edc-postgresql.enabled
+    alias: edc-postgresql
+    name: postgresql
+    repository: https://charts.bitnami.com/bitnami
+    version: 12.1.6

charts/traceability-foss/values.yaml

@@ -343,8 +343,34 @@ postgresql:
 irs-helm:
   enabled: false  # <irs-helm.enabled>
 
+###################################
+# EDC Consumer configuration  #
+###################################
+tractusx-connector:
+  enabled: false
+
+  participant:
+    id: "BPN"
+
+  ##################################
+  # EDC Postgres Configuration #
+  ##################################
+  postgresql:
+    enabled: false
+    auth:
+      username: "CHANGEME"
+      password: "CHANGEME"
+    username: "CHANGEME"
+    password: "CHANGEME"
+    jdbcUrl: "CHANGEME"
+
 ###################################
 # IRS EDC Consumer configuration  #
 ###################################
-irs-edc-consumer:
-  enabled: false  # <irs-edc-consumer.enabled>
+edc-postgresql:
+  enabled: false
+  auth:
+    postgresPassword: "CHANGEME"
+    password: "CHANGEME"
+    database: "trace"
+    username: "traceuser"

frontend/angular.json

@@ -80,6 +80,14 @@
                 }
               ]
             },
+            "authE2eA": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.authE2eA.ts"
+                }
+              ]
+            },
             "authLocal": {
               "fileReplacements": [
                 {
@@ -161,6 +169,9 @@
             "authTest": {
               "browserTarget": "trace-x:build:dev,authTest"
             },
+            "authE2eA": {
+              "browserTarget": "trace-x:build:dev,authE2eA"
+            },
             "authLocal": {
               "browserTarget": "trace-x:build:dev,authLocal"
             },

frontend/package.json

@@ -16,6 +16,7 @@
     "start" : "ng serve",
     "start:auth" : "ng serve --configuration=dev,auth",
     "start:auth:test": "ng serve --configuration=dev,authTest",
+    "start:auth:e2ea": "ng serve --configuration=dev,authE2eA",
     "start:auth:mock" : "ng serve --configuration=authMock",
     "start:auth:local" : "ng serve --configuration=authLocal",
     "start:auth:localBe" : "ng serve --configuration=localBackend",

frontend/src/app/modules/page/investigations/detail/investigation-detail.component.html

@@ -20,7 +20,18 @@
 -->
 
 <div class="detail--header">
-  <div>
+  <div class="detail--navigation">
+    <app-button
+      [color]="'primary'"
+      (click)="this.navigateBackToInvestigations()"
+        >
+      <div class="flex justify-between items-center">
+        <mat-icon class="mr-2">arrow_back</mat-icon>
+        {{ 'actions.goBack' | i18n }}
+      </div>
+    </app-button>
+  </div>
+  <div class="detail--action">
     <app-button
       *ngIf="helperService.showApproveButton(selectedInvestigation)"
       (click)="approveModal?.show(selectedInvestigation)"

frontend/src/app/modules/page/investigations/detail/investigation-detail.component.spec.ts

@@ -25,9 +25,11 @@ import { InvestigationsModule } from '@page/investigations/investigations.module
 import { InvestigationsService } from '@shared/service/investigations.service';
 import { fireEvent, screen, waitFor } from '@testing-library/angular';
 import { renderComponent } from '@tests/test-render.utils';
+import { of } from 'rxjs';
 import { MOCK_part_1 } from '../../../../mocks/services/parts-mock/parts.test.model';
 
 describe('InvestigationDetailComponent', () => {
+
   const renderInvestigationDetail = async (id?: string) => {
     return await renderComponent(InvestigationDetailComponent, {
       imports: [InvestigationsModule],
@@ -41,6 +43,7 @@ describe('InvestigationDetailComponent', () => {
                 get: () => id || 'id-2',
               },
             },
+            queryParams: of({ pageNumber: 0, tabIndex: 0 })
           },
         },
       ],
@@ -58,6 +61,11 @@ describe('InvestigationDetailComponent', () => {
     await waitFor(() => expect(screen.getByText('pageInvestigation.subHeadline.supplierParts')).toBeInTheDocument());
   });
 
+  it('should render specific text for back button', async () => {
+    await renderInvestigationDetail('id-1');
+    await waitFor(() => expect(screen.getByText('actions.goBack')).toBeInTheDocument());
+  });
+
   it('should render copy data to clipboard', async () => {
     await renderInvestigationDetail('id-1');
     await waitFor(() => expect(screen.getByText('pageInvestigation.subHeadline.supplierParts')).toBeInTheDocument());