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

1230 Commits

Author SHA1 Message Date
Bogdan Fazakas
2e9a1cd147 added codegen config file 2021-07-06 01:10:28 +03:00
Bogdan Fazakas
04b89ddd35 replaced introspection generation with graphql codegen 2021-07-06 01:09:51 +03:00
Bogdan Fazakas
8d50eb92c0 merged multinetwork into poc-urql 2021-07-05 14:27:43 +03:00
Norbert
60addda1cc Merge branch 'main' into feature/multinetwork 2021-07-02 13:48:26 +03:00
Bogdan Fazakas
c6c502188a
Merge pull request #517 from oceanprotocol/issue510-match-providers-algo-dataset
Match dataset providers with private algorithms providers
2021-07-02 13:22:29 +03:00
Bogdan Fazakas
5de2a6e330 remove apollo typings and generate schema using urql 2021-07-02 09:44:24 +03:00
Norbert
00c61f2de6 added bsc to supported chainIds 2021-07-01 15:38:08 +03:00
Norbert
5fddeb66c1 fixed lint error 2021-07-01 15:07:50 +03:00
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
da23e9f3a0
bump ocean.js, support more networks (#701)
* bump ocean.js

* fix frontpage empty views

* package-lock fix

* hook dependencies are fun

* bump ocean.js

* network tweaks

* add more chains to user preferences
2021-06-30 10:32:09 +03:00
Bogdan Fazakas
1ceb0f6158 fixed lint errors 2021-06-29 09:37:12 +03:00
Bogdan Fazakas
127d31d729 fixed issues after merge of main branch 2021-06-29 09:20:35 +03:00
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
6f1abcbb1e
output MarketStats again 2021-06-25 10:48:48 +02: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
Bogdan Fazakas
eeeb34fada added query context for price fetching based on assets chainId 2021-06-25 10:50:56 +03: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
Bogdan Fazakas
5e45fff361 wip replace apollo with urql 2021-06-22 08:52:49 +03: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
a017ad219d
move network metadata into a hook 2021-06-14 20:04:44 +02:00
88bead1474
activate isAssetNetwork check 2021-06-14 15:37:59 +02: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
2f4f53ae2a
Menu refactor (#672)
* layout flow and space saving tinkering

* different tactic

* different minimal network name

* next layout flow iteration

* move chains preference into its own action

* mobile view tweaks

* more network icons

* fix and clean up ocean token metadata

* refactor and clean up Chains component

* naming cleanup
2021-06-14 15:05:16 +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
ea15f20cac
mock ddo.chainId response 2021-06-11 15:43:59 +02:00
8ac4f59dee
temporary ddo.chainId typing 2021-06-11 15:35:28 +02:00
Norbi
064bb2fd69
Change bookmarks and migration (#675)
* changed bookmark structure to list of dids

* fixed add, remove bookmark

* wip

* fixed type error and migration

* remove logs

* fix lint error

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-11 16:01:44 +03: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
9ea1b644fc
fix app crash on unsupported network 2021-06-11 09:39:17 +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
4df84b8b14
split up network list into main & test networks 2021-06-09 19:41:12 +02:00
9943dae93c
full width menu bar 2021-06-09 19:40:43 +02:00
270f567879
move Graph sync status to asset details only 2021-06-09 13:16:55 +02:00
2d16841967
move main app warning 2021-06-09 12:49:00 +02:00
ef218a9d9e
chainId switching mechanism 2021-06-09 11:45:36 +02: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
f0b040c5cb
Merge branch 'main' into feature/multinetwork 2021-06-08 10:48:10 +02:00
15b036f462
capture chainIds in user preferences provider 2021-06-08 10:46:53 +02: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