Skip to content

Commit

Permalink
Merge pull request #212 from catenax-ng/hotfix/v2.1.1
Browse files Browse the repository at this point in the history
[ 4º ] - Hotfix/v2.1.1: Solved vulnerabilities and frontend bugs
  • Loading branch information
matbmoser authored Feb 5, 2024
2 parents 467c36e + 1569e10 commit 5f50095
Show file tree
Hide file tree
Showing 30 changed files with 341 additions and 149 deletions.
21 changes: 18 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,23 @@

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).

## [released]
## [v2.1.1] - 05-02-2024

## Added
- Added missing german translations to the transmission pass
- Added missing german translations to the policy selection feature
- Integrated dependabot to automate the dependencies updates

## Updated
- Updated axios library from `v1.6.0` to `v1.6.7` to fix vulnerability
- Updated the license headers in all the files to the latest "license and copyright header" of 2024

## Issues Fixed
- Fixed tabs bugs related to translations
- Fixed translations of battery pass and digital product pass
- Fixed missing additional data visualization
- Fixed missing total sources visualization

## [released]
## [v2.1.0] - 02-02-2024
Expand All @@ -43,8 +60,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
- Added fixes in backend and frontend integration
- Added pydoc comments to the getPassport.py
- Added access-token parameter to authorize the APIs without providing username/password and company



## Updated
- Updated versions from container base images
- Adjusted the non root user ids in Dockerfiles and dpp helm chart configurations
Expand All @@ -57,7 +73,6 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
- Updated license header
- Updated user manual readme by adding the policy selection screenshots


## Issues Fixed
- Fixed issue related to `sleepy` EDCs, allowing the backend to re-request the contract negotiation when the EDC does not respond.

Expand Down
2 changes: 1 addition & 1 deletion DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ npm/npmjs/-/anymatch/3.1.3, ISC, approved, #5050
npm/npmjs/-/argparse/1.0.10, MIT, approved, #2174
npm/npmjs/-/astral-regex/2.0.0, MIT, approved, clearlydefined
npm/npmjs/-/asynckit/0.4.0, MIT, approved, clearlydefined
npm/npmjs/-/axios/1.6.3, MIT, approved, #11338
npm/npmjs/-/axios/1.6.7, MIT, approved, #11338
npm/npmjs/-/balanced-match/1.0.2, MIT, approved, clearlydefined
npm/npmjs/-/base64-js/1.5.1, MIT, approved, clearlydefined
npm/npmjs/-/binary-extensions/2.2.0, MIT, approved, clearlydefined
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ In particular, the appliction is used to access the battery passport data provid

### Software Version
#### Helm Chart Version
<pre id="helm-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/digital-product-pass-2.1.0">2.1.0</a></pre>
<pre id="helm-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/digital-product-pass-2.1.1">2.1.1</a></pre>
#### Application Version
<pre id="app-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/v2.1.0">v2.1.0</a></pre>
<pre id="app-version"><a href="https://github.com/eclipse-tractusx/digital-product-pass/releases/tag/v2.1.1">v2.1.1</a></pre>



Expand Down Expand Up @@ -83,7 +83,7 @@ To get started you can have a look into our documentation:

## Installation
For installing the Digital Product Pass application please consult our [Intallation Guide](./INSTALL.md).
For installing the Digital Product Pass Application please consult our [Intallation Guide](./INSTALL.md).

## License

Expand Down
4 changes: 2 additions & 2 deletions charts/digital-product-pass/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ type: application
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 2.1.0
version: 2.1.1

# 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: "2.1.0"
appVersion: "2.1.1"
2 changes: 1 addition & 1 deletion charts/digital-product-pass/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

# digital-product-pass

![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square)
![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square)

A Helm chart for Tractus-X Digital Product Pass Kubernetes

Expand Down
3 changes: 1 addition & 2 deletions charts/digital-product-pass/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,4 @@ oauth:
enabled: true
bpn: *bpn
roleCheck:
enabled: false

enabled: false
5 changes: 3 additions & 2 deletions charts/digital-product-pass/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ backend:
catalog: "/catalog/request"
negotiation: "/contractnegotiations"
transfer: "/transferprocesses"
delay: 100 # -- Negotiation status Delay in milliseconds in between async requests [<= 500]
# -- Negotiation status Delay in milliseconds in between async requests [<= 500]
delay: 100

# -- backend hostname (without protocol prefix [DEFAULT HTTPS] for security )
hostname: *hostname
Expand Down Expand Up @@ -181,7 +182,7 @@ frontend:
ingress:
enabled: false
hosts: []

# -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
podSecurityContext:
seccompProfile:
Expand Down
5 changes: 3 additions & 2 deletions deployment/local/storage/pv-data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#################################################################################

apiVersion: v1
kind: PersistentVolume
metadata:
Expand All @@ -33,6 +34,6 @@ spec:
storageClassName: standard
claimRef:
name: pvc-data
namespace: default
namespace: {{ .Values.namespace }}
hostPath:
path: "/mnt"
path: "/mnt"
2 changes: 1 addition & 1 deletion deployment/local/storage/pvc-data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ metadata:
name: pvc-data
labels:
{{- include "chart.labels" . | nindent 4 }}
namespace: default
namespace: {{ .Values.namespace }}
spec:
storageClassName: standard
accessModes:
Expand Down
17 changes: 17 additions & 0 deletions docs/RELEASE_USER.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,23 @@
# Release Notes Digital Product Pass Application
User friendly relase notes without especific technical details.

**February 05 2024 (Version 2.1.1)**
*05.02.2024*

### Added
#### Added missing german translations for transmission passport
The missing translations related with the view to show the transmission passport was added in order to have both english and german languages on the application.

#### Integrated dependabot in repository
Integrated dependabot to automate the dependencies updates and comply to the tractus-x release guidelines.

### Updated
#### Updated License and copyright header
The License and copyright header was changed and the latest version was updated to every files needed in the application folder to the year 2024.

#### Fixed security vulnerabilies related to axios
Updated the axios library to the latest version `v1.6.7` in order to solve the library vulnerability.

**February 02 2024 (Version 2.1.0)**
*02.02.2024*

Expand Down
4 changes: 2 additions & 2 deletions dpp-backend/charts/digital-product-pass-backend/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ type: application
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 2.1.0
version: 2.1.1

# 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: "2.1.0"
appVersion: "2.1.1"
2 changes: 1 addition & 1 deletion dpp-backend/charts/digital-product-pass-backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

# digital-product-pass-backend

![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square)
![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square)

A Helm chart for Tractus-X Digital Product Pass Backend Kubernetes

Expand Down
2 changes: 1 addition & 1 deletion dpp-backend/digitalproductpass/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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">v2.0.1</span><h2>
<h2><strong>Version</strong>: <span style="color: cyan">v2.1.1</span><h2>

<br>

Expand Down
2 changes: 1 addition & 1 deletion dpp-backend/digitalproductpass/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</parent>
<groupId>org.eclipse.tractusx</groupId>
<artifactId>digitalproductpass</artifactId>
<version>2.1.0</version>
<version>2.1.1</version>
<packaging>jar</packaging>
<name>Catena-X Digital Product Passport Backend</name>
<description>Digital Product Passport Consumer Backend Reference Implementation System for Product Passport Consumer Frontend Application
Expand Down
22 changes: 11 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "digital-product-pass-frontend",
"version": "2.1.0",
"version": "2.1.1",
"private": true,
"scripts": {
"serve": "vite --host localhost",
Expand All @@ -15,7 +15,7 @@
"@mdi/font": "5.9.55",
"@popperjs/core": "^2.11.2",
"@vitejs/plugin-vue": "^4.0.0",
"axios": ">=1.6.0",
"axios": ">=1.6.7",
"clipboard": "^2.0.11",
"core-js": "^3.8.3",
"crypto-js": "^4.2.0",
Expand Down
12 changes: 10 additions & 2 deletions src/components/general/TabsComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,14 @@
:value="section.component"
>
<v-icon start md :icon="section.icon"> </v-icon>
{{ $t(`passportView.dppComponentsNames.${section.label}`) }}
{{
section.label.includes("passportView")
? $t(`${section.label}`)
: semanticId ===
"urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"
? $t(`passportView.tppComponentsNames.${section.label}`)
: $t(`passportView.dppComponentsNames.${section.label}`)
}}
</v-tab>
</v-tabs>
<v-card-text>
Expand Down Expand Up @@ -108,6 +115,7 @@ export default {
props: {
componentsNames: { type: Object, default: Object },
componentsData: { type: Object, default: Object },
semanticId: { type: String, default: "" },
},
};
</script>
</script>
2 changes: 1 addition & 1 deletion src/components/passport/AttributeField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</span>
</template>
<template v-if="attribute.unit">
<span> {{}} {{ attribute.unit }} </span>
<span> {{ attribute.unit }} </span>
</template>
</li>
</ul>
Expand Down
4 changes: 3 additions & 1 deletion src/components/passport/GeneralCards.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ export default {
this.$props.data.aspect.sustainability["PEF"].carbon
? this.$props.data.aspect.sustainability["PEF"].carbon[0].value
: "-",
valueUnits: "t CO2 Total",
valueUnits: (this.$props.data.aspect.sustainability["PEF"].carbon[0].unit !== ""
? this.$props.data.aspect.sustainability["PEF"].carbon[0].unit
: "t CO₂") + " Total",
secondValue: this.$props.data.aspect.commercial
? this.$props.data.aspect.commercial.warranty
: "-",
Expand Down
Loading

0 comments on commit 5f50095

Please sign in to comment.