Dropping nationalities without labels from enum clientside. Refs #191

SciencesPo · Jan 23, 2017 · 14c99a3 · 14c99a3
1 parent 7273d1e
commit 14c99a3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/client/src/app/fields/isari-multi-select/isari-multi-select.component.ts b/client/src/app/fields/isari-multi-select/isari-multi-select.component.ts
@@ -162,7 +162,12 @@ export class IsariMultiSelectComponent implements OnInit {
   }
 
   private findOption(item) {
-    return this.options.find(option => (option.value && option.value === item.value) || (option.id && option.id === item.id));
+    return this.options.find(option => {
+      return (
+        (option.value && option.value === item.value) ||
+        (option.id && option.id === item.id)
+      );
+    });
   }
 
   private setExtend() {

diff --git a/client/src/app/isari-data.service.ts b/client/src/app/isari-data.service.ts
@@ -562,7 +562,20 @@ export class IsariDataService {
     }
 
     const url = `${this.enumUrl}/${src}`;
-    let $enum = this.http.get(url).map(response => response.json())
+    let $enum = this.http.get(url)
+      .map(response => {
+        let json = response.json();
+
+        // NOTE: this is a dirty special case for nationalities.
+        // Might be generic one day...
+        if (src === 'nationalities') {
+          json = json.filter(item => {
+            return !!item.label.fr;
+          });
+        }
+
+        return json;
+      })
       .publishReplay(1)
       .refCount();
     this.enumsCache[src] = $enum;