diff --git a/deploy/datasets/query.js b/deploy/datasets/query.js index 5d2cd3d29e2b226dbcf2e8ffc742b383e847f47d..65087477e59b9e1aba25695cc5e333d1fa959047 100644 --- a/deploy/datasets/query.js +++ b/deploy/datasets/query.js @@ -63,7 +63,12 @@ const flattenArray = (array) => { } const readConfigFile = (filename) => new Promise((resolve, reject) => { - const filepath = path.join(__dirname, '..', 'res', filename) + let filepath + if (process.env.NODE_ENV === 'production') { + filepath = path.join(__dirname, '..', 'res', filename) + } else { + filepath = path.join(__dirname, '..', '..', 'src', 'res', 'ext', filename) + } fs.readFile(filepath, 'utf-8', (err, data) => { if(err) reject(err) resolve(data) diff --git a/deploy/templates/query.js b/deploy/templates/query.js index 485e71c5726084526a16321caeb3d1b60dfdb95f..1ecebe476dce91c21819342ad6031f46643b1db8 100644 --- a/deploy/templates/query.js +++ b/deploy/templates/query.js @@ -18,9 +18,13 @@ exports.getAllTemplates = () => new Promise((resolve, reject) => { }) exports.getTemplate = (template) => new Promise((resolve, reject) => { - - const filePath = path.join(__dirname, '..', 'res', `${template}.json`) - fs.readFile(filePath, 'utf-8', (err, data) => { + let filepath + if (process.env.NODE_ENV === 'production') { + filepath = path.join(__dirname, '..', 'res', `${template}.json`) + } else { + filepath = path.join(__dirname, '..', '..', 'src', 'res', 'ext', `${template}.json`) + } + fs.readFile(filepath, 'utf-8', (err, data) => { if (err) reject(err) resolve(data) }) diff --git a/src/ui/databrowser/databrowser.component.ts b/src/ui/databrowser/databrowser.component.ts index aa889e93b111861b12ee659466452047d9653cec..a06d6456d505f4bc586221db66e1caaff07f30f0 100644 --- a/src/ui/databrowser/databrowser.component.ts +++ b/src/ui/databrowser/databrowser.component.ts @@ -146,7 +146,10 @@ export class DataBrowserUI implements OnDestroy,OnInit{ this.subscriptions.push(this.metadataMap$.subscribe(map=>(this.metadataMap = map))) - this.subscriptions.push(this.fetchedDataEntries$.subscribe(arr=>(this.dataEntries = arr))) + this.subscriptions.push(this.fetchedDataEntries$.subscribe(arr=>{ + console.log('arr', arr) + this.dataEntries = arr + })) this.subscriptions.push(this.selectParcellation$.subscribe(parcellation=> this.handleParcellationSelection(parcellation.regions))) diff --git a/src/util/pipes/filterDataEntriesByType.pipe.ts b/src/util/pipes/filterDataEntriesByType.pipe.ts index 0bc735f3cfffbd24babd23e43457318873c9f109..0e61d49a51239d0fb625d63c15724bdfd4023141 100644 --- a/src/util/pipes/filterDataEntriesByType.pipe.ts +++ b/src/util/pipes/filterDataEntriesByType.pipe.ts @@ -8,6 +8,8 @@ import { DataEntry } from "../../services/stateStore.service"; export class FilterDataEntriesbyType implements PipeTransform{ public transform(dataEntries:DataEntry[],showDataType:Set<string>):DataEntry[]{ - return dataEntries.filter(dataEntry=>dataEntry.formats.some(format => showDataType.has(format))) + return showDataType.size > 0 + ? dataEntries.filter(dataEntry=>dataEntry.formats.some(format => showDataType.has(format))) + : dataEntries } } \ No newline at end of file