Merge pull request #6807 from Ocelot-Social-Community/6794-fix-filter…

…s-if-categories-switched-off fix(webapp): make filter menu visible if categories are inactive
Ocelot-Social-Community · Oct 31, 2023 · 7c0a825 · 7c0a825
2 parents 0e21c73 + 941d877
commit 7c0a825
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
@@ -3,7 +3,7 @@
     <div class="filter-menu-options">
       <div class="filter-header">
         <h2 class="title">{{ $t('filter-menu.filter-by') }}</h2>
-        <div class="item-save-topics">
+        <div v-if="categoriesActive" class="item-save-topics">
           <labeled-button
             filled
             :label="$t('actions.saveCategories')"
@@ -62,18 +62,20 @@ export default {
   },
   methods: {
     saveCategories() {
-      this.$apollo
-        .mutate({
-          mutation: SaveCategories(),
-          variables: { activeCategories: this.filteredCategoryIds },
-        })
-        .then(() => {
-          this.$emit('showFilterMenu')
-          this.$toast.success(this.$t('filter-menu.save.success'))
-        })
-        .catch(() => {
-          this.$toast.error(this.$t('filter-menu.save.error'))
-        })
+      if (this.categoriesActive) {
+        this.$apollo
+          .mutate({
+            mutation: SaveCategories(),
+            variables: { activeCategories: this.filteredCategoryIds },
+          })
+          .then(() => {
+            this.$emit('showFilterMenu')
+            this.$toast.success(this.$t('filter-menu.save.success'))
+          })
+          .catch(() => {
+            this.$toast.error(this.$t('filter-menu.save.error'))
+          })
+      }
     },
   },
 }

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
@@ -19,7 +19,7 @@
       </client-only>
     </div>
     <div>
-      <div v-if="categoriesActive && SHOW_CONTENT_FILTER_MASONRY_GRID" class="top-filter-menu">
+      <div v-if="SHOW_CONTENT_FILTER_MASONRY_GRID" class="top-filter-menu">
         <div class="filterButtonBox">
           <div class="filterButtonMenu" :class="{ 'hide-filter': hideByScroll }">
             <base-button