From a8f96c70b4301fdaa9acd4cfd1a56721ae8eca20 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Wed, 4 Oct 2023 14:11:34 +0000
Subject: [PATCH 1/2] fix(nc-gui): Fixed issue with comment not loadning and
 syncing with the grid comment count

---
 .../components/smartsheet/expanded-form/Comments.vue      | 6 +++---
 .../nc-gui/components/smartsheet/expanded-form/index.vue  | 2 ++
 packages/nc-gui/composables/useExpandedFormStore.ts       | 8 ++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 794a6cb07a..a4d8e862d2 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -8,9 +8,9 @@ const { loadCommentsAndLogs, commentsAndLogs, saveComment: _saveComment, comment
 
 const commentsWrapperEl = ref<HTMLDivElement>()
 
-onMounted(async () => {
-  await loadCommentsAndLogs()
-})
+const auditTabDomRef = (e: HTMLElement) => {
+  e.scrollTop = e.scrollHeight
+}
 
 const { user } = useGlobal()
 
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index fad89d8ad7..7f064d110c 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -221,11 +221,13 @@ onMounted(async () => {
   isLoading.value = true
   if (props.loadRow) {
     await _loadRow()
+    await loadCommentsAndLogs()
   }
 
   if (props.rowId) {
     try {
       await _loadRow(props.rowId)
+      await loadCommentsAndLogs()
     } catch (e: any) {
       if (e.response?.status === 404) {
         // todo: i18n
diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts
index c6bb3fe1ff..0395aef888 100644
--- a/packages/nc-gui/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui/composables/useExpandedFormStore.ts
@@ -143,6 +143,8 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
 
       comment.value = ''
 
+      reloadTrigger?.trigger()
+
       await loadCommentsAndLogs()
     } catch (e: any) {
       message.error(e.message)
@@ -269,12 +271,6 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
         addOrEditStackRow(row.value, isNewRow)
       }
 
-      // trim the display value if greater than 20chars
-      const trimmedDisplayValue =
-        displayValue.value && displayValue.value?.length > 20 ? `${displayValue.value?.substring(0, 20)}...` : displayValue.value
-
-      message.success(`${trimmedDisplayValue || 'Row'} updated successfully.`)
-
       changedColumns.value = new Set()
     } catch (e: any) {
       message.error(`${t('msg.error.rowUpdateFailed')}: ${await extractSdkResponseErrorMsg(e)}`)

From 5f351892f250f6f16e965378a6c77394c848e3c4 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Wed, 4 Oct 2023 14:11:34 +0000
Subject: [PATCH 2/2] fix(nc-gui): Fixed grid jumping when comments are there

---
 packages/nc-gui/components/smartsheet/grid/Table.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index 1c3fd5cceb..52ffaf9b5d 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -1358,7 +1358,7 @@ const handleCellClick = (event: MouseEvent, row: number, col: number) => {
                         <div class="items-center flex gap-1 min-w-[60px]">
                           <div
                             v-if="!readOnly || !isLocked || isMobileMode"
-                            class="nc-row-no text-xs text-gray-500"
+                            class="nc-row-no sm:min-w-4 text-xs text-gray-500"
                             :class="{ toggle: !readOnly, hidden: row.rowMeta.selected }"
                           >
                             {{ ((paginationDataRef?.page ?? 1) - 1) * (paginationDataRef?.pageSize ?? 25) + rowIndex + 1 }}