From 6e77cb12531ae7f74cd5703cc6846605c6b3bfdb Mon Sep 17 00:00:00 2001 From: Aitor <1726644+aaitor@users.noreply.github.com> Date: Wed, 11 Oct 2023 14:30:00 +0200 Subject: [PATCH 1/7] fix: the `tokenId` attribute in the DDO is now clean (no DID prefix) --- package.json | 2 +- src/utils/DDOHelpers.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 544281fe9..967d82b00 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nevermined-io/sdk", - "version": "2.0.0-rc16", + "version": "2.0.0-rc17", "description": "Javascript SDK for connecting with Nevermined Data Platform ", "main": "./dist/node/sdk.js", "typings": "./dist/node/sdk.d.ts", diff --git a/src/utils/DDOHelpers.ts b/src/utils/DDOHelpers.ts index ac7a4bf15..a9106d1bf 100644 --- a/src/utils/DDOHelpers.ts +++ b/src/utils/DDOHelpers.ts @@ -112,7 +112,7 @@ function getParameter( case 'duration': return String(duration) case 'tokenId': - return tokenId ? tokenId : '' + return tokenId ? tokenId.replace('did:nv:', '') : '' } return '' From ce8106b4b9e671841a3669d36aa056e6b0e8e2ce Mon Sep 17 00:00:00 2001 From: Aitor <1726644+aaitor@users.noreply.github.com> Date: Wed, 11 Oct 2023 15:11:02 +0200 Subject: [PATCH 2/7] chore: adding v2.0.0-rc17 Changelog updates --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fea4f7b0e..674de7f2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,10 +66,17 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - feat: subscription by credits api [`f97aa61`](https://github.com/nevermined-io/sdk-js/commit/f97aa61c4328a7bc8ea1f14f584b3664876970db) - chore: adapting nft 1155 to duration and transfer params [`a133315`](https://github.com/nevermined-io/sdk-js/commit/a133315c8b217cec7d41e6f863277dfe94fce98a) -#### [v2.0.0-rc2](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc16...v2.0.0-rc2) +#### [v2.0.0-rc2](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc17...v2.0.0-rc2) > 26 July 2023 +#### [v2.0.0-rc17](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc16...v2.0.0-rc17) + +> 11 October 2023 + +- chore: adding v2.0.0-rc16 Changelog updates [`176899a`](https://github.com/nevermined-io/sdk-js/commit/176899afa7c4fb3bf8d28eb7bfa689e9ffca67fe) +- fix: the `tokenId` attribute in the DDO is now clean (no DID prefix) [`6e77cb1`](https://github.com/nevermined-io/sdk-js/commit/6e77cb12531ae7f74cd5703cc6846605c6b3bfdb) + #### [v2.0.0-rc16](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc15...v2.0.0-rc16) > 9 October 2023 From 849b02c17ae97c944c477ae69ba1d37d0e8cc997 Mon Sep 17 00:00:00 2001 From: Rodolphe Marques Date: Thu, 12 Oct 2023 18:28:02 +0200 Subject: [PATCH 3/7] feat: update to latest version of nvm-tools-actions --- .github/workflows/testing-nightly.yml | 6 +++--- .github/workflows/testing-node.yml | 2 +- .github/workflows/testing.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/testing-nightly.yml b/.github/workflows/testing-nightly.yml index 4d678317c..220c7c69e 100644 --- a/.github/workflows/testing-nightly.yml +++ b/.github/workflows/testing-nightly.yml @@ -56,7 +56,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 - - uses: nevermined-io/nvm-tools-actions@v0.14.0 + - uses: nevermined-io/nvm-tools-actions@v0.15.0 with: token: ${{ secrets.API_TOKEN_GITHUB }} opengsn: 'true' @@ -98,7 +98,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 - - uses: nevermined-io/nvm-tools-actions@v0.14.0 + - uses: nevermined-io/nvm-tools-actions@v0.15.0 with: token: ${{ secrets.API_TOKEN_GITHUB }} opengsn: 'true' @@ -132,7 +132,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 - - uses: nevermined-io/nvm-tools-actions@v0.14.0 + - uses: nevermined-io/nvm-tools-actions@v0.15.0 with: token: ${{ secrets.API_TOKEN_GITHUB }} opengsn: 'true' diff --git a/.github/workflows/testing-node.yml b/.github/workflows/testing-node.yml index 78e03f800..6af7c5751 100644 --- a/.github/workflows/testing-node.yml +++ b/.github/workflows/testing-node.yml @@ -20,7 +20,7 @@ jobs: # TODO: remove this when Node integrated with SDKv2 is integraged ref: develop token: ${{ secrets.API_TOKEN_GITHUB }} - - uses: nevermined-io/nvm-tools-actions@v0.14.0 + - uses: nevermined-io/nvm-tools-actions@v0.15.0 with: token: ${{ secrets.API_TOKEN_GITHUB }} opengsn: 'true' diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7f7998cee..d2aeca9fe 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 - - uses: nevermined-io/nvm-tools-actions@v0.14.0 + - uses: nevermined-io/nvm-tools-actions@v0.15.0 with: token: ${{ secrets.API_TOKEN_GITHUB }} opengsn: 'true' From 17d9e60a88ea3a6f6fdb5061682970734c3a7e6b Mon Sep 17 00:00:00 2001 From: Aitor <1726644+aaitor@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:16:23 +0200 Subject: [PATCH 4/7] fix: adding additional external resource attributes --- src/ddo/types.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/ddo/types.ts b/src/ddo/types.ts index 32167b8bb..1a88c629b 100644 --- a/src/ddo/types.ts +++ b/src/ddo/types.ts @@ -101,6 +101,15 @@ export interface ServiceMetadata { definition: ServiceDefinition } +export enum ExternalResourceFileType { + Avatar = 'Avatar', + Private = 'Private', + CoverImage = 'CoverImage', + TermsAndConditions = 'TermsAndConditions', + SampleData = 'SampleData', + Other = 'Other', +} + export interface MetaDataExternalResource { /** * File name. @@ -139,7 +148,13 @@ export interface MetaDataExternalResource { contentLength?: string /** - * Resource ID (depending on the source). + * The type of the external resource file + */ + resourceType?: ExternalResourceFileType + + /** + * Resource ID (depending on the source). It is used to reference the id of the file in an external source. + * For example the `ugcId` */ resourceId?: string From 0c66298ca58111f7fac59afa306d5320f8a56d4d Mon Sep 17 00:00:00 2001 From: Aitor <1726644+aaitor@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:16:48 +0200 Subject: [PATCH 5/7] chore: bumping version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 967d82b00..3ec92351a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nevermined-io/sdk", - "version": "2.0.0-rc17", + "version": "2.0.0-rc18", "description": "Javascript SDK for connecting with Nevermined Data Platform ", "main": "./dist/node/sdk.js", "typings": "./dist/node/sdk.d.ts", From cd8cb489d36fb0296ee08b3e10457e1d5d62e4a3 Mon Sep 17 00:00:00 2001 From: Aitor <1726644+aaitor@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:19:40 +0200 Subject: [PATCH 6/7] chore: adding v2.0.0-rc18 Changelog updates --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 674de7f2f..1f2f22c80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,10 +66,18 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - feat: subscription by credits api [`f97aa61`](https://github.com/nevermined-io/sdk-js/commit/f97aa61c4328a7bc8ea1f14f584b3664876970db) - chore: adapting nft 1155 to duration and transfer params [`a133315`](https://github.com/nevermined-io/sdk-js/commit/a133315c8b217cec7d41e6f863277dfe94fce98a) -#### [v2.0.0-rc2](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc17...v2.0.0-rc2) +#### [v2.0.0-rc2](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc18...v2.0.0-rc2) > 26 July 2023 +#### [v2.0.0-rc18](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc17...v2.0.0-rc18) + +> 16 October 2023 + +- fix: adding additional external resource attributes [`17d9e60`](https://github.com/nevermined-io/sdk-js/commit/17d9e60a88ea3a6f6fdb5061682970734c3a7e6b) +- chore: adding v2.0.0-rc17 Changelog updates [`ce8106b`](https://github.com/nevermined-io/sdk-js/commit/ce8106b4b9e671841a3669d36aa056e6b0e8e2ce) +- chore: bumping version [`0c66298`](https://github.com/nevermined-io/sdk-js/commit/0c66298ca58111f7fac59afa306d5320f8a56d4d) + #### [v2.0.0-rc17](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc16...v2.0.0-rc17) > 11 October 2023 From c2a70078805da0ec46bead9fc2b56d452a5c3817 Mon Sep 17 00:00:00 2001 From: Aitor <1726644+aaitor@users.noreply.github.com> Date: Mon, 16 Oct 2023 10:07:07 +0200 Subject: [PATCH 7/7] ci: nvm tools v0.15.0 --- .github/workflows/testing-nightly.yml | 6 +++--- .github/workflows/testing-node.yml | 2 +- .github/workflows/testing.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/testing-nightly.yml b/.github/workflows/testing-nightly.yml index 4d678317c..220c7c69e 100644 --- a/.github/workflows/testing-nightly.yml +++ b/.github/workflows/testing-nightly.yml @@ -56,7 +56,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 - - uses: nevermined-io/nvm-tools-actions@v0.14.0 + - uses: nevermined-io/nvm-tools-actions@v0.15.0 with: token: ${{ secrets.API_TOKEN_GITHUB }} opengsn: 'true' @@ -98,7 +98,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 - - uses: nevermined-io/nvm-tools-actions@v0.14.0 + - uses: nevermined-io/nvm-tools-actions@v0.15.0 with: token: ${{ secrets.API_TOKEN_GITHUB }} opengsn: 'true' @@ -132,7 +132,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 - - uses: nevermined-io/nvm-tools-actions@v0.14.0 + - uses: nevermined-io/nvm-tools-actions@v0.15.0 with: token: ${{ secrets.API_TOKEN_GITHUB }} opengsn: 'true' diff --git a/.github/workflows/testing-node.yml b/.github/workflows/testing-node.yml index 78e03f800..6af7c5751 100644 --- a/.github/workflows/testing-node.yml +++ b/.github/workflows/testing-node.yml @@ -20,7 +20,7 @@ jobs: # TODO: remove this when Node integrated with SDKv2 is integraged ref: develop token: ${{ secrets.API_TOKEN_GITHUB }} - - uses: nevermined-io/nvm-tools-actions@v0.14.0 + - uses: nevermined-io/nvm-tools-actions@v0.15.0 with: token: ${{ secrets.API_TOKEN_GITHUB }} opengsn: 'true' diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7f7998cee..d2aeca9fe 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 - - uses: nevermined-io/nvm-tools-actions@v0.14.0 + - uses: nevermined-io/nvm-tools-actions@v0.15.0 with: token: ${{ secrets.API_TOKEN_GITHUB }} opengsn: 'true'