From fb8991d0ef39736f7cc8b4cd781c35289ea2a780 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Fri, 22 Mar 2019 12:08:01 +0100
Subject: [PATCH] bugfix: emtpy dataformat will not filter
---
deploy/datasets/query.js | 7 ++++++-
deploy/templates/query.js | 10 +++++++---
src/ui/databrowser/databrowser.component.ts | 5 ++++-
src/util/pipes/filterDataEntriesByType.pipe.ts | 4 +++-
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/deploy/datasets/query.js b/deploy/datasets/query.js
index 5d2cd3d29..65087477e 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 485e71c57..1ecebe476 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 aa889e93b..a06d6456d 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 0bc735f3c..0e61d49a5 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
--
GitLab