From feb4051741a6a10335859a6252989a0af4c345ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 13:03:38 +0200
Subject: [PATCH] Rename post type filters computed in mixin

---
 webapp/components/FilterMenu/OrderByFilter.vue  | 4 +++-
 webapp/components/FilterMenu/PostTypeFilter.vue | 8 ++++----
 webapp/mixins/filterMenuMixin.js                | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index 31b3e741c..5ed60c48e 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -1,5 +1,6 @@
 <template>
   <filter-menu-section
+    v-if="noneSetInPostTypeFilter || articleSetInPostTypeFilter"
     class="order-by-filter"
     :title="$t('filter-menu.creationDate')"
     :divider="false"
@@ -31,6 +32,7 @@
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
+import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
 
@@ -40,9 +42,9 @@ export default {
     FilterMenuSection,
     LabeledButton,
   },
+  mixins: [FilterMenuMixin],
   computed: {
     ...mapGetters({
-      filteredPostTypes: 'posts/filteredPostTypes',
       orderBy: 'posts/orderBy',
     }),
   },
diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index fcd4f161a..ea69cda18 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -9,7 +9,7 @@
         <labeled-button
           icon="check"
           :label="$t('filter-menu.all')"
-          :filled="noneSet"
+          :filled="noneSetInPostTypeFilter"
           :title="$t('filter-menu.all')"
           @click="setUnsetPostTypeFilter('All')"
         />
@@ -18,7 +18,7 @@
         <labeled-button
           icon="book"
           :label="$t('filter-menu.article')"
-          :filled="articleSet"
+          :filled="articleSetInPostTypeFilter"
           :title="$t('filter-menu.article')"
           @click="setUnsetPostTypeFilter('Article')"
         />
@@ -27,7 +27,7 @@
         <labeled-button
           icon="calendar"
           :label="$t('filter-menu.event')"
-          :filled="eventSet"
+          :filled="eventSetInPostTypeFilter"
           :title="$t('filter-menu.event')"
           @click="setUnsetPostTypeFilter('Event')"
         />
@@ -60,7 +60,7 @@ export default {
       })
     },
     setUnsetPostTypeFilter(setPostType) {
-      if (this.noneSet) {
+      if (this.noneSetInPostTypeFilter) {
         if (setPostType !== 'All') this.toggleFilterPostType(setPostType)
       } else {
         if (setPostType !== 'All') {
diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index 47ac5c5c6..c6f57d43d 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -6,13 +6,13 @@ export default {
       filteredPostTypes: 'posts/filteredPostTypes',
       currentUser: 'auth/user',
     }),
-    noneSet() {
-      return !this.articleSet && !this.eventSet
+    noneSetInPostTypeFilter() {
+      return !this.articleSetInPostTypeFilter && !this.eventSetInPostTypeFilter
     },
-    articleSet() {
+    articleSetInPostTypeFilter() {
       return this.filteredPostTypes.includes('Article')
     },
-    eventSet() {
+    eventSetInPostTypeFilter() {
       return this.filteredPostTypes.includes('Event')
     },
   },