From a03e7050a56dd1cd82301e7237b887f04e135a7e Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Wed, 3 Apr 2024 14:45:18 +0200 Subject: [PATCH 1/7] feature(notifications): 616 - fix notification flow --- .../traceability/common/model/SecurityUtils.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SecurityUtils.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SecurityUtils.java index e739309b34..81a166d246 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SecurityUtils.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SecurityUtils.java @@ -21,15 +21,18 @@ import lombok.experimental.UtilityClass; -import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotification; -import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotificationContent; -import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotificationHeader; import notification.request.CloseNotificationRequest; import notification.request.StartNotificationRequest; import notification.request.UpdateNotificationRequest; +import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotification; +import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotificationContent; +import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotificationHeader; +import java.util.Collections; import java.util.List; +import static org.apache.commons.collections4.ListUtils.emptyIfNull; + @UtilityClass public class SecurityUtils { @@ -49,7 +52,7 @@ public static List sanitize(List unSanitizedList) { .map(SecurityUtils::sanitize) .toList(); } - return null; + return Collections.emptyList(); } public static StartNotificationRequest sanitize(StartNotificationRequest request) { @@ -104,7 +107,7 @@ private static EDCNotificationHeader sanitize(EDCNotificationHeader edcNotificat private static EDCNotificationContent sanitize(EDCNotificationContent edcNotificationContent) { String cleanInformation = sanitize(edcNotificationContent.information()); - List cleanStringListOfAffectedItems = sanitize(edcNotificationContent.listOfAffectedItems()); + List cleanStringListOfAffectedItems = sanitize(emptyIfNull(edcNotificationContent.listOfAffectedItems())); return new EDCNotificationContent(cleanInformation, cleanStringListOfAffectedItems); } } From 3ca7eb1817b9689ce01f1ce3945fc85f66b1eec5 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Wed, 3 Apr 2024 14:45:50 +0200 Subject: [PATCH 2/7] feature(notifications): 616 - fix notification flow --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43d9cbb26c..388ce533d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha - #706 Notification controller having the same endpoints as alerts and investigations controllers - #736 add contractAgreementId as searchable field for /contracts - Added capitalization section in guidelines.md +- Allow edc notification update with empty asset list ### Changed - #709 Bumped spring-core from 6.0.17 to 6.1.5 From 689b3870c5bb902789127497a5f683ad42ebb483 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Wed, 3 Apr 2024 14:46:55 +0200 Subject: [PATCH 3/7] feature(notifications): 616 - fix notification flow --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 388ce533d0..a99e4b94f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha - #706 Notification controller having the same endpoints as alerts and investigations controllers - #736 add contractAgreementId as searchable field for /contracts - Added capitalization section in guidelines.md -- Allow edc notification update with empty asset list +- #616 Allow edc notification update with empty asset list ### Changed - #709 Bumped spring-core from 6.0.17 to 6.1.5 From c1771f1854f13aebb6228dcd8e3518176d554ab9 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Wed, 3 Apr 2024 14:56:37 +0200 Subject: [PATCH 4/7] feature(notifications): 616 - fix. --- .../infrastructure/edc/model/EDCNotification.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/model/EDCNotification.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/model/EDCNotification.java index 8fcd824c8d..9d5c2c599e 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/model/EDCNotification.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/model/EDCNotification.java @@ -32,6 +32,8 @@ import java.time.Instant; import java.util.List; +import static org.apache.commons.collections4.ListUtils.emptyIfNull; + @JsonInclude(JsonInclude.Include.NON_NULL) public record EDCNotification(@Valid @NotNull @@ -81,7 +83,7 @@ public String getRelatedNotificationId() { @JsonIgnore public List getListOfAffectedItems() { - return content.listOfAffectedItems().stream() + return emptyIfNull(content.listOfAffectedItems()).stream() .map(NotificationAffectedPart::new).toList(); } From 4ae718483ab8d1548165e11f9a131e9a13c20cd0 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 3 Apr 2024 15:24:04 +0200 Subject: [PATCH 5/7] chore: update irs-client-lib.version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9085e09762..b10f88747f 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ SPDX-License-Identifier: Apache-2.0 7.15.0 5.10.2 3.0.0 - 1.6.0 + 1.8.0 5.4.0 jacoco From dd7c4c08481f809a7b7aec4361699de2a015dbc8 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 3 Apr 2024 15:37:41 +0200 Subject: [PATCH 6/7] chore: release 10.8.0 --- CHANGELOG.md | 3 +++ COMPATIBILITY_MATRIX.md | 29 +++++++++++++++++++++++++++ charts/traceability-foss/CHANGELOG.md | 4 ++++ 3 files changed, 36 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a99e4b94f4..f188518be3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). _**For better traceability add the corresponding GitHub issue number in each changelog entry, please.**_ ## [UNRELEASED - DD.MM.YYYY] + +## [10.8.0 - 03.04.2024] + ### Added - #695 OAuth2.0 Client scope configuration - #606 Added error message into notifications on failure diff --git a/COMPATIBILITY_MATRIX.md b/COMPATIBILITY_MATRIX.md index 551bdbd696..0f027de13e 100644 --- a/COMPATIBILITY_MATRIX.md +++ b/COMPATIBILITY_MATRIX.md @@ -1,5 +1,34 @@ # Compatibility matrix Trace-X +## Trace-X version [[10.8.0](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.8.0)] - 2024-04-03 + +### Catena-X Release? + +- [ ] yes +- [x] no + +### Helm Version [1.3.33](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/helm-charts-1.3.33) + +| Dependency | Name of Service | Version | Helm | Comments | +|------------------|------------------------------|---------------------------------|--------|-----------------------------------------------------------------------------------| +| EDC | edc-postgresql | 12.1.6 | 2.0.0 | Enterprise Data Connector for PostgreSQL | +| IRS | irs-helm | 4.5.1 | 6.14.1 | Helm charts for Item Relationship Service | +| EDC | tractusx-connector | 0.5.3 | 2.0.0 | Connector for Data Transfer and Registration | +| Discovery Finder | discovery service | v0.2.4-M1 | 0.1.11 | Service for discovering and registering artifacts | +| Portal | portal | 1.8.0 | 1.8.0 | Web portal for interacting with Trace-X | +| SD-Factory | SD-Factory | 2.1.7 | 2.1.8 | Service Discovery Factory for managing dependencies | +| Wallet | wallet | 0.3.0 | 0.3.0 | Secure storage for sensitive information | +| SDE | Simple Data Exchanger (SDE) | 2.3.3 | 0.1.3 | Standalone service for companies to provide data in the Eclipse Tractus-X network | +| Aspect Model | SerialPart | [1.0.0,1.1.0,2.0.0,3.0.0) | - | | +| Aspect Model | Batch | [1.0.1,1.0.2,2.0.0,2.0.1,3.0.0) | - | | +| Aspect Model | PartAsPlanned | [1.0.0,1.0.1,2.0.0) | - | | +| Aspect Model | PartSiteInformationAsPlanned | [1.0.0] | - | | +| Aspect Model | JustInSequencePart | [1.0.0,2.0.0,3.0.0) | - | | +| Aspect Model | TractionBatteryCode | [1.0.0] | - | | +| Aspect Model | SingleLevelUsageAsBuilt | [1.0.1] | - | | +| Aspect Model | SingleLevelBomAsBuilt | [1.0.0, 2.0.0) | - | | +| Aspect Model | SingleLevelBomAsPlanned | [1.0.1, 1.1.0) | - | | + ## Trace-X version [[10.7.0](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.7.0)] - 2024-03-18 ### Catena-X Release? diff --git a/charts/traceability-foss/CHANGELOG.md b/charts/traceability-foss/CHANGELOG.md index 5c6d693eb0..47861b6f68 100644 --- a/charts/traceability-foss/CHANGELOG.md +++ b/charts/traceability-foss/CHANGELOG.md @@ -4,7 +4,11 @@ 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). +## [1.3.33] - 2024-04-03 +### No changes + ## [1.3.32] - 2024-03-04 + ### No changes ## [1.3.31] - 2024-03-04 From 10aca9fe3bc73a0e96490a03990ee3ba71dafc7a Mon Sep 17 00:00:00 2001 From: ds-lcapellino <137265091+ds-lcapellino@users.noreply.github.com> Date: Wed, 3 Apr 2024 13:43:13 +0000 Subject: [PATCH 7/7] chore(release): Prepare release for Helm version 1.3.33 --- charts/traceability-foss/Chart.yaml | 8 ++++---- charts/traceability-foss/charts/backend/Chart.yaml | 4 ++-- charts/traceability-foss/charts/frontend/Chart.yaml | 4 ++-- frontend/package.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/traceability-foss/Chart.yaml b/charts/traceability-foss/Chart.yaml index 56d66b6465..eb79f87689 100644 --- a/charts/traceability-foss/Chart.yaml +++ b/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.32 -appVersion: "10.7.0" +version: 1.3.33 +appVersion: "10.8.0" dependencies: - name: frontend repository: "file://charts/frontend" - version: 1.3.32 + version: 1.3.33 - name: backend repository: "file://charts/backend" - version: 1.3.32 + version: 1.3.33 - name: postgresql repository: https://charts.bitnami.com/bitnami version: 12.12.10 diff --git a/charts/traceability-foss/charts/backend/Chart.yaml b/charts/traceability-foss/charts/backend/Chart.yaml index 5c04ca4977..9296e33f40 100644 --- a/charts/traceability-foss/charts/backend/Chart.yaml +++ b/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.32 -appVersion: "10.7.0" +version: 1.3.33 +appVersion: "10.8.0" dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami diff --git a/charts/traceability-foss/charts/frontend/Chart.yaml b/charts/traceability-foss/charts/frontend/Chart.yaml index 501e355ccc..90ebe39ec8 100644 --- a/charts/traceability-foss/charts/frontend/Chart.yaml +++ b/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.32 -appVersion: "10.7.0" +version: 1.3.33 +appVersion: "10.8.0" diff --git a/frontend/package.json b/frontend/package.json index 09e6104f9a..72ad3a225c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "trace-x", - "version": "10.7.0", + "version": "10.8.0", "scripts": { "analyze": "ng build --configuration=production --stats-json && webpack-bundle-analyzer dist/stats.json", "build:prod": "ng build --output-hashing=all --configuration=debugProd --base-href /{baseHrefPlaceholder}/ --deploy-url /{baseHrefPlaceholder}/ ",