oceanprotocol
/
market
mirror of https://github.com/oceanprotocol/market.git
1
0
Fork 0
Code Releases Activity
2,090 Commits 39 Branches 5 Tags 60 MiB
Commit Graph

2090 Commits

Author SHA1 Message Date
mihaisc 131f1f15e3
Change datatoken template and ensure compatibility with both (#1728) 
* change template

* fix build

* add template config

* test fixes

* Update app.config.js

Co-authored-by: Alex Coseru <alex.coseru@gmail.com>

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Alex Coseru <alex.coseru@gmail.com>
 2022-11-15 16:35:26 +02:00
EnzoVezzaro 8225775828
Merge pull request #1487 from oceanprotocol/fix/issue-1069-c2d-unsupported-networks 
allow price calculation when users are on unsupported network / not connected
 2022-11-15 05:58:40 -04:00
EnzoVezzaro 072d346932 Revert "fix text and added ipfs and arweave tests" 
This reverts commit 23d8002ce8.
 2022-11-14 12:18:35 -04:00
EnzoVezzaro 23d8002ce8 fix text and added ipfs and arweave tests 2022-11-14 12:17:29 -04:00
EnzoVezzaro 1649e075e2 Merge branch 'main' into fix/issue-1069-c2d-unsupported-networks 2022-11-14 11:47:44 -04:00
mihaisc 6ba95fe4d5
fix loading in preview (#1785) 2022-11-11 12:27:30 +00:00
Jamie Hewitt 4ff84b0871
Handle provider error & showing Retry button (#1770) 
* adding error handling for button onCLick

* Updating butoon to show retry & updating toast message

* Logging provider error

* Removing unused imports

* Using early return when provider fees are present to prevent unneccessary nesting

* Adding retry logic for compute

* Removing duplicate teast message

* Adding tests for rendering Buy button

* Additional tests for BuyButton

* Refactoring BuyButton tests for download

* Fix failing tests

* Refactoring compute tests

* Refactoring tests

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
 2022-11-11 12:54:21 +03:00
Matthias Kretschmann 4b4a926f89
special veOCEAN number treatment (#1782) 
* special veOCEAN number treatment

* path fix

* fix duplicate AllLocked declarations

* so many duplicate declarations

* bold numbers on asset teasers

* update test

* unify number formatting in more generic `formatNumber()` method
 2022-11-09 14:14:57 +00:00
Matthias Kretschmann b99634a3b3
filter out `className` from `Tippy` (#1783) 2022-11-09 12:23:26 +00:00
Matthias Kretschmann 482af1be0c
NFT image & faulty metadata fixes (#1779) 
* safeguard against faults in metadata.tags

* properly handle image strings in tokenURI

* keep image ratios

* render test for faulty tags

* tweak fallback in popover
 2022-11-09 12:22:30 +00:00
dependabot[bot] ee4e5c3b4d
Bump loader-utils from 1.4.0 to 1.4.1 (#1780) 
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-09 09:02:18 +00:00
mihaisc c302122795
Add most viewed (#1754) 
* add most viewed

* Update src/components/Home/index.tsx

Co-authored-by: Jamie Hewitt <jamie.hewitt15@gmail.com>

* add views in teasers

* typo

* add test

* switch to axios

* test tweaks

* fix

* add 30 days label

Co-authored-by: Jamie Hewitt <jamie.hewitt15@gmail.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
 2022-11-08 17:17:22 +00:00
EnzoVezzaro 8363b9f2bb fix tests 2022-11-08 05:25:01 -04:00
EnzoVezzaro 606a32065c Merge branch 'main' into fix/issue-1069-c2d-unsupported-networks 2022-11-08 05:15:39 -04:00
Jamie Hewitt 81341cd914
Showing related assets (#1748) 
* Creating related assets component

* Ensuring that related assets doesn't show the same asset

* Adjusting query to show assets from the same publisher but not the exact same asset

* modifying search term

* Removing logs and unused import

* Removing log

* Updating query

* Fixes

* updating query

* Updating query to include both related tag assets anbd related owner assests when <3. SHowing results as a list of links

* creating minimal asset teaser

* removing duplicate filters

* Changing minimal to noDescription

* Removing unneccessary use of noDescription prop

* Adding minimal prop back into Publisher

* Removing props from RelatedAssets component

* Getting data from asset context

* refactor

* space-saving asset teaser changes
* remove price from output
* increase to 4
* refactor for better loading experience

* css cleanup

* filter out duplicates when merging results

* basic render test

* try/catch, secure against null query responses

* different test tactic

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
 2022-11-07 20:09:19 +00:00
Bogdan Fazakas 124fd1d137
Fix compute asset selection lists (#1773) 
* fix compute asset selction lists

* Update src/@utils/assetConvertor.ts

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>

* use propper const

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
 2022-11-07 12:07:42 +00:00
Matthias Kretschmann 56f5e77c49
Tests for @shared components (#1737) 
* asset teaser test, story, useUserPreferences Jest mock

* fixtures & mocks

* more tests

* cleanup

* more tests

* more tests

* more tests

* more tests

* typing fix

* package updates

* reorg

* more tests

* more tests

* more tests

* more tests

* reorg, more tests

* reorg fixes

* more tests

* rebase fix

* subgraph query typing fix

* restore some storybook stories

* more tests

* more tests

* package lock fix

* graphql override
 2022-11-04 15:52:40 +02:00
EnzoVezzaro 49960f38e0 cleanup after merge 2022-11-04 07:16:06 -04:00
EnzoVezzaro 983d460614 Merge branch 'main' into fix/issue-1069-c2d-unsupported-networks 2022-11-04 06:49:33 -04:00
Jamie Hewitt a042387804
Ensuring the market doesn't crash when asset has no services (#1768) 
* Ensuring the market doesn't crash when asset has no services

* Showing no pricing schema available when there are no services for an asset

* Shoing No file info available when there are no services available

* removing logs

* early return if asset has no services
 2022-11-02 15:40:55 +00:00
Bogdan Fazakas c780411b74
C2D fixes (#1715) 2022-11-02 15:24:20 +00:00
Jamie Hewitt d1e3fa9afa
Checking for google drive links (#1757) 
* checking for google drive links

* Removing unused function

* Update src/components/Publish/_validation.ts

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>

* CHecking for google drive URLs on the edit form

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
 2022-11-01 15:00:07 +00:00
dependabot[bot] 6d0ce2d708
Bump @storybook/react from 6.5.12 to 6.5.13 (#1760) 
Bumps [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/app/react) from 6.5.12 to 6.5.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.13/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.13/app/react)

---
updated-dependencies:
- dependency-name: "@storybook/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-01 13:28:56 +02:00
Jamie Hewitt 0df5440b06
Simplifying comparison (#1758) 2022-11-01 12:54:42 +02:00
dependabot[bot] f53b77fc65
Bump axios from 0.27.2 to 1.1.3 (#1761) 
Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.1.3.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.27.2...v1.1.3)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-01 12:52:59 +02:00
dependabot[bot] dc8b95abac
Bump jest-environment-jsdom from 29.0.3 to 29.2.2 (#1762) 
Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.0.3 to 29.2.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.2.2/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-01 12:52:26 +02:00
dependabot[bot] bbcadb7367
Bump @svgr/webpack from 6.3.1 to 6.5.1 (#1763) 
Bumps [@svgr/webpack](https://github.com/gregberge/svgr) from 6.3.1 to 6.5.1.
- [Release notes](https://github.com/gregberge/svgr/releases)
- [Changelog](https://github.com/gregberge/svgr/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gregberge/svgr/compare/v6.3.1...v6.5.1)

---
updated-dependencies:
- dependency-name: "@svgr/webpack"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-01 12:51:56 +02:00
dependabot[bot] 16ed80e3db
Bump @storybook/manager-webpack5 from 6.5.12 to 6.5.13 (#1764) 
Bumps [@storybook/manager-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.5.12 to 6.5.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.13/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.13/lib/core)

---
updated-dependencies:
- dependency-name: "@storybook/manager-webpack5"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-01 12:51:21 +02:00
mihaisc 972f6a092f
remove moonbase (#1756) 2022-10-31 13:08:38 +02:00
EnzoVezzaro 589963e368 fix connection and networks calculations 2022-10-26 08:25:52 -04:00
mihaisc 5c02da8597
ignore assets with state 5 (#1749) 
* ignore assets with state 5

* hide in profile for other users

* fix display on own account

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
 2022-10-26 09:45:20 +01:00
mihaisc 51b167fb14
update ocean.js to v2.4.0 (#1751) 2022-10-25 10:16:28 +01:00
EnzoVezzaro 508d615855
Merge pull request #1655 from oceanprotocol/feature/issue-1244-edit-ui 
adding UI for field files / links in edit form
 2022-10-25 05:03:48 -04:00
EnzoVezzaro 8c88d512bf adding check on priceDataset 2022-10-20 08:17:52 -04:00
EnzoVezzaro d88b4c9d5d fix code after prev merge 2022-10-20 08:17:36 -04:00
EnzoVezzaro 120af82e18 cleanup subgraph.ts code 2022-10-20 08:16:37 -04:00
EnzoVezzaro ff06d91898 remove unnecessary type def 2022-10-20 08:16:14 -04:00
EnzoVezzaro 2fb9fb2c63 fix total sum order on compute 2022-10-19 10:00:23 -04:00
EnzoVezzaro bbd391ddfe fix valid order tx and algo tx 2022-10-19 09:47:04 -04:00
EnzoVezzaro 5819c25015 Revert "remove previous orders from price calculation in compute" 
This reverts commit 504840a2d3.
 2022-10-19 09:06:34 -04:00
mihaisc af93b561ad
Disable ordering when state is 4 (#1746) 
* fix state 4

* update var name

* fix typo
 2022-10-19 13:53:24 +01:00
EnzoVezzaro 504840a2d3 remove previous orders from price calculation in compute 2022-10-19 08:48:36 -04:00
EnzoVezzaro 16d7077c9f Merge branch 'main' into feature/issue-1244-edit-ui-links-validation 2022-10-19 07:03:39 -04:00
EnzoVezzaro 7b13f84a7f removed unnecessary required 2022-10-19 06:59:21 -04:00
EnzoVezzaro 8844e82c75 Merge branch 'main' into fix/issue-1069-c2d-unsupported-networks 2022-10-19 06:16:32 -04:00
EnzoVezzaro 7fef77afef fix web3 connection for unsupported assets price 2022-10-19 06:14:15 -04:00
mihaisc 67621f5639
Various veOCEAN features (#1743) 
* change top message, fixes, allocations

* lock ocean tooltip

* asset stats tweaks

* front page allocations refactor

* wording, run empty table messages through markdown

* footer stats tweaks

* profile tinkering

* fix allocations in table

* Tweak lock action logic

* fix allocation 0

* sort by allocation

* search ordering fixes

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
 2022-10-17 15:56:03 +01:00
EnzoVezzaro 52a69a1e37 refactor default values (files / links) edit form 2022-10-17 09:41:39 -04:00
mihaisc 2fb4ee01c4
update ocean.js (#1745) 2022-10-17 14:11:51 +03:00
EnzoVezzaro 9ef93f5059 catch and cancelled queries from unsupported networks 2022-10-14 06:51:19 -04:00