diff --git a/.gitignore b/.gitignore index 9c79f13edd4aa2ed694164a9298ea41ed0ad28c2..af575bd0c5a43d5b39ef3da13f3dc798ebe1704d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,4 @@ node_modules dist package-lock.json src/res/raw -src/plugin_examples/*/ -deploy +src/plugin_examples/*/ \ No newline at end of file diff --git a/deploy/datasets/index.js b/deploy/datasets/index.js index 40ca1dee52076d95a69c12ec808ad18acb964ed0..7bc9333b68fd051ed6d73b508a9cd3667e0fccf5 100644 --- a/deploy/datasets/index.js +++ b/deploy/datasets/index.js @@ -13,9 +13,11 @@ datasetsRouter.use((req, res, next) => { datasetsRouter.get('/templateName/:templateName', (req, res, next) => { const { templateName } = req.params - getDatasets({ templateName }) + const { user } = req + getDatasets({ templateName, user }) .then(ds => { - res.status(200).send(JSON.stringify(ds)) + const data = JSON.stringify(ds) + res.status(200).send(data) }) .catch(error => { next({ diff --git a/deploy/datasets/query.js b/deploy/datasets/query.js index 504bc635a3830bc59fcd3f986bd536dc828b2a7b..edf455b9b559b31b376010be9b2c16e92f1d3a79 100644 --- a/deploy/datasets/query.js +++ b/deploy/datasets/query.js @@ -22,7 +22,6 @@ const fetchDatasetFromKg = (arg) => new Promise((resolve, reject) => { if (resp.statusCode >= 400) return reject(resp.statusCode) const json = JSON.parse(body) - console.log('fetch dataset form kg', json) return resolve(json) }) }) @@ -103,12 +102,8 @@ const filterByPRs = (prs, atlasPr) => atlasPr : false const filter = (datasets, {templateName, parcellationName}) => datasets.filter(ds => { - const datasetRS = datasets.filter(ds => ds.referenceSpaces.length > 0).map(ds => ds.referenceSpaces.map(rs => rs.name).join(' -- ')) - console.log('filtering process', {datasetRS, templateName, parcellationName}) if (templateName) { - return templateName === 'undefined' - ? ds.referenceSpaces.length === 0 - : ds.referenceSpaces.some(rs => rs.name === templateName) + return ds.referenceSpaces.some(rs => rs.name === templateName) } if (parcellationName) { return ds.parcellationRegion.length > 0 @@ -138,6 +133,4 @@ exports.init = () => fetchDatasetFromKg() exports.getDatasets = ({ templateName, parcellationName, user }) => getDs({ user }) .then(json => filter(json, {templateName, parcellationName})) - .then(json => (console.log(json), json)) -