diff --git a/deploy/datasets/util.js b/deploy/datasets/util.js index bcf51667018f507090276493ebeb101559f6b7a5..2b8e7c7ad68c54e60efac8625e3afc41671f2e46 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 081c106c2ca58c97bbeb99f8b4009d5382f2901b..a84b78208f395922cf9389954420bfd62f0409e0 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 bd0d5fa5d3355e03ed1e254e30bb186b278483e9..7559f8b632c9f9a6a4578e080b03a857b67acab8 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