From 9a8f47b00790b62a48af1c9256e2044a6e6acbcd Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 10 Aug 2023 13:47:56 +0530
Subject: [PATCH] fix: show sort count & filter out applied sort while adding
 new sort

---
 frontend/src/components/SortBy.vue | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/SortBy.vue b/frontend/src/components/SortBy.vue
index b9bc0f1a..6c8e7530 100644
--- a/frontend/src/components/SortBy.vue
+++ b/frontend/src/components/SortBy.vue
@@ -1,8 +1,15 @@
 <template>
-  <NestedPopover v-if="sortOptions.data">
+  <NestedPopover v-if="options">
     <template #target>
       <Button label="Sort" ref="sortButtonRef">
         <template #prefix><SortIcon class="h-4" /></template>
+        <template v-if="sortValues.length" #suffix>
+          <div
+            class="flex justify-center items-center w-5 h-5 text-2xs font-medium pt-[1px] bg-gray-900 text-white rounded"
+          >
+            {{ sortValues.length }}
+          </div>
+        </template>
       </Button>
     </template>
     <template #body="{ close }">
@@ -45,7 +52,7 @@
           </div>
           <div class="flex items-center justify-between gap-2">
             <Autocomplete
-              :options="sortOptions.data"
+              :options="options"
               value=""
               placeholder="Sort by"
               @change="(e) => setSort(e)"
@@ -88,7 +95,7 @@ import {
   FormControl,
   createResource,
 } from 'frappe-ui'
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 
 const props = defineProps({
   doctype: {
@@ -110,6 +117,14 @@ const sortOptions = createResource({
   },
 })
 
+const options = computed(() => {
+  if (!sortOptions.data) return []
+  const selectedOptions = sortValues.value.map((sort) => sort.fieldname)
+  return sortOptions.data.filter((option) => {
+    return !selectedOptions.includes(option.value)
+  })
+})
+
 function initialOrderBy() {
   const orderBy = getOrderBy()
   if (!orderBy) return []