From 5831405fbb5bb8509ae77bf1d5eb564095d4013f Mon Sep 17 00:00:00 2001 From: Christophe Loiseau Date: Tue, 17 Sep 2024 17:00:49 +0200 Subject: [PATCH 1/3] chore: Prepare release 10.4.0 --- CHANGELOG.md | 46 +++++++++++++++++-- docs/api/postman_collection.json | 6 +-- .../edc/ext/wrapper/api/ui/UiResource.java | 2 +- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50efff6d1..c4cb1a3ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ For documentation on how to update this changelog, please see [changelog_updates.md](docs/dev/changelog_updates.md). + ## [x.x.x] - UNRELEASED ### Overview @@ -13,13 +14,12 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). #### Minor Changes -- Extend the Wrapper API - - Adds `createDataOffer` endpoint to create an asset, policies and a contract definition in a single call - #### Patch Changes ### Deployment Migration Notes +_No special deployment migration steps required_ + #### Compatible Versions - Connector Backend Docker Images: @@ -31,6 +31,46 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). - Connector UI Docker Image: `ghcr.io/sovity/edc-ui:{{ UI VERSION }}` +## [10.4.0] - 2024-09-17 + +### Overview + +MDS Patch release + +### Detailed Changes + +UI and Wrapper API improvements. + +#### Minor Changes + +- Extend the Wrapper API ([#1373](https://github.com/sovity/PMO-Software/issues/1373)) + - Adds `createDataOffer` / `pages/create-data-offer` endpoint to create an asset, policies and a contract definition in a single call + +#### Patch Changes + +- Changed wording on the data offer creation page ([#817](https://github.com/sovity/edc-ui/issues/795)) +- Data Offer details now display the contract ID for each contract offer ([#795](https://github.com/sovity/edc-ui/issues/795)) +- Warn the user when using an invalid Policy Id ([#746](https://github.com/sovity/edc-ui/issues/746)) +- Warn the user when using an invalid Data Offer Id ([#745](https://github.com/sovity/edc-ui/issues/745)) +- Fixed time restriction upper bound "local day to datetime" conversion issues + ([#815](https://github.com/sovity/edc-ui/issues/815)) + + +### Deployment Migration Notes + +_No special deployment migration steps required_ + +#### Compatible Versions + +- Connector Backend Docker Images: + - Dev EDC: `ghcr.io/sovity/edc-dev:10.4.0` + - sovity EDC CE: `ghcr.io/sovity/edc-ce:10.4.0` + - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:10.4.0` + - Dev Catalog Crawler: `ghcr.io/sovity/catalog-crawler-dev:10.4.0` + - Catalog Crawler CE: `ghcr.io/sovity/catalog-crawler-ce:10.4.0` +- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:4.1.4` + + ## [10.3.0] - 2024-09-04 ### Overview diff --git a/docs/api/postman_collection.json b/docs/api/postman_collection.json index 9d8a0b327..b15b1bf9a 100644 --- a/docs/api/postman_collection.json +++ b/docs/api/postman_collection.json @@ -876,7 +876,7 @@ } }, "url": { - "raw": "{{PROVIDER_EDC_MANAGEMENT_URL}}/wrapper/ui/pages/create-asset/", + "raw": "{{PROVIDER_EDC_MANAGEMENT_URL}}/wrapper/ui/pages/create-data-offer/", "host": [ "{{PROVIDER_EDC_MANAGEMENT_URL}}" ], @@ -884,7 +884,7 @@ "wrapper", "ui", "pages", - "create-asset", + "create-data-offer", "" ] } @@ -2159,4 +2159,4 @@ "type": "default" } ] -} \ No newline at end of file +} diff --git a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ui/UiResource.java b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ui/UiResource.java index a024ed9dc..71895a4b0 100644 --- a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ui/UiResource.java +++ b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ui/UiResource.java @@ -138,7 +138,7 @@ interface UiResource { IdResponseDto deleteContractDefinition(@PathParam("contractDefinitionId") String contractDefinitionId); @POST - @Path("pages/create-data-offer/") + @Path("pages/create-data-offer") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) @Operation(description = "Create a new asset, contract definition and optional policies. Uses the same id for the asset, the contract policy, the access policy and the contract definition") From 4bd2bb08c40c5fc0d40b01f32857ef22a6c83d9d Mon Sep 17 00:00:00 2001 From: Christophe Loiseau Date: Tue, 17 Sep 2024 17:06:16 +0200 Subject: [PATCH 2/3] Ignore PMO links --- .github/markdown-link-checker-config.jq | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/markdown-link-checker-config.jq b/.github/markdown-link-checker-config.jq index e73dc13c3..2695e8fe8 100755 --- a/.github/markdown-link-checker-config.jq +++ b/.github/markdown-link-checker-config.jq @@ -7,7 +7,8 @@ {"pattern": "^https://www\\.linkedin\\.com"}, {"pattern": "https://(.*?)\\.azure\\.sovity\\.io"}, {"pattern": "http://edc2?:"}, - {"pattern": "^https?://connector:"} + {"pattern": "^https?://connector:"}, + {"pattern": "^https://github.com/sovity/PMO-Software/issues/"} ], "replacementPatterns": [ { From 0b47154cd77058c2e557acf38d1244f1e78e1fe5 Mon Sep 17 00:00:00 2001 From: Christophe Loiseau Date: Wed, 18 Sep 2024 08:45:03 +0200 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Tim Berthold <75306992+tmberthold@users.noreply.github.com> --- .github/markdown-link-checker-config.jq | 3 +-- CHANGELOG.md | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/markdown-link-checker-config.jq b/.github/markdown-link-checker-config.jq index 2695e8fe8..e73dc13c3 100755 --- a/.github/markdown-link-checker-config.jq +++ b/.github/markdown-link-checker-config.jq @@ -7,8 +7,7 @@ {"pattern": "^https://www\\.linkedin\\.com"}, {"pattern": "https://(.*?)\\.azure\\.sovity\\.io"}, {"pattern": "http://edc2?:"}, - {"pattern": "^https?://connector:"}, - {"pattern": "^https://github.com/sovity/PMO-Software/issues/"} + {"pattern": "^https?://connector:"} ], "replacementPatterns": [ { diff --git a/CHANGELOG.md b/CHANGELOG.md index c4cb1a3ea..038f1769d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,7 @@ _No special deployment migration steps required_ - Connector UI Docker Image: `ghcr.io/sovity/edc-ui:{{ UI VERSION }}` -## [10.4.0] - 2024-09-17 +## [10.4.0] - 2024-09-18 ### Overview @@ -43,7 +43,7 @@ UI and Wrapper API improvements. #### Minor Changes -- Extend the Wrapper API ([#1373](https://github.com/sovity/PMO-Software/issues/1373)) +- Extend the Wrapper API ([PR 1035](https://github.com/sovity/edc-ce/pull/1035)) - Adds `createDataOffer` / `pages/create-data-offer` endpoint to create an asset, policies and a contract definition in a single call #### Patch Changes