From d349c125601692e49720d8572a12199c18537a3d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 11 Jul 2022 22:50:36 +0530
Subject: [PATCH] feat(gui-v2): filter, sort integration with grid view

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet-toolbar/ColumnFilter.vue       |  4 +--
 .../smartsheet-toolbar/SortListMenu.vue       | 36 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue
index 6169050997..969e9cb902 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue
@@ -437,7 +437,7 @@ export default {
 
             <MdiDeleteIcon
               v-if="!filter.readOnly"
-              class="nc-filter-item-remove-btn text-grey"
+              class="nc-filter-item-remove-btn text-grey align-self-center"
               @click.stop="deleteFilter(filter, i)"
             ></MdiDeleteIcon>
             <span v-else />
@@ -519,7 +519,7 @@ export default {
       </template>
     </div>
 
-    <v-btn small class="elevation-0 text-sm text-capitalize my-3" @click.stop="addFilter">
+    <v-btn small class="elevation-0 text-sm text-capitalize text-grey my-3" @click.stop="addFilter">
       <!--      <v-icon small color="grey"> mdi-plus </v-icon> -->
       <!-- Add Filter -->
       {{ $t('activity.addFilter') }}
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
index f9acac2d04..d5fd294ca1 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
@@ -1,18 +1,21 @@
 <script setup lang="ts">
-import { inject } from '@vue/runtime-core'
 import FieldListAutoCompleteDropdown from './FieldListAutoCompleteDropdown.vue'
-import { ActiveViewInj, IsLockedInj, ReloadViewDataHookInj } from '~/components'
+import { computed, inject } from '#imports'
+import { ActiveViewInj, IsLockedInj, MetaInj, ReloadViewDataHookInj } from '~/components'
 import useViewSorts from '~/composables/useViewSorts'
 import MdiMenuDownIcon from '~icons/mdi/menu-down'
 import MdiSortIcon from '~icons/mdi/sort'
 import MdiDeleteIcon from '~icons/mdi/close-box'
 
+const meta = inject(MetaInj)
 const view = inject(ActiveViewInj)
 const isLocked = inject(IsLockedInj)
 const reloadDataHook = inject(ReloadViewDataHookInj)
 
 const { sorts, saveOrUpdate, loadSorts, addSort, deleteSort } = useViewSorts(view, () => reloadDataHook?.trigger())
 
+const columns = computed(() => meta?.value?.columns || [])
+
 watch(
   () => view?.value?.id,
   () => {
@@ -144,37 +147,36 @@ export default {
       <div class="sort-grid" @click.stop>
         <template v-for="(sort, i) in sorts || []" :key="i">
           <!--          <v-icon :key="`${i}icon`" class="nc-sort-item-remove-btn" small @click.stop="deleteSort(sort)"> mdi-close-box </v-icon> -->
-          <MdiDeleteIcon class="nc-sort-item-remove-btn text-grey" small @click.stop="deleteSort(sort, i)"></MdiDeleteIcon>
+          <MdiDeleteIcon
+            class="nc-sort-item-remove-btn text-grey align-self-center"
+            small
+            @click.stop="deleteSort(sort, i)"
+          ></MdiDeleteIcon>
           <FieldListAutoCompleteDropdown
             v-model="sort.fk_column_id"
             class="caption nc-sort-field-select"
             :columns="columns"
             @click.stop
-            @change="sync(sort, i)"
+            @update:modelValue="saveOrUpdate(sort, i)"
           />
           <v-select
             v-model="sort.direction"
             class="flex-shrink-1 flex-grow-0 caption nc-sort-dir-select"
-            :items="[
-              // { text: 'A -> Z', value: 'asc' },
-              'asc',
-              // { text: 'Z -> A', value: 'desc' },
-              'desc',
-            ]"
+            :items="['asc', 'desc']"
             :label="$t('labels.operation')"
             density="compact"
             variant="solo"
             hide-details
             @click.stop
-            @change="saveOrUpdate(sort, i)"
-          >
-            <template #item="{ item }">
-              <span class="caption font-weight-regular">{{ item.text }}</span>
-            </template>
-          </v-select>
+            @update:modelValue="saveOrUpdate(sort, i)"
+          />
+          <!--            <template #item="{ item }"> -->
+          <!--              <span class="caption font-weight-regular">{{ item.text }}</span> -->
+          <!--            </template> -->
+          <!--          </v-select> -->
         </template>
       </div>
-      <v-btn small class="elevation-0 grey&#45;&#45;text my-3" @click.stop="addSort">
+      <v-btn small class="elevation-0 text-grey text-capitalize text-sm my-3" @click.stop="addSort">
         <!-- todo:        <v-icon small color="grey"> mdi-plus </v-icon> -->
         <!-- Add Sort Option -->
         {{ $t('activity.addSort') }}