From 70702f3f2622c284a7390e66ace0ea925fc5203d Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Fri, 10 Jan 2020 10:12:40 +0100
Subject: [PATCH] chore update to query api v2
---
deploy/datasets/util.js | 5 ++---
deploy/datasets/util.spec.js | 4 ++--
docs/advanced/datasets.md | 4 ++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/deploy/datasets/util.js b/deploy/datasets/util.js
index bcf516670..2b8e7c7ad 100644
--- a/deploy/datasets/util.js
+++ b/deploy/datasets/util.js
@@ -164,8 +164,7 @@ const getKgId = ({ templateName }) => {
* @param { templateName } template to be queried
*/
const datasetBelongsInTemplate = ({ templateName }) => ({ referenceSpaces }) => {
- if (referenceSpaces.length === 0) return true
- else return referenceSpaces.some(({ name, fullId }) =>
+ return referenceSpaces.some(({ name, fullId }) =>
name === templateName
|| fullId && fullId.includes(getKgId({ templateName })))
}
@@ -232,7 +231,7 @@ const filterDataset = async (dataset = null, { templateName, parcellationName })
const flagDatasetBelongToParcellation = datasetBelongToParcellation({ dataset, parcellationName: overwriteParcellationName || parcellationName })
&& await datasetRegionExistsInParcellationRegion(dataset.parcellationRegion, useSet)
- return flagDatasetBelongToTemplate && flagDatasetBelongToParcellation
+ return flagDatasetBelongToTemplate || flagDatasetBelongToParcellation
}
/**
diff --git a/deploy/datasets/util.spec.js b/deploy/datasets/util.spec.js
index 081c106c2..a84b78208 100644
--- a/deploy/datasets/util.spec.js
+++ b/deploy/datasets/util.spec.js
@@ -72,11 +72,11 @@ describe('datasets/util.js', () => {
}
})
- it('should include datasets without any reference space defined', () => {
+ it('should NOT include datasets without any reference space defined', () => {
for (const ds of humanReceptor) {
const belong = datasetBelongsInTemplate({ templateName: 'Big Brain (Histology)' })(ds)
- expect(belong).to.be.true
+ expect(belong).to.be.false
}
})
diff --git a/docs/advanced/datasets.md b/docs/advanced/datasets.md
index bd0d5fa5d..7559f8b63 100644
--- a/docs/advanced/datasets.md
+++ b/docs/advanced/datasets.md
@@ -66,7 +66,7 @@ Then datasets which have *`Mus musculus`* as one of its species described above
The datasets are then filtered based on the selected template space and parcellation atlas.
-The dataset must satisfy both conditionals.
+The dataset may satisfy either conditionals to be presented to the user.
### Template space
@@ -100,7 +100,7 @@ The dataset is considered relevant (returns true for this conditional) if the st
| MNI Colin 27 | minds/core/dataset/v1.0.0/7f39f7be-445b-47c0-9791-e971c0b6d992 |
!!! important
- If the dataset does not have any reference spaces defined, it is considered relevant for any template space, and will return `true` for this conditional.
+ If the dataset does not have any reference spaces defined, it is considered NOT relevant for any template space, and will return `false` for this conditional.
### Parcellation atlas
--
GitLab