From bb60f10d49b41ac2288ad7fe6765cb2d783b41c1 Mon Sep 17 00:00:00 2001
From: Gauthier Roebroeck <gauthier.roebroeck@gmail.com>
Date: Mon, 8 Jun 2020 17:47:18 +0800
Subject: [PATCH] fix(webui): simplify unread filter

only offer UNREAD option, the other 2 are confusing and not really relevant
---
 komga-webui/src/components/FilterMenuButton.vue |  2 +-
 komga-webui/src/views/BrowseLibraries.vue       | 16 ++++++++--------
 komga-webui/src/views/BrowseSeries.vue          |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/komga-webui/src/components/FilterMenuButton.vue b/komga-webui/src/components/FilterMenuButton.vue
index 0d684c47e..dd637f3b9 100644
--- a/komga-webui/src/components/FilterMenuButton.vue
+++ b/komga-webui/src/components/FilterMenuButton.vue
@@ -11,7 +11,7 @@
       <div v-for="(f, i) in filtersOptions"
            :key="i"
       >
-        <v-subheader>{{ f.name }}</v-subheader>
+        <v-subheader v-if="f.name">{{ f.name }}</v-subheader>
         <v-list-item v-for="v in f.values"
                      :key="v"
                      @click.stop="click(i, v)"
diff --git a/komga-webui/src/views/BrowseLibraries.vue b/komga-webui/src/views/BrowseLibraries.vue
index 3a5740a0d..f0c4235f5 100644
--- a/komga-webui/src/views/BrowseLibraries.vue
+++ b/komga-webui/src/views/BrowseLibraries.vue
@@ -147,7 +147,7 @@ export default Vue.extend({
       ] as SortOption[],
       sortActive: {} as SortActive,
       sortDefault: { key: 'metadata.titleSort', order: 'asc' } as SortActive,
-      filterOptions: [{ name: 'STATUS', values: SeriesStatus }, { name: 'READ STATUS', values: ReadStatus }],
+      filterOptions: [{ values: [ReadStatus.UNREAD] }, { name: 'STATUS', values: SeriesStatus }],
       filters: [[], []] as any[],
       sortUnwatch: null as any,
       filterUnwatch: null as any,
@@ -191,8 +191,8 @@ export default Vue.extend({
 
     // restore from query param
     this.sortActive = this.parseQuerySortOrDefault(this.$route.query.sort)
-    this.filters.splice(0, 1, parseQueryFilter(this.$route.query.status, SeriesStatus))
-    this.filters.splice(1, 1, parseQueryFilter(this.$route.query.readStatus, ReadStatus))
+    this.filters.splice(1, 1, parseQueryFilter(this.$route.query.status, SeriesStatus))
+    this.filters.splice(0, 1, parseQueryFilter(this.$route.query.readStatus, ReadStatus))
     if (this.$route.query.page) this.page = Number(this.$route.query.page)
     if (this.$route.query.pageSize) this.pageSize = Number(this.$route.query.pageSize)
 
@@ -206,8 +206,8 @@ export default Vue.extend({
 
       // reset
       this.sortActive = this.parseQuerySortOrDefault(to.query.sort)
-      this.filters.splice(0, 1, parseQueryFilter(to.query.status, SeriesStatus))
-      this.filters.splice(1, 1, parseQueryFilter(to.query.readStatus, ReadStatus))
+      this.filters.splice(1, 1, parseQueryFilter(to.query.status, SeriesStatus))
+      this.filters.splice(0, 1, parseQueryFilter(to.query.readStatus, ReadStatus))
       this.page = 1
       this.totalPages = 1
       this.totalElements = null
@@ -284,8 +284,8 @@ export default Vue.extend({
           page: `${this.page}`,
           pageSize: `${this.pageSize}`,
           sort: `${this.sortActive.key},${this.sortActive.order}`,
-          status: `${this.filters[0]}`,
-          readStatus: `${this.filters[1]}`,
+          status: `${this.filters[1]}`,
+          readStatus: `${this.filters[0]}`,
         },
       }).catch(_ => {
       })
@@ -304,7 +304,7 @@ export default Vue.extend({
       if (libraryId !== 0) {
         requestLibraryId = libraryId
       }
-      const seriesPage = await this.$komgaSeries.getSeries(requestLibraryId, pageRequest, undefined, this.filters[0], this.filters[1])
+      const seriesPage = await this.$komgaSeries.getSeries(requestLibraryId, pageRequest, undefined, this.filters[1], this.filters[0])
 
       this.totalPages = seriesPage.totalPages
       this.totalElements = seriesPage.totalElements
diff --git a/komga-webui/src/views/BrowseSeries.vue b/komga-webui/src/views/BrowseSeries.vue
index d419c155e..8f5a8b3ba 100644
--- a/komga-webui/src/views/BrowseSeries.vue
+++ b/komga-webui/src/views/BrowseSeries.vue
@@ -206,7 +206,7 @@ export default Vue.extend({
       }] as SortOption[],
       sortActive: {} as SortActive,
       sortDefault: { key: 'metadata.numberSort', order: 'asc' } as SortActive,
-      filterOptions: [{ name: 'READ STATUS', values: ReadStatus }],
+      filterOptions: [{ values: [ReadStatus.UNREAD] }],
       filters: [[]] as any[],
       dialogEdit: false,
       sortUnwatch: null as any,