From 24efc38c7aa8bcf68944b321ef64d829f3c2f815 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 10 Oct 2023 13:29:49 +0000
Subject: [PATCH 1/8] fix(nc-gui): Fixed table pagination timing coming up on
 group by

---
 packages/nc-gui/components/smartsheet/grid/GroupBy.vue | 2 ++
 packages/nc-gui/components/smartsheet/grid/Table.vue   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
index ad003337c2..67919f0934 100644
--- a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
+++ b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
@@ -297,6 +297,7 @@ const onScroll = (e: Event) => {
       v-model:pagination-data="vGroup.paginationData"
       align-count-on-right
       custom-label="groups"
+      show-api-timing
       :change-page="(p: number) => groupWrapperChangePage(p, vGroup)"
       :style="`${props.depth && props.depth > 0 ? 'border-radius: 0 0 12px 12px !important;' : ''}`"
     ></LazySmartsheetPagination>
@@ -305,6 +306,7 @@ const onScroll = (e: Event) => {
       v-model:pagination-data="vGroup.paginationData"
       align-count-on-right
       custom-label="groups"
+      show-api-timing
       :change-page="(p: number) => groupWrapperChangePage(p, vGroup)"
       :hide-sidebars="true"
       :style="`${props.depth && props.depth > 0 ? 'border-radius: 0 0 12px 12px !important;' : ''}margin-left: ${scrollBump}px;`"
diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index bdcfeb039e..0c010a3629 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -1682,7 +1682,7 @@ const loaderText = computed(() => {
       v-if="headerOnly !== true"
       :key="isMobileMode"
       v-model:pagination-data="paginationDataRef"
-      show-api-timing
+      :show-api-timing="!isGroupBy"
       align-count-on-right
       :change-page="changePage"
       :hide-sidebars="paginationStyleRef?.hideSidebars === true"

From 48ee51614bf1400e6bd833e7278c1c0ddbfd488c Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 10 Oct 2023 13:29:49 +0000
Subject: [PATCH 2/8] fix(nc-gui): Fixed details open for editor role

---
 packages/nc-gui/components/smartsheet/Details.vue    |  2 +-
 .../components/smartsheet/topbar/SelectMode.vue      | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Details.vue b/packages/nc-gui/components/smartsheet/Details.vue
index 5c5915a452..32484a243f 100644
--- a/packages/nc-gui/components/smartsheet/Details.vue
+++ b/packages/nc-gui/components/smartsheet/Details.vue
@@ -33,7 +33,7 @@ const openedSubTab = computed({
 watch(openedSubTab, () => {
   // TODO: Find a good way to know when the roles are populated and check
   // Re-enable this check for first render
-  if (openedSubTab.value === 'field' && !isUIAllowed('hookList')) {
+  if (openedSubTab.value === 'field' && !isUIAllowed('fieldAdd')) {
     onViewsTabChange('relation')
   }
   if (openedSubTab.value === 'webhook' && !isUIAllowed('hookList')) {
diff --git a/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue b/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue
index cf224665e7..600629f433 100644
--- a/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue
+++ b/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue
@@ -3,7 +3,17 @@ import { storeToRefs, useViewsStore } from '#imports'
 
 const { openedViewsTab, activeView } = storeToRefs(useViewsStore())
 
+const { isUIAllowed } = useRoles()
+
 const { onViewsTabChange } = useViewsStore()
+
+const onClickDetails = () => {
+  if (isUIAllowed('fieldAdd')) {
+    onViewsTabChange('field')
+  } else {
+    onViewsTabChange('relation')
+  }
+}
 </script>
 
 <template>
@@ -26,7 +36,7 @@ const { onViewsTabChange } = useViewsStore()
       :class="{
         active: openedViewsTab !== 'view',
       }"
-      @click="onViewsTabChange('field')"
+      @click="onClickDetails"
     >
       <GeneralIcon
         icon="erd"

From 28033c9320bc6ad1198d60a9ef49597057a6fa64 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 10 Oct 2023 13:29:49 +0000
Subject: [PATCH 3/8] fix(nc-gui): Fixed grid pagination issue

---
 packages/nc-gui/components/smartsheet/Pagination.vue | 6 +++++-
 packages/nc-gui/components/smartsheet/grid/Table.vue | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/Pagination.vue b/packages/nc-gui/components/smartsheet/Pagination.vue
index 5be2598992..86187f5cb9 100644
--- a/packages/nc-gui/components/smartsheet/Pagination.vue
+++ b/packages/nc-gui/components/smartsheet/Pagination.vue
@@ -14,6 +14,7 @@ interface Props {
   fixedSize?: number
   extraStyle?: string
   showApiTiming?: boolean
+  alignLeft?: boolean
 }
 
 const props = defineProps<Props>()
@@ -34,6 +35,8 @@ const extraStyle = toRef(props, 'extraStyle')
 
 const isGroupBy = inject(IsGroupByInj, ref(false))
 
+const alignLeft = computed(() => props.alignLeft ?? false)
+
 const { isViewDataLoading, isPaginationLoading } = storeToRefs(useViewsStore())
 
 const { isLeftSidebarOpen } = storeToRefs(useSidebarStore())
@@ -63,7 +66,7 @@ const isRTLLanguage = computed(() => isRtlLang(locale.value as keyof typeof Lang
 
 <template>
   <div
-    class="flex items-center bg-white border-gray-200 nc-grid-pagination-wrapper"
+    class="relative flex items-center bg-white border-gray-200 nc-grid-pagination-wrapper"
     :class="{ 'border-t-1': !isGroupBy, 'h-13': isMobileMode, 'h-10': !isMobileMode }"
     :style="`${fixedSize ? `width: ${fixedSize}px;` : ''}${
       isGroupBy ? 'margin-top:1px; border-radius: 0 0 12px 12px !important;' : ''
@@ -85,6 +88,7 @@ const isRTLLanguage = computed(() => isRtlLang(locale.value as keyof typeof Lang
       class="transition-all duration-350"
       :class="{
         '-ml-17': isLeftSidebarOpen,
+        '!absolute top-1 !left-65': alignLeft,
       }"
     >
       <div v-if="isPaginationLoading" class="flex flex-row justify-center item-center min-h-10 min-w-42">
diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index 0c010a3629..bf0ae2608c 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -1684,6 +1684,7 @@ const loaderText = computed(() => {
       v-model:pagination-data="paginationDataRef"
       :show-api-timing="!isGroupBy"
       align-count-on-right
+      :align-left="isGroupBy"
       :change-page="changePage"
       :hide-sidebars="paginationStyleRef?.hideSidebars === true"
       :fixed-size="paginationStyleRef?.fixedSize"

From ae9c49b7b2ec7898d6983b9a57e09ec639f56483 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 10 Oct 2023 13:29:49 +0000
Subject: [PATCH 4/8] fix(nc-gui): Fixed sidebar hidden issue

---
 packages/nc-gui/components/dashboard/View.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/nc-gui/components/dashboard/View.vue b/packages/nc-gui/components/dashboard/View.vue
index cafb2c3af2..5e43b9c6b3 100644
--- a/packages/nc-gui/components/dashboard/View.vue
+++ b/packages/nc-gui/components/dashboard/View.vue
@@ -111,6 +111,14 @@ watch(isMobileMode, () => {
   isLeftSidebarOpen.value = !isMobileMode.value
 })
 
+watch(sidebarState, () => {
+  if (sidebarState.value === 'peekCloseEnd') {
+    setTimeout(() => {
+      sidebarState.value = 'hiddenEnd'
+    }, animationDuration)
+  }
+})
+
 onMounted(() => {
   handleSidebarOpenOnMobileForNonViews()
 })

From 71205efe9069784b0333650649f9e8933312e52e Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 10 Oct 2023 13:29:50 +0000
Subject: [PATCH 5/8] fix(nc-gui): Fixed sidebar hidden issue

---
 packages/nc-gui/components/dashboard/View.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/dashboard/View.vue b/packages/nc-gui/components/dashboard/View.vue
index 5e43b9c6b3..d2fc9316ca 100644
--- a/packages/nc-gui/components/dashboard/View.vue
+++ b/packages/nc-gui/components/dashboard/View.vue
@@ -140,7 +140,7 @@ onMounted(() => {
     >
       <div
         ref="wrapperRef"
-        class="nc-sidebar-wrapper relative flex flex-col h-full justify-center !min-w-32 absolute overflow-visible"
+        class="nc-sidebar-wrapper relative flex flex-col h-full justify-center !min-w-12 absolute overflow-visible"
         :class="{
           'mobile': isMobileMode,
           'minimized-height': !isLeftSidebarOpen,
@@ -179,6 +179,7 @@ onMounted(() => {
 
   > * {
     @apply opacity-0;
+    z-index: -1 !important;
     transform: translateX(-100%);
   }
 }

From 65b2a6bf3c59e3774ca3264b9915c43550b8f7a8 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 10 Oct 2023 13:29:50 +0000
Subject: [PATCH 6/8] fix(nc-gui): Fixed grid pagination issue

---
 packages/nc-gui/components/smartsheet/Pagination.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Pagination.vue b/packages/nc-gui/components/smartsheet/Pagination.vue
index 86187f5cb9..40dd57abad 100644
--- a/packages/nc-gui/components/smartsheet/Pagination.vue
+++ b/packages/nc-gui/components/smartsheet/Pagination.vue
@@ -72,7 +72,12 @@ const isRTLLanguage = computed(() => isRtlLang(locale.value as keyof typeof Lang
       isGroupBy ? 'margin-top:1px; border-radius: 0 0 12px 12px !important;' : ''
     }${extraStyle}`"
   >
-    <div class="flex-1 flex items-center">
+    <div
+      class="flex items-center"
+      :class="{
+        'flex-1': !alignLeft,
+      }"
+    >
       <slot name="add-record" />
       <span
         v-if="!alignCountOnRight && count !== null && count !== Infinity"
@@ -87,8 +92,8 @@ const isRTLLanguage = computed(() => isRtlLang(locale.value as keyof typeof Lang
       v-if="!hidePagination"
       class="transition-all duration-350"
       :class="{
-        '-ml-17': isLeftSidebarOpen,
-        '!absolute top-1 !left-65': alignLeft,
+        '-ml-17': isLeftSidebarOpen && !alignLeft,
+        'ml-8': alignLeft,
       }"
     >
       <div v-if="isPaginationLoading" class="flex flex-row justify-center item-center min-h-10 min-w-42">

From 4563eac81c9e8ba3d0b874782ff7f751fadee3b8 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 10 Oct 2023 13:29:50 +0000
Subject: [PATCH 7/8] fix(nc-gui): Fixed grid pagination issue

---
 packages/nc-gui/components/smartsheet/Pagination.vue   | 2 +-
 packages/nc-gui/components/smartsheet/grid/GroupBy.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Pagination.vue b/packages/nc-gui/components/smartsheet/Pagination.vue
index 40dd57abad..3c3de49788 100644
--- a/packages/nc-gui/components/smartsheet/Pagination.vue
+++ b/packages/nc-gui/components/smartsheet/Pagination.vue
@@ -66,7 +66,7 @@ const isRTLLanguage = computed(() => isRtlLang(locale.value as keyof typeof Lang
 
 <template>
   <div
-    class="relative flex items-center bg-white border-gray-200 nc-grid-pagination-wrapper"
+    class="flex items-center bg-white border-gray-200 nc-grid-pagination-wrapper"
     :class="{ 'border-t-1': !isGroupBy, 'h-13': isMobileMode, 'h-10': !isMobileMode }"
     :style="`${fixedSize ? `width: ${fixedSize}px;` : ''}${
       isGroupBy ? 'margin-top:1px; border-radius: 0 0 12px 12px !important;' : ''
diff --git a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
index 67919f0934..d4da331bb0 100644
--- a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
+++ b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
@@ -297,7 +297,7 @@ const onScroll = (e: Event) => {
       v-model:pagination-data="vGroup.paginationData"
       align-count-on-right
       custom-label="groups"
-      show-api-timing
+      :show-api-timing="false"
       :change-page="(p: number) => groupWrapperChangePage(p, vGroup)"
       :style="`${props.depth && props.depth > 0 ? 'border-radius: 0 0 12px 12px !important;' : ''}`"
     ></LazySmartsheetPagination>
@@ -306,7 +306,7 @@ const onScroll = (e: Event) => {
       v-model:pagination-data="vGroup.paginationData"
       align-count-on-right
       custom-label="groups"
-      show-api-timing
+      :show-api-timing="false"
       :change-page="(p: number) => groupWrapperChangePage(p, vGroup)"
       :hide-sidebars="true"
       :style="`${props.depth && props.depth > 0 ? 'border-radius: 0 0 12px 12px !important;' : ''}margin-left: ${scrollBump}px;`"

From 53f267ec8fb4f12a0493ac6dcc390c345d339563 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 10 Oct 2023 13:29:50 +0000
Subject: [PATCH 8/8] fix(nc-gui): Fixed grid pagination issue

---
 packages/nc-gui/components/smartsheet/grid/GroupBy.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
index d4da331bb0..67919f0934 100644
--- a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
+++ b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
@@ -297,7 +297,7 @@ const onScroll = (e: Event) => {
       v-model:pagination-data="vGroup.paginationData"
       align-count-on-right
       custom-label="groups"
-      :show-api-timing="false"
+      show-api-timing
       :change-page="(p: number) => groupWrapperChangePage(p, vGroup)"
       :style="`${props.depth && props.depth > 0 ? 'border-radius: 0 0 12px 12px !important;' : ''}`"
     ></LazySmartsheetPagination>
@@ -306,7 +306,7 @@ const onScroll = (e: Event) => {
       v-model:pagination-data="vGroup.paginationData"
       align-count-on-right
       custom-label="groups"
-      :show-api-timing="false"
+      show-api-timing
       :change-page="(p: number) => groupWrapperChangePage(p, vGroup)"
       :hide-sidebars="true"
       :style="`${props.depth && props.depth > 0 ? 'border-radius: 0 0 12px 12px !important;' : ''}margin-left: ${scrollBump}px;`"