From 542647f4186780595a0d831158f20144526a8727 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 30 Oct 2019 14:40:02 +0100
Subject: [PATCH] Add NotificationsDropdownFilter story, refactor

- rename incorrectly named varaibles
- use filterOptions to remove unneccessary computed routes

Co-authored-by: @alina-beck
---
 .../NotificationsDropdownFilter.story.js      | 18 ++++++++++
 .../NotificationsDropdownFilter.vue           | 33 +++++++------------
 webapp/locales/de.json                        |  2 +-
 webapp/locales/en.json                        |  2 +-
 webapp/locales/pt.json                        |  2 +-
 webapp/pages/notifications/index.vue          |  6 ++--
 6 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100644 webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.story.js

diff --git a/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.story.js b/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.story.js
new file mode 100644
index 000000000..35724fe7e
--- /dev/null
+++ b/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.story.js
@@ -0,0 +1,18 @@
+import { storiesOf } from '@storybook/vue'
+import { withA11y } from '@storybook/addon-a11y'
+import { action } from '@storybook/addon-actions'
+import NotificationsDropdownFilter from '~/components/NotificationsDropdownFilter/NotificationsDropdownFilter'
+import helpers from '~/storybook/helpers'
+
+helpers.init()
+
+storiesOf('NotificationsDropdownFilter', module)
+  .addDecorator(withA11y)
+  .addDecorator(helpers.layout)
+  .add('filter dropdown', () => ({
+    components: { NotificationsDropdownFilter },
+    methods: {
+      filterNotifications: action('filterNotifications'),
+    },
+    template: '<notifications-dropdown-filter @filterNotifications="filterNotifications" />',
+  }))
diff --git a/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.vue b/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.vue
index b0d1deb7d..7c5e0a42a 100644
--- a/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.vue
+++ b/webapp/components/NotificationsDropdownFilter/NotificationsDropdownFilter.vue
@@ -1,5 +1,5 @@
 <template>
-  <dropdown>
+  <dropdown offset="8">
     <a
       slot="default"
       slot-scope="{ toggleMenu }"
@@ -7,7 +7,7 @@
       href="#"
       @click.prevent="toggleMenu()"
     >
-      <ds-icon style="margin-right: 2px;" name="sort" />
+      <ds-icon style="margin-right: 2px;" name="filter" />
       {{ selected }}
       <ds-icon style="margin-left: 2px" size="xx-small" name="angle-down" />
     </a>
@@ -15,7 +15,7 @@
       slot="popover"
       slot-scope="{ toggleMenu }"
       class="locale-menu-popover"
-      :routes="routes"
+      :routes="filterOptions"
     >
       <ds-menu-item
         slot="menuitem"
@@ -23,7 +23,7 @@
         class="locale-menu-item"
         :route="item.route"
         :parents="item.parents"
-        @click.stop.prevent="sortNotifications(item.route, toggleMenu)"
+        @click.stop.prevent="filterNotifications(item.route, toggleMenu)"
       >
         {{ item.route.label }}
       </ds-menu-item>
@@ -39,28 +39,17 @@ export default {
   },
   data() {
     return {
-      selected: this.$t('notifications.sortingLabel.all'),
-      sortingOptions: [
-        { label: this.$t('notifications.sortingLabel.all'), value: null },
-        { label: this.$t('notifications.sortingLabel.read'), value: true },
-        { label: this.$t('notifications.sortingLabel.unread'), value: false },
+      selected: this.$t('notifications.filterLabel.all'),
+      filterOptions: [
+        { label: this.$t('notifications.filterLabel.all'), value: null },
+        { label: this.$t('notifications.filterLabel.read'), value: true },
+        { label: this.$t('notifications.filterLabel.unread'), value: false },
       ],
     }
   },
-  computed: {
-    routes() {
-      let routes = this.sortingOptions.map(option => {
-        return {
-          label: option.label,
-          value: option.value,
-        }
-      })
-      return routes
-    },
-  },
   methods: {
-    sortNotifications(option, toggleMenu) {
-      this.$emit('sortNotifications', option)
+    filterNotifications(option, toggleMenu) {
+      this.$emit('filterNotifications', option.value)
       this.selected = option.label
       toggleMenu()
     },
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 534ef819f..c5ea3d818 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -181,7 +181,7 @@
     "post": "Beitrag",
     "user": "Benutzer",
     "content": "Inhalt",
-    "sortingLabel": {
+    "filterLabel": {
       "all": "Alle",
       "read": "Lesen  ",
       "unread": "Ungelesen"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 775132eab..e591b3b68 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -182,7 +182,7 @@
     "post": "Post",
     "user": "User",
     "content": "Content",
-    "sortingLabel": {
+    "filterLabel": {
       "all": "All",
       "read": "Read",
       "unread": "Unread"
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 8ff168b72..d2d753527 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -194,7 +194,7 @@
     "post": "Post",
     "user": "Usuário",
     "content": "Conteúdo",
-    "sortingLabel": {
+    "filterLabel": {
       "all": "Todos",
       "read": "Lido",
       "unread": "Não lido"
diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue
index 9e2346061..59d63b5e3 100644
--- a/webapp/pages/notifications/index.vue
+++ b/webapp/pages/notifications/index.vue
@@ -6,7 +6,7 @@
       </ds-flex-item>
       <ds-flex-item class="sorting-dropdown">
         <client-only>
-          <notifications-dropdown-filter @sortNotifications="sortNotifications" />
+          <notifications-dropdown-filter @filterNotifications="filterNotifications" />
         </client-only>
       </ds-flex-item>
     </ds-flex>
@@ -48,8 +48,8 @@ export default {
     },
   },
   methods: {
-    sortNotifications(option) {
-      this.notificationRead = option.value
+    filterNotifications(value) {
+      this.notificationRead = value
       this.$apollo.queries.notifications.refresh()
     },
     async markNotificationAsRead(notificationSourceId) {