Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Features-alignment #51

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
90b41c7
restore error check on input (#1989)
EnzoVezzaro Nov 2, 2023
8c886e7
Updating remark packages (#1997)
jamiehewitt15 Nov 9, 2023
a2ce8e4
remove graphql query for accessDetails as it is return by aquarius (#…
EnzoVezzaro Nov 10, 2023
ef5b236
Added normalize url function to check the endpoint (#2000)
LoznianuAnamaria Nov 10, 2023
908acb1
remove provider url from check error method (#1992)
EnzoVezzaro Nov 14, 2023
b5b3137
Updating validation so that node or python images can be selected (#2…
jamiehewitt15 Nov 14, 2023
f39ddf9
Only validating custom parameters if algorithm has been selected (#2005)
jamiehewitt15 Nov 14, 2023
4ced71c
simple fix, a lot of debugging :-( (#1993)
EnzoVezzaro Nov 15, 2023
c575fde
feat: add saas service type (#477)
LucaMilanese90 Nov 17, 2023
37f8fa6
feat: update saas success access message (#479)
LucaMilanese90 Nov 20, 2023
5dbbd27
Merge pull request #478 from deltaDAO/development
moritzkirstein Nov 20, 2023
338d34d
fix: query (#480)
LucaMilanese90 Nov 21, 2023
8e19c33
Merge pull request #481 from deltaDAO/development
moritzkirstein Nov 21, 2023
4c8a410
fix: whitelist query address addition
LucaMilanese90 Nov 21, 2023
8ae7799
Merge pull request #482 from deltaDAO/fix/address-whitelisting
moritzkirstein Nov 21, 2023
289accb
feat: add T&C checkbox to download asset actions
LucaMilanese90 Nov 24, 2023
68f67a0
fix: consumer parameters form alignment in download asset actions
LucaMilanese90 Nov 24, 2023
2eb1cd0
Merge remote-tracking branch 'pontus/main' into features-alignment
LucaMilanese90 Nov 28, 2023
ecd28c7
Merge remote-tracking branch 'ocean/main' into features-alignment
LucaMilanese90 Nov 28, 2023
2497f2c
Merge pull request #484 from deltaDAO/features-alignment
moritzkirstein Nov 29, 2023
e46eae7
Merge pull request #483 from deltaDAO/feat/terms-checkbox
moritzkirstein Nov 29, 2023
d1ea636
chore: update package-lock
LucaMilanese90 Nov 29, 2023
e2a49f6
Merge pull request #486 from deltaDAO/fix/test
moritzkirstein Nov 29, 2023
c92d901
Merge pull request #485 from deltaDAO/development
moritzkirstein Nov 29, 2023
2765f65
Merge remote-tracking branch 'pontus/main' into features-alignment
LucaMilanese90 Nov 29, 2023
6c2c2f3
chore: update package-lock
LucaMilanese90 Nov 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/@utils/aquarius/index.test.ts
Original file line number Diff line number Diff line change
@@ -33,12 +33,15 @@ const defaultBaseQueryReturn: SearchQuery = {

// add whitelist filtering
if (getWhitelistShould()?.length > 0) {
defaultBaseQueryReturn.query.bool.must.push({
const whitelistQuery = {
bool: {
should: [...getWhitelistShould()],
minimum_should_match: 1
}
})
}
Object.hasOwn(defaultBaseQueryReturn.query.bool, 'must')
? defaultBaseQueryReturn.query.bool.must.push(whitelistQuery)
: (defaultBaseQueryReturn.query.bool.must = [whitelistQuery])
}

describe('@utils/aquarius', () => {
7 changes: 5 additions & 2 deletions src/@utils/aquarius/index.ts
Original file line number Diff line number Diff line change
@@ -166,12 +166,15 @@ export function generateBaseQuery(

// add whitelist filtering
if (getWhitelistShould()?.length > 0) {
generatedQuery.query.bool.must.push({
const whitelistQuery = {
bool: {
should: [...getWhitelistShould()],
minimum_should_match: 1
}
})
}
Object.hasOwn(generatedQuery.query.bool, 'must')
? generatedQuery.query.bool.must.push(whitelistQuery)
: (generatedQuery.query.bool.must = [whitelistQuery])
}

// if the selected type filter includes both algo and saas, we need to inject the