Merge branch 'eclipse-tractusx:main' into feature/cmp-703/add-docker-…

…images-notice

CHANGELOG.md

@@ -23,8 +23,9 @@
 # Changelog
 
 The changelog 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).
+
 
-## [in  preparation]
+## [pre-released] - [1.0.0-alpha] - 2023-07-03
 ## [1.0.0] - xxxx-xx-xx
 
 ## Deleted
@@ -53,6 +54,14 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 - Added `.tractusx` metafile
 - Align chart version with app version.
 - Added file system logging of the negotiation and transfer.
+- Added new contract attributes from response.
+- Optimized the retrieval time to ~4 seconds.
+- Refactored git workflows to add the dpp frontend and backend container images onto Docker Hub registry in order to have public access to the images.
+- Added docker.io in digital-product-pass helm chart.
+- Commit ID and Repo URL added in frontend image
+- Frontend component to display legal information
+- Added components to display more contract information.
+- Fixed bug related to backend get status, where it looped over the status received.
 
 ## Updated
 - Updated charts configurations related to the backend.
@@ -61,7 +70,12 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 - Update the backend chart configuration
 - Refactor secrets structure
 - Updated postman collection
-
+- Updated veracode workflow
+- Updated the backend service in the frontend to call the async backend apis.
+- Updated footer of the application to add the legal information dialog. 
+- Updated the Mock payloads in the frontend component.
+- Updated pom.xml file adding a resource tag to include files into /META-INF folder inside JAR.
+
 ## Security Improvements
 - Added logic to create and authenticate with  unique session tokens the sign and other methods.
 - Added Encryption of passport payload when coming from Data Plane endpoint, until it is retrieved to the  user which is authenticated and is using the unique  session token as decryption key.
@@ -85,23 +99,6 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 - Upgraded Spring Boot version to  `v0.3.1`
 
 
-## [in  preparation]
-## [0.9.0] - xxxx-xx-xx
-
-## Deleted
-
-- Deleted the cx-backend-service from the EDC Consumer and Provider deployments 
-
-## Added
-- Added new `/endpoint` api to store the payload incomming from the EDC data plane
-- Added the encryption and decryption in AES from passport payload.
-- Added AES unit tests
-- Added the DataPlane service in the backend to comunicate with the data plane.
-
-## Updated
-- Updated charts configurations related to the backend.
-- Updated the EDC test charts to remote the cx-backend-service configurations
-
 ## [released]
 ## [0.8.1] - 2023-06-09
 

DEPENDENCIES_FRONTEND

@@ -71,7 +71,7 @@ npm/npmjs/-/csstype/2.6.21, MIT, approved, clearlydefined
 npm/npmjs/-/cypress-keycloak/1.9.0, MIT, approved, #6952
 npm/npmjs/-/cypress/12.5.1, MIT AND OFL-1.1 AND BSD-3-Clause AND Apache-2.0 AND ISC AND (BSD-2-Clause AND MIT), approved, #7095
 npm/npmjs/-/dashdash/1.14.1, MIT, approved, clearlydefined
-npm/npmjs/-/dayjs/1.11.7, MIT, approved, clearlydefined
+npm/npmjs/-/dayjs/1.11.7, MIT, approved, #9149
 npm/npmjs/-/de-indent/1.0.2, MIT, approved, clearlydefined
 npm/npmjs/-/debug/3.2.7, MIT, approved, clearlydefined
 npm/npmjs/-/debug/4.3.4, MIT, approved, clearlydefined
@@ -231,7 +231,7 @@ npm/npmjs/-/object-inspect/1.12.3, MIT, approved, clearlydefined
 npm/npmjs/-/once/1.4.0, ISC, approved, clearlydefined
 npm/npmjs/-/onetime/5.1.2, MIT, approved, clearlydefined
 npm/npmjs/-/open/8.4.1, MIT, approved, #7102
-npm/npmjs/-/optionator/0.9.1, MIT, approved, clearlydefined
+npm/npmjs/-/optionator/0.9.1, MIT, approved, #9208
 npm/npmjs/-/ospath/1.2.2, MIT, approved, clearlydefined
 npm/npmjs/-/p-limit/2.3.0, MIT, approved, clearlydefined
 npm/npmjs/-/p-locate/4.1.0, MIT, approved, clearlydefined

charts/digital-product-pass/Chart.yaml

@@ -37,10 +37,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
+
 version: 1.0.0
 
+
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.0"
+appVersion: "1.0.0-alpha"

charts/digital-product-pass/templates/service-frontend.yaml

@@ -36,3 +36,4 @@ spec:
       name: http
   selector:
     {{- include "chart.selectorLabels" . | nindent 4 }}
+

consumer-backend/productpass/pom.xml

@@ -33,7 +33,7 @@
 	</parent>
 	<groupId>org.eclipse.tractusx</groupId>
 	<artifactId>productpass</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.0-alpha-SNAPSHOT</version>
     <packaging>jar</packaging>
 	<name>Catena-X Digital Product Passport Backend</name>
 	<description>Product Passport Consumer Backend System for Product Passport Consumer Frontend Application</description>

consumer-backend/productpass/readme.md

@@ -23,7 +23,7 @@
 <h1 style="display:flex; align-items: center;"><img src="../../docs/catena-x-logo.svg"/>&nbsp;&nbsp;Digital Product Pass Backend</h1>
 
 
-<h2><strong>Version</strong>: <span style="color: cyan">1.0.0-SNAPSHOT</span><h2>
+<h2><strong>Version</strong>: <span style="color: cyan">1.0.0-alpha-SNAPSHOT</span><h2>
 
 <br>
 

consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ApiController.java

@@ -161,11 +161,6 @@ public Response getPassport(@Valid @RequestBody TokenRequest tokenRequestBody) {
                 return httpUtil.buildResponse(response, httpResponse);
             }
 
-            if (!status.historyExists("transfer-completed")) {
-                response = httpUtil.getNotFound("The passport transfer was not completed!");
-                return httpUtil.buildResponse(response, httpResponse);
-            }
-
             if (!status.historyExists("passport-received")) {
                 response = httpUtil.getNotFound("The passport is not available!");
                 return httpUtil.buildResponse(response, httpResponse);

deployment/helm/edc-consumer/Chart.yaml

@@ -1,50 +1,31 @@
+#################################################################################
+# Catena-X - Product Passport Consumer Application
 #
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA
 #
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
 #
-#  This program and the accompanying materials are made available under the
-#  terms of the Apache License, Version 2.0 which is available at
-#  https://www.apache.org/licenses/LICENSE-2.0
+# This program and the accompanying materials are made available under the
+# terms of the Apache License, Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0.
 #
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the
+# License for the specific language govern in permissions and limitations
+# under the License.
 #
-#  SPDX-License-Identifier: Apache-2.0
-#
-
+# SPDX-License-Identifier: Apache-2.0
+#################################################################################
 ---
 apiVersion: v2
 name: tractusx-connector
 description: |
-  A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
-  Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included.
-
-  This chart is intended for use with an _existing_ PostgreSQL database and an _existing_ HashiCorp Vault.
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+  A Helm chart for Tractus-X Eclipse Data Space Connector. This chart is a test mock that can be used as edc consumer for the DPP applicatiton.
 type: application
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
 version: 0.3.3
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
 appVersion: "0.4.1"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 sources: