From bb7e79004db27541a17aabd730a14d4bef79d2c0 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 17 Sep 2021 14:15:15 -0500
Subject: [PATCH] Fix sort by volume number, show batch read/not read update
 for users

---
 client/components/app/Appbar.vue     | 9 +++++++--
 client/components/cards/BookCard.vue | 2 +-
 client/package.json                  | 2 +-
 client/store/audiobooks.js           | 5 ++++-
 package.json                         | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/client/components/app/Appbar.vue b/client/components/app/Appbar.vue
index cdf60b4b..0071979c 100644
--- a/client/components/app/Appbar.vue
+++ b/client/components/app/Appbar.vue
@@ -39,8 +39,9 @@
         <ui-btn small class="text-sm mx-2" @click="toggleSelectAll">{{ isAllSelected ? 'Select None' : 'Select All' }}</ui-btn>
 
         <div class="flex-grow" />
-        <ui-tooltip v-if="userCanUpdate" :text="`Mark as ${selectedIsRead ? 'Not Read' : 'Read'}`" direction="bottom">
-          <ui-read-icon-btn :is-read="selectedIsRead" @click="toggleBatchRead" class="mx-1.5" />
+
+        <ui-tooltip :text="`Mark as ${selectedIsRead ? 'Not Read' : 'Read'}`" direction="bottom">
+          <ui-read-icon-btn :disabled="processingBatch" :is-read="selectedIsRead" @click="toggleBatchRead" class="mx-1.5" />
         </ui-tooltip>
         <template v-if="userCanUpdate">
           <ui-icon-btn v-show="!processingBatchDelete" icon="edit" bg-color="warning" class="mx-1.5" @click="batchEditClick" />
@@ -101,6 +102,9 @@ export default {
         var userAb = this.userAudiobooks[ab]
         return !userAb || !userAb.isRead
       })
+    },
+    processingBatch() {
+      return this.$store.state.processingBatch
     }
   },
   methods: {
@@ -124,6 +128,7 @@ export default {
       }
     },
     toggleBatchRead() {
+      this.$store.commit('setProcessingBatch', true)
       var newIsRead = !this.selectedIsRead
       var updateProgressPayloads = this.selectedAudiobooks.map((ab) => {
         return {
diff --git a/client/components/cards/BookCard.vue b/client/components/cards/BookCard.vue
index cec42de6..54937a90 100644
--- a/client/components/cards/BookCard.vue
+++ b/client/components/cards/BookCard.vue
@@ -24,7 +24,7 @@
               <span class="material-icons" :style="{ fontSize: sizeMultiplier + 'rem' }">edit</span>
             </div>
 
-            <div v-if="userCanUpdate || userCanDelete" class="absolute cursor-pointer hover:text-yellow-300 hover:scale-125 transform duration-100" :style="{ top: 0.375 * sizeMultiplier + 'rem', left: 0.375 * sizeMultiplier + 'rem' }" @click.stop.prevent="selectBtnClick">
+            <div class="absolute cursor-pointer hover:text-yellow-300 hover:scale-125 transform duration-100" :style="{ top: 0.375 * sizeMultiplier + 'rem', left: 0.375 * sizeMultiplier + 'rem' }" @click.stop.prevent="selectBtnClick">
               <span class="material-icons" :class="selected ? 'text-yellow-400' : ''" :style="{ fontSize: 1.25 * sizeMultiplier + 'rem' }">{{ selected ? 'radio_button_checked' : 'radio_button_unchecked' }}</span>
             </div>
           </div>
diff --git a/client/package.json b/client/package.json
index f559c257..fb3e9e5d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/client/store/audiobooks.js b/client/store/audiobooks.js
index 4974ca26..4023d3ac 100644
--- a/client/store/audiobooks.js
+++ b/client/store/audiobooks.js
@@ -45,9 +45,12 @@ export const getters = {
     var direction = settings.orderDesc ? 'desc' : 'asc'
 
     var filtered = getters.getFiltered()
+    var orderByNumber = settings.orderBy === 'book.volumeNumber'
     return sort(filtered)[direction]((ab) => {
       // Supports dot notation strings i.e. "book.title"
-      return settings.orderBy.split('.').reduce((a, b) => a[b], ab)
+      var value = settings.orderBy.split('.').reduce((a, b) => a[b], ab)
+      if (orderByNumber && !isNaN(value)) return Number(value)
+      return value
     })
   },
   getUniqueAuthors: (state) => {
diff --git a/package.json b/package.json
index bca428c6..784faf41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "Self-hosted audiobook server for managing and playing audiobooks.",
   "main": "index.js",
   "scripts": {