1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-06-30 05:41:41 +02:00
Commit Graph

987 Commits

Author SHA1 Message Date
9d7486d626
prototype network feedback based on asset network checks 2021-06-04 15:01:22 +02:00
fa682dad1e
show network at all times in wallet component 2021-06-04 15:00:33 +02:00
10b29c6e37
unify network names, more icons 2021-06-04 15:00:33 +02:00
476147f65a
add network icon components 2021-06-04 15:00:32 +02:00
fc6f611ac0
Merge pull request #617 from oceanprotocol/feature/package-updates
Bump all non-gatsby dependencies / npm v7
2021-06-04 14:34:09 +02:00
claudiaHash
f73191ef1a
Remove price.isConsumable from elastic query (#639)
* price.isConsumable removed from query
* subgraph query updated

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-06-04 13:23:18 +02:00
ece07927f6
more package updates 2021-06-04 11:51:13 +02:00
53639e6839
disable storybook test runs for now 2021-06-04 11:43:51 +02:00
b516e95879
prettier formatting updates 2021-06-04 11:43:47 +02:00
feed5dd2d1
react-markdown code updates 2021-06-04 11:42:33 +02:00
claudiaHash
88663d812a
Highest liquidity list based on subgraph (#512)
* fetch pools from graph, fetch ddos for pools

* WIP on displaying highest liquidity assets

* loader added

* check ddo state for each asset

* data ordered  by valueLocked, logger added

* filter ddos for purgatory

* verify  ddo isConsumable price attribute

* moved query into subgraph.ts

* send did list, fix assets display

* fixes on assets display

* assets sorted by dids

* get assets on correct order

* get assets in correct order

* loading assets fixes

* correct order and loading, network overloaded

* fixes on loading

* fixed on network change, added loading

* fixed on network change when no wallet connected, improved loading

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-02 12:14:54 +03:00
94139f42b4
fix marketFeeAddress (#633)
* fix marketFeeAddress

* UseSiteMetadata typing fixes
2021-05-31 12:53:37 +02:00
Dimo Dzhurenov
29b644f402
updated parameter (#635) 2021-05-31 12:52:14 +02:00
Norbi
cd8e388806
fixed app crash (#629)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-27 16:39:02 +02:00
Norbi
18f3daed75
List of algorithms to select seems capped (#618)
* removed paginations from the algorithms query and set offset

* changed offset to 500 for compute algorithms query

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-26 16:16:46 +02:00
claudiaHash
5428a8e5b4
searching by full token symbol (#564)
* searching by full token symbol


regular expression used

* search by full names


match partial data


useless comments deleted


log deleted

* make search text uppercase

* data author and description added in query fields

* working search combined with sorting and filtering

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-25 11:23:48 +03:00
claudiaHash
f7cf804ba5
Filter buttons bugs fix (#614)
* buttons selection and deselection fix

* style fixes

* hide button fix

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-20 11:50:52 +03:00
Norbi
56169b9887
show page details after receiving the title (#612)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-20 11:00:50 +03:00
Norbi
9ce9fc84c7
Display fiat value inside pool statistics (#610)
* fixed

* replaced ddo.price with price from useAsset

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-19 14:14:06 +02:00
Norbi
cb8243f4cc
fix assets from mainnet displayed on rinkeby inside the home page (#607)
* get assets after web3Loading is over

* set web3Loading as false when not connected to wallet

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-19 11:31:23 +03:00
Dimo Dzhurenov
4a28907fe3
Fix edge case calculation errors in remove liquidity screen (#586)
* switched to toFixed instead of toPrecision

* add round down parameter toFixed

* removed console log

* added toExpPos

* set decimal precision

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

* slice price

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

* slice price

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

* slice ocean and dt amount

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

* add logs

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

* switch to decimal

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-05-18 10:32:19 +02:00
Bogdan Fazakas
7cc6b9b95b Merge branch 'main' into fix/issue583-start-second-job 2021-05-17 17:24:07 +03:00
Bogdan Fazakas
e620ee2a47 Merge branch 'main' into fix/issue583-start-second-job 2021-05-17 17:13:13 +03:00
Jamie Hewitt
d887675f82
Add datatoken to wallet for metamask users (#574)
* upgrading to ocean.js 0.14.6

* saving initial changes

* creating seperate component for adding tokens

* showing datatoken name

* adding button for metamask users

* using substring as datatoken symbol

* removing duplicated code

* removing empty div element

* removing unneccessary div element

* no longer sending the whole DDO

* refactoring add token functions

* updating function name

* no longer sending the whole ddo to the addDataToken component

* removing DDO import

* small refactor, get web3 provider info in useWeb3

* general AddToken component

* cleanup

* cleanup, remove symbol shortening

* copy, layout tweaks

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-17 16:12:22 +02:00
Norbi
65194696d3
Handle asset price in teaser (#596)
* used price from subgraph for asset teasers

* moved loading component inside AssetList

* replaced any with proper types inside subgraph utils

* fixed loading component displayed when empty assets or prices list

* show loading component when refetching data on sort and filter

* get each asset price before displaying the component, loading changes

* refactoring functions for getting asset prices

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-17 17:08:15 +03:00
Norbi
c2d03f94ac
Refetch compute status (#558)
* WIP

* use interval to refetch every minute

* fixes

* get jobs after verifications

* refetch jobs on button click

* fix loading when no jobs, hide refresh button then no jobs

* button UI changes

* styling updates

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-17 16:04:17 +02:00
Norbi
f0ed9f68cb
Add new custom form field for single value selection (#504)
* created BoxSelection component

* wip

* design changes

* integrate with form

* refactoring

* used inside appearance component

* WIP, added space between options

* adde new fields to BoxSelection used for chain selection

* fixed errors

* removed access type option from publish.json

* updated component for chain selection

* updated for compute type on publish dataset

* added component to dockerImageOpions

* removed Dotdotdot component from options

* remove space

* styling updates, fix React warning for terms checkbox

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-17 15:32:01 +02:00
claudiaHash
82acbba5ce
Remove price from queries (#600)
* subgraph query added

* return ddo list

* price queries removed from sorting and filtering

* subgraph query added


return ddo list


price queries removed from sorting and filtering

* subgraph query removed

* removed unused subgraph query

* undo subgraph fetchData change

* linting errors fixed

* files renamed, priceType removed

* removed unused imports and vars

* removed all price filter variables

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-17 16:14:40 +03:00
Bogdan Fazakas
065419f739 Merge branch 'main' into fix/issue497-fetch-price-subgraph 2021-05-13 13:47:04 +03:00
Bogdan Fazakas
3670993fd7 Merge branch 'main' into fix/issue497-fetch-price-subgraph 2021-05-11 11:41:19 +03:00
Norbi
574e4a02f1
used price from useAsset instead of ddo (#590)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-11 11:33:05 +03:00
Bogdan Fazakas
ff1d987b5d Merge branch 'main' into fix/issue497-fetch-price-subgraph, fixed merge conflicts 2021-05-10 16:27:32 +03:00
Bogdan Fazakas
a103240592 Merge branch 'main' into fix/issue583-start-second-job 2021-05-10 15:39:01 +03:00
Bogdan Fazakas
fadffb5d87 added no cache fetch policy on appolo request and removed debug logs 2021-05-10 15:35:49 +03:00
Jamie Hewitt
f5da6e4b0b
Issue 560 empty search (#561)
* upgrading to ocean.js 0.14.6

* Empty search gives all results

* Using ocean.js 13.0

* onBlur empty search when deleting text

* making empty search automatic on change

* removing console log messages

* including the search bar on results page

* keeping searchbox visible after an empty search

* refactoring If statement
2021-05-10 12:38:24 +03:00
Bogdan Fazakas
e73d140012 trigger check previous order after starting a compute job 2021-05-07 16:00:40 +03:00
claudiaHash
96a32242fd
hide Web3Feedback for private algorithms (#587)
* hide Web3Feedback for private algorithms

* correct private algo check

* remove redundant check

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-07 10:53:26 +03:00
Dimo Dzhurenov
49cd032274
using BigNumber instead of Number (#570)
* using BigNumber instead of Number

* remove wrong calculation of ocean ammount

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

* remove calculateAmountOfOceansRemoved

* using decimal.js for remove

* bump to ocean.js v0.14.8

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-04 14:56:47 +02:00
Jamie Hewitt
0a739cbe93
Support for Moonbase Alpha (#552)
* upgrading to ocean.js 0.14.6

* proper ocean.js update

* make all explorer links work

* handle new moonbeamalpha config

* add moonbase alpha to chain user preferences

* more ocean.js v0.14 updates

* switch to grid

* upgrading ocean.js to 0.14.7

* lock to @oceanprotocol/contracts v0.5.16

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-29 14:48:57 +02:00
5228010575
temporarily disable custom Docker image check
* closes #565
2021-04-28 20:16:03 +02:00
3319cf844d
mention compute restrictions throughout UI (#568)
* mention compute restrictions in publish forms

* copy

* results storage info
2021-04-28 19:59:56 +02:00
04ef9daf9f
fix compute settings showing up on algos 2021-04-28 19:42:35 +02:00
2587c4d4b9
set ComputeOutput 2021-04-28 17:07:14 +02:00
Bogdan Fazakas
6c3cf1f121
Fix/AssetSelection: Algo symbol & DID & Total price issues when no wallet connected (#559)
* fixed total price calculation issues

* fixed algoSymbol and Did dissappear in Safari
2021-04-28 14:23:44 +02:00
0ea01ac932
switch button copy for publish success 2021-04-28 12:47:12 +02:00
8453a07e36
another MetaMain visual tweak 2021-04-26 16:40:51 +02:00
claudiaHash
c0157dff21
Add datatoken to algo publish form (#531)
* datatoken added to algo publish form

* init datatoken option with non empty values

* remove hacks

* use nonempty data token initial values

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-26 13:43:58 +02:00
b89fcc99da
Merge branch 'main' into feature/compute 2021-04-23 15:46:50 +02:00
Bogdan Fazakas
369b075aa9
fixed compute algorithm pool price value (#553) 2021-04-23 15:44:31 +02:00
c89b5995d4
more reliable isOwner check (#547) 2021-04-22 16:29:40 +02:00
1f9f22cbc1
merge fix 2021-04-22 13:18:23 +02:00
df643e1fd8
merge fixes 2021-04-22 13:11:34 +02:00
14e4cc3f68
Merge branch 'main' into feature/compute 2021-04-22 13:03:08 +02:00
Norbi
cf44ab7f51
Feature/allow changing of fixed rate price (#399)
* added price field to edit metadata form

* use method for updating price

* get exchangeId for setRate function

* setRate method update

* misc fixes

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

* revert price

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

* get correct exchange id

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

* add price to MetadataEditForm interface

* fixed lint error

* disable update price on assets with dynamic price

* display price input only on fixed price

* price input changes

* fixed price input displayed when no price is set

* review fixes

* fixes

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-04-22 12:55:11 +02:00
Bogdan Fazakas
fa6554a23f
fix for terms state (#545) 2021-04-22 12:37:43 +02:00
mihaisc
e4803fda9e
fix price value (#544)
* fix price value

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

* proper price

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-21 18:03:13 +03:00
Dimo Dzhurenov
e21780530a Merge branch 'fix/490' into main 2021-04-21 17:31:07 +03:00
Jamie Hewitt
a20d6d82f0 Fixing issue with Toast message appearing twice 2021-04-21 16:23:50 +03:00
Bogdan Fazakas
d73b921a48 merged compute into issue497-fetch-price-subgraph 2021-04-21 13:09:03 +03:00
Bogdan Fazakas
4aae5fe6c1 removed price querry from compute 2021-04-21 13:00:30 +03:00
mihaisc
06fa195bd8
dont search for prev orders on order
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-20 19:30:16 +03:00
621aea64b5
metadata display tweaks
* new lock icon for private algos
* visual updates for asset details
2021-04-20 14:07:23 +02:00
mihaisc
1639a3e6ce
ignore old providers (#535)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-16 15:57:31 +03:00
Norbi
1da7eae35a
fix (#534)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-04-16 14:26:24 +02:00
Bogdan Fazakas
749b5d1f8d
check also DT for total pice calculation and amount to spend display (#533) 2021-04-16 14:25:35 +02:00
mihaisc
545be24429
fix compute history duplication (#530)
* check provider compute address

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

* remove console

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

* lock file

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

* lib update, lock file fix

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-16 15:23:09 +03:00
93ca8e3879
Job details (#528)
* refactor

* refactor job details

* styling, cleanup, get algo name

* output dataset & algo dt symbol

* more styling and job metadata output

* history background tweak

* human numbers, edge case fixes
2021-04-16 11:12:53 +03:00
Dimo Dzhurenov
ab6578e982 change function position 2021-04-15 18:26:31 +03:00
Dimo Dzhurenov
16254fd59b update the file info UI after URL re-add 2021-04-15 18:26:31 +03:00
55b09220b4
Merge branch 'main' into feature/compute 2021-04-15 14:55:11 +02:00
claudiaHash
49caca234d
filter ordered assets by service type (#515)
* filter ordered assets by service type

* filter dids fetched

* loader added

* show loader fix

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-04-15 14:54:41 +02:00
4a83732255
Merge branch 'main' into feature/compute 2021-04-15 13:50:07 +02:00
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
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
Bogdan Fazakas
0d1534db70 check ddo provider for assets in edit compute 2021-04-15 10:55:58 +03:00
Bogdan Fazakas
1beb33d3e1 check ddo provider for algo list in start compute 2021-04-14 20:11:29 +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
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
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
Bogdan Fazakas
a27bc6718a update get prev order method & small typo 2021-04-12 17:09:41 +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
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
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
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
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
Bogdan Fazakas
90787e9031 fixed reset form & cover flow where algorithm form is clear 2021-02-25 14:21:05 +02:00
e5b71046db
small global color tweaks 2021-02-25 13:16:32 +01:00
claudia.holhos
2283148e6d code refactoring 2021-02-25 14:14:21 +02:00
Norbi
bee7c1ecbf changed way to get accessType, asset type declaration 2021-02-25 13:46:20 +02:00
Norbi
a9e1ff1dbb AssetType changes, moved to MetaMain 2021-02-25 10:55:38 +02:00
claudia.holhos
99e0cb78e2 select multiple options 2021-02-24 20:32:18 +02:00
Bogdan Fazakas
7ef538818a hide image/tag/entrypoint when pre-defined docker image is selected 2021-02-24 16:56:22 +02:00
Bogdan Fazakas
dca5b9f56c fix persistance for both publish forms 2021-02-24 13:32:15 +02:00
Bogdan Fazakas
e92f759898 set default pre-defined docker image and renamed version field to docker image tag 2021-02-24 11:25:52 +02:00
claudia.holhos
2938a09454 select and deselect filter button
price and service filters combined


unselect filter on button
2021-02-23 23:51:02 +02:00
8f8870c829
tabs color tweak 2021-02-23 11:46:23 +01:00
70d3e26bab
Merge branch 'feature/compute' into publish-algo 2021-02-23 11:43:49 +01:00
Norbi
80ae4d2bd5 created AssetTypeDetails component and added it to asset details 2021-02-23 12:16:52 +02:00
e532ec3891
remove value reset on mount 2021-02-23 11:14:41 +01:00
e157278e37
form tabs thingy 2021-02-22 18:38:24 +01:00
193670ed5f
more tab switching 2021-02-22 16:43:16 +01:00
f79d8c2c91
content updates 2021-02-22 16:37:50 +01:00
41fd894ce6
output form titles 2021-02-22 16:28:56 +01:00
Norbi
4a35d08880 Merge branch 'feature/compute' into feature/algorithm-details-view 2021-02-22 17:25:09 +02:00
82a12a915d
refactor publish page for tab usage 2021-02-22 16:15:22 +01:00
claudiaHash
ce81777030
view algorithms on homepage (#388)
* view algorithms on homepage

* linting error fixed

* view algos on rinkeby/mainnet, added algos on search

* global color system tweak, apply on asset teaser system

* create subtle hierarchical distinction between background & content
* output asset type
* add asset type as css class
* bonus side effect: a nicer dark mode theme on OLED screens

* add icon assets

* compute/download icons added to asset teaser

* tooltip content fix

* tooltip content width fix


tooltip message shortened

* max-width added

* links renamed, all algos section removed

* datatoken tooltip removed

* spacing tweaks

* visual separation of asset & access type, flip order
* spacing/font size tweaks, aligning things

* fix search

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

* light mode color tweak

* change dataset display name

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

* data set label fixed

* query updated for data sets and algos

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-02-22 16:25:27 +02:00
Bogdan Fazakas
2f1bd399f8 refactor metadata types for publish forms 2021-02-19 17:51:40 +02:00
Norbi
14942b5785 use action view changes by asset type 2021-02-19 16:25:49 +02:00
Bogdan Fazakas
5112a35524 fixed lint errors 2021-02-19 16:25:42 +02:00
Bogdan Fazakas
92547533a5 refactor publish page content 2021-02-19 16:08:47 +02:00
Bogdan Fazakas
243283e434 disable aditional docker image fields for pre-defined containers 2021-02-19 13:44:04 +02:00
Norbi
c731bab782 remove created files 2021-02-18 16:32:46 +02:00
Bogdan Fazakas
707045071a added support for custom docker images 2021-02-18 14:53:32 +02:00
Norbi
7c30d974ad WIP 2021-02-18 12:02:12 +02:00
28555ffd1b
lint fix 2021-02-18 09:53:54 +01:00
8430cb9ba2
Merge branch 'main' into feature/compute 2021-02-18 09:52:34 +01:00
Norbi
fe67af2dda
added pagination to Published list, used aquarius to get assets (#377)
* added pagination to Published list, used aquarius to get assets

* loading only when component mounts

* pagination style unification

* Auto stash before merge of "feature/add-pagination-to-published-section" and "origin/feature/add-pagination-to-published-section"

* removed unnecessary code

* fixed lint errors

* code climate fixes

* removed unused component

* added hook for network switch

* display bottom border for last table row

* trigger pagination calculation on network change

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-02-18 09:33:38 +01:00
Bogdan Fazakas
ee25e29de0 Redundant Boolean call 2021-02-17 15:42:22 +02:00
Bogdan Fazakas
7d25bc07ce added keep algorith private checkbox 2021-02-17 15:31:26 +02:00
Norbi
44dbd51592
Added link to highest liquidity pool search (#375)
* Added link to highest liquidity pool search

* changed link name

* changed sections link and title texts
2021-02-16 15:50:39 +01:00
Bogdan Fazakas
4088a790fb change publish type from data to dataset 2021-02-16 16:47:07 +02:00
Bogdan Fazakas
18cd6b6f01 WIP publish algorithm 2021-02-16 11:27:02 +02:00
claudiaHash
9991b6dfeb
Display TVL (#353)
* get  pools data from graph

* TVL displayed

* ESlint fixes

* Code style fixed on App.tsx

* footer stats display changes

* ApolloProvider wrapping

* config subgraphUri verified

* pool number taken from graph

* Apollo provider fix

* Pools number set fixed

* deleted unused imports

* fix fetch, gatsby build

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

* remove apollo client redundant init

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

* fix prop

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

* update pool count

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

* tooltip added

* small development config refactor

* make sure initial config is actually overwritten with local addresses

* log error on missing subgraphUri

* copy change

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-02-11 14:30:29 +02:00
Bogdan Fazakas
e4a826cc7e add publishType compoenents 2021-02-11 11:26:12 +02:00