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

1137 Commits

Author SHA1 Message Date
Bogdan Fazakas
b0356f559c Merge branch 'main' into issue510-match-providers-algo-dataset 2021-06-29 00:08:45 +03:00
Norbi
c81a986261
Fix refetch data token orders (#700)
* refetch token orders inside getJobs

* removed logs

* don't use Time component for Finished column if date is undefined

* removed logs

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-28 12:47:56 +03: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
Jamie Hewitt
00bce63b8d
Adding advanced documentation (#687)
* Creating advance documentation file

* adding descriptions of advance features

* fixing small issues

* update RBAC instructions

* update RBAC instructions

* integrating feedback

* reorder example env vars, document in place

* integrating feedback

* additional instructions on RBAC settings

* fixing contents links

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-06-22 12:16:27 +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
claudiaHash
eb8c6afb62
Search issues fix (#641)
* search by addresses

* search by asset id

* logs deleted

* search query updated

* search query updated

* search terms differentiated

* asset id hack

* id search hack removed

* restore lock file

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

* remove SearchQuery return type

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

* refine query, add relevance sort

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

* remove old comments

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

* remove white spaces from search term endings

* fix filter by type

* wip on filter with empty search text

* sort by relevance fix

* linting errors fix

* lint fixes

* comment sort by relevance

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

* lint

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

* search by owner and tags fix

* lint  err fix

* fix search

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

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-06-15 16:46:49 +03:00
Norbi
6ed92c0bfd
covert timeout before display (#682)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-15 14:30:01 +03: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
Bogdan Fazakas
e8033687fb
Put back in place removed docker hub image check (#642)
* Put back removed docker hub image check using proxy

* fixed lint errors

* update scroll so  in case of docker image validation error the input fields are in viewport
2021-06-14 14:10:12 +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
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
mihaisc
1560c69239
Revert "Fix assets in purgatory not displayed" (#647)
* Revert "Fix assets in purgatory not displayed (#646)"

This reverts commit f759757a1d.

* fix asset purgatory

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-06-07 14:24:51 +03:00
Norbi
f759757a1d
Fix assets in purgatory not displayed (#646)
* don't show loading component if pageTitle is an empty string

* fix lint errors

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-07 12:36:44 +03: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
mihaisc
e0f8104d07
add web3 in package-lock
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-06-04 14:19:51 +03:00
ece07927f6
more package updates 2021-06-04 11:51:13 +02:00
729bc5d998
update docs 2021-06-04 11:43:51 +02:00
3ff9fe4a68
add nvmrc with Node.js v16 2021-06-04 11:43:51 +02:00
53639e6839
disable storybook test runs for now 2021-06-04 11:43:51 +02:00
4dd11fd0f0
ethereumjs-abi lockfile fix 2021-06-04 11:43:51 +02:00
b5d58267c0
ethereum-blockies lockfile fix 2021-06-04 11:43:51 +02:00
508564ec03
more package updates, lock graphql, fresh package-lock 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
de2e4e8fae
package cleanup and updates 2021-06-04 11:42:33 +02:00
306ff5833a
ESLint config updates 2021-06-04 11:42:32 +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
Jamie Hewitt
24ad90cf59
Creating a new 'forking' section on the readme (#613)
* Creating a new 'forking' section on the readme

* adding copyright message to forking section in readme
2021-05-25 08:31:11 +02: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
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