From a81838c8e7cbd87636d25a20a480ec379a81b47d Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 7 Nov 2019 16:55:18 +0100 Subject: [PATCH 01/24] bump to squid@next --- client/package-lock.json | 6 +++--- client/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index cc95b8a..7799a3e 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1934,9 +1934,9 @@ } }, "@oceanprotocol/squid": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-0.8.3.tgz", - "integrity": "sha512-T7uE4s2BBQf2+3SZtkP8WBmo8TvEZhCyW88T4Sq7Cw2iwQULEnLSKhhvuXfQ+416khGgNIgILTypSTuAcxtQYQ==", + "version": "1.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-1.0.0-beta.1.tgz", + "integrity": "sha512-byYCr+ZO7DcJBUACzbwn7YT/2ZBxSA1957uhEUMeTsY4uB+vPIdhEjHjvQ7mI3917udFKIBtJxRVbzwDvUeZvg==", "requires": { "@oceanprotocol/keeper-contracts": "^0.12.7", "@oceanprotocol/secret-store-client": "^0.0.15", diff --git a/client/package.json b/client/package.json index 394ab81..f1ccfd6 100644 --- a/client/package.json +++ b/client/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@oceanprotocol/art": "^2.2.0", - "@oceanprotocol/squid": "^0.8.3", + "@oceanprotocol/squid": "next", "@oceanprotocol/typographies": "^0.1.0", "@sindresorhus/slugify": "^0.9.1", "@truffle/hdwallet-provider": "^1.0.23", From c3c8ca5368e84b36a153bb4bbdf73206706eeacd Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 7 Nov 2019 16:57:51 +0100 Subject: [PATCH 02/24] switch to v2 components --- .travis.yml | 6 +++--- library.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24e128b..02b456a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,10 +33,10 @@ env: - IPFS_GATEWAY_URI="https://ipfs.oceanprotocol.com" # start Barge with these versions - - BRIZO_VERSION=v0.4.6 - - AQUARIUS_VERSION=v0.3.9 + - BRIZO_VERSION=v0.6.0 + - AQUARIUS_VERSION=v0.4.2 - KEEPER_VERSION=v0.12.7 - - EVENTS_HANDLER_VERSION=v0.1.2 + - EVENTS_HANDLER_VERSION=v0.3.0 - KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260" - FAUCET_TIMESPAN=0 diff --git a/library.json b/library.json index db25acd..1115f6e 100644 --- a/library.json +++ b/library.json @@ -11,15 +11,15 @@ }, { "name": "brizo", - "version": "~0.4.6" + "version": "~0.6.0" }, { "name": "aquarius", - "version": "~0.3.9" + "version": "~0.4.2" }, { "name": "squid-js", - "version": "~0.8.3" + "version": "~1.0.0-beta.1" }, { "name": "faucet", From 985803d43e4a3d729d90196f260b128bf2e37f63 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 7 Nov 2019 17:38:17 +0100 Subject: [PATCH 03/24] update to new DDO structure --- .../src/components/molecules/AssetTeaser.tsx | 29 ++- .../templates/Asset/AssetDetails.test.tsx | 10 +- .../templates/Asset/AssetDetails.tsx | 43 ++-- .../templates/Asset/AssetFile.test.tsx | 2 +- .../components/templates/Asset/AssetFile.tsx | 6 +- .../src/components/templates/Asset/index.tsx | 26 ++- client/src/models/AssetModel.ts | 33 ++- client/src/routes/Publish/index.tsx | 19 +- cypress/fixtures/asset.duero.json | 190 ------------------ 9 files changed, 98 insertions(+), 260 deletions(-) delete mode 100644 cypress/fixtures/asset.duero.json diff --git a/client/src/components/molecules/AssetTeaser.tsx b/client/src/components/molecules/AssetTeaser.tsx index 5c322d7..07a6e56 100644 --- a/client/src/components/molecules/AssetTeaser.tsx +++ b/client/src/components/molecules/AssetTeaser.tsx @@ -17,18 +17,18 @@ const AssetTeaser = ({ list?: boolean minimal?: boolean }) => { - const { metadata } = asset.findServiceByType('Metadata') - const { base } = metadata + const { attributes } = asset.findServiceByType('metadata') + const { main, additionalInformation } = attributes return list ? (
-

{base.name}

+

{main.name}

- {moment(base.datePublished, 'YYYYMMDD').fromNow()} + {moment(main.datePublished, 'YYYYMMDD').fromNow()}
@@ -39,22 +39,29 @@ const AssetTeaser = ({ } > - {base.categories && !minimal && ( - + {additionalInformation.categories && !minimal && ( + )} -

{base.name}

+

{main.name}

{!minimal && (
- {base.description} + + {additionalInformation.description} +
)}