oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Code Releases Activity
1,048 Commits 36 Branches 5 Tags 85 MiB
1f9f22cbc1
Commit Graph

1048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias Kretschmann
1f9f22cbc1
merge fix 2021-04-22 13:18:23 +02:00
Matthias Kretschmann
df643e1fd8
merge fixes 2021-04-22 13:11:34 +02:00
Matthias Kretschmann
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
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
Matthias Kretschmann
621aea64b5
metadata display tweaks 
* new lock icon for private algos
* visual updates for asset details
 2021-04-20 14:07:23 +02:00
Matthias Kretschmann
9f38bba69a
bump to ocean.js v0.14.4 2021-04-19 16:07:52 +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
Matthias Kretschmann
afca6cfdd3
npm audit fix 2021-04-16 11:32:46 +02:00
Matthias Kretschmann
26a410a479
lock to ocean.js v0.14.1 2021-04-16 11:31:44 +02:00
Matthias Kretschmann
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
ad096d4347 Merge branch 'fix/490' of https://github.com/oceanprotocol/market into fix/490 2021-04-15 18:29:24 +03:00
Dimo Dzhurenov
add3208814 removed launch.json 2021-04-15 18:26:31 +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
Dimo Dzhurenov
9ecfcda20e removed launch.json 2021-04-15 17:33:34 +03:00
Matthias Kretschmann
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
Dimo Dzhurenov
f506758bfe change function position 2021-04-15 15:07:25 +03:00
Matthias Kretschmann
4a83732255
Merge branch 'main' into feature/compute 2021-04-15 13:50:07 +02:00
Matthias Kretschmann
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
Dimo Dzhurenov
00a6d7af63 update the file info UI after URL re-add 2021-04-15 14:35:29 +03: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
mihaisc
c40ca5dae7
fix package-lock (#520) 
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
 2021-04-15 12:26:53 +03:00
Matthias Kretschmann
79497adbab
package fix 2021-04-15 11:24:00 +02:00
Matthias Kretschmann
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
Matthias Kretschmann
ea2f03d8cd
merge fix 2021-04-14 15:34:28 +02:00
Matthias Kretschmann
fff5699c67
Merge branch 'main' into feature/compute 2021-04-14 15:31:36 +02:00
Bogdan Fazakas
f531fea4b0
Merge pull request #488 from oceanprotocol/feature/sugraph-util-methods 
Subgraph helpers for assetSelection list and previous orders
 2021-04-14 16:06:25 +03: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
Matthias Kretschmann
fa53b024fa
wallet reconnect button fix 2021-04-13 17:02:40 +02:00
Matthias Kretschmann
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