From c4405db554a2d0d3c536d92f510f7042219e8c85 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 8 Feb 2022 18:20:58 +0800
Subject: [PATCH 1/3] fix: MoreAction in SQL Views and fine-tuned UI

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../project/spreadsheet/public/xcTable.vue    | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
index 4f12bb3561..93b6f7ce3e 100644
--- a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
+++ b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
@@ -15,14 +15,19 @@
         <span class="font-weight-bold"> {{ viewName }}</span> <span class="font-weight-regular ml-1" />
       </div>
 
-      <v-toolbar v-if="meta" height="40" dense class="elevation-0 xc-toolbar xc-border-bottom" style="z-index: 7;border-radius: 4px">
-        <!--
-      <div class="d-flex xc-border align-center search-box">
+      <v-toolbar 
+        v-if="meta" 
+        height="32"
+        dense
+        class="nc-table-toolbar elevation-0 xc-toolbar xc-border-bottom mx-1"
+        style="z-index: 7"
+      >
+      <div class="d-flex xc-border align-center search-box" style="min-width:156px">
         <v-menu bottom offset-y>
           <template #activator="{on}">
-            <div v-on="on">
+            <div style="min-width: 56px" v-on="on">
               <v-icon
-                class="pa-1 pr-0 ml-2"
+                class="ml-2"
                 small
                 color="grey"
               >
@@ -56,7 +61,7 @@
         <v-text-field
           v-model="searchQuery"
           autocomplete="off"
-          style="min-width: 300px"
+          style="min-width: 100px ; width: 150px"
           flat
           dense
           solo
@@ -74,16 +79,15 @@
       >{{ refTable }}({{
         relationPrimaryValue
       }}) -> {{ relationType === 'hm' ? ' Has Many ' : ' Belongs To ' }} -> {{ table }}</span>
--->
 
-        <v-spacer />
+      <div class="d-inline-flex">
 
-        <v-btn outlined small text @click="reload">
+        <!-- <v-btn outlined small text @click="reload">
           <v-icon small class="mr-1" color="grey  darken-3">
             mdi-reload
           </v-icon>
           Reload
-        </v-btn>
+        </v-btn> -->
 
         <fields-menu v-model="showFields" :field-list="fieldList" is-public />
 
@@ -92,7 +96,8 @@
         <column-filter-menu v-model="filters" :field-list="realFieldList" />
 
         <csv-export-import :is-view="isView" :query-params="{...queryParams, showFields}" :public-view-id="$route.params.id" :meta="meta" />
-
+      </div>
+      <v-spacer class="h-100" @dblclick="debug=true" />
       <!--      <v-menu>
         <template #activator="{ on, attrs }">
           <v-icon
@@ -293,7 +298,7 @@ export default {
     concatenatedXWhere() {
       let where = ''
       if (this.searchField && this.searchQuery.trim()) {
-        if (['text', 'string'].includes(this.sqlUi.getAbstractType(this.meta.columns.find(({ cn }) => cn === this.searchField)))) {
+        if (['text', 'string'].includes(this.sqlUi.getAbstractType(this.meta.columns.find(({ _cn }) => _cn === this.searchField)))) {
           where = `(${this.searchField},like,%${this.searchQuery.trim()}%)`
         } else {
           where = `(${this.searchField},eq,${this.searchQuery.trim()})`
@@ -720,6 +725,7 @@ export default {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *

From c7d532e44175ddf0854f661cb04d67d7d468b366 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 8 Feb 2022 18:21:21 +0800
Subject: [PATCH 2/3] fix: MoreAction in SQL Views and fine-tuned UI

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../project/viewTabs/viewSpreadsheet.vue      | 106 ++++++++++--------
 1 file changed, 59 insertions(+), 47 deletions(-)

diff --git a/packages/nc-gui/components/project/viewTabs/viewSpreadsheet.vue b/packages/nc-gui/components/project/viewTabs/viewSpreadsheet.vue
index 82672205d7..72586caf9a 100644
--- a/packages/nc-gui/components/project/viewTabs/viewSpreadsheet.vue
+++ b/packages/nc-gui/components/project/viewTabs/viewSpreadsheet.vue
@@ -1,16 +1,20 @@
 <template>
-  <v-container class=" j-excel-container pa-0 ma-0" fluid>
+  <v-container class="h-100 j-excel-container backgroundColor pa-0 ma-0" fluid>
     <div v-if="modelName" class="model-name text-capitalize">
       <span class="font-weight-bold"> {{ modelName }}</span> <span class="font-weight-regular ml-1">( Main View )</span>
     </div>
-
-    <v-toolbar height="36" dense class="elevation-0 xc-toolbar xc-border-bottom" style="z-index: 7;border-radius: 4px">
-      <div class="d-flex xc-border align-center search-box">
+    <v-toolbar 
+      height="32"
+      dense
+      class="nc-table-toolbar elevation-0 xc-toolbar xc-border-bottom mx-1"
+      style="z-index: 7"
+      >
+      <div class="d-flex xc-border align-center search-box" style="min-width:156px">
         <v-menu bottom offset-y>
           <template #activator="{on}">
-            <div v-on="on">
+            <div style="min-width: 56px" v-on="on">
               <v-icon
-                class="pa-1 pr-0 ml-2"
+                class="ml-2"
                 small
                 color="grey"
               >
@@ -44,7 +48,7 @@
         <v-text-field
           v-model="searchQuery"
           autocomplete="off"
-          style="min-width: 300px"
+          style="min-width: 100px ; width: 150px"
           flat
           dense
           solo
@@ -63,47 +67,48 @@
         relationPrimaryValue
       }}) -> {{ relationType === 'hm' ? ' Has Many ' : ' Belongs To ' }} -> {{ table }}</span>
 
-      <v-spacer />
+      <div class="d-inline-flex">
 
-      <v-btn outlined small text @click="loadTableData">
-        <v-icon small class="mr-1" color="grey  darken-3">
-          mdi-reload
+        <fields-menu v-model="showFields" :field-list="fieldList" />
+
+        <sort-list-menu v-model="sortList" :field-list="fieldList" />
+
+        <column-filter-menu v-model="filters" :field-list="fieldList" />
+
+        <share-view-menu @share="$refs.drawer && $refs.drawer.genShareLink()" />
+
+        <MoreActions
+            ref="csvExportImport"
+            :meta="meta"
+            :nodes="nodes"
+            :query-params="{
+              fieldsOrder,
+              fieldFilter,
+              sortList,
+              showFields
+            }"
+            :selected-view="selectedView"
+            :is-view="true"
+            @showAdditionalFeatOverlay="showAdditionalFeatOverlay($event)"
+            @webhook="showAdditionalFeatOverlay('webhooks')"
+          />
+      </div>
+      <v-spacer class="h-100" @dblclick="debug=true" />
+
+      <template>
+        <debug-metas v-if="debug" class="mr-3" />
+        <v-icon small class="mx-n1" color="grey lighten-1">
+          mdi-circle-small
         </v-icon>
-        Reload
-      </v-btn>
-
-      <fields-menu v-model="showFields" :field-list="fieldList" />
-
-      <sort-list-menu v-model="sortList" :field-list="fieldList" />
-
-      <column-filter-menu v-model="filters" :field-list="fieldList" />
-
-      <!--            <v-menu>
-              <template #activator="{ on, attrs }">
-                <v-icon
-                  v-bind="attrs"
-                  small
-                  class="mx-2"
-                  color="grey  darken-3"
-                  v-on="on"
-                >
-                  mdi-arrow-collapse-vertical
-                </v-icon>
-              </template>
-
-              <v-list dense class="caption">
-                <v-list-item v-for="h in cellHeights" :key="h.size" dense @click.stop="cellHeight = h.size">
-                  <v-list-item-icon class="mr-1">
-                    <v-icon small :color="cellHeight === h.size && 'primary'">
-                      {{ h.icon }}
-                    </v-icon>
-                  </v-list-item-icon>
-                  <v-list-item-title :class="{'primary&#45;&#45;text' : cellHeight === h.size}" style="text-transform: capitalize">
-                    {{ h.size }}
-                  </v-list-item-title>
-                </v-list-item>
-              </v-list>
-            </v-menu>-->
+        <x-icon
+          tooltip="Reload view data"
+          icon.class="nc-table-reload-btn mx-1"
+          small
+          @click="loadTableData"
+        >
+          mdi-reload
+        </x-icon>
+      </template>
 
       <x-btn
         tooltip="Toggle navigation drawer"
@@ -195,6 +200,7 @@
       </div>
 
       <spreadsheet-nav-drawer
+        ref="drawer"
         :nodes="nodes"
         :table="table"
         :meta="meta"
@@ -251,6 +257,9 @@ import KanbanView from '@/components/project/spreadsheet/views/kanbanView'
 import CalendarView from '@/components/project/spreadsheet/views/calendarView'
 import AdditionalFeatures from '@/components/project/spreadsheet/overlay/additinalFeatures'
 import spreadsheet from '@/components/project/spreadsheet/mixins/spreadsheet'
+import MoreActions from '~/components/project/spreadsheet/components/moreActions'
+import ShareViewMenu from '~/components/project/spreadsheet/components/shareViewMenu'
+
 
 export default {
   name: 'Spreadsheet',
@@ -263,7 +272,9 @@ export default {
     XcGridView,
     ColumnFilterMenu,
     SortListMenu,
-    FieldsMenu
+    FieldsMenu,
+    ShareViewMenu,
+    MoreActions,
   },
   mixins: [spreadsheet],
   props: {
@@ -638,6 +649,7 @@ export default {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *

From e5e16c48dbd9df563e3c0aa1973fa57003048719 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 9 Feb 2022 12:13:21 +0800
Subject: [PATCH 3/3] fix: add missing LockMenu in SQL view

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../project/viewTabs/viewSpreadsheet.vue      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/project/viewTabs/viewSpreadsheet.vue b/packages/nc-gui/components/project/viewTabs/viewSpreadsheet.vue
index 72586caf9a..19740c046a 100644
--- a/packages/nc-gui/components/project/viewTabs/viewSpreadsheet.vue
+++ b/packages/nc-gui/components/project/viewTabs/viewSpreadsheet.vue
@@ -69,11 +69,11 @@
 
       <div class="d-inline-flex">
 
-        <fields-menu v-model="showFields" :field-list="fieldList" />
+        <fields-menu v-model="showFields" :field-list="fieldList" :is-locked="isLocked" />
 
-        <sort-list-menu v-model="sortList" :field-list="fieldList" />
+        <sort-list-menu v-model="sortList" :field-list="fieldList" :is-locked="isLocked" />
 
-        <column-filter-menu v-model="filters" :field-list="fieldList" />
+        <column-filter-menu v-model="filters" :field-list="fieldList" :is-locked="isLocked" />
 
         <share-view-menu @share="$refs.drawer && $refs.drawer.genShareLink()" />
 
@@ -94,9 +94,10 @@
           />
       </div>
       <v-spacer class="h-100" @dblclick="debug=true" />
-
+    
       <template>
         <debug-metas v-if="debug" class="mr-3" />
+        <lock-menu v-if="_isUIAllowed('view-type')" v-model="viewStatus.type" />
         <v-icon small class="mx-n1" color="grey lighten-1">
           mdi-circle-small
         </v-icon>
@@ -214,6 +215,7 @@
         :filters.sync="filters"
         :sort-list.sync="sortList"
         :show-fields.sync="showFields"
+        :view-status.sync="viewStatus"
       >
         <!--        <v-list-item
           @click="showAdditionalFeatOverlay('view-columns')"
@@ -245,7 +247,6 @@
 <script>
 
 import debounce from 'debounce'
-import ApiFactory from '@/components/project/spreadsheet/apis/apiFactory'
 import { SqlUI } from '@/helpers/sqlUi/SqlUiFactory'
 import FieldsMenu from '@/components/project/spreadsheet/components/fieldsMenu'
 import SortListMenu from '@/components/project/spreadsheet/components/sortListMenu'
@@ -257,8 +258,9 @@ import KanbanView from '@/components/project/spreadsheet/views/kanbanView'
 import CalendarView from '@/components/project/spreadsheet/views/calendarView'
 import AdditionalFeatures from '@/components/project/spreadsheet/overlay/additinalFeatures'
 import spreadsheet from '@/components/project/spreadsheet/mixins/spreadsheet'
-import MoreActions from '~/components/project/spreadsheet/components/moreActions'
-import ShareViewMenu from '~/components/project/spreadsheet/components/shareViewMenu'
+import MoreActions from '@/components/project/spreadsheet/components/moreActions'
+import ShareViewMenu from '@/components/project/spreadsheet/components/shareViewMenu'
+import LockMenu from '@/components/project/spreadsheet/components/lockMenu'
 
 
 export default {
@@ -275,6 +277,7 @@ export default {
     FieldsMenu,
     ShareViewMenu,
     MoreActions,
+    LockMenu,
   },
   mixins: [spreadsheet],
   props: {
@@ -351,7 +354,10 @@ export default {
       icon: 'mdi-card'
     }],
     rowContextMenu: null,
-    modelName: null
+    modelName: null,
+    viewStatus: {
+      type: null
+    },
   }),
   computed: {
     meta() {