Merge pull request #312 from catenax-ng/main

Refactored Dates, Added Datepicker

.github/workflows/eclipse-dash.yml

@@ -20,12 +20,14 @@ name: "[BE][FE][SECURITY] Eclipse DASH IP"
 on:
   workflow_dispatch: # Trigger manually
   push:
-    branches: main
+    branches:
+      - main
     paths-ignore:
       - '**/*.md'
       - '**/*.txt'
   pull_request:
-    branches: main
+    branches:
+      - main
     paths:
       - '**/pom.xml'
       - 'pom.xml'
@@ -73,7 +75,7 @@ jobs:
 
       - name: Check dependencies
         run: |
-          mvn package -pl tx-models,tx-backend org.eclipse.dash:license-tool-plugin:license-check -DskipTests=true -Ddash.summary=DEPENDENCIES_BACKEND -Ddash.fail=true
+          mvn package org.eclipse.dash:license-tool-plugin:license-check -DskipTests=true -Ddash.summary=DEPENDENCIES_BACKEND -Ddash.fail=true
 
       - name: upload results
         if: always()

.github/workflows/veracode_frontend.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: "[FE][SECURITY] Trivy"
+name: "[FE][SECURITY] Veracode"
 
 on:
   workflow_dispatch:

CONTRIBUTING.md

@@ -142,7 +142,7 @@ https://gitlab.eclipse.org/-/profile/personal_access_tokens
 #### Backend
 ##### Generate Dependencies
 
-`mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES_BACKEND`
+`mvn package org.eclipse.dash:license-tool-plugin:license-check -DskipTests=true -Ddash.summary=DEPENDENCIES_BACKEND -Ddash.fail=true`
 
 ##### Request Review
 

DEPENDENCIES_BACKEND

@@ -237,14 +237,16 @@ maven/mavencentral/org.eclipse.jetty.websocket/websocket-servlet/11.0.15, EPL-2.
 maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-jndi/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-plus/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.2.1-20231005.130041-12, Apache-2.0, approved, automotive.tractusx

DEPENDENCIES_FRONTEND

@@ -391,7 +391,7 @@ npm/npmjs/-/fs-minipass/3.0.2, ISC, approved, #8277
 npm/npmjs/-/fs-monkey/1.0.3, Unlicense AND (ISC AND MIT), approved, #2964
 npm/npmjs/-/fs.realpath/1.0.0, ISC, approved, clearlydefined
 npm/npmjs/-/fsevents/2.3.2, MIT, approved, #2967
-npm/npmjs/-/function-bind/1.1.1, MIT, approved, clearlydefined
+npm/npmjs/-/function-bind/1.1.1, MIT, approved, #11063
 npm/npmjs/-/function.prototype.name/1.1.5, MIT, approved, #10255
 npm/npmjs/-/functions-have-names/1.2.3, MIT, approved, clearlydefined
 npm/npmjs/-/gauge/4.0.4, ISC, approved, clearlydefined

charts/traceability-foss/CHANGELOG.md

@@ -4,7 +4,7 @@ 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.16] - 2023-10-16
 ### Added
 - Init pods on backend startup to check dependant services readiness status ( irs, edc-controlplane )
 

charts/traceability-foss/Chart.yaml

@@ -23,15 +23,15 @@ home: https://eclipse-tractusx.github.io/
 sources:
   - https://github.com/eclipse-tractusx/traceability-foss
 type: application
-version: 1.3.14
-appVersion: "7.1.0"
+version: 1.3.16
+appVersion: "8.0.0"
 dependencies:
   - name: frontend
     repository: "file://charts/frontend"
-    version: 1.3.14
+    version: 1.3.16
   - name: backend
     repository: "file://charts/backend"
-    version: 1.3.14
+    version: 1.3.16
   - name: postgresql
     repository: https://charts.bitnami.com/bitnami
     version: 12.1.6

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

@@ -20,8 +20,8 @@ apiVersion: v2
 name: backend
 description: A Helm chart for Traceability backend application
 type: application
-version: 1.3.14
-appVersion: "7.1.0"
+version: 1.3.16
+appVersion: "8.0.0"
 dependencies:
   - name: postgresql
     repository: https://charts.bitnami.com/bitnami

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

@@ -20,5 +20,5 @@ apiVersion: v2
 name: frontend
 description: A Helm chart for Traceability frontend application
 type: application
-version: 1.3.14
-appVersion: "7.1.0"
+version: 1.3.16
+appVersion: "8.0.0"

dev/README.md

@@ -21,7 +21,7 @@ Wait until pvc and database pods are restored. Underneath all 'DELETE' directori
 - Wait until pvc and database pods are restored
 - Sync full application with prune and replace
 
-Repeat those steps for registry, submodelserver, trace-x-provider-edcs, tracex-instances
+Repeat those steps for registry, trace-x-provider-edcs, tracex-instances
 
 ## 2) Data upload of assets
 
@@ -32,66 +32,55 @@ 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.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
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability.dev.demo.catena-x.net/api/submodel -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.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
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -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.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
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -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.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
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -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.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
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -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.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
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -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
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-stable-a.stable.demo.catena-x.net/api/submodel -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
+python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-stable-b.stable.demo.catena-x.net/api/submodel -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
-* -s submodel server url(s)
+* -s submodel server url(s) -- ( currently pointing to our backend api as it was implemented under /api/submodel )
 * -edc edc url(s) to upload data to
 * -a aas url(s)
 * -p policies to add to the data

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trace-x",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "scripts": {
     "analyze": "ng build --configuration=production --stats-json && webpack-bundle-analyzer dist/stats.json",
     "build:prod": "ng build --configuration=debugProd --base-href /{baseHrefPlaceholder}/ --deploy-url /{baseHrefPlaceholder}/",

frontend/src/app/modules/core/core.module.ts

@@ -81,6 +81,10 @@ import { ErrorPageModule } from '@page/error-page/error-page.module';
       provide: MAT_DATE_LOCALE,
       useValue: 'en-GB',
     },
+    {
+      provide: MAT_DATE_LOCALE,
+      useValue: 'de-DE',
+    },
     {
       provide: HTTP_INTERCEPTORS,
       useClass: HttpErrorInterceptor,

frontend/src/app/modules/page/parts/presentation/parts.component.ts

@@ -121,7 +121,6 @@ export class PartsComponent implements OnInit, OnDestroy, AfterViewInit {
 
     }
 
-
     private resetFilterAndShowToast() {
         let filterIsSet = resetMultiSelectionAutoCompleteComponent(this.partsTableComponents, false);
         if (filterIsSet) {

frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html

@@ -17,14 +17,15 @@
 SPDX-License-Identifier: Apache-2.0
 -->
 <mat-form-field>
-    <mat-select #selectElem [placeholder]="placeholder" [formControl]="formControl"
+    <mat-select *ngIf="!isDate" #selectElem [placeholder]="placeholder" [formControl]="formControl"
                 [multiple]="multiple"
                 (selectionChange)="onSelectionChange($event)">
 
         <div class="box-search">
             <mat-checkbox *ngIf="multiple" color="primary" class="box-select-all" [(ngModel)]="selectAllChecked"
                           (change)="toggleSelectAll($event)"></mat-checkbox>
-            <input [disabled]="!textSearch" #searchInput [(ngModel)]="theSearchElement" type="text" [ngClass]="{'pl-1': !multiple}"
+            <input [disabled]="!textSearch" #searchInput [(ngModel)]="theSearchElement" type="text"
+                   [ngClass]="{'pl-1': !multiple}"
                    (input)="filterItem(searchInput.value)"
                    [placeholder]="textSearch ? 'Search..': 'Choose..'">
             <div class="box-search-icon" (click)="filterItem(''); clickClear()">
@@ -33,16 +34,30 @@
                 </button>
             </div>
         </div>
-        <mat-select-trigger>
+
+
+        <mat-select-trigger *ngIf="!isDate">
             {{onDisplayString()}}
         </mat-select-trigger>
         <mat-option (click)="changeSearchTextOption()" [value]=this.theSearchElement
                     [style.display]="shouldHideTextSearchOptionField() ? 'none': 'flex'">{{this.theSearchElement}}
         </mat-option>
-        <mat-option *ngFor="let option of options" [disabled]="option.disabled" [value]="option[value]"
+        <mat-option  *ngFor="let option of options" [disabled]="option.disabled" [value]="option[value]"
                     [style.display]="hideOption(option) ? 'none': 'flex'">{{option[display]}}
         </mat-option>
 
     </mat-select>
 
+    <div  *ngIf="isDate" class="date-search">
+            <input disabled [value]="theSearchElement" [placeholder]="placeholder" matInput [matDatepicker]="datepicker"
+                   (dateInput)="dateSelectionEvent($event)" (dateChange)="dateSelectionEvent($event)">
+            <mat-datepicker-toggle  matIconSuffix [for]="datepicker"></mat-datepicker-toggle>
+            <mat-datepicker  disabled="false" #datepicker>
+                <mat-datepicker-actions>
+                    <button (click)="filterItem(''); clickClear()" mat-button matDatepickerCancel>{{ 'datepicker.cancel' | i18n }}</button>
+                    <button mat-raised-button color="primary" matDatepickerApply>{{ 'datepicker.apply' | i18n }}</button>
+                </mat-datepicker-actions>
+            </mat-datepicker>
+    </div>
+
 </mat-form-field>

frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.scss

@@ -25,7 +25,7 @@
   display: flex;
 }
 
-.box-search input {
+.box-search, input {
   flex: 1;
   border: none;
   outline: none;
@@ -45,3 +45,10 @@
 .pl-1 {
   padding-left: 1rem;
 }
+
+.date-search {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  /* Add any other necessary styling for the date-search container */
+}