From 864c40a35d9c56d98a37d2ccffc7d9759f4f5b7a Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:05:14 +0000
Subject: [PATCH 1/6] fix(nc-gui): audit log sort username issue 
 nocodb/nocodb/issues/7418

---
 .../smartsheet/expanded-form/Comments.vue      | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 4fd776cfd7..880a2ea70d 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -301,9 +301,21 @@ const onClickAudit = () => {
                 <GeneralUserIcon size="base" :email="log.user" />
 
                 <div class="flex flex-col">
-                  <span class="truncate font-bold max-w-50">
-                    {{ log.display_name ?? log.user.split('@')[0].slice(0, 2) ?? 'Shared source' }}
-                  </span>
+                  <NcTooltip class="truncate max-w-50" show-on-truncate-only>
+                    <template #title>
+                      {{ log.display_name?.trim() || log.user || 'Shared source' }}
+                    </template>
+                    <span
+                      class="text-ellipsis overflow-hidden font-bold"
+                      :style="{
+                        wordBreak: 'keep-all',
+                        whiteSpace: 'nowrap',
+                        display: 'inline',
+                      }"
+                    >
+                      {{ log.display_name?.trim() || log.user || 'Shared source' }}
+                    </span>
+                  </NcTooltip>
                   <div v-if="log.id !== editLog?.id" class="text-xs font-medium text-gray-500">
                     {{ timeAgo(log.created_at) }}
                   </div>

From 99186966a9797c8491d1af83ac010308ddb8bbae Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:05:14 +0000
Subject: [PATCH 2/6] fix: table icon issue

---
 packages/nc-gui/components/project/AllTables.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/project/AllTables.vue b/packages/nc-gui/components/project/AllTables.vue
index 43058bcaa6..566a580164 100644
--- a/packages/nc-gui/components/project/AllTables.vue
+++ b/packages/nc-gui/components/project/AllTables.vue
@@ -142,7 +142,9 @@ const onCreateBaseClick = () => {
         @click="openTable(table)"
       >
         <div class="flex flex-row w-2/5 items-center gap-x-2" data-testid="proj-view-list__item-title">
-          <GeneralIcon icon="table" class="text-gray-700" />
+          <div class="min-w-5 flex items-center justify-center">
+            <GeneralTableIcon :meta="{ meta: table.meta }" class="text-gray-500" />
+          </div>
           {{ table?.title }}
         </div>
         <div class="w-1/5 text-gray-600" data-testid="proj-view-list__item-type">

From 6c63d45eda5704b4d7c365e2c167c278ad22bed1 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:05:14 +0000
Subject: [PATCH 3/6] fix: UI ACl icon and default view title issue

---
 .../nc-gui/components/dashboard/settings/UIAcl.vue    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/settings/UIAcl.vue b/packages/nc-gui/components/dashboard/settings/UIAcl.vue
index b7c85dcba7..5ed2acf212 100644
--- a/packages/nc-gui/components/dashboard/settings/UIAcl.vue
+++ b/packages/nc-gui/components/dashboard/settings/UIAcl.vue
@@ -221,11 +221,16 @@ const toggleSelectAll = (role: Role) => {
             <div v-if="column.name === 'View Name'">
               <div class="flex items-center gap-1">
                 <div class="min-w-5 flex items-center justify-center">
-                  <GeneralViewIcon :meta="record" class="text-gray-500"></GeneralViewIcon>
+                  <GeneralTableIcon
+                    v-if="record?.meta?.icon"
+                    :meta="{ meta: record.table_meta, type: record.ptype }"
+                    class="text-gray-500 !text-sm children:(!w-5 !h-5)"
+                  />
+                  <GeneralViewIcon v-else :meta="record" class="text-gray-500"></GeneralViewIcon>
                 </div>
                 <NcTooltip class="overflow-ellipsis min-w-0 shrink-1 truncate" show-on-truncate-only>
-                  <template #title>{{ record.title }}</template>
-                  <span>{{ record.title }}</span>
+                  <template #title>{{ record.is_default ? $t('title.defaultView') : record.title }}</template>
+                  <span>{{ record.is_default ? $t('title.defaultView') : record.title }}</span>
                 </NcTooltip>
               </div>
             </div>

From a475e9611f6e885af8c0615fc3c2ae4d5ca3e23e Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:05:14 +0000
Subject: [PATCH 4/6] fix(nc-gui): UI ACL view icon issue

---
 packages/nc-gui/components/dashboard/settings/UIAcl.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/dashboard/settings/UIAcl.vue b/packages/nc-gui/components/dashboard/settings/UIAcl.vue
index 5ed2acf212..a0489d0eaf 100644
--- a/packages/nc-gui/components/dashboard/settings/UIAcl.vue
+++ b/packages/nc-gui/components/dashboard/settings/UIAcl.vue
@@ -223,7 +223,7 @@ const toggleSelectAll = (role: Role) => {
                 <div class="min-w-5 flex items-center justify-center">
                   <GeneralTableIcon
                     v-if="record?.meta?.icon"
-                    :meta="{ meta: record.table_meta, type: record.ptype }"
+                    :meta="{ meta: record.meta, type: 'view' }"
                     class="text-gray-500 !text-sm children:(!w-5 !h-5)"
                   />
                   <GeneralViewIcon v-else :meta="record" class="text-gray-500"></GeneralViewIcon>

From 5e52326d44d270365283bb85f49f8656bcc676dd Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:05:15 +0000
Subject: [PATCH 5/6] fix: lint errors

---
 .../components/smartsheet/details/Fields.vue  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/details/Fields.vue b/packages/nc-gui/components/smartsheet/details/Fields.vue
index 12a05b2a98..669c27d68f 100644
--- a/packages/nc-gui/components/smartsheet/details/Fields.vue
+++ b/packages/nc-gui/components/smartsheet/details/Fields.vue
@@ -819,8 +819,8 @@ watch(
       <template v-else>
         <div class="flex w-full justify-between py-2">
           <a-input
-            data-testid="nc-field-search-input"
             v-model:value="searchQuery"
+            data-testid="nc-field-search-input"
             class="!h-8 !px-1 !rounded-lg !w-72"
             :placeholder="$t('placeholder.searchFields')"
           >
@@ -832,8 +832,8 @@ watch(
                 v-if="searchQuery.length > 0"
                 icon="close"
                 class="mx-1 h-3.5 w-3.5 text-gray-500 group-hover:text-black"
-                @click="searchQuery = ''"
                 data-testid="nc-field-clear-search"
+                @click="searchQuery = ''"
               />
             </template>
           </a-input>
@@ -888,16 +888,16 @@ watch(
               :model-value="fields"
               :disabled="isLocked"
               item-key="id"
-              @change="onMove($event)"
               data-testid="nc-field-list-wrapper"
+              @change="onMove($event)"
             >
               <template #item="{ element: field }">
                 <div
                   v-if="field.title.toLowerCase().includes(searchQuery.toLowerCase()) && !field.pv"
                   class="flex px-2 hover:bg-gray-100 first:rounded-t-lg border-b-1 last:rounded-b-none border-gray-200 pl-5 group"
                   :class="` ${compareCols(field, activeField) ? 'selected' : ''}`"
-                  @click="changeField(field, $event)"
                   :data-testid="`nc-field-item-${fieldState(field)?.title || field.title}`"
+                  @click="changeField(field, $event)"
                 >
                   <div class="flex items-center flex-1 py-2.5 gap-1 w-2/6">
                     <component
@@ -913,12 +913,12 @@ watch(
                       :checked="
                         visibilityOps.find((op) => op.column.fk_column_id === field.id)?.visible ?? viewFieldsMap[field.id].show
                       "
+                      data-testid="nc-field-visibility-checkbox"
                       @change="
                         (event: any) => {
                           toggleVisibility(event.target.checked, viewFieldsMap[field.id])
                         }
                       "
-                      data-testid="nc-field-visibility-checkbox"
                     />
                     <NcCheckbox v-else :disabled="true" class="opacity-0" :checked="true" />
                     <SmartsheetHeaderVirtualCellIcon
@@ -994,8 +994,8 @@ watch(
                       size="small"
                       class="no-action mr-2"
                       :disabled="loading"
-                      @click="recoverField(field)"
                       data-testid="nc-field-restore-changes"
+                      @click="recoverField(field)"
                     >
                       <div class="flex items-center text-xs gap-1">
                         <GeneralIcon icon="reload" />
@@ -1030,8 +1030,8 @@ watch(
 
                               <div
                                 class="flex flex-row px-3 py-2 w-46 justify-between items-center group hover:bg-gray-100 cursor-pointer"
-                                @click="onClickCopyFieldUrl(field)"
                                 data-testid="nc-field-item-action-copy-id"
+                                @click="onClickCopyFieldUrl(field)"
                               >
                                 <div class="flex flex-row items-baseline gap-x-1 font-bold text-xs">
                                   <div class="text-gray-600">{{ $t('labels.idColon') }}</div>
@@ -1051,16 +1051,16 @@ watch(
                           <template v-if="!isLocked">
                             <NcMenuItem
                               key="table-explorer-duplicate"
-                              @click="duplicateField(field)"
                               data-testid="nc-field-item-action-duplicate"
+                              @click="duplicateField(field)"
                             >
                               <Icon class="iconify text-gray-800" icon="lucide:copy" /><span>{{ $t('general.duplicate') }}</span>
                             </NcMenuItem>
                             <NcMenuItem
                               v-if="!field.pv"
                               key="table-explorer-insert-above"
-                              @click="addField(field, true)"
                               data-testid="nc-field-item-action-insert-above"
+                              @click="addField(field, true)"
                             >
                               <Icon class="iconify text-gray-800" icon="lucide:arrow-up" /><span>{{
                                 $t('general.insertAbove')
@@ -1068,8 +1068,8 @@ watch(
                             </NcMenuItem>
                             <NcMenuItem
                               key="table-explorer-insert-below"
-                              @click="addField(field)"
                               data-testid="nc-field-item-action-insert-below"
+                              @click="addField(field)"
                             >
                               <Icon class="iconify text-gray-800" icon="lucide:arrow-down" /><span>{{
                                 $t('general.insertBelow')
@@ -1081,8 +1081,8 @@ watch(
                             <NcMenuItem
                               key="table-explorer-delete"
                               class="!hover:bg-red-50"
-                              @click="onFieldDelete(field)"
                               data-testid="nc-field-item-action-delete"
+                              @click="onFieldDelete(field)"
                             >
                               <div class="text-red-500">
                                 <GeneralIcon icon="delete" class="group-hover:text-accent -ml-0.25 -mt-0.75 mr-0.5" />
@@ -1111,8 +1111,8 @@ watch(
                 <div
                   class="flex px-2 bg-white hover:bg-gray-100 border-b-1 border-gray-200 first:rounded-tl-lg last:border-b-1 pl-5 group"
                   :class="` ${compareCols(displayColumn, activeField) ? 'selected' : ''}`"
-                  @click="changeField(displayColumn, $event)"
                   :data-testid="`nc-field-item-${fieldState(displayColumn)?.title || displayColumn.title}`"
+                  @click="changeField(displayColumn, $event)"
                 >
                   <div class="flex items-center flex-1 py-2.5 gap-1 w-2/6">
                     <component
@@ -1171,8 +1171,8 @@ watch(
                       size="small"
                       class="no-action mr-2"
                       :disabled="loading"
-                      @click="recoverField(displayColumn)"
                       data-testid="nc-field-restore-changes"
+                      @click="recoverField(displayColumn)"
                     >
                       <div class="flex items-center text-xs gap-1">
                         <GeneralIcon icon="reload" />
@@ -1212,8 +1212,8 @@ watch(
 
                             <div
                               class="flex flex-row px-3 py-2 w-46 justify-between items-center group hover:bg-gray-100 cursor-pointer"
-                              @click="onClickCopyFieldUrl(displayColumn)"
                               data-testid="nc-field-item-action-copy-id"
+                              @click="onClickCopyFieldUrl(displayColumn)"
                             >
                               <div class="flex flex-row items-baseline gap-x-1 font-bold text-xs">
                                 <div class="text-gray-600">{{ $t('labels.idColon') }}</div>

From b8c188867b562ad646b9aee46ca5fccc4d19ebf9 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:05:15 +0000
Subject: [PATCH 6/6] fix(nc-gui): generalTableIcon meta props

---
 packages/nc-gui/components/general/TableIcon.vue | 2 +-
 packages/nc-gui/components/project/AllTables.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/general/TableIcon.vue b/packages/nc-gui/components/general/TableIcon.vue
index 0f4ea0f2d7..eb7bcad91a 100644
--- a/packages/nc-gui/components/general/TableIcon.vue
+++ b/packages/nc-gui/components/general/TableIcon.vue
@@ -9,7 +9,7 @@ const { meta: tableMeta } = defineProps<{
 
 <template>
   <LazyGeneralEmojiPicker
-    v-if="tableMeta.meta?.icon"
+    v-if="tableMeta?.meta?.icon"
     :data-testid="`nc-emoji-${tableMeta.meta?.icon}`"
     class="text-lg"
     size="small"
diff --git a/packages/nc-gui/components/project/AllTables.vue b/packages/nc-gui/components/project/AllTables.vue
index 566a580164..5dcdbaad1e 100644
--- a/packages/nc-gui/components/project/AllTables.vue
+++ b/packages/nc-gui/components/project/AllTables.vue
@@ -143,7 +143,7 @@ const onCreateBaseClick = () => {
       >
         <div class="flex flex-row w-2/5 items-center gap-x-2" data-testid="proj-view-list__item-title">
           <div class="min-w-5 flex items-center justify-center">
-            <GeneralTableIcon :meta="{ meta: table.meta }" class="text-gray-500" />
+            <GeneralTableIcon :meta="table" class="text-gray-500" />
           </div>
           {{ table?.title }}
         </div>