From ddb9fcdcb76bb77c35dd2ebcedeee32b5e2c4787 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 1 Nov 2019 10:13:32 +0100
Subject: [PATCH] Make dropdown filter reusable

---
 .../DropdownFilter.story.js}                  |  6 ++--
 .../DropdownFilter.vue}                       | 35 ++++++++++---------
 webapp/pages/notifications/index.vue          | 25 +++++++++----
 3 files changed, 40 insertions(+), 26 deletions(-)
 rename webapp/components/{NotificationsDropdownFilter/NotificationsDropdownFilter.story.js => DropdownFilter/DropdownFilter.story.js} (69%)
 rename webapp/components/{NotificationsDropdownFilter/NotificationsDropdownFilter.vue => DropdownFilter/DropdownFilter.vue} (65%)

diff --git a/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.story.js b/webapp/components/DropdownFilter/DropdownFilter.story.js
similarity index 69%
rename from webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.story.js
rename to webapp/components/DropdownFilter/DropdownFilter.story.js
index 35724fe7e..559a07285 100644
--- a/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.story.js
+++ b/webapp/components/DropdownFilter/DropdownFilter.story.js
@@ -1,16 +1,16 @@
 import { storiesOf } from '@storybook/vue'
 import { withA11y } from '@storybook/addon-a11y'
 import { action } from '@storybook/addon-actions'
-import NotificationsDropdownFilter from '~/components/NotificationsDropdownFilter/NotificationsDropdownFilter'
+import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
 import helpers from '~/storybook/helpers'
 
 helpers.init()
 
-storiesOf('NotificationsDropdownFilter', module)
+storiesOf('DropdownFilter', module)
   .addDecorator(withA11y)
   .addDecorator(helpers.layout)
   .add('filter dropdown', () => ({
-    components: { NotificationsDropdownFilter },
+    components: { DropdownFilter },
     methods: {
       filterNotifications: action('filterNotifications'),
     },
diff --git a/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.vue b/webapp/components/DropdownFilter/DropdownFilter.vue
similarity index 65%
rename from webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.vue
rename to webapp/components/DropdownFilter/DropdownFilter.vue
index a179b54d0..8ca5c5410 100644
--- a/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.vue
+++ b/webapp/components/DropdownFilter/DropdownFilter.vue
@@ -1,14 +1,16 @@
 <template>
   <dropdown offset="8">
     <a
+      :v-model="selected"
       slot="default"
       slot-scope="{ toggleMenu }"
-      class="locale-menu"
+      name="dropdown"
+      class="dropdown-filter"
       href="#"
       @click.prevent="toggleMenu()"
     >
       <ds-icon style="margin-right: 2px;" name="filter" />
-      {{ selected }}
+      <label for="dropdown">{{ selected }}</label>
       <ds-icon style="margin-left: 2px" size="xx-small" name="angle-down" />
     </a>
     <ds-menu
@@ -37,26 +39,25 @@ export default {
   components: {
     Dropdown,
   },
-  data() {
-    return {
-      selected: this.$t('notifications.filterLabel.all'),
-    }
-  },
-  computed: {
-    filterOptions() {
-      return [
-        { label: this.$t('notifications.filterLabel.all'), value: null },
-        { label: this.$t('notifications.filterLabel.read'), value: true },
-        { label: this.$t('notifications.filterLabel.unread'), value: false },
-      ]
-    },
+  props: {
+    selected: { type: String, default: '' },
+    filterOptions: { type: Array, default: () => [] },
   },
   methods: {
     filterNotifications(option, toggleMenu) {
-      this.$emit('filterNotifications', option.value)
-      this.selected = option.label
+      this.$emit('filterNotifications', option)
       toggleMenu()
     },
   },
 }
 </script>
+<style lang="scss">
+.dropdown-filter {
+  user-select: none;
+  display: flex;
+  align-items: center;
+  height: 100%;
+  padding: $space-xx-small;
+  color: $text-color-soft;
+}
+</style>
diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue
index 7c798010d..f18d5afd2 100644
--- a/webapp/pages/notifications/index.vue
+++ b/webapp/pages/notifications/index.vue
@@ -4,9 +4,13 @@
       <ds-flex-item :width="{ lg: '85%' }">
         <ds-heading tag="h3">{{ $t('notifications.title') }}</ds-heading>
       </ds-flex-item>
-      <ds-flex-item width="100px">
+      <ds-flex-item width="110px">
         <client-only>
-          <notifications-dropdown-filter @filterNotifications="filterNotifications" />
+          <dropdown-filter
+            @filterNotifications="filterNotifications"
+            :filterOptions="filterOptions"
+            :selected="selected"
+          />
         </client-only>
       </ds-flex-item>
     </ds-flex>
@@ -21,13 +25,13 @@
 
 <script>
 import NotificationsTable from '~/components/NotificationsTable/NotificationsTable'
-import NotificationsDropdownFilter from '~/components/NotificationsDropdownFilter/NotificationsDropdownFilter'
+import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
 import Paginate from '~/components/Paginate/Paginate'
 import { notificationQuery, markAsReadMutation } from '~/graphql/User'
 
 export default {
   components: {
-    NotificationsDropdownFilter,
+    DropdownFilter,
     NotificationsTable,
     Paginate,
   },
@@ -40,16 +44,25 @@ export default {
       pageSize,
       first: pageSize,
       hasNext: false,
+      selected: this.$t('notifications.filterLabel.all'),
     }
   },
   computed: {
     hasPrevious() {
       return this.offset > 0
     },
+    filterOptions() {
+      return [
+        { label: this.$t('notifications.filterLabel.all'), value: null },
+        { label: this.$t('notifications.filterLabel.read'), value: true },
+        { label: this.$t('notifications.filterLabel.unread'), value: false },
+      ]
+    },
   },
   methods: {
-    filterNotifications(value) {
-      this.notificationRead = value
+    filterNotifications(option) {
+      this.notificationRead = option.value
+      this.selected = option.label
       this.$apollo.queries.notifications.refresh()
     },
     async markNotificationAsRead(notificationSourceId) {