1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-11-15 09:44:53 +01:00
Commit Graph

881 Commits

Author SHA1 Message Date
a8aebf2fac
set isConsumable to true by default (#523)
* set isConsumable to true by default

* kick out dtUtils, cleanup

* cleanup

* tweak AssetTeaser price check
2021-04-15 13:47:32 +02:00
Norbi
85a956a8f2
fix Graph sync status randomly failing (#522)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-04-15 12:43:12 +02:00
79497adbab
package fix 2021-04-15 11:24:00 +02:00
a78988be67
Merge branch 'main' into feature/compute 2021-04-15 11:21:46 +02:00
Bogdan Fazakas
8586f0c77b
do not check prev orders when order compute algo in ocean lib (#516) 2021-04-15 12:00:22 +03:00
Jamie Hewitt
2826df8287
Allowing urls without proceeding http or https (#493)
* allowing urls without proceeding http or https

* Installing package: valid-url-utf8

* removing pre-submit URL validation

* removing new package

* updating package-lock.json
2021-04-15 11:18:48 +03:00
mihaisc
67cdd62718
don't check for prev orders (#514)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-14 20:09:50 +03:00
fff5699c67
Merge branch 'main' into feature/compute 2021-04-14 15:31:36 +02:00
Jamie Hewitt
0383186660
chaning pink buttons back to grey (#507)
* chaning pink buttons back to grey

* pull from origin main

* using grey-light for button styling

* adding primary style to 'Add File' button
2021-04-14 14:10:03 +02:00
Bogdan Fazakas
1696fb2c44 use priceList interface instead of any for return type 2021-04-14 14:41:17 +03:00
Jamie Hewitt
7c09ceca06
Issue 366/dataset publish ux (#461)
* changing the info text for dataset input

* Updating error message for invalid dataset input

* chaning button styling to make it look more like a button

* fixing package-lock.json issue

* removing changes from package-lock.json

* adding onBlur event to validate the data input

* Removing autoclose on error message

* adding success message when the dataset is valid
2021-04-14 13:24:07 +03:00
Bogdan Fazakas
d52d644850 merged compute into subgraph-util-methods 2021-04-14 12:08:30 +03:00
claudiaHash
fc6b029118
Compute job history (#462)
* get compute orders query

* wip on getting compute jobs

* wip refcatoring

* get compute history refactored

* small refactor

* loop fixes

* display jobs refactor changes

* display jobs fix

* early output of assets

* query tweak

* quick fix

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

* live update for testing

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

* fix load time

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

* temp refactor

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

* cleanup

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

* lib bump

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

* fix status args

* remove metadata json

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

* fix item duplication

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

* check if wallet connected

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

* debug logs

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

* lib bump

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

* fix service grouping

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

* added sorting

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

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-14 12:01:37 +03:00
Bogdan Fazakas
b87d50aa09
Refactor compute methods calls (#502)
* prepare compute for oceanJs method refactor

* bump oceanjs to 0.14.0
2021-04-14 10:21:59 +03:00
Bogdan Fazakas
56554028b8 merged compute into subgraph-util-methods 2021-04-13 19:21:05 +03:00
Bogdan Fazakas
1c2d81049d refactor getAssetPrices method, not using ddo.price.type anymore 2021-04-13 19:15:09 +03:00
fa53b024fa
wallet reconnect button fix 2021-04-13 17:02:40 +02:00
faa6a8329a
Merge branch 'main' into feature/compute 2021-04-13 15:14:59 +02:00
Jamie Hewitt
7672d78aee
Refactoring Market for new Ocean.js build (#481)
* removing imports from utils folder

* lib bump

* update status args

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-13 15:13:55 +02:00
Dimo Dzhurenov
b2f6e541a3
remove tooltip animation (#494) 2021-04-13 13:58:32 +02:00
Norbi
b8247c7ef4
The Graph sync status (#466)
* WIP

* query update

* quick fix

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

* get blocks number when no provider, added threshold

* format code

* naming fix

* show graph out of sync message inside announcement banner

* added loader

* moved sync component

* refactor all the things

* new atoms/AnnouncementBanner : banner component reduced to presentation only, where its content is always passed as props

* revised molecules/NetworkBanner: the former AnnouncementBanner now holds all the specific network detection logic, in the end also returns the atoms/AnnouncementBanner

* new hook hooks/useGraphSyncStatus: move all the graph fetching logic in there so we can use its status in multiple places in the app without all this props passing. This also decouples the SyncStatus component in footer from its logic

* in App.tsx, add the graph sync warning banner in another atoms/AnnouncementBanner, getting its values from the hook

* data flow refactor

* .env.example tweak

* race condition fighting

* subgraph loading

* polygon fallback fix

* no interval fetching

* turn around logic for adding infura ID

* removed graphNotSynched

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-13 10:57:59 +02:00
mihaisc
d8b40bfd46
fetch all data from graph (#501)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-12 18:50:26 +03:00
Bogdan Fazakas
a27bc6718a update get prev order method & small typo 2021-04-12 17:09:41 +03:00
Bogdan Fazakas
0740917731 typo fixes 2021-04-12 13:52:09 +03:00
Bogdan Fazakas
a92a7b88d9 merged compute into subgraph-util-methods 2021-04-11 02:15:24 +03:00
Bogdan Fazakas
c533d1ee0c get compute previous orders from subgraph util 2021-04-11 02:13:43 +03:00
Bogdan Fazakas
ab71ba187f
remove status and text status check on start job (#489) 2021-04-10 11:34:08 +02:00
b1a2b2453d
Merge branch 'main' into feature/compute 2021-04-09 16:19:44 +02:00
mihaisc
4e4bbc1120
limit price precision to 18 (#492)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-09 16:59:20 +03:00
Bogdan Fazakas
2cce93d502 fetch asset list prices from the graph 2021-04-09 12:55:18 +03:00
118bfb93a9
Merge branch 'main' into feature/compute 2021-04-09 10:19:56 +02:00
8511a3b165
showPricing check change (#485) 2021-04-09 11:10:39 +03:00
claudiaHash
ab01615ab3
show assets ordered by creation time (#486) 2021-04-08 21:09:17 +02:00
claudiaHash
ccfb381d9d
Feature/issue474 algorithms timeout (#483)
* timeout added for algorithm publish

* publish algorithm fixes

* set termsAndConditions fix

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-04-08 19:01:00 +02:00
Bogdan Fazakas
1d13000772
Help messages & price display for starting compute job (#478)
* add dataset, algo and total price to form footer

* styled price component on start compute

* fix lint issues

* added help messages for compute jobs in BuyButton

* consume button text alignment fix

* help text copy changes

* styles cleanup

* use graph price on dataset display, remove buy compute timeout text

* minimal total price output

* spacing, copy

* more spacing & copy

* calculation output, timeout output

* price output refactor

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-08 17:10:51 +02:00
ffca6f1bd6
AssetSelection: add search by datatoken symbol (#482)
* add search by datatoken symbol

* case insensitive search for everything
2021-04-08 10:16:45 +02:00
Bogdan Fazakas
07bad6ead9
fix get algo asset querry (#476) 2021-04-06 09:49:50 +02:00
claudiaHash
36084fbc1f
output datatoken symbol for each asset in asset selection (#477)
Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-04-06 09:49:16 +02:00
mihaisc
c09bc3342a
fix warning (#475)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-01 19:27:02 +03:00
432961b278
Merge branch 'main' into feature/compute 2021-04-01 17:29:29 +02:00
Bogdan Fazakas
18f2c99e78
Start compute job (#439)
* Wip start compute job

* Wip select algorithm design

* Asset selection form component, for start compute job (#442)

* prototype AssetSelection

* assetselection styling

* typing "fix"

* put back file info icon

* AssetSelection styling in context

* update start job method, fixed algo select, and fixed option typing

* compute logic update

* add has previous orders for algo asset

* fixed search algorithm assets in start compute form

* fixed lint errors

* updated previous order for algo logic and compute flow

* update use price hook and added buy DT for algo

* display only alg of type exchange and sort by value

* display only trusted algo for asset if field is set

* added logic for allow all published algorithms or no algorithms allowed

* asset selection style & spacing tweaks

* refactor get algorithms for compute and edit compute

* fixed form options and more refactoring

* new ButtonBuy component

* shared component between consume/compute
* dealing with various states: loading, previous orders, help text output

* effect dependencies

* move error output into toast

* formik data flow refactor

* ditch custom field change handler
* fix initialValues
* typed form data & validation
* fixes multiple form validation issues along the way

* isInitialValid → validateOnMount

* metadata display tweaks

* error feedback tweaks

* oler assets checks, confeti on succes job, market fee on order, removed algo compute logic

* more startJob logging

* feedback & messaging changes

* metadata display

* return all algos, fixed & dynamic priced ones

* fix DOM nesting

* messaging updates

* copy tweaks

* check algorithm previous history for both acces and compute sercive types

* handle start compute error

* extra checks on start compute response

* styling tweaks, fix toast UI errors

* AssetSelection: empty screen, tweak min/max height

* fix FRE issues on start compute

* check is ordarable before start compute job

* logging tweaks

* disable eslint no-unused-vars rule for some Apollo code blocks

* fix metadata editing for compute assets

* consider dataset timeout for compute too

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-01 17:21:08 +02:00
Norbi
96296008c9
Add custom network (#450)
* add custom network

* created announcement banner

* add custom network from banner

* show ADD CUSTOM NETWORK on MetaMask provider

* show add ocean to wallet action

* removed warningPolygon from alert

* removed customNetwork component

* remove Add custom network on asset details page

* Details use function from web3 to add token

* changed available on Polygon link, refactoring

* show Switch to Polygon when no wallet connected

* banner content for no provider and Polygon network

* change message when not provider and eth network

* changed warning and added announcement in site.json

* moved network logic inside Announcement, moved Announcement component

* added switch to ETH button, refactoring

* removed add mOcean action button

* moved location verification to App.tsx

* styling & copy updates

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-03-30 15:37:30 +02:00
6d14181d17
Merge branch 'main' into feature/compute 2021-03-26 12:24:09 +01:00
mihaisc
6190737f08
fix buy fre (#458)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-03-26 10:48:27 +02:00
claudiaHash
59b571e984
WIP on expected price impact (#440)
* wip on expected price impact - simple case

* advance flow implemented

* slippage change fixed

* compute using pool shares

* spendings, receivings, helper message corrected

* output values display fixed

* output messages fixed, slippage input replaced

* used remove ocean liquidity with minimum oceans received function

* maxShares removed, ocean.js version updated

* package-lock.json updated

* output messages resized

* spacing fixed in trading form

* removed redundant css

* removed unnecessary verification

* file removed

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-03-25 13:47:31 +02:00
a5706d22eb
bump to ocean.js v0.12.1 (#455) 2021-03-25 08:48:13 +01:00
Norbi
977a38e118
Edit compute dataset (#417)
* WIP

* created form for editing compute privacy

* used editComputePrivacy method

* select and update trusted algorithm

* display and select multiple trusted algorithms

* fixed update when trusted algorithm list not changed

* code refactoring

* moved separator inside condition

* moved functions and interface from EditComputeDataset component

* moved algorithmOptions to parent component

* used AssetSelection to display algorithms

* use AssetSelection to select trusted algorithms

* getAlgorithmsOptions function review

* review fixes

* removed unused imports

* merge fixes

* AssetSelection style & usability tweaks

* use custom radio & checkbox styles
* add simple search for name & DID
* spacing adjustments

* copy updates, remove raw algo input, hardcode allowRawAlgorithm

* copy

* AssetSelection usability tweaks

* make rows clickable
* tweak layout, style and markup

* use formik set function to update values

* sorted algorithm list, added checked field

* sort assetSelection list on user select

* fix getAlgorithmsForAssetSelection breaking on empty responses

* form debug output

* another empty publisherTrustedAlgorithms fix

* created separate algorithms state for the form, sort list on edit

* refactor

* use Formik functionality wherever possible
* unify transforming form data to final data

* fix form debug transformation

* fix form submit, fix defaultChecked

* refactor

* use Formik functionality wherever possible
* unify transforming form data to final data

* fix form debug transformation

* fix form submit, fix defaultChecked

* disable assetSelection when allowAllAlgorithms is true

* added loader to AssetSelection

* changed allowAllAlgorithms to allowAllPublishedAlgorithms

* fixed lint error

* updated transformComputeFormToServiceComputePrivacy

* lint fix

* modify publish defaults

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-03-25 08:34:07 +01:00
Kris Liew
30b4c77093
feature/add toggle option for fixed & dynamic pricing (#453)
* add toggle for create pricing option variable

* code refactor

* Minor fix from feedback
2021-03-24 20:27:32 +08:00
Norbi
ed9eb61c1c
Add custom token from the wallet (#437)
* WIP

* added button that allows to push custom token to metamask

* added image url

* use provider from ocean, add mOCEAN symbol to Matic

* use token symbol based on networkId

* removed customToken.json, used Logger to display message

* log error

* fixed log

* review fixes

* used oceanTokenSymbol from config

* getOceanConfig fix
2021-03-22 12:48:28 +01:00
Bogdan Fazakas
2e9db9d170 Merge branch 'main' into feature/compute 2021-03-18 13:42:31 +02:00
mihaisc
1599d74cfe
Update search and publish (#444)
* fix querys

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

* lib bump, publish update

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

* package-lock

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

* fix searchquery

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-03-18 13:27:58 +02:00
df587bb5b5
Merge branch 'main' into feature/compute 2021-03-17 12:58:13 +01:00
bdccb0966f
Web3/Ocean splitup + full Polygon/Matic support (#433) 2021-03-17 11:44:26 +01:00
Dimo Dzhurenov
c9a8345222
Removing showing updates on never updated assets (#438)
* removes showing updates on never updated assets

* package-lock fix
2021-03-16 19:23:11 +01:00
509dbf3e68
Merge branch 'main' into feature/compute 2021-03-15 19:23:51 +01:00
36aaf1b7d4
Asset selection form component (#441)
* prototype AssetSelection

* assetselection styling

* typing "fix"
2021-03-15 19:03:10 +01:00
Norbi
aa6cceaf0e
Reorganize history page (#434)
* displayed content using tabs

* fixed transparent background on table and tabs

* tabs design update

* overflow tabs

* pagination and no results message spacing
2021-03-11 18:05:49 +01:00
mihaisc
a3e2c8ef3b
fix edit history (#435)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-03-11 14:51:43 +02:00
e180ab0085
Merge branch 'main' into feature/compute 2021-03-09 19:18:47 +01:00
Bogdan Fazakas
a4f4de84fd
add sample file to edit metadata form (#419)
* add sample file to edit metada form

* bump oceanjs to 0.11.2

* retrigger checks

* added updated package-lock.json

* bump react hooks to 0.5.4

* bump ocean.js to 0.11.4 and react hooks to 0.5.5
2021-03-09 17:52:40 +01:00
Bogdan Fazakas
a137177be6
fixed PoolTransactions history refresh from history and asset detail transactions (#427) 2021-03-09 17:46:43 +01:00
Bogdan Fazakas
f1196f10de removed commented block and published and updated from metafull 2021-03-05 14:01:20 +02:00
Bogdan Fazakas
d1c4cdb29f
Merge branch 'main' into feature/compute 2021-03-05 13:51:26 +02:00
Bogdan Fazakas
eed94a1127 update grid-template-columns on metafull and removed widht from metaitem 2021-03-05 13:16:03 +02:00
7356981350
hotfix for asset details (#425)
* was broken in non-web3 browsers
* missed in https://github.com/oceanprotocol/market/pull/421
2021-03-05 00:40:13 +01:00
claudiaHash
be82d9ef2e
Feature/edit history subgraph (#423)
* fetching Subgraph data

* updates ordered by timestamp

* comment removed

* comment removed

* apollo generated  typing used

* date converted to string

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-03-04 19:31:10 +02:00
8737264816
refactor network name output (#421)
* refactor network output

* fetch chain & network metadata from @ethereum-lists/chains

* typed responses

* switch warning icon for testnet badge

* add supportedNetworks list, output warning based on it

* markup & spacing tweaks

* check networkId against ocean.js ConfigHelper

* remove supportedNetworks app config

* fetch EVM networks metadata on build time

* fixes
2021-03-04 18:16:20 +01:00
Bogdan Fazakas
9310155ce9 remove unnecesary imports in MetaItem 2021-03-04 18:58:08 +02:00
Bogdan Fazakas
fd619b5b4b set fix width for metadata item content 2021-03-04 18:49:36 +02:00
mihaisc
a261c35ec7
check order from the graph
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-03-04 15:53:34 +02:00
Bogdan Fazakas
32ff7af3ce
Merge branch 'feature/compute' into publish-algo 2021-03-03 16:13:03 +02:00
Bogdan Fazakas
188f60e7de replaced local isUrl with is-super-url 2021-03-03 09:56:29 +02:00
202d690fd5
Merge branch 'main' into feature/compute 2021-03-02 16:19:27 +01:00
feef24ddd9
Merge pull request #400 from oceanprotocol/feature/issue392
Search filter bar
2021-03-02 16:16:39 +01:00
claudia.holhos
c35fb820c3 clear button display changed 2021-03-02 15:41:43 +02:00
93c115e75b
Merge pull request #389 from oceanprotocol/feature/agorithm-details-view
View Algorithm details page
2021-03-02 12:10:48 +01:00
claudia.holhos
3b604085ab clear button styling 2021-03-02 11:29:57 +02:00
claudia.holhos
f1d47bbec9 typo fixed 2021-03-01 19:09:43 +02:00
claudia.holhos
8cce1898fd clear filters button added 2021-03-01 19:08:18 +02:00
5c4c13452f
Merge pull request #409 from oceanprotocol/feature/optimize-did-fetching-in-tables
optimize did fetching in tables
2021-03-01 17:03:25 +01:00
claudia.holhos
59b8b8b48a Merge remote-tracking branch 'origin/feature/issue392' into feature/issue392 2021-03-01 17:38:37 +02:00
claudia.holhos
8d07414db1 sort fix 2021-03-01 17:38:02 +02:00
3607084efc
copy 2021-03-01 16:24:55 +01:00
0303c52f3e
copy 2021-03-01 16:17:44 +01:00
f6f6c68428
more fine grained price issues display 2021-03-01 16:08:50 +01:00
Norbi
29a37b531c Merge branch 'main' into feature/optimize-did-fetching-in-tables 2021-03-01 16:55:00 +02:00
Norbi
4b4cda4906 resolve promise using async/await 2021-03-01 16:54:43 +02:00
d71bf5dfaa
style fix 2021-03-01 15:10:52 +01:00
9f9113c291
Merge branch 'feature/compute' into feature/issue392 2021-03-01 15:07:34 +01:00
07e8ac6f13
styling & spacing 2021-03-01 15:04:41 +01:00
Bogdan Fazakas
f2e906e790
Fix/ Search query with price filter and no text (#408)
* fixed querry with price filter and no text entered

* retrigger checks
2021-03-01 15:35:29 +02:00
Norbi
0b942de217 added function to get only the name of the asset 2021-03-01 11:51:24 +02:00
Bogdan Fazakas
f4f7ecefc8 run validation only when custom image is selected 2021-02-26 16:15:41 +02:00
Bogdan Fazakas
a770fdac55 merged publish-algo into issue398-validate-dockerImages 2021-02-26 10:54:25 +02:00
Bogdan Fazakas
d9b5355ba7 updated key name for private algo in metadata preview 2021-02-25 23:08:40 +02:00
Bogdan Fazakas
cdd5c5cf16 WIP validate for dockerhub images and 3rd party images 2021-02-25 23:05:30 +02:00
Norbi
042e40eeb6 displayed Docker Image, used MetadataMain type interface for asset type 2021-02-25 20:15:42 +02:00
claudia.holhos
6eaf2efd95 eliminate no price elements on both price filters set 2021-02-25 17:10:19 +02:00
433af0147a
switch IPFS gateway (#404)
* switch to dweb.link for loading 3Box profile images
* ipfs.oceanprotocol.com has been deprecated
2021-02-25 16:00:42 +02:00
Bogdan Fazakas
9b78e46c97
Merge pull request #402 from oceanprotocol/issue397-form-persistance
save form values for both publish forms
2021-02-25 15:29:10 +02:00