Merge pull request #295 from catenax-ng/main

Added View toggle for parts View
eclipse-tractusx · Sep 25, 2023 · 6e38a89 · 6e38a89
2 parents 76543d5 + cc41ac7
commit 6e38a89
Show file tree

Hide file tree

Showing 96 changed files with 8,639 additions and 1,116 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -20,3 +20,4 @@ The following people have contributed to this repository:
 - 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
+- Abilash Shanmugavel, doubleSlash Net-Business GmbH, https://github.com/abi231002
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 ### Added
+- Splitscreen View with sliders on parts and otherParts View
+- New test data for as planned assets aswell as JustInSequence and TractionBatteryCode
+- Toggle for parts and other parts to switch views asPlanned/asBuilt
+- LocalStorage to be used for saving view setting
+
+### Changed
+- added sorting for /api/investigations received and created endpoints
+- added sorting for /api/alerts received and created endpoints
+- integration tests uses flyway now rather than hibernate schema auto creation
+- irs helm updated from 6.5.0 to 6.6.1
+
 ### Removed
 - Old edc code not necessary anymore
 
@@ -63,7 +74,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Upgraded snakeyaml from 2.0 to 2.2
 - Upgraded docker/login-action from 2 to 3
 - Upgraded cypress-io/github-action 6.0.0 to 6.5.0
--
+
 ### Known knowns
 
 - Backend [TRACEFOSS-1458]: AdminView: No validation of BPN for BPN  EDC URL mapping

diff --git a/DEPENDENCIES_BACKEND b/DEPENDENCIES_BACKEND
@@ -75,7 +75,7 @@ maven/mavencentral/jakarta.json/jakarta.json-api/2.1.1, EPL-2.0 OR GPL-2.0-only
 maven/mavencentral/jakarta.json/jakarta.json-api/2.1.2, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7907
 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.1, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697
-maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.validation
 maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
 maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb
 maven/mavencentral/net.javacrumbs.shedlock/shedlock-core/5.7.0, Apache-2.0, approved, #10582
@@ -140,7 +140,7 @@ maven/mavencentral/org.eclipse.edc/transfer-spi/0.1.3, Apache-2.0, approved, tec
 maven/mavencentral/org.eclipse.edc/transform-spi/0.1.3, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/validator-spi/0.1.3, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/web-spi/0.1.3, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.2.1-20230901.134601-2, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.2.1-20230922.131153-4, 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.16.3, Apache-2.0, approved, #7935

diff --git a/DEPENDENCIES_FRONTEND b/DEPENDENCIES_FRONTEND
@@ -16,6 +16,7 @@ npm/npmjs/-/ajv/6.12.6, MIT, approved, #979
 npm/npmjs/-/ajv/8.11.0, MIT, approved, #4969
 npm/npmjs/-/ajv/8.12.0, MIT AND OFL-1.1 AND (EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, #6025
 npm/npmjs/-/angular-i18next/15.0.5, MIT, approved, clearlydefined
+npm/npmjs/-/angular-split/15.0.0, , restricted, clearlydefined
 npm/npmjs/-/ansi-colors/4.1.3, MIT, approved, clearlydefined
 npm/npmjs/-/ansi-escapes/4.3.2, MIT, approved, clearlydefined
 npm/npmjs/-/ansi-html-community/0.0.8, Apache-2.0, approved, clearlydefined
@@ -1016,6 +1017,7 @@ npm/npmjs/-/tsconfig-paths/4.1.2, MIT, approved, #5390
 npm/npmjs/-/tslib/1.14.1, 0BSD, approved, clearlydefined
 npm/npmjs/-/tslib/2.4.1, 0BSD, approved, #4336
 npm/npmjs/-/tslib/2.5.0, 0BSD, approved, #6747
+npm/npmjs/-/tslib/2.6.2, 0BSD, approved, #9189
 npm/npmjs/-/tsutils/3.21.0, MIT, approved, clearlydefined
 npm/npmjs/-/tuf-js/1.1.4, MIT, approved, #7585
 npm/npmjs/-/tunnel-agent/0.6.0, Apache-2.0, approved, clearlydefined

diff --git a/charts/traceability-foss/Chart.yaml b/charts/traceability-foss/Chart.yaml
@@ -42,7 +42,7 @@ dependencies:
     condition: pgadmin4.enabled
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.5.0
+    version: 6.6.1
     condition: irs-helm.enabled
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc

diff --git a/dev/README.md b/dev/README.md
@@ -32,39 +32,62 @@ Keep in mind to always update DEV and TEST since they are dependend on each othe
 Sample invocation (DEV)
 
 ```
-python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.9.json -s https://tracex-submodel-server.dev.demo.catena-x.net -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server.dev.demo.catena-x.net -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC
 ```
 
 Sample invocation (TEST)
 
 ```
-python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.9.json -s https://tracex-submodel-server-test.dev.demo.catena-x.net -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server-test.dev.demo.catena-x.net -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC
 ```
 
 Sample invocation (E2E A)
 
 ```
-python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.9.json -s https://tracex-submodel-server-e2e-a.dev.demo.catena-x.net -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server-e2e-a.dev.demo.catena-x.net -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC
 ```
 
 Sample invocation (E2E B)
 
 ```
-python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.9.json -s https://tracex-submodel-server-e2e-b.dev.demo.catena-x.net -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server-e2e-b.dev.demo.catena-x.net -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC
 ```
 
 Sample invocation (INT A)
 
 ```
-python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.9.json -s https://tracex-submodel-server-int-a.int.demo.catena-x.net -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server-int-a.int.demo.catena-x.net -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV
 ```
 
 Sample invocation (INT B)
 
 ```
-python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.9.json -s https://tracex-submodel-server-int-b.int.demo.catena-x.net -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server-int-b.int.demo.catena-x.net -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV
 ```
 
+Sample invocation (STABLE A)
+
+```
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tx-submodel-server-stable-a.stable.demo.catena-x.net -edc https://trace-x-edc-stable-a.stable.demo.catena-x.net -a https://tx-registry-stable-a.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV
+```
+
+Sample invocation (STABLE B)
+
+```
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tx-submodel-server-stable-b.stable.demo.catena-x.net -edc https://trace-x-edc-stable-b.stable.demo.catena-x.net -a https://tx-registry-stable-b.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV
+```
+
+Sample invocation (STABLE A)
+
+```
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.9.json -s https://tx-submodel-server-stable-a.stable.demo.catena-x.net -edc https://trace-x-edc-stable-a.stable.demo.catena-x.net -a https://tx-registry-stable-a.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV
+```
+
+Sample invocation (STABLE B)
+
+```
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.9.json -s https://tx-submodel-server-stable-b.stable.demo.catena-x.net -edc https://trace-x-edc-stable-b.stable.demo.catena-x.net -a https://tx-registry-stable-b.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k <apiKey> --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV
+```
 where:
 
 * -f file to be used for data provisioning /tx-backend/testdata/CX_Testdata_MessagingTest_vx.x.x.json

diff --git a/frontend/package.json b/frontend/package.json
@@ -48,6 +48,7 @@
     "@angular/router": "15.2.8",
     "@types/lodash-es": "4.17.7",
     "angular-i18next": "15.0.5",
+    "angular-split": "15.0.0",
     "autoprefixer": "10.4.14",
     "d3": "7.8.4",
     "esbuild": "^0.17.18",

diff --git a/frontend/src/app/mocks/mock.ts b/frontend/src/app/mocks/mock.ts
@@ -25,15 +25,17 @@ import {
   dashboardHandler,
   errorHandler,
   investigationsHandlers,
-  otherPartsHandlers,
+  otherPartsAsBuiltHandlers,
+  otherPartsAsPlannedHandlers,
   partsAsBuiltHandlers,
   partsAsPlannedHandlers,
 } from './services';
 import { alertsHandlers } from './services/alerts-mock/alerts.handler';
 
 const handlers = [
   ...dashboardHandler,
-  ...otherPartsHandlers,
+  ...otherPartsAsBuiltHandlers,
+  ...otherPartsAsPlannedHandlers,
   ...partsAsBuiltHandlers,
   ...partsAsPlannedHandlers,
   ...investigationsHandlers,

diff --git a/frontend/src/app/mocks/services/index.ts b/frontend/src/app/mocks/services/index.ts
@@ -22,7 +22,7 @@
 export { dashboardHandler } from './dashboard-mock/dashboard.handler';
 export { partsAsBuiltHandlers, partsHandlersTest } from './parts-mock/partsAsBuilt/partsAsBuilt.handler';
 export { partsAsPlannedHandlers } from './parts-mock/partsAsPlanned/partsAsPlanned.handler';
-export { otherPartsHandlers, otherPartsHandlersTest } from './otherParts-mock/otherParts.handler';
+export { otherPartsAsBuiltHandlers, otherPartsAsBuiltHandlersTest, otherPartsAsPlannedHandlers, otherPartsAsPlannedHandlersTest } from './otherParts-mock/otherParts.handler';
 export { investigationsHandlers, investigationsTestHandlers } from './investigations-mock/investigations.handler';
 export { adminHandler } from './admin-mock/admin.handler';
 export { errorHandler } from './error-mock/error.handler';