Merge pull request #249 from HumanBrainProject/bugfix/previewingArea44ReceptorData

bugfix: preview area 44 receptor data

deploy/datasets/query.js

@@ -137,7 +137,8 @@ readConfigFile('waxholmRatV2_0.json')
 const filterByPRs = (prs, atlasPr) => atlasPr
   ? prs.some(pr => {
       const regex = new RegExp(pr.name.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'), 'i')
-      return atlasPr.some(aPr => regex.test(aPr.name))
+      return atlasPr.some(aPr => regex.test(aPr.name)
+        || aPr.synonyms && aPr.synonyms.length && aPr.synonyms.some(syn => syn === pr.name) )
     })
   : false
 

src/res/ext/MNI152.json

@@ -2901,6 +2901,10 @@
                                 74,
                                 75
                               ],
+                              "synonyms":[
+                                "Area 44v",
+                                "Area 44d"
+                              ],
                               "labelIndex": 2,
                               "ngId": "jubrain v17 left",
                               "children": [],
@@ -2917,6 +2921,10 @@
                                 74,
                                 75
                               ],
+                              "synonyms":[
+                                "Area 44v",
+                                "Area 44d"
+                              ],
                               "ngId": "jubrain v17 right",
                               "labelIndex": 2,
                               "children": [],

src/res/ext/colin.json

@@ -2901,7 +2901,12 @@
                                 74,
                                 75
                               ],
+                              "synonyms":[
+                                "Area 44v",
+                                "Area 44d"
+                              ],
                               "labelIndex": 2,
+                              
                               "ngId": "jubrain colin v17 left",
                               "children": [],
                               "position": [
@@ -2917,6 +2922,10 @@
                                 74,
                                 75
                               ],
+                              "synonyms":[
+                                "Area 44v",
+                                "Area 44d"
+                              ],
                               "ngId": "jubrain colin v17 right",
                               "labelIndex": 2,
                               "children": [],

src/ui/databrowserModule/databrowser/databrowser.component.ts

@@ -74,7 +74,6 @@ export class DataBrowser implements OnDestroy,OnInit{
     this.dbService.getDataByRegion({ regions, parcellation, template })
       .then(de => {
         this.dataentries = de
-        this.fetchingFlag = false
         return de
       })
       .then(this.dbService.getModalityFromDE)
@@ -83,9 +82,11 @@ export class DataBrowser implements OnDestroy,OnInit{
       })
       .catch(e => {
         console.error(e)
-        this.fetchingFlag = false
         this.fetchError = true
       })
+      .finally(() => {
+        this.fetchingFlag = false
+      })
 
     this.subscriptions.push(
       merge(

src/ui/databrowserModule/util/filterDataEntriesByRegion.pipe.ts

@@ -34,7 +34,9 @@ export class FilterDataEntriesByRegion implements PipeTransform{
                 /**
                  * TODO replace pseudo id with real uuid
                  */
-                return (r.id && id && r.id === id) || regex.test(r.name)
+                return (r.id && id && r.id === id)
+                  || regex.test(r.name)
+                  || r.synonyms && r.synonyms.length && r.synonyms.some(syn => syn === name) 
                 /**
                  * more correct, but probably should use UUID in the future
                  */