From 0ccd375738d3f51d23a66f9e0576a0f3b412a6fd Mon Sep 17 00:00:00 2001 From: Andrea Armanni Date: Wed, 7 Dec 2022 12:24:40 +0000 Subject: [PATCH 1/5] Fix #1809 - C2D text update: proposal (#1820) * C2D text update: proposal As suggested by Veronica and Roberto, proposing to update the C2D alert in the publish flow to have a softer connotation. Requesting review/opinions to the OM team * Update content/site.json Co-authored-by: Jamie Hewitt --- content/site.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/site.json b/content/site.json index 3e3378201..8772ac20c 100644 --- a/content/site.json +++ b/content/site.json @@ -16,6 +16,6 @@ ], "announcement": "[Lock your OCEAN](https://df.oceandao.org/) to get veOCEAN, earn rewards and curate data.", "warning": { - "ctd": "Compute-to-Data is still in a testing phase, please use it only on test networks." + "ctd": "Please note that Compute-to-Data is still in alpha phase." } } From 80c0748dba0ce326cbf68d49c729e57857e9f961 Mon Sep 17 00:00:00 2001 From: Jamie Hewitt Date: Thu, 8 Dec 2022 14:35:31 +0300 Subject: [PATCH 2/5] Updating readme instructions to include prerequisites (#1824) * Updating readme instructions to include prerequisites * Updating text --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 39e4dcf4d..92674441e 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,12 @@ The app is a React app built with [Next.js](https://nextjs.org) + TypeScript + CSS modules and will connect to Ocean remote components by default. +Prerequisites: + +- [Node.js](https://nodejs.org/en/) (required). Check the [.nvmrc](.nvmrc) file to make sure you are using the correct version of Node.js. +- [nvm](https://github.com/nvm-sh/nvm) (recommended). This is the recommend way to manage Node.js versions. +- [Git](https://git-scm.com/) is required to follow the instructions below. + To start local development: ```bash From 79cee02271f45ebfac26f23bb91101372b8e0772 Mon Sep 17 00:00:00 2001 From: EnzoVezzaro Date: Thu, 8 Dec 2022 09:04:24 -0400 Subject: [PATCH 3/5] fix file object on edit (#1818) --- src/components/Asset/Edit/EditMetadata.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/Asset/Edit/EditMetadata.tsx b/src/components/Asset/Edit/EditMetadata.tsx index 0e71e429e..d7de68248 100644 --- a/src/components/Asset/Edit/EditMetadata.tsx +++ b/src/components/Asset/Edit/EditMetadata.tsx @@ -117,7 +117,11 @@ export default function Edit({ { type: values.files[0].type, index: 0, - url: values.files[0].url, + [values.files[0].type === 'ipfs' + ? 'hash' + : values.files[0].type === 'arweave' + ? 'transactionId' + : 'url']: values.files[0].url, method: 'GET' } ] From 025701a4fcde2db6cf8d1ba7d2627611d563e699 Mon Sep 17 00:00:00 2001 From: mihaisc Date: Fri, 9 Dec 2022 10:22:40 +0200 Subject: [PATCH 4/5] update for new subgraph release (#1821) * update query * undo hardcode --- src/components/Asset/AssetContent/EditHistory.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Asset/AssetContent/EditHistory.tsx b/src/components/Asset/AssetContent/EditHistory.tsx index 59d0172db..e6c7bcdcb 100644 --- a/src/components/Asset/AssetContent/EditHistory.tsx +++ b/src/components/Asset/AssetContent/EditHistory.tsx @@ -17,7 +17,6 @@ const getReceipts = gql` id nft { address - owner } tx timestamp From 6db159f1cc78d0b2718a9a3792fd50ebe80a5c18 Mon Sep 17 00:00:00 2001 From: mihaisc Date: Tue, 13 Dec 2022 11:42:56 +0200 Subject: [PATCH 5/5] Fix filters (#1830) * fix filters * add chainid, fix test --- src/@types/aquarius/SearchQuery.ts | 1 + src/@utils/aquarius/index.test.ts | 2 +- src/@utils/aquarius/index.ts | 45 +++++++++++++----------------- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/@types/aquarius/SearchQuery.ts b/src/@types/aquarius/SearchQuery.ts index 026adbcfd..9dbabc564 100644 --- a/src/@types/aquarius/SearchQuery.ts +++ b/src/@types/aquarius/SearchQuery.ts @@ -46,6 +46,7 @@ declare global { // eslint-disable-next-line @typescript-eslint/no-explicit-any query: any sort?: { [jsonPath: string]: SortDirectionOptions } + // eslint-disable-next-line @typescript-eslint/no-explicit-any aggs?: any } } diff --git a/src/@utils/aquarius/index.test.ts b/src/@utils/aquarius/index.test.ts index e9d646de9..97a8446cb 100644 --- a/src/@utils/aquarius/index.test.ts +++ b/src/@utils/aquarius/index.test.ts @@ -9,8 +9,8 @@ const defaultBaseQueryReturn = { query: { bool: { filter: [ - { terms: { chainId: [1, 3] } }, { term: { _index: 'aquarius' } }, + { terms: { chainId: [1, 3] } }, { term: { 'purgatory.state': false } }, { bool: { must_not: [{ term: { 'nft.state': 5 } }] } } ] diff --git a/src/@utils/aquarius/index.ts b/src/@utils/aquarius/index.ts index 070037fcc..480e5506f 100644 --- a/src/@utils/aquarius/index.ts +++ b/src/@utils/aquarius/index.ts @@ -42,6 +42,24 @@ export function getFilterTerm( export function generateBaseQuery( baseQueryParams: BaseQueryParams ): SearchQuery { + const filters: unknown[] = [getFilterTerm('_index', 'aquarius')] + baseQueryParams.filters && filters.push(...baseQueryParams.filters) + baseQueryParams.chainIds && + filters.push(getFilterTerm('chainId', baseQueryParams.chainIds)) + !baseQueryParams.ignorePurgatory && + filters.push(getFilterTerm('purgatory.state', false)) + !baseQueryParams.ignoreState && + filters.push({ + bool: { + must_not: [ + { + term: { + 'nft.state': 5 + } + } + ] + } + }) const generatedQuery = { from: baseQueryParams.esPaginationOptions?.from || 0, size: @@ -51,31 +69,7 @@ export function generateBaseQuery( query: { bool: { ...baseQueryParams.nestedQuery, - filter: [ - ...(baseQueryParams.filters || []), - baseQueryParams.chainIds - ? getFilterTerm('chainId', baseQueryParams.chainIds) - : [], - getFilterTerm('_index', 'aquarius'), - ...(baseQueryParams.ignorePurgatory - ? [] - : [getFilterTerm('purgatory.state', false)]), - ...(baseQueryParams.ignoreState - ? [] - : [ - { - bool: { - must_not: [ - { - term: { - 'nft.state': 5 - } - } - ] - } - } - ]) - ] + filter: filters } } } as SearchQuery @@ -90,7 +84,6 @@ export function generateBaseQuery( baseQueryParams.sortOptions.sortDirection || SortDirectionOptions.Descending } - return generatedQuery }