1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Commit Graph

1244 Commits

Author SHA1 Message Date
Bogdan Fazakas
0954613b5e
Merge pull request #588 from oceanprotocol/fix/issue583-start-second-job
Fix/Start a second compute job after first successful attempt
2021-05-17 17:38:16 +03: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
48cb9b1840
Merge pull request #540 from oceanprotocol/issue497-fetch-price-subgraph
Fetch asset price without relying on ddo's price
2021-05-13 11:36:06 +03:00
Bogdan Fazakas
3dba118546 remove unnecessary console log 2021-05-11 16:15:35 +03:00
Bogdan Fazakas
5adf03c5f1 added fetchPolicy no-cache on graph requests from subgraph.ts util 2021-05-11 16:09:16 +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
6cc268bd3f
effect dependency fix (#578) 2021-05-05 11:43:09 +02: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
020d4fa05a
Merge pull request #376 from oceanprotocol/feature/compute
Compute-to-data
2021-04-29 12:02:47 +02:00
e3c0fd3d85
switch visual order of edit compute settings 2021-04-29 00:26:09 +02:00
7f5a8e11cc
dataset → file
* closes #567
2021-04-28 20:20:56 +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
Alex Coseru
3ca36a9ece
remove objects (#571) 2021-04-28 20:59:14 +03: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
015b212eda
remove useCompute hook 2021-04-28 17:06:18 +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
Bogdan Fazakas
1d02f53a06 fixed no price set usecase 2021-04-23 12:07:59 +03: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
Bogdan Fazakas
0cef2cccd5 update price value for pool assets using consumePrice and added isConsumable logic 2021-04-22 14:03:58 +03: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