1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-06-30 22:01:44 +02:00
Commit Graph

133 Commits

Author SHA1 Message Date
Norbi
14f2f2a747 Merge branch 'main' into feature/multinetwork 2021-07-01 14:44:21 +03: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
30174e1a84
Merge branch 'main' into feature/multinetwork 2021-06-14 15:17:33 +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
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
796fc6be81
get all screens to render again 2021-06-04 15:53:34 +02:00
b516e95879
prettier formatting updates 2021-06-04 11:43:47 +02: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
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
04ef9daf9f
fix compute settings showing up on algos 2021-04-28 19:42:35 +02:00
8453a07e36
another MetaMain visual tweak 2021-04-26 16:40:51 +02:00
b89fcc99da
Merge branch 'main' into feature/compute 2021-04-23 15:46:50 +02:00
c89b5995d4
more reliable isOwner check (#547) 2021-04-22 16:29:40 +02:00
621aea64b5
metadata display tweaks
* new lock icon for private algos
* visual updates for asset details
2021-04-20 14:07:23 +02: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
118bfb93a9
Merge branch 'main' into feature/compute 2021-04-09 10:19:56 +02:00
8511a3b165
showPricing check change (#485) 2021-04-09 11:10:39 +03: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
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
Kris Liew
30b4c77093
feature/add toggle option for fixed & dynamic pricing (#453)
* add toggle for create pricing option variable

* code refactor

* Minor fix from feedback
2021-03-24 20:27:32 +08: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
Dimo Dzhurenov
c9a8345222
Removing showing updates on never updated assets (#438)
* removes showing updates on never updated assets

* package-lock fix
2021-03-16 19:23:11 +01:00
509dbf3e68
Merge branch 'main' into feature/compute 2021-03-15 19:23:51 +01:00
mihaisc
a3e2c8ef3b
fix edit history (#435)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-03-11 14:51:43 +02:00
Bogdan Fazakas
f1196f10de removed commented block and published and updated from metafull 2021-03-05 14:01:20 +02:00
Bogdan Fazakas
d1c4cdb29f
Merge branch 'main' into feature/compute 2021-03-05 13:51:26 +02:00
Bogdan Fazakas
eed94a1127 update grid-template-columns on metafull and removed widht from metaitem 2021-03-05 13:16:03 +02:00
7356981350
hotfix for asset details (#425)
* was broken in non-web3 browsers
* missed in https://github.com/oceanprotocol/market/pull/421
2021-03-05 00:40:13 +01:00
claudiaHash
be82d9ef2e
Feature/edit history subgraph (#423)
* fetching Subgraph data

* updates ordered by timestamp

* comment removed

* comment removed

* apollo generated  typing used

* date converted to string

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-03-04 19:31:10 +02:00
Bogdan Fazakas
9310155ce9 remove unnecesary imports in MetaItem 2021-03-04 18:58:08 +02:00
Bogdan Fazakas
fd619b5b4b set fix width for metadata item content 2021-03-04 18:49:36 +02:00
Norbi
042e40eeb6 displayed Docker Image, used MetadataMain type interface for asset type 2021-02-25 20:15:42 +02:00
Norbi
bee7c1ecbf changed way to get accessType, asset type declaration 2021-02-25 13:46:20 +02:00
Norbi
a9e1ff1dbb AssetType changes, moved to MetaMain 2021-02-25 10:55:38 +02:00
Norbi
80ae4d2bd5 created AssetTypeDetails component and added it to asset details 2021-02-23 12:16:52 +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
5824d35ef7
move purgatory asset warning and hide most metadata (#287)
* move purgatory asset warning, hide most metadata

* move copy, less metadata

* refactor

* move copy

* delay fix
2020-12-02 14:37:01 +01:00
mihaisc
dac47bf524
3Box publisher profiles (#264)
* install 3box

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

* tinkering

* check tweak

* load library on init only

* add profile

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

* get 3box profile

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

* fix return type

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

* remove console.log

* fix travis

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

* fix eslit

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

* fix travis

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

* 3box data structure tweaks, prepare output in byline

* refactor

* new Publisher component

* tweaks

* remove data partners

* link/profile splitup

* profile tweaks

* component splitup

* lots of styling, add image

* affordance for publisher, refactor, server response tinkering

* use 3Box proxy

* open all 3box links in new tab/window

* mobile fixes

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2020-11-27 12:04:35 +01:00
mihaisc
35d9b6faec
price optimizations and bug fixes (#274)
* price optimizations and bug fixes

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

* travis fix

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

* remove console.log

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

* rephrasing

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

* bump react hooks, show price while checking if consumable

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

* remove console.log

* fix travis
2020-11-26 16:02:42 +01:00
ed57702ff3
refactor root components (#263)
* refactor layout

* refactor

* root components reordering

* type-check fix
2020-11-18 20:01:33 +01:00
7f2a5e7515
refresh interval tweaks (#257) 2020-11-17 13:10:12 +01:00
mihaisc
f8a0ff41c3
purgatory updates (#249)
* purgatory updates

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

* format

* update react hooks

* alert style, copy changes

* remove inverse style

* disable remove for purgatory owner

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

* remove buy button for purgatory assets

* hide remove liquidity for owner

* query change

* query rollback

* query change

* query change

* query change

* change frontpage queries

* typings

* query refactor, make `all data sets` link work again

* footer fix

* test endpoint for stats

* fix pagination

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

* partner query tweaks

* switch back market-stats endpoint

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2020-11-14 15:02:54 +01:00
241f6c0df6
markdown render fixes (#239) 2020-11-11 19:00:07 +02:00
a19e7bca04
Default weight change to 70/30 (#211)
* dt weight tests

* update weights

* validation and defaults tweaks
2020-11-10 13:52:02 +01:00
66984a575a
dark mode fixes (#216) 2020-11-05 21:49:31 +01:00