1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-06-28 16:47:52 +02:00
Commit Graph

291 Commits

Author SHA1 Message Date
Norbi
14f2f2a747 Merge branch 'main' into feature/multinetwork 2021-07-01 14:44:21 +03:00
Kris Liew
1c4ba145bb
Edit Advance Settings (updateMetadata() v3 workaround solution for free pricing) (#692)
* v3 update metadata workaround
2021-07-01 14:52:10 +08:00
Norbi
31ee1aab98
Pool statistics graph shows two sets of data when switching tabs (#696)
* removed compose previous data with new data

* removed unused states

* fix refetch multiple times for same block number

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-25 10:34:39 +02:00
mihaisc
04d505da42
remove fileInfo check, cleanup (#689)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-06-16 18:49:40 +02:00
Kris Liew
e02babf2c2
[EPIC] Free Pricing (#681)
* Free Pricing Option at create Pricing (#621)

* Free Pricing Option + env var toggle

* Create Pricing step msg

* Default 'allowFreePricing' to true temp for review

* Fix price 0 on free tab

* Attempt fix useSiteMetadata

* Fix linting

* Feature/free price support consume compute (#654)

* Update fetch free price

* Feedback change UI remove 0's

* update button msg && fix

* compute algorithm list show 'Free' instead of '0'

* updateMetadata() v3 workaround solution for free pricing (#677)

* compute algorithm list show 'Free' instead of '0'

* workaround editMetaData free price

* utils function for compute & download

* `allowFreePricing` default to false
2021-06-16 09:32:11 +08:00
Norbi
6ed92c0bfd
covert timeout before display (#682)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-15 14:30:01 +03:00
63bfe43c5b
merge fix 2021-06-14 15:34:21 +02:00
30174e1a84
Merge branch 'main' into feature/multinetwork 2021-06-14 15:17:33 +02:00
Norbi
88c94f6ce9
Fix buy asset button (#537)
* fixed button turning to Download on unsuccessful buy

* removed console.log

* fixed multiple error message displayed bug

* return if error on buying datatoken

* verify orderId value

* added try catch block for asset.order in consume hook

* added checkPreviousOrders also when compute ends with error

* bumped oceanjs lib to 0.15.0

* fixed lint errors

* show loading while consume

* fixed wrong timeout validation

* updated package-lock from main

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>
2021-06-14 15:13:10 +02:00
Norbi
3a4851132d
Show the list of data sets an algorithm is allowed to run on (#579)
* WIP

* UI changes

* get and display datasets on both compute and consume

* new component for datasets that algorithm can run compute job on

* AssetSelection className refactor

* added internal link to AssetSelection

* show loading page when changing asset

* Component and asset title UI update

* created new component for dataset list

* removed unnecessary changes

* updated link margin

* prettier fix

* merge fix

* another fix

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-06-14 14:37:03 +02:00
Kris Liew
4fc5862654
Edit Advance Settings form for Edit Credentials & edit isOrderDisabled Flag (#655)
* #638 Initial design

* #638 fix import and get value from env file

* #638 Fix UI

* #638 Improved UI

* #638 Add deny credential and isOrderDisabled

* UI update

* Fix lint

* Attempt fix issue

* Revert "Attempt fix issue"

This reverts commit e3d916fe61.

* Extract default credential type

* Fix complexity issue

* Fix complexity issue

* Fix typo error

* Enhance UI

* Enhance Credentials Component UI

* Reduce duplication

* Revert "Reduce duplication"

This reverts commit e3bf6b4a2a.

Co-authored-by: KY Lau <kian_yee.lau@daimler.com>
2021-06-14 15:47:31 +08:00
f9f3768f5f
fix most remaining typing errors 2021-06-11 11:23:24 +02:00
b8930cc738
Merge branch 'main' into feature/multinetwork 2021-06-11 11:14:43 +02:00
Jamie Hewitt
e26ed0e81a
Issue 582 market rbac integration (#597)
* adding env for RBAC server url to app.config.js

* creating util function for requesting auth from the rbac server

* fixing typing error

* testing rbac request on homepage

* removing console logs

* importing RBAC url from config file

* creating develpment .env file

* return true if no rbac url env is set

* creating permissions parent component

* wrapping homepage content in permission element

* wrapping publish in permissions wrapper

* wrapping search results in permissions wrapper

* wrapping asset actions in permissions element

* creating an error alert for permission denied

* updating react hook dependency

* passing address to rbac component

* sedning address to RBAC server

* wrapping asset in permission component

* removing unused import of Permission component

* sending request based on address

* chaning default permission case to restrict access

* updating eventType as consume

* Adding loader icon while waiting form permission response

* only sending request to RBAC if address is defined

* adding wallet connection info message

* changing the env name and checking for undefined

* updating .env.development

* Check for undefined RBAC_URL in permissions component

* removing .env.development and updating .env.example

* updating .env.example comment

* switching alert messages and reducing return statements

* removing console.log message

* fixing linting issue

* Revert "fixing linting issue"

This reverts commit 8bcb80be3d.

* Fixing linting errors

* pull from origin main

* Revert "pull from origin main"

This reverts commit 9535e41a5f.
2021-06-10 12:06:26 +03:00
claudiaHash
b1d8a77895
Update file metadata from provider (#631)
* get file metadata from provider

* get file metadata without a wallet connected

* unused import deleted

* get file metadata from provider


get file metadata without a wallet connected


unused import deleted

* loader added

* lint fix

* loaded added on file icon

* fileMetadata empty object init

* lint error fixed, deleted unused imports

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-06-10 11:39:24 +03:00
claudiaHash
f5e01d7c0c
Display compute jobs history tab for a successful job (#652)
* selected tab added

* preselect and display compute jobs history

* defaultIndex prop used

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-06-08 14:35:06 +03:00
21792e9d4f
move OceanProvider to asset route 2021-06-04 15:13:47 +02:00
3332249928
refactor and tinkering 2021-06-04 15:06:24 +02:00
9d7486d626
prototype network feedback based on asset network checks 2021-06-04 15:01:22 +02:00
b516e95879
prettier formatting updates 2021-06-04 11:43:47 +02: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
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
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
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
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
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
Bogdan Fazakas
369b075aa9
fixed compute algorithm pool price value (#553) 2021-04-23 15:44:31 +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
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
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
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
Bogdan Fazakas
8586f0c77b
do not check prev orders when order compute algo in ocean lib (#516) 2021-04-15 12:00:22 +03:00