From cd1b4b549e583bed8770139ae0012f908912c49d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 23 Oct 2023 20:42:17 +0530
Subject: [PATCH 1/2] refactor: avoid loading default sort in shared view

- Hide existing sort options and by default sort it internally
- If user provides sort option override the default one

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/shared-view/Gallery.vue | 2 +-
 packages/nc-gui/components/shared-view/Grid.vue    | 4 ++--
 packages/nc-gui/components/shared-view/Kanban.vue  | 2 +-
 packages/nc-gui/components/shared-view/Map.vue     | 2 +-
 packages/nc-gui/composables/useViewSorts.ts        | 4 +---
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/shared-view/Gallery.vue b/packages/nc-gui/components/shared-view/Gallery.vue
index 4f544411d6..a7fd3ded11 100644
--- a/packages/nc-gui/components/shared-view/Gallery.vue
+++ b/packages/nc-gui/components/shared-view/Gallery.vue
@@ -19,7 +19,7 @@ provide(IsPublicInj, ref(true))
 
 useProvideViewColumns(sharedView, meta, () => reloadEventHook?.trigger(), true)
 
-useProvideSmartsheetStore(sharedView, meta, true, sorts, nestedFilters)
+useProvideSmartsheetStore(sharedView, meta, true, ref([]), nestedFilters)
 </script>
 
 <template>
diff --git a/packages/nc-gui/components/shared-view/Grid.vue b/packages/nc-gui/components/shared-view/Grid.vue
index 86df6b74f1..31b5239d10 100644
--- a/packages/nc-gui/components/shared-view/Grid.vue
+++ b/packages/nc-gui/components/shared-view/Grid.vue
@@ -17,13 +17,13 @@ import {
   useSharedView,
 } from '#imports'
 
-const { sharedView, meta, sorts, nestedFilters } = useSharedView()
+const { sharedView, meta, nestedFilters } = useSharedView()
 
 const { signedIn } = useGlobal()
 
 const { loadProject } = useBase()
 
-const { isLocked } = useProvideSmartsheetStore(sharedView, meta, true, sorts, nestedFilters)
+const { isLocked } = useProvideSmartsheetStore(sharedView, meta, true, ref([]), nestedFilters)
 
 useProvideKanbanViewStore(meta, sharedView)
 
diff --git a/packages/nc-gui/components/shared-view/Kanban.vue b/packages/nc-gui/components/shared-view/Kanban.vue
index a71643d9e3..0a4b6e088c 100644
--- a/packages/nc-gui/components/shared-view/Kanban.vue
+++ b/packages/nc-gui/components/shared-view/Kanban.vue
@@ -27,7 +27,7 @@ provide(IsPublicInj, ref(true))
 
 useProvideViewColumns(sharedView, meta, () => reloadEventHook?.trigger(), true)
 
-useProvideSmartsheetStore(sharedView, meta, true, sorts, nestedFilters)
+useProvideSmartsheetStore(sharedView, meta, true, ref([]), nestedFilters)
 
 useProvideKanbanViewStore(meta, sharedView, true)
 </script>
diff --git a/packages/nc-gui/components/shared-view/Map.vue b/packages/nc-gui/components/shared-view/Map.vue
index 6e5ba8846f..a105a2d400 100644
--- a/packages/nc-gui/components/shared-view/Map.vue
+++ b/packages/nc-gui/components/shared-view/Map.vue
@@ -27,7 +27,7 @@ provide(IsPublicInj, ref(true))
 
 useProvideViewColumns(sharedView, meta, () => reloadEventHook?.trigger(), true)
 
-useProvideSmartsheetStore(sharedView, meta, true, sorts, nestedFilters)
+useProvideSmartsheetStore(sharedView, meta, true, ref([]), nestedFilters)
 
 useProvideMapViewStore(meta, sharedView, true)
 </script>
diff --git a/packages/nc-gui/composables/useViewSorts.ts b/packages/nc-gui/composables/useViewSorts.ts
index 79312a7d8f..95826420d9 100644
--- a/packages/nc-gui/composables/useViewSorts.ts
+++ b/packages/nc-gui/composables/useViewSorts.ts
@@ -42,9 +42,7 @@ export function useViewSorts(view: Ref<ViewType | undefined>, reloadData?: () =>
 
   const loadSorts = async () => {
     if (isPublic.value) {
-      // todo: sorts missing on `ViewType`
-      const sharedSorts = (sharedView.value as any)?.sorts || []
-      sorts.value = [...sharedSorts]
+      sorts.value = []
       return
     }
 

From d3f6722a26f1f3e0cc3cd05d25d1e64c12d64ff1 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 23 Oct 2023 21:38:32 +0530
Subject: [PATCH 2/2] test: fix filter reset in shared view

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/views/viewGridShare.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/playwright/tests/db/views/viewGridShare.spec.ts b/tests/playwright/tests/db/views/viewGridShare.spec.ts
index 8b29f54daa..8cb454c9bf 100644
--- a/tests/playwright/tests/db/views/viewGridShare.spec.ts
+++ b/tests/playwright/tests/db/views/viewGridShare.spec.ts
@@ -210,7 +210,6 @@ test.describe('Shared view', () => {
      **/
 
     // create new sort & filter criteria in shared view
-    await sharedPage.grid.toolbar.sort.reset();
     await sharedPage.grid.toolbar.sort.add({
       title: 'Address',
       ascending: true,