From 9f38bba69a33df367d02cbd0a325b45b0d5c10a5 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Mon, 19 Apr 2021 16:07:52 +0200 Subject: [PATCH 1/3] bump to ocean.js v0.14.4 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 63b39c1be..81941ee59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3622,14 +3622,14 @@ "integrity": "sha512-j4PEZSVtKSqxDYMVh/hd5vk088Bg6a6QkrUMTXN9Q6OIFAMfHM235f1AxaakNrEyK0FKMD908KuJEdfFLRn9Hw==" }, "@oceanprotocol/contracts": { - "version": "0.5.14", - "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.5.14.tgz", - "integrity": "sha512-wGid/5/Ea+OLcgGa86LDLrIoyHtn2015m59LLHYpSXGD/vZTgqwkQO0Qx7LYzDRsKgAHaMVXwpACwjTDw1ratA==" + "version": "0.5.15", + "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.5.15.tgz", + "integrity": "sha512-16edzNeO2v5WLW9ClsZ9VvMH1w24fZZutCmDhZWPirCAIdojGWRHraompfICjY1fovDljnZ5MpJpffuQ6kgxOA==" }, "@oceanprotocol/lib": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.14.3.tgz", - "integrity": "sha512-RN/NmYNiBQXtqs41iiUgcKKfXHwsewahr35LvnFzLx462MiuZwo42C8JotMy+sbK93KkHiHOiws0Yj39dpCF9w==", + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.14.4.tgz", + "integrity": "sha512-f6Wj6FLpYmuFSGtnDw0lex0Vru1tGgvZqtwrdBYtMD+hW6Bn3B51+F/9ACVYAiSRDADrqPTDZiZetT2Ji3QY7Q==", "requires": { "@ethereum-navigator/navigator": "^0.5.2", "@oceanprotocol/contracts": "^0.5.10", @@ -18101,7 +18101,7 @@ } }, "ethereumjs-abi": { - "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#1ce6a1d64235fabe2aaf827fd606def55693508f", + "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#1a27c59c15ab1e95ee8e5c4ed6ad814c49cc439e", "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git", "requires": { "bn.js": "^4.11.8", diff --git a/package.json b/package.json index f3b83aa70..2fb742364 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@coingecko/cryptoformat": "^0.4.2", "@loadable/component": "^5.14.1", "@oceanprotocol/art": "^3.0.0", - "@oceanprotocol/lib": "0.14.3", + "@oceanprotocol/lib": "^0.14.4", "@oceanprotocol/typographies": "^0.1.0", "@portis/web3": "^3.0.3", "@sindresorhus/slugify": "^1.0.0", From 621aea64b5e41fbfda66cc81a5867b4addabba42 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 20 Apr 2021 14:07:23 +0200 Subject: [PATCH 2/3] metadata display tweaks * new lock icon for private algos * visual updates for asset details --- src/components/atoms/AssetType.module.css | 8 ++--- src/components/atoms/AssetType.tsx | 3 ++ .../AssetContent/MetaMain.module.css | 17 +++------- .../organisms/AssetContent/MetaMain.tsx | 33 +++++++++---------- src/images/lock.svg | 4 +++ 5 files changed, 32 insertions(+), 33 deletions(-) create mode 100644 src/images/lock.svg diff --git a/src/components/atoms/AssetType.module.css b/src/components/atoms/AssetType.module.css index 01bf00842..a578aa0f8 100644 --- a/src/components/atoms/AssetType.module.css +++ b/src/components/atoms/AssetType.module.css @@ -1,9 +1,9 @@ .icon { - fill: var(--brand-grey-light); - width: 1.1em; - height: 1.1em; + fill: currentColor; + width: 1em; + height: 1em; vertical-align: baseline; - margin-bottom: -0.2em; + margin-bottom: -0.1em; display: inline-block; } diff --git a/src/components/atoms/AssetType.tsx b/src/components/atoms/AssetType.tsx index cfd2ffe86..c1776ec20 100644 --- a/src/components/atoms/AssetType.tsx +++ b/src/components/atoms/AssetType.tsx @@ -3,6 +3,7 @@ import styles from './AssetType.module.css' import classNames from 'classnames/bind' import { ReactComponent as Compute } from '../../images/compute.svg' import { ReactComponent as Download } from '../../images/download.svg' +import { ReactComponent as Lock } from '../../images/lock.svg' const cx = classNames.bind(styles) @@ -25,6 +26,8 @@ export default function AssetType({ {accessType === 'access' ? ( + ) : accessType === 'compute' && type === 'algorithm' ? ( + ) : ( )} diff --git a/src/components/organisms/AssetContent/MetaMain.module.css b/src/components/organisms/AssetContent/MetaMain.module.css index 9d98b6680..08155aa3d 100644 --- a/src/components/organisms/AssetContent/MetaMain.module.css +++ b/src/components/organisms/AssetContent/MetaMain.module.css @@ -1,25 +1,18 @@ .meta { margin-bottom: calc(var(--spacer) / 1.5); color: var(--color-secondary); + font-size: var(--font-size-small); } .meta p { margin-bottom: 0; } -.date { +.published { + margin-top: calc(var(--spacer) / 2); font-size: var(--font-size-small); } -.typeAndDate { - margin-bottom: calc(var(--spacer) / 12); - display: flex; -} - -.typeDetails { - border-right: 1px solid var(--border-color); - padding-right: calc(var(--spacer) / 3.5); - margin-right: calc(var(--spacer) / 4); - width: auto; - font-size: var(--font-size-small); +.updated { + font-size: var(--font-size-mini); } diff --git a/src/components/organisms/AssetContent/MetaMain.tsx b/src/components/organisms/AssetContent/MetaMain.tsx index 6e8765ce4..c2c503680 100644 --- a/src/components/organisms/AssetContent/MetaMain.tsx +++ b/src/components/organisms/AssetContent/MetaMain.tsx @@ -15,22 +15,7 @@ export default function MetaMain(): ReactElement { return ( ) } diff --git a/src/images/lock.svg b/src/images/lock.svg new file mode 100644 index 000000000..b78caeed1 --- /dev/null +++ b/src/images/lock.svg @@ -0,0 +1,4 @@ + + + + From 06fa195bd8845bb0e734640ef39e33d6ea904b81 Mon Sep 17 00:00:00 2001 From: mihaisc Date: Tue, 20 Apr 2021 19:30:16 +0300 Subject: [PATCH 3/3] dont search for prev orders on order Signed-off-by: mihaisc --- src/components/organisms/AssetActions/Compute/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/organisms/AssetActions/Compute/index.tsx b/src/components/organisms/AssetActions/Compute/index.tsx index 3286acb75..58ac280d6 100644 --- a/src/components/organisms/AssetActions/Compute/index.tsx +++ b/src/components/organisms/AssetActions/Compute/index.tsx @@ -356,7 +356,9 @@ export default function Compute({ ddo.id, computeService.index, computeAlgorithm, - marketFeeAddress + marketFeeAddress, + undefined, + false ) assetOrderId &&