Commit Graph

59 Commits

Author SHA1 Message Date
mihaisc 131f1f15e3
Change datatoken template and ensure compatibility with both (#1728)
* change template

* fix build

* add template config

* test fixes

* Update app.config.js

Co-authored-by: Alex Coseru <alex.coseru@gmail.com>

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Alex Coseru <alex.coseru@gmail.com>
2022-11-15 16:35:26 +02:00
mihaisc b505bddb4b Merge branch 'main' into feature/enforce-docker-containers 2022-10-07 12:17:41 +03:00
Luca Milanese 52eaee0ad5
Feat: autocomplete tags functionality (#1471)
* feat: add autocomplete tag component

* feat: pass tags aggregated list to autocomplete component

* feat: add initial styling to autocomplete tag component

* fix: autocomplete style types

* feat: move styling elements to module.css file

* feat: update placeholder text for tag input field

* feat: add default value to tags if present

* feat: add edit tags functionality

* fix: default tag value

* fix: style for automplete menu's keyboard navigation

* fix: tags aggregation query size

* feat: return sorted tags aggregated list suggestion in publish

* fix: set tags value touched state in edit mode

* add package back

* enhancement: autocomplete tag component config (#1679)

* fix publishing when connecting wallet on publish form

* fix reset pricing on tx execution

* removed changing steps

* cleanup

* Fix headers (#1663)

* test

* test

* test

* test

* test

* test

* test

* remove link

* enhancement: tag autocomplete settings

* feat: add cursor type text

* feat: tweak filter and sort for matched tags

* fix: tags input font color

* fix: tag autocomplete component input color

Co-authored-by: EnzoVezzaro <enzo-vezzaro@live.it>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Ana <84312885+AnaLoznianu@users.noreply.github.com>

* fix lock

* test

* fix

* fix

* minor fixes

* fix cursor on remove item (x)

* style updates

* UX tweaks

* start suggestions upon first key stroke
* remove redundant help tooltip
* change placeholder copy
* remove input clear action

* edit updates

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: EnzoVezzaro <enzo-vezzaro@live.it>
Co-authored-by: Ana <84312885+AnaLoznianu@users.noreply.github.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-10-05 15:40:00 +01:00
Bogdan Fazakas cc47e48b4d add more error handlers 2022-09-28 15:47:43 +03:00
Bogdan Fazakas afbc42068c fix repetitive requests 2022-09-28 15:10:01 +03:00
Bogdan Fazakas 2ac422f175 more ui touches 2022-09-20 17:32:55 +03:00
Bogdan Fazakas fe4aa79ffb fix default images 2022-09-20 11:30:11 +03:00
EnzoVezzaro 4dca7d3442
update market to ocean.js@2.0.2 (#1661)
* update ocean js

* refactoring ocean.js 2.0.0

* removed deleted method

* added type in publish utils

* fix FixedRateExchange parameters

* use 2.0.0 lib version

* remove cast on approveWei and fix algo asset selection list issue

* bump oceanlib to 2.0.1

* bump oceanlib to 2.0.2

Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>
2022-09-13 12:19:56 +03:00
Luca Milanese 52ad877b13
Dynamic token list support for publishing (#1516)
* feat: add approved tokens list query to subgraph

* feat: add base token selector

* feat: add placeholder tooltip message for base token

* feat: use user selected base token for publish

* fix: publish constants

* feat: update base token query to include digits and symbol

* feat: display correct token name and symbol in publish pricing tab

* fix: publish preview token name

* fix: query type

* feat: add balance fetch for all approved tokens

* fix: balance check for dynamic price with alternative base tokens

* feat: update balance to show baseToken instead of ocean

* fix: default baseToken in publish form

* feat: update text content for pricing publish step

* chore: update ocean.js

* add decimals to token

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix dt decimals

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* update ocean.js

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix: show correct basetoken symbol under button buy

* refactor: move baseToken selector to input label [WIP]

* refactor: preserve baseToken value value when switching tabs

* remove basetoken tooltip from content json

* fix: price props

* refactor: remove BaseToken component

* fix: baseToken name on first load

* fix: baseToken display name in dynamic price

* fix: conversion tooltip text

* fix: error box overlapping in Coin component

* feat: add token logo component

* feat: add basetoken logo to asset actions pool

* fix: token images size

* fix: add default appproved token list when disconnected or chainId not supported

* fix: datatoken logo on asset details meta

* refactor: balance fetch + move approved base tokens list in web3 provider

* feat: update all datatokens to display ocean logo in violet

* fix: show correct logos on polygon

* fix wallet, remove dynamic

* fix build

* fix: reset baseToken on chainId change during publish

* fix: price tabs selection indicator

* feat: set the ocean token as default in pricing

* add baseToken

* fix price

* remove firstPrice

* cleanup, more affordance for token dropdown

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-08-03 13:48:57 +01:00
EnzoVezzaro eb29c4ce3b
Remove AMM Pools (#1614) 2022-08-02 10:53:22 +01:00
EnzoVezzaro 7788086bcc
removed dynamic price on publish, liquidity button and trade tab (#1593)
* removed dynamic price on publish, liquidity button and trade tab

* change label remove button

* removed dynamic pricing model references

* revert useEffects on pricing publish

* removed more references to dynamic pricing
2022-07-12 19:52:45 +03:00
Matthias Kretschmann 02beb0f8c3
Edit screen fixes (#1546)
* edit refactors

* fix logic around `publisherTrustedAlgorithms`

* typing fix

* copy & typos

* conditionally add compute tab to edit screen

* more logic fixes

* fix various app crashes because of Debug component
* semi-deal with publisherTrustedAlgorithmPublishers

* more fixes, bound submit button to touched state
2022-06-27 10:15:45 +01:00
Bogdan Fazakas 5387b9a3dd
Restore compute functionality (#1069)
* add balance check and check is consumable

* add isOrderable and other helpers

* finish start compute job

* removed unused methods

* add more comments

* add pool logic for order

* move asset selection to compute helper

* small fix

* fixed get algo list

* refactor start compute job and more fixes

* update order params

* use compute env and compute consumer address

* fix prices

* fix algorithms selection list on allowAllPublisher case

* fix edit compute settings

* update compute resources valid until logic

* fixes and cleanups

* wip compute jobs

* fix compute timeout value

* fixed compute jobs logic

* fix algo selection list name

* fixed compute jobs from profile loading

* update start compute flow messages

* update set algo access details

* update compute message logic

* added logs

* update package lock

* remove logs

* fix edit compute checksums for files and container

* Fix compute dataset algorithm list (#1194)

* fix query

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove comment

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* Fix previous order tx (#1197)

* rename nft update query

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix previous order

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix build

* handle order price, NaN and default 0

* optional value for all fee, prevent breaking when no value

* fix aquarius call and added logs

* update provider compute status call

* remove percentage fee from price sum, depends smart contract calculation (#1249)

Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>

* fix display of compute datasets with free price

* removed to lowerCase on eth address

* fix compute jobs section and your jobs

* bumo ocean lib to 1.0.0-next.32

* c2d show price with fee, exclude provider fee

* wip get results

* include loading when calculating data + algo price, tooltip show order price

* update get compute url and use oceanjs helper for download

* update computeStatus signature to fix build and CI

* added logs

* refactor setting price and fees for assets

* update compute details and compute results UI and style

* update flex value

* update download buttons style

* update download buttons text

* bump ocean lib version and lint fixes

* get provier uri for compute results based on job input did

* use zero adress for price and fees order

* some fixes

* Add reuse order in start compute flow  (#1352)

* wip add reuse order logic

* add reuse order in start job

* added missing check if no jobs found

* update lib

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix lint

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix fixed rate

* fix build

* fix your compute jobs section when asset network not selected

* disable edit compute settings for algorithms

* fix compute jobs infinite loading when no jobs found

* fix compute form

* show token symbol for free assets also on compute price output

* removed swp file

* some decimal fixes

* partial fix for asset with pool fees, algo not working yet

* more decimal fixes

* fix algo with pool price and fees fetching

* fix selecting algorithms when on different network

* fix compute jobs table auto refresh and details  modal closing

* wip compute initialize

* order fixes

* fix lint

* fix conditions and cleanups

* fix compute status text display

* init prices and fees after starting a compute job

* start/order button tweaks

* kick in loader earlier

* update compute status feedback messages

* fixed initial price

* compute jobs refetch and reuse order

* remove logs

* removed logs and added some explanations

* use compute env max duration value in seconds

* error handling on intializeCompute and order

* removed console logs and added one new check

* use optional on initialized provider check

* remove toast from provider helper

* fix compute env issue on start order

* disable job selection during actions execution

* temporary fix publish algo with custom docker image

* fix provider fee display

* remove unnecessary condition

* fix alignment based button on action type (#1491)

* fix alignment based on action type

* moving to CSS modules

* send providerFeeAmount as string

* remove cast on providerFeeAmount

* removed some logs and added few comments

* update price output tooltip and total price logic

* set providerFee amount only when avaialable

* bump oceanlib to 1.1.2

* replace FIleMetadata to fix build

* used approveWei for approving provider fees

* fix free algo price selection and display

* fix provider fee load at first algo selection

* update compute help text

* fix provider fee approve for free assets

* cleanup

* remove commented out code
* remove unused state
* removed unused imports
* typos in comments, variables, props

* more typos

* shorten getAccessDetailsFromTokenPrice() a bit

* state & hooks access reordering

* Update src/@utils/ddo.ts

remove metadata from service type

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>

* effect dependency fixes

* state renaming

* effect dependency fixes

* compute jobs profile visual fixes

* effect dependency fixes

* more comments removal

* add accountId as a dependency in effect

* move isOwner to asset provider

* refactor handleComputeOrder for less complexity and more useful error reporting

* more proper error throwing

* provider fee statement tweak

* more obvious edit action

* empty array for `publisherTrustedAlgorithms` & `publisherTrustedAlgorithmPublishers` by default

* ref #1538
* ref #1539

* don t use initial tx values as valid order use subgraph value

* fix algo list fetching

* closes #1537
* addresses #1538

* fix disable compute button if algo is consumable

* move isOwner check to single effect

* Correctly display trusted algorithms in compute asset (#1541)

* fix allowed algo

* fix trusted algo filter

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
Co-authored-by: Soon Huat <soonhuat.phan@hotmail.com>
Co-authored-by: Enzo Vezzaro <enzo-vezzaro@live.it>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-06-23 16:53:05 +01:00
mihaisc a47fb09b91
update publish form with DDO v4.1.0 structure (#1519)
* update publish form

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* typing quick fix

* fix build

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-06-15 17:35:41 +03:00
EnzoVezzaro 1fcc3b1356
sanitize urls as code scanning suggestions (#1412)
* sanitize url on DebugEditMetadata as code scanning suggestion

* sanitize urls
2022-05-10 10:11:53 +01:00
mihaisc d1e21b7f03
Various fixes in the pool component (#1327)
* remove legacy check to prevent rug pull

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* various fixes

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove old prop

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove old prop

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* add expected output to remove

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove console.logs

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix max calculations

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* refactors

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* temp fixes for build

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fixes

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* local calc for pice and liquidity

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove var

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix profile liquidity

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* global context, opc fee

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* comment

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* various fixes

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* refactor global context

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove nesting from market context

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix build

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix undefined appConfig

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* direct import of appConfig & siteContent

* this never changes on run time, so we should never have to wait for it and have it in js bundle at all times
* in utility methods, import directly
* for components, import directly in MarketMetadata context  and pass through

* remove screen CSS fixes

* put back auto-fetching indicator, move manual refresh action behind debug

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-04-22 02:38:35 +02:00
Matthias Kretschmann fc2681231b
fix transferable NFTs (#1309)
- send along `transferable` param when creating NFT
- new optional `transferable` param in our `generateNftCreateData()` helper, default to `true`. So we don't need to bother adding this to the publish tx fee component
- capture new key in form data, `metadata.transferable`, set to `true` by default. This prepares this to be added as a UI option later on
2022-04-04 20:13:39 +01:00
mihaisc 3dd21bd20d
update publish params for new contracts (#1308)
* fix params

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix params

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-04-04 18:16:04 +03:00
Bogdan Fazakas 8f93d9bc2f
bump oceanlib to 1.0.0-next.32 (#1282) 2022-03-30 14:06:40 +01:00
Moritz Kirstein 9d1b7794a3
Feat: Display NFT in asset details (#1125)
* feat: add decodeTokenUri helper

* refactor: restructure of MetaMain component

* feat: add nft tooltip

* feat: add opensea link for nfts

* style: adjust nft image size in tooltip

* feat: add nft data to publish preview

* fix: readd owner to nft metadata

* refactor: conditional display of nft tooltip

* style: fix link styles in nft tooltip

* feat: add placeholder graphic as fallback if nft data does not contain one

* fix: display openSea link only on supported networks

* fix: rename ddo props to asset in metamain related components

* feat: add original publisher to asset details

* chore: remove unused imports

* fix: remove unused prop

* feat: convert publisher address to checksum address

* chore: remove console.error when decoding tokenURI

* Revert "chore: remove console.error when decoding tokenURI"

This reverts commit f387175970.

* feat: shorten nft address in tooltip preview

* fix: use Web3.utils instead of the actual web3 instance to convert wei in ether

Co-authored-by: Luca Milanese <luca.milanese90@gmail.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-03-16 19:01:51 +00:00
Matthias Kretschmann 3ea832d270
update compute service options (#1180)
* bump ocean.js to v1.0.0-next.26

* update compute service options
2022-03-11 11:26:04 +00:00
EnzoVezzaro 1eacf9d93e
stop execution on publish if user rejects approval tokens (#1173) 2022-03-09 16:06:55 +00:00
mihaisc af60018500
fix max add/remove liquidity (#1141)
* fix max add/remove liquidity

* fix graph liquidity

* small comment

* change liquidity graph to tvl, fix swap

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* change label

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove todo

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix max remove liquidity
2022-03-03 12:23:23 +00:00
mihaisc 8d1782a800
Restore order (#1068)
* minor refactors

* minor refactors

* fixes

* buy dt

* consumePrice + estimation

* various fixes

* cleanup

* fix build

* fix ssh issue

* feedback

* build fix

* ssh fix

* remove console.log

* suggested fixes

* other fixes

* switch to decimal

* more fixes

* more fixes

* fix

* some fee refactors

* more fee refactoring

* lib update, fre rename

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* minor refactors

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* build fixes

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* update + more refactoring

* calc price

* fix build

* restore accountId in effect

* fix order

* fix build and update lib

* fix order index

* fix comments

* pool fix

* remove console.log

* fix order fixed rate exchange

* fixed free order and messaging

* add comment

* minor type fix

* more type fixes
2022-02-14 08:27:36 -08:00
mihaisc fc1f396c96
updates (#1084)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-02-11 13:26:58 +02:00
mihaisc 463c850fc4
update (#1065) 2022-02-07 08:31:22 -08:00
mihaisc 57be62a6b1
Refactor pricing and various components that are involved (#1046)
* update

* merge pr #1012

* fix header

* fix

* abort controller

* up next.8

* build fix

* update lock

* fix

* another fix

* ssh fix

* another ssh fix

* remove optional

* order mock

* small cleanup

* fix package

* price updates

* finish getPrice

* fix consume

* fix consume

* getConsumeDetails  comments

* restore functionality after consumeDetails

* fix some compute typings

* more price fetching updates

* 'minor' refactors and fixed build

* package-lock fix

* minor comments

* minor naming changes

* fix

* fix pool badge

* remove console.log
2022-02-03 03:29:39 -08:00
Matthias Kretschmann e113ba5300
V4-publish-fixes (#1030)
* tweak file URL input

* remove logging
2022-01-28 11:46:09 +00:00
mihaisc 487bcad8b4
Update ocean.js (#1013)
* update

* merge pr #1012

* fix header

* fix

* abort controller

* up next.8

* build fix

* update lock

* fix

* another fix

* ssh fix

* another ssh fix

* remove optional
2022-01-26 10:17:41 +00:00
Matthias Kretschmann 25920b7763
more logging within createTokensAndPricing 2022-01-12 19:05:15 +00:00
Matthias Kretschmann b139346b35 output transaction links 2022-01-12 18:02:56 +00:00
Matthias Kretschmann e5ee3e10c7 working feedback state switching 2022-01-12 18:02:56 +00:00
Matthias Kretschmann 453458814e
move token & price creation into method 2022-01-11 22:18:33 +00:00
Matthias Kretschmann a1c75c94fe
fix preview crash 2022-01-11 20:09:14 +00:00
Matthias Kretschmann a084c038c5
merge fixes 2022-01-11 19:58:39 +00:00
Matthias Kretschmann 38ce25225f
Merge branch 'v4' into feature/publish 2022-01-11 19:49:11 +00:00
Matthias Kretschmann 64a25f3f3e
use Asset from ocean.js, adapt to new structure 2022-01-11 19:45:14 +00:00
mihaisc f576aadbfe fix service id 2022-01-11 13:03:54 +02:00
mihaisc 7cac17d906 fix publish with pool 2022-01-11 12:57:22 +02:00
mihaisc c7d6616874 fixes & hacks 2021-12-21 22:26:08 +02:00
mihaisc b86ac219f3 interm 2021-12-20 16:38:54 +02:00
Matthias Kretschmann 318bc44f43
compute options dataflow tweak 2021-11-29 16:55:15 +00:00
Matthias Kretschmann 8a60aaf3f5
add default compute environment options 2021-11-29 15:57:12 +00:00
Matthias Kretschmann 3aa739fce0
add Docker image presets, populate algo Docker field from them 2021-11-29 13:25:30 +00:00
Matthias Kretschmann 362e404110
fixes & todo 2021-11-26 10:35:41 +00:00
Matthias Kretschmann b64e4ff5dc
adapt transformPublishFormToDdo 2021-11-25 14:20:00 +00:00
Matthias Kretschmann a313f39494
file input validation fixes 2021-11-23 15:34:43 +00:00
Matthias Kretschmann c484a5b40c
new publish preview (#947)
* refactor preview

* make preview render

* more preview elements, proper debug output

* make more elements work

* cleanup and fixes

* make asset actions preview work, kinda

* more fixes

* reorg

* make preview price display work

* fix timeout

* layout tweaks

* fixes

* another fix

* make file info preview work

* empty render fix
2021-11-23 12:53:09 +00:00
Matthias Kretschmann 713de2eb94
data structure change 2021-11-19 13:49:29 +00:00
Matthias Kretschmann d3810168aa
first go at randomly-generated ocean waves 2021-11-16 21:06:02 +00:00