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

203 Commits

Author SHA1 Message Date
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
Bogdan Fazakas
0cef2cccd5 update price value for pool assets using consumePrice and added isConsumable logic 2021-04-22 14:03:58 +03:00
Bogdan Fazakas
7b653c46ba fetch asset price withoud relying on ddo.price 2021-04-20 09:44:18 +03:00
4a83732255
Merge branch 'main' into feature/compute 2021-04-15 13:50:07 +02:00
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
79497adbab
package fix 2021-04-15 11:24:00 +02:00
Bogdan Fazakas
1beb33d3e1 check ddo provider for algo list in start compute 2021-04-14 20:11:29 +03:00
fff5699c67
Merge branch 'main' into feature/compute 2021-04-14 15:31:36 +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
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
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
Norbi
b8247c7ef4
The Graph sync status (#466)
* WIP

* query update

* quick fix

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

* get blocks number when no provider, added threshold

* format code

* naming fix

* show graph out of sync message inside announcement banner

* added loader

* moved sync component

* refactor all the things

* new atoms/AnnouncementBanner : banner component reduced to presentation only, where its content is always passed as props

* revised molecules/NetworkBanner: the former AnnouncementBanner now holds all the specific network detection logic, in the end also returns the atoms/AnnouncementBanner

* new hook hooks/useGraphSyncStatus: move all the graph fetching logic in there so we can use its status in multiple places in the app without all this props passing. This also decouples the SyncStatus component in footer from its logic

* in App.tsx, add the graph sync warning banner in another atoms/AnnouncementBanner, getting its values from the hook

* data flow refactor

* .env.example tweak

* race condition fighting

* subgraph loading

* polygon fallback fix

* no interval fetching

* turn around logic for adding infura ID

* removed graphNotSynched

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-13 10:57:59 +02:00
Bogdan Fazakas
a27bc6718a update get prev order method & small typo 2021-04-12 17:09:41 +03:00
Bogdan Fazakas
0740917731 typo fixes 2021-04-12 13:52:09 +03:00
Bogdan Fazakas
c533d1ee0c get compute previous orders from subgraph util 2021-04-11 02:13:43 +03:00
Bogdan Fazakas
2cce93d502 fetch asset list prices from the graph 2021-04-09 12:55:18 +03:00
claudiaHash
36084fbc1f
output datatoken symbol for each asset in asset selection (#477)
Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-04-06 09:49:16 +02:00
432961b278
Merge branch 'main' into feature/compute 2021-04-01 17:29:29 +02:00
Bogdan Fazakas
18f2c99e78
Start compute job (#439)
* Wip start compute job

* Wip select algorithm design

* Asset selection form component, for start compute job (#442)

* prototype AssetSelection

* assetselection styling

* typing "fix"

* put back file info icon

* AssetSelection styling in context

* update start job method, fixed algo select, and fixed option typing

* compute logic update

* add has previous orders for algo asset

* fixed search algorithm assets in start compute form

* fixed lint errors

* updated previous order for algo logic and compute flow

* update use price hook and added buy DT for algo

* display only alg of type exchange and sort by value

* display only trusted algo for asset if field is set

* added logic for allow all published algorithms or no algorithms allowed

* asset selection style & spacing tweaks

* refactor get algorithms for compute and edit compute

* fixed form options and more refactoring

* new ButtonBuy component

* shared component between consume/compute
* dealing with various states: loading, previous orders, help text output

* effect dependencies

* move error output into toast

* formik data flow refactor

* ditch custom field change handler
* fix initialValues
* typed form data & validation
* fixes multiple form validation issues along the way

* isInitialValid → validateOnMount

* metadata display tweaks

* error feedback tweaks

* oler assets checks, confeti on succes job, market fee on order, removed algo compute logic

* more startJob logging

* feedback & messaging changes

* metadata display

* return all algos, fixed & dynamic priced ones

* fix DOM nesting

* messaging updates

* copy tweaks

* check algorithm previous history for both acces and compute sercive types

* handle start compute error

* extra checks on start compute response

* styling tweaks, fix toast UI errors

* AssetSelection: empty screen, tweak min/max height

* fix FRE issues on start compute

* check is ordarable before start compute job

* logging tweaks

* disable eslint no-unused-vars rule for some Apollo code blocks

* fix metadata editing for compute assets

* consider dataset timeout for compute too

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-01 17:21:08 +02:00
Norbi
96296008c9
Add custom network (#450)
* add custom network

* created announcement banner

* add custom network from banner

* show ADD CUSTOM NETWORK on MetaMask provider

* show add ocean to wallet action

* removed warningPolygon from alert

* removed customNetwork component

* remove Add custom network on asset details page

* Details use function from web3 to add token

* changed available on Polygon link, refactoring

* show Switch to Polygon when no wallet connected

* banner content for no provider and Polygon network

* change message when not provider and eth network

* changed warning and added announcement in site.json

* moved network logic inside Announcement, moved Announcement component

* added switch to ETH button, refactoring

* removed add mOcean action button

* moved location verification to App.tsx

* styling & copy updates

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-03-30 15:37:30 +02:00
6d14181d17
Merge branch 'main' into feature/compute 2021-03-26 12:24:09 +01:00
Norbi
977a38e118
Edit compute dataset (#417)
* WIP

* created form for editing compute privacy

* used editComputePrivacy method

* select and update trusted algorithm

* display and select multiple trusted algorithms

* fixed update when trusted algorithm list not changed

* code refactoring

* moved separator inside condition

* moved functions and interface from EditComputeDataset component

* moved algorithmOptions to parent component

* used AssetSelection to display algorithms

* use AssetSelection to select trusted algorithms

* getAlgorithmsOptions function review

* review fixes

* removed unused imports

* merge fixes

* AssetSelection style & usability tweaks

* use custom radio & checkbox styles
* add simple search for name & DID
* spacing adjustments

* copy updates, remove raw algo input, hardcode allowRawAlgorithm

* copy

* AssetSelection usability tweaks

* make rows clickable
* tweak layout, style and markup

* use formik set function to update values

* sorted algorithm list, added checked field

* sort assetSelection list on user select

* fix getAlgorithmsForAssetSelection breaking on empty responses

* form debug output

* another empty publisherTrustedAlgorithms fix

* created separate algorithms state for the form, sort list on edit

* refactor

* use Formik functionality wherever possible
* unify transforming form data to final data

* fix form debug transformation

* fix form submit, fix defaultChecked

* refactor

* use Formik functionality wherever possible
* unify transforming form data to final data

* fix form debug transformation

* fix form submit, fix defaultChecked

* disable assetSelection when allowAllAlgorithms is true

* added loader to AssetSelection

* changed allowAllAlgorithms to allowAllPublishedAlgorithms

* fixed lint error

* updated transformComputeFormToServiceComputePrivacy

* lint fix

* modify publish defaults

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-03-25 08:34:07 +01:00
Norbi
ed9eb61c1c
Add custom token from the wallet (#437)
* WIP

* added button that allows to push custom token to metamask

* added image url

* use provider from ocean, add mOCEAN symbol to Matic

* use token symbol based on networkId

* removed customToken.json, used Logger to display message

* log error

* fixed log

* review fixes

* used oceanTokenSymbol from config

* getOceanConfig fix
2021-03-22 12:48:28 +01:00
df587bb5b5
Merge branch 'main' into feature/compute 2021-03-17 12:58:13 +01:00
bdccb0966f
Web3/Ocean splitup + full Polygon/Matic support (#433) 2021-03-17 11:44:26 +01:00
Bogdan Fazakas
d1c4cdb29f
Merge branch 'main' into feature/compute 2021-03-05 13:51:26 +02:00
8737264816
refactor network name output (#421)
* refactor network output

* fetch chain & network metadata from @ethereum-lists/chains

* typed responses

* switch warning icon for testnet badge

* add supportedNetworks list, output warning based on it

* markup & spacing tweaks

* check networkId against ocean.js ConfigHelper

* remove supportedNetworks app config

* fetch EVM networks metadata on build time

* fixes
2021-03-04 18:16:20 +01:00
Bogdan Fazakas
32ff7af3ce
Merge branch 'feature/compute' into publish-algo 2021-03-03 16:13:03 +02:00
Bogdan Fazakas
188f60e7de replaced local isUrl with is-super-url 2021-03-03 09:56:29 +02:00
Norbi
0b942de217 added function to get only the name of the asset 2021-03-01 11:51:24 +02:00
Bogdan Fazakas
f4f7ecefc8 run validation only when custom image is selected 2021-02-26 16:15:41 +02:00
Bogdan Fazakas
cdd5c5cf16 WIP validate for dockerhub images and 3rd party images 2021-02-25 23:05:30 +02:00
433af0147a
switch IPFS gateway (#404)
* switch to dweb.link for loading 3Box profile images
* ipfs.oceanprotocol.com has been deprecated
2021-02-25 16:00:42 +02:00
Bogdan Fazakas
e92f759898 set default pre-defined docker image and renamed version field to docker image tag 2021-02-24 11:25:52 +02:00
Bogdan Fazakas
2f1bd399f8 refactor metadata types for publish forms 2021-02-19 17:51:40 +02:00
Bogdan Fazakas
707045071a added support for custom docker images 2021-02-18 14:53:32 +02:00
Bogdan Fazakas
18cd6b6f01 WIP publish algorithm 2021-02-16 11:27:02 +02:00
Bogdan Fazakas
3e2ad9674c
set default value for contentLenght if not received from provider (#372) 2021-02-10 14:24:16 +01:00
Bogdan Fazakas
c72dfb6ced
Fileinfo replacement (#352)
* replaces market fileinfo with provider file info

* removed test for replaced getFileInfo method

* updated toast messages
- if uploaded file when no web3 wallet is connected
- if file is not valid

* used provider api to check file'

* moved get fileinfo logic to provider.ts

* cancel fileinfo req on unmount

* reduced fileinfo method complexity

* canceltoken passed to fileinfo issue
2021-02-04 15:45:21 +01:00
mihaisc
ab609b93c0
refetch balance (#357) 2021-01-29 16:21:34 +02:00
a760935564
Add Portis wallet connection (#291)
* add portis

* library loading tinkering

* bump packages

* typings fix

* pip as addon

* remove setuptools

* revert typings fix

* modal styling

* show portis button

* provider name workaround

* for faulty getInjectedProviderName()
* fixes https://github.com/oceanprotocol/market/issues/332

* more usage of provider info object

* output respective wallet logos

* add network switcher for Portis

* add functionality

* prototype for portis network switching

* improve user experience when reconnecting to cached provider

* support mainnet only, leave networking switching code commented out
2021-01-29 13:40:54 +01:00
Norby
a2fe2fdee0
Set, edit, and display timeout (#324)
* added timeout to publish asset

* add timeout to edit asses(wip)

* added timout to edit metadata form

* fixed wrong constant name

* fix options autosorting

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

* Fixed autosorting in edit form

* Added "1 day" to timeout options

* Changed ternary operators to switch

* Feature/asset timeout (#325)

* Compute asset timeout

* Code styled

* Deleted unused import

* Display timeout for buy/download

* Switch case for timeout values

* Moved mapping function to /utils/metadata

* display timeout option not matching defined ones, map seconds to string

* handle update with no predefined timeout value, add weeks to map method

* Display timeout on button

* consume button text logic change

* whoops, revert wrong change

* small millisecondsToStr refactor

* copy tweaks

* template literal logic restore

* keep tweaking help text logic

* abstract into method
* change whole condition logic
* tweak hasDatatoken/hasPreviousOrder combination condition

* Unified seconds to string conversion methods

* getHelpText tweaks, small refactor

* copy editing, limit hardcoded timeout list

* fix mixup of map & filter

* use Timeout as label and be done with it

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: claudiaHash <49017601+claudiaHash@users.noreply.github.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Claudia Holhos <clawww1996@gmail.com>
2021-01-22 17:12:48 +01:00
de1bc11efe
add ropsten to network detection utilities (#294)
* add ropsten to network detection utilities

* mention ropsten in publish warning

* bump @oceanprotocol/lib
2020-12-11 18:30:51 +01:00
mihaisc
072a4475eb
update 3box url (#298) 2020-12-10 16:04:35 +02:00
960c5b3234
Update metadata, the proper way (#292)
* prototype view switching

* refactor, more UI

* formik form setup & data flow

* debug output, fixes, refactor

* description preview refactor

* publish/update date changes

* output created & updated date at top of asset
* use ddo.created & ddo.updated everywhere
* stop pushing metadata.main.datePublished

* owner check for edit link

* all the feedback states and switching between them: loading, error, success

* refactor feedback, one component for publish & edit

* action & date output fixes

* move all content, iterate form fields from it

* UI updates

* styling tweaks

* ddo dataflow refactor, more useAsset usage

* more useAsset usage

* form actions styling

* prepare edit history component

* metadata output tweaks

* copy

* safeguard against profile urls without protocol defined

* refetch ddo after edit

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

* switch author for dataTokenOptions in metadata preview

* refactor

* copy

* showPricing fix

* validation: minimum characters for title & description

* disable submit button when validation fails

* form validation fixes

* manually trigger onChange validation in publish & edit forms

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2020-12-10 14:30:40 +01:00
c57731cd0b
restore WalletConnect (#290)
* restore WalletConnect

* bump @oceanprotocol/react

* visual fixes for walletconnect modal
2020-12-03 14:54:14 +01:00