From 2b3f9c7ae038c0f4b3dbbd2eec6189e27e72f588 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 13 Sep 2022 16:28:56 +0200
Subject: [PATCH] Update filtering in client

---
 .../components/instruments/FilterEntry.vue    | 10 +---
 .../components/instruments/FilterGroup.vue    | 12 ++--
 .../instruments/InstrumentEntry.vue           | 10 +++-
 .../instruments/InstrumentFilter.vue          | 56 +++----------------
 .../gql/queries/instrumentCategoriesQuery.gql | 17 ++++++
 client/src/helpers/instrumentType.js          |  2 +-
 client/src/pages/instrumentOverview.vue       |  6 +-
 7 files changed, 49 insertions(+), 64 deletions(-)
 create mode 100644 client/src/graphql/gql/queries/instrumentCategoriesQuery.gql

diff --git a/client/src/components/instruments/FilterEntry.vue b/client/src/components/instruments/FilterEntry.vue
index 1226bb46..4d3ef067 100644
--- a/client/src/components/instruments/FilterEntry.vue
+++ b/client/src/components/instruments/FilterEntry.vue
@@ -12,7 +12,6 @@
 </template>
 
 <script>
-  import {INTERDISCIPLINARY, LANGUAGE_COMMUNICATION, SOCIETY} from '@/consts/instrument.consts';
   import INSTRUMENT_FILTER_QUERY from 'gql/local/instrumentFilter.gql';
   const ChevronRight = () => import(/* webpackChunkName: "icons" */'@/components/icons/ChevronRight');
 
@@ -22,7 +21,7 @@
         type: String,
         required: true,
       },
-      type: {
+      id: {
         type: String,
         default: '',
       },
@@ -31,8 +30,8 @@
         default: false,
       },
       category: {
-        type: String,
-        default: '',
+        type: Object,
+        default: () => {},
       },
     },
 
@@ -65,9 +64,6 @@
       },
       typeClass() {
         return {
-          'filter-entry--language-communication': this.category === LANGUAGE_COMMUNICATION,
-          'filter-entry--society': this.category === SOCIETY,
-          'filter-entry--interdisciplinary': this.category === INTERDISCIPLINARY,
           'filter-entry--active': this.isActive,
           'filter-entry--category': this.isCategory,
         };
diff --git a/client/src/components/instruments/FilterGroup.vue b/client/src/components/instruments/FilterGroup.vue
index c767aec8..413c5b83 100644
--- a/client/src/components/instruments/FilterGroup.vue
+++ b/client/src/components/instruments/FilterGroup.vue
@@ -3,20 +3,20 @@
     <filter-entry
       :text="title"
       v-bind="$attrs"
-      :type="category"
       :category="category"
       :is-category="true"
-      @click.native="setCategoryFilter(category)"
+      :id="category.id"
+      @click.native="setCategoryFilter(category.id)"
     />
     <div class="filter-group__children">
       <filter-entry
         :data-cy="`filter-${type.type}`"
         :category="type.category"
         :text="type.name"
-        :type="type.type"
         v-for="type in types"
+        :id="type.id"
         :key="type.id"
-        @click.native="setFilter(`type:${type.type}`)"
+        @click.native="setFilter(`type:${type.id}`)"
       />
     </div>
   </div>
@@ -39,8 +39,8 @@
         default: () => [],
       },
       category: {
-        type: String,
-        default: '',
+        type: Object,
+        default: () => ({}),
       },
     },
     components: {
diff --git a/client/src/components/instruments/InstrumentEntry.vue b/client/src/components/instruments/InstrumentEntry.vue
index 64ee5320..091881e1 100644
--- a/client/src/components/instruments/InstrumentEntry.vue
+++ b/client/src/components/instruments/InstrumentEntry.vue
@@ -1,15 +1,21 @@
 <template>
   <div
-    :class="typeClass"
+    :style="{
+      color: instrument.type.category.foreground,
+      backgroundColor: instrument.type.category.background
+    }"
     class="instrument-entry"
   >
     <h4
       class="instrument-entry__category"
+      :style="{color: instrument.type.category.foreground}"
       data-cy="instrument-subheader"
     >
       {{ categoryName }}
     </h4>
-    <h3 class="instrument-entry__title">
+    <h3
+      class="instrument-entry__title"
+    >
       {{ instrument.title }}
     </h3>
   </div>
diff --git a/client/src/components/instruments/InstrumentFilter.vue b/client/src/components/instruments/InstrumentFilter.vue
index c5d197eb..675e4c02 100644
--- a/client/src/components/instruments/InstrumentFilter.vue
+++ b/client/src/components/instruments/InstrumentFilter.vue
@@ -6,72 +6,34 @@
     />
 
     <filter-group
-      :types="languageCommunicationTypes"
-      :category="LANGUAGE_COMMUNICATION"
-      title="Sprache und Kommunikation"
-      data-cy="filter-language-communication"
-      class="instrument-filter__group--language"
-    />
-
-    <filter-group
-      :types="societyTypes"
-      :category="SOCIETY"
-      title="Gesellschaft"
-      data-cy="filter-society"
-    />
-
-    <filter-group
-      :category="INTERDISCIPLINARY"
-      title="Überfachliche Instrumente"
-      data-cy="filter-interdisciplinary"
+      :types="category.types"
+      :category="category"
+      :title="category.name"
+      v-for="category in instrumentCategories"
+      :key="category.id"
     />
   </div>
 </template>
 
 <script>
-  import {INTERDISCIPLINARY, LANGUAGE_COMMUNICATION, SOCIETY} from '@/consts/instrument.consts';
 
   import FilterGroup from '@/components/instruments/FilterGroup';
 
-  import INSTRUMENT_TYPES_QUERY from 'gql/queries/instrumentTypesQuery';
+  import INSTRUMENT_CATEGORIES_QUERY from 'gql/queries/instrumentCategoriesQuery.gql';
 
   export default {
-
     components: {
       FilterGroup,
     },
     data() {
       return {
-        filter: '',
-        LANGUAGE_COMMUNICATION,
-        SOCIETY,
-        INTERDISCIPLINARY,
-        instrumentTypes: [],
+        instrumentCategories: [],
       };
     },
 
-    computed: {
-      languageCommunicationTypes() {
-        return this.instrumentTypes.filter(t => t.category === 'LANGUAGE_COMMUNICATION');
-      },
-      societyTypes() {
-        return this.instrumentTypes.filter(t => t.category === 'SOCIETY');
-      },
-      interdisciplinaryTypes() {
-        return this.instrumentTypes.filter(t => t.category === 'INTERDISCIPLINARY');
-      },
-    },
-
-    methods: {
-      setFilter(filter) {
-        this.filter = filter;
-        this.$emit('filter', filter);
-      }
-    },
-
     apollo: {
-      instrumentTypes: {
-        query: INSTRUMENT_TYPES_QUERY,
+      instrumentCategories: {
+        query: INSTRUMENT_CATEGORIES_QUERY,
       },
     },
   };
diff --git a/client/src/graphql/gql/queries/instrumentCategoriesQuery.gql b/client/src/graphql/gql/queries/instrumentCategoriesQuery.gql
new file mode 100644
index 00000000..99a1225f
--- /dev/null
+++ b/client/src/graphql/gql/queries/instrumentCategoriesQuery.gql
@@ -0,0 +1,17 @@
+query InstrumentTypesQuery {
+  instrumentCategories {
+    name
+    id
+    types {
+      name
+      id
+      type
+      category {
+        id
+        name
+        foreground
+        background
+      }
+    }
+  }
+}
diff --git a/client/src/helpers/instrumentType.js b/client/src/helpers/instrumentType.js
index a4892494..f2562d29 100644
--- a/client/src/helpers/instrumentType.js
+++ b/client/src/helpers/instrumentType.js
@@ -6,7 +6,7 @@ const instrumentType = (instrument) => {
   if (typeof instrument === 'string') {
     category = instrument;
   } else {
-    category = instrument.type.category;
+    return instrument.type.category.name;
   }
   return typeDictionary[category] || '';
 };
diff --git a/client/src/pages/instrumentOverview.vue b/client/src/pages/instrumentOverview.vue
index 21eb7fdf..e93f6041 100644
--- a/client/src/pages/instrumentOverview.vue
+++ b/client/src/pages/instrumentOverview.vue
@@ -48,7 +48,11 @@
           const {currentFilter} = instrumentFilter;
           if (currentFilter && currentFilter.indexOf(':') > -1) {
             const [filterType, identifier] = currentFilter.split(':');
-            this.filter = i => i.type[filterType] === identifier;
+            if(filterType === 'type') {
+              this.filter = i => i.type.id === identifier;
+            } else {
+              this.filter = i => i.type.category.id === identifier;
+            }
           } else {
             this.filter = i => i; // identity
           }