From b24c5419f1a79b48d38fba73e096945b49c8228a Mon Sep 17 00:00:00 2001
From: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Tue, 29 Aug 2023 15:53:36 +0200
Subject: [PATCH] Add module Filter category or level == null -> belongs to all

---
 client/src/components/instruments/FilterBar.vue | 2 +-
 client/src/components/modules/ModuleFilter.vue  | 4 ++--
 client/src/pages/instrumentOverview.vue         | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/client/src/components/instruments/FilterBar.vue b/client/src/components/instruments/FilterBar.vue
index 62865dd8..c8d05a3c 100644
--- a/client/src/components/instruments/FilterBar.vue
+++ b/client/src/components/instruments/FilterBar.vue
@@ -44,7 +44,7 @@ onMounted(() => {
 
   &__input-wrapper {
     position: relative;
-    width: 400px;
+    width: 380px; // With from modules, has nothing to do with it but at least it is the same width
     max-width: 500px;
   }
 
diff --git a/client/src/components/modules/ModuleFilter.vue b/client/src/components/modules/ModuleFilter.vue
index 72f5b6f2..cb2697d0 100644
--- a/client/src/components/modules/ModuleFilter.vue
+++ b/client/src/components/modules/ModuleFilter.vue
@@ -113,11 +113,11 @@ const updateLevel = (level: ModuleLevelNode) => {
 };
 
 const filterByLevel = (module: ModuleNode, level: ModuleLevelNode) => {
-  return level.filterAttributeType === 'ALL' || module.level?.id === level.id;
+  return level.filterAttributeType === 'ALL' || module.level?.id === level.id || module.level === null;
 };
 
 const filterByCategory = (module: ModuleNode, category: ModuleCategoryNode) => {
-  return category.filterAttributeType === 'ALL' || module.category?.id === category.id;
+  return category.filterAttributeType === 'ALL' || module.category?.id === category.id || module.category === null;
 };
 
 const filterByLanguage = (module: ModuleNode, language: string) => {
diff --git a/client/src/pages/instrumentOverview.vue b/client/src/pages/instrumentOverview.vue
index f4d26ee6..29c7b343 100644
--- a/client/src/pages/instrumentOverview.vue
+++ b/client/src/pages/instrumentOverview.vue
@@ -10,7 +10,7 @@
       v-else
     />
     <div class="instrument-overview__list">
-      <FilterBar v-model:filter="searchText"></FilterBar>
+      <FilterBar :search-query="searchText" @update:searchQuery="val => searchText = val"></FilterBar>
       <router-link
         :to="{ name: 'instrument', params: { slug: instrument.slug } }"
         data-cy="instrument"
@@ -29,7 +29,6 @@ import InstrumentEntry from '@/components/instruments/InstrumentEntry.vue';
 import INSTRUMENTS_QUERY from '@/graphql/gql/queries/instrumentsQuery.gql';
 import INSTRUMENT_FILTER_QUERY from 'gql/local/instrumentFilter.gql';
 import FilterBar from '@/components/instruments/FilterBar.vue';
-import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
 import { graphql } from '@/__generated__';
 
 export default {
@@ -96,9 +95,6 @@ export default {
       instruments = instruments.filter((i) => i.title.toLowerCase().includes(this.searchText.toLowerCase()));
       return instruments;
     },
-    // language() {
-    //   return this.instruments.value?.me.language || 'de';
-    // },
   },
 
   methods: {