From 0f99256daa903dc8e1675211bf8de025836d0f3c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 13:17:45 +0800
Subject: [PATCH 01/18] refactor(nc-gui): variable naming

---
 .../components/smartsheet/expanded-form/Comments.vue      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index c6e921385e..7dd7a6101a 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -8,7 +8,7 @@ const commentsWrapperEl = ref<HTMLDivElement>()
 
 await loadCommentsAndLogs()
 
-const showborder = ref(false)
+const showBorder = ref(false)
 
 watch(
   commentsAndLogs,
@@ -72,9 +72,9 @@ watch(
           v-model:value="comment"
           class="!text-xs nc-comment-box"
           ghost
-          :class="{ focus: showborder }"
-          @focusin="showborder = true"
-          @focusout="showborder = false"
+          :class="{ focus: showBorder }"
+          @focusin="showBorder = true"
+          @focusout="showBorder = false"
           @keyup.enter.prevent="saveComment"
         >
           <template #addonBefore>

From 6725d8ee211a212e4d37cf8c182756fe53948b56 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 17:06:32 +0800
Subject: [PATCH 02/18] feat(nc-gui): add copyComment, editComment and
 commentCopied in en.json

---
 packages/nc-gui/lang/en.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index c309782e21..93e179484c 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -378,6 +378,8 @@
     "resendInvite": "Resend invite E-mail",
     "copyInviteURL": "Copy invite URL",
     "copyPasswordResetURL": "Copy password reset URL",
+    "copyComment": "Copy Comment",
+    "editComment": "Edit Comment",
     "newRole": "New role",
     "reloadRoles": "Reload roles",
     "nextPage": "Next page",
@@ -778,6 +780,7 @@
       "userDeletedFromProject": "Successfully deleted user from project",
       "inviteEmailSent": "Invite Email sent successfully",
       "inviteURLCopied": "Invite URL copied to clipboard",
+      "commentCopied": "Comment copied to clipboard",
       "passwordResetURLCopied": "Password reset URL copied to clipboard",
       "shareableURLCopied": "Copied shareable base URL to clipboard!",
       "embeddableHTMLCodeCopied": "Copied embeddable HTML code!",

From c6c2f04fb88929c102435871940e083993121458 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 17:07:24 +0800
Subject: [PATCH 03/18] feat(nc-gui): add context menu for expanded form
 comments

---
 .../smartsheet/expanded-form/Comments.vue     | 100 +++++++++++++-----
 1 file changed, 73 insertions(+), 27 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 7dd7a6101a..49f99ea062 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { enumColor, ref, timeAgo, useExpandedFormStoreOrThrow, watch } from '#imports'
+import { enumColor, ref, timeAgo, useCopy, useExpandedFormStoreOrThrow, useI18n, watch } from '#imports'
 
 const { loadCommentsAndLogs, commentsAndLogs, isCommentsLoading, commentsOnly, saveComment, isYou, comment } =
   useExpandedFormStoreOrThrow()
@@ -10,6 +10,35 @@ await loadCommentsAndLogs()
 
 const showBorder = ref(false)
 
+const { copy } = useCopy()
+
+const { t } = useI18n()
+
+const { isUIAllowed } = useUIPermission()
+
+const hasEditPermission = $computed(() => isUIAllowed('commentEditable'))
+
+const _contextMenu = ref(false)
+
+const contextMenu = computed({
+  get: () => _contextMenu.value,
+  set: (val) => {
+    if (hasEditPermission) {
+      _contextMenu.value = val
+    }
+  },
+})
+
+async function copyComment(val: string) {
+  if (!val) return
+  try {
+    await copy(val)
+    message.success(t('msg.success.commentCopied'))
+  } catch (e: any) {
+    message.error(e.message)
+  }
+}
+
 watch(
   commentsAndLogs,
   () => {
@@ -26,31 +55,49 @@ watch(
   <div class="h-full flex flex-col w-full bg-[#eceff1] p-2">
     <div ref="commentsWrapperEl" class="flex-1 min-h-[100px] overflow-y-auto scrollbar-thin-dull p-2 space-y-2">
       <a-skeleton v-if="isCommentsLoading && !commentsAndLogs" type="list-item-avatar-two-line@8" />
-
       <template v-else>
-        <div v-for="log of commentsAndLogs" :key="log.id" class="flex gap-1 text-xs">
-          <MdiAccountCircle class="row-span-2" :class="isYou(log.user) ? 'text-pink-300' : 'text-blue-300 '" />
-
-          <div class="flex-1">
-            <p class="mb-1 caption edited-text text-[10px] text-gray-500">
-              {{ isYou(log.user) ? 'You' : log.user == null ? 'Shared base' : log.user }}
-              {{ log.op_type === 'COMMENT' ? 'commented' : log.op_sub_type === 'INSERT' ? 'created' : 'edited' }}
-            </p>
-
-            <p
-              v-if="log.op_type === 'COMMENT'"
-              class="block caption my-2 nc-chip w-full min-h-20px p-2 rounded"
-              :style="{ backgroundColor: enumColor.light[2] }"
-            >
-              {{ log.description }}
-            </p>
-
-            <p v-else v-dompurify-html="log.details" class="caption my-3" style="word-break: break-all" />
-
-            <p class="time text-right text-[10px] mb-0 mt-1 text-gray-500">
-              {{ timeAgo(log.created_at) }}
-            </p>
-          </div>
+        <div v-for="(log, idx) of commentsAndLogs" :key="log.id">
+          <a-dropdown :trigger="['contextmenu']" :overlay-class-name="`nc-dropdown-comment-context-menu-${idx}`">
+            <div class="flex gap-1 text-xs">
+              <MdiAccountCircle class="row-span-2" :class="isYou(log.user) ? 'text-pink-300' : 'text-blue-300 '" />
+
+              <div class="flex-1">
+                <p class="mb-1 caption edited-text text-[10px] text-gray-500">
+                  {{ isYou(log.user) ? 'You' : log.user == null ? 'Shared base' : log.user }}
+                  {{ log.op_type === 'COMMENT' ? 'commented' : log.op_sub_type === 'INSERT' ? 'created' : 'edited' }}
+                </p>
+
+                <p
+                  v-if="log.op_type === 'COMMENT'"
+                  class="block caption my-2 nc-chip w-full min-h-20px p-2 rounded"
+                  :style="{ backgroundColor: enumColor.light[2] }"
+                >
+                  {{ log.description }}
+                </p>
+
+                <p v-else v-dompurify-html="log.details" class="caption my-3" style="word-break: break-all" />
+
+                <p class="time text-right text-[10px] mb-0 mt-1 text-gray-500">
+                  {{ timeAgo(log.created_at) }}
+                </p>
+              </div>
+            </div>
+
+            <template #overlay>
+              <a-menu @click="contextMenu = false">
+                <a-menu-item key="copy-comment" @click="copyComment(log.description)">
+                  <div v-e="['a:comment:copy']" class="nc-project-menu-item">
+                    {{ t('activity.copyComment') }}
+                  </div>
+                </a-menu-item>
+                <a-menu-item key="edit-comment">
+                  <div v-e="['a:comment:edit']" class="nc-project-menu-item">
+                    {{ t('activity.editComment') }}
+                  </div>
+                </a-menu-item>
+              </a-menu>
+            </template>
+          </a-dropdown>
         </div>
       </template>
     </div>
@@ -59,10 +106,9 @@ watch(
 
     <div class="p-0">
       <div class="flex justify-center">
-        <!--        Comments only -->
+        <!-- Comments only -->
         <a-checkbox v-model:checked="commentsOnly" v-e="['c:row-expand:comment-only']" @change="loadCommentsAndLogs">
           {{ $t('labels.commentsOnly') }}
-
           <span class="text-[11px] text-gray-500" />
         </a-checkbox>
       </div>

From 37ffa63e8dd99c8a5c8e052ef946d8cc371be7a1 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 18:50:29 +0800
Subject: [PATCH 04/18] feat(nc-gui): allow comment op type only

---
 .../nc-gui/components/smartsheet/expanded-form/Comments.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 49f99ea062..5e643a0be8 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -84,7 +84,7 @@ watch(
             </div>
 
             <template #overlay>
-              <a-menu @click="contextMenu = false">
+              <a-menu v-if="log.op_type === 'COMMENT'" @click="contextMenu = false">
                 <a-menu-item key="copy-comment" @click="copyComment(log.description)">
                   <div v-e="['a:comment:copy']" class="nc-project-menu-item">
                     {{ t('activity.copyComment') }}

From 65b89b71c6d5cde82e937cd788a551a1c87408d1 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 20:21:14 +0800
Subject: [PATCH 05/18] feat(nocodb): add comment update api

---
 packages/nocodb/src/schema/swagger.json | 269 ++++++++++++++++--------
 1 file changed, 176 insertions(+), 93 deletions(-)

diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index a26f21c9f1..60fc44bfff 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -11523,6 +11523,69 @@
         ]
       }
     },
+    "/api/v1/db/meta/audits/{auditId}/comment": {
+      "parameters": [
+        {
+          "schema": {
+            "type": "string",
+            "example": "adt_zlskd6rlf3liay"
+          },
+          "name": "auditId",
+          "in": "path",
+          "required": true,
+          "description": "Audit ID"
+        },
+        {
+          "name": "xc-auth",
+          "in": "header",
+          "required": false,
+          "schema": {
+            "type": "string"
+          },
+          "description": "Auth Token is a JWT Token generated based on the logged-in user. By default, the token is only valid for 10 hours. However, you can change the value by defining it using environment variable NC_JWT_EXPIRES_IN."
+        }
+      ],
+      "patch": {
+        "summary": "Update Comment in Audit",
+        "operationId": "utils-comment-update",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "number",
+                  "example": 1
+                },
+                "examples": {
+                  "Example 1": {
+                    "value": 1
+                  }
+                }
+              }
+            }
+          }
+        },
+        "tags": ["Utils"],
+        "description": "Update comment in Audit",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CommentUpdateReq"
+              },
+              "examples": {
+                "Example 1": {
+                  "value": {
+                    "description": "This is the comment for the row"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/db/meta/audits/comments/count": {
       "parameters": [
         {
@@ -13583,7 +13646,7 @@
           }
         },
         "x-stoplight": {
-          "id": "q8h78qib3l9ko"
+          "id": "zc9ztw0ih4ttt"
         }
       },
       "ApiTokenReq": {
@@ -13604,13 +13667,13 @@
           }
         },
         "x-stoplight": {
-          "id": "insn8kf1n4s6k"
+          "id": "t9dpbaw4dhpx3"
         }
       },
       "ApiTokenList": {
         "description": "Model for API Token List",
         "x-stoplight": {
-          "id": "r482re16lknrx"
+          "id": "dgoo5jfkvypld"
         },
         "examples": [
           {
@@ -13715,7 +13778,7 @@
           }
         },
         "x-stoplight": {
-          "id": "g4rbip7xwyo6c"
+          "id": "9uff8of377ouf"
         }
       },
       "AttachmentReq": {
@@ -13753,7 +13816,7 @@
           }
         },
         "x-stoplight": {
-          "id": "13qyneoxa9jal"
+          "id": "7mvkmys63d0bx"
         }
       },
       "Audit": {
@@ -13878,7 +13941,7 @@
           }
         },
         "x-stoplight": {
-          "id": "l0ptb1ze54xw8"
+          "id": "dz9hjvx07jaje"
         }
       },
       "AuditRowUpdateReq": {
@@ -13918,7 +13981,7 @@
           }
         },
         "x-stoplight": {
-          "id": "56u0jsmndirwt"
+          "id": "t4l2bqjgukcr1"
         }
       },
       "Base": {
@@ -13995,7 +14058,7 @@
           }
         },
         "x-stoplight": {
-          "id": "af5ft42zw0uds"
+          "id": "l5nhyvoa0dfag"
         }
       },
       "BaseList": {
@@ -14097,7 +14160,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "ixksiq5jlmtt8"
+          "id": "pn96b18y3k0je"
         }
       },
       "BaseReq": {
@@ -14153,7 +14216,7 @@
         "title": "Base Request",
         "type": "object",
         "x-stoplight": {
-          "id": "noplj8yr34xzd"
+          "id": "gebxq2b5pp1a3"
         }
       },
       "Bool": {
@@ -14175,7 +14238,7 @@
         ],
         "title": "Bool Model",
         "x-stoplight": {
-          "id": "1mdcm71g7euvt"
+          "id": "6qmxbfclxa8em"
         }
       },
       "Column": {
@@ -14463,7 +14526,7 @@
           }
         },
         "x-stoplight": {
-          "id": "jcj9uwgl3rnum"
+          "id": "0nszsk1q6done"
         }
       },
       "ColumnList": {
@@ -14571,7 +14634,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "vs478sn3czrc2"
+          "id": "fjqsqgw1ahlon"
         }
       },
       "ColumnReq": {
@@ -14663,7 +14726,7 @@
         "title": "Column Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "gz9531uzue95g"
+          "id": "fw6an7vvhpqfu"
         }
       },
       "CommentReq": {
@@ -14696,7 +14759,27 @@
         },
         "required": ["fk_model_id", "row_id"],
         "x-stoplight": {
-          "id": "bsshnshrcy8f7"
+          "id": "k7vnf7oc33p6m"
+        }
+      },
+      "CommentUpdateReq": {
+        "description": "Model for Comment Update Request",
+        "x-stoplight": {
+          "id": "wan84coiq9lyn"
+        },
+        "examples": [
+          {
+            "description": "This is the comment for the row"
+          }
+        ],
+        "title": "Comment Update Request Model",
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": "string",
+            "description": "Description for the target row",
+            "example": "This is the comment for the row"
+          }
         }
       },
       "Filter": {
@@ -14855,7 +14938,7 @@
         "title": "Filter Model",
         "type": "object",
         "x-stoplight": {
-          "id": "ugwuw0aemt5y2"
+          "id": "goytqs4ua69w0"
         }
       },
       "FilterList": {
@@ -14944,7 +15027,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "5wly9iyeixwxs"
+          "id": "wzp2nwu7k19uj"
         }
       },
       "FilterReq": {
@@ -14962,7 +15045,7 @@
         "title": "Filter Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "3rypg89wx0qp1"
+          "id": "viq9ex4d7k8k2"
         },
         "properties": {
           "comparison_op": {
@@ -15183,7 +15266,7 @@
           }
         },
         "x-stoplight": {
-          "id": "luvu108gux43l"
+          "id": "bjh5qbmqyzy1k"
         }
       },
       "FormUpdateReq": {
@@ -15254,7 +15337,7 @@
           }
         },
         "x-stoplight": {
-          "id": "j9hvt9lds2o4q"
+          "id": "76m5jsz93rjsc"
         }
       },
       "FormColumn": {
@@ -15348,7 +15431,7 @@
           }
         },
         "x-stoplight": {
-          "id": "uga344v068snf"
+          "id": "liiv7vd1hgeqf"
         }
       },
       "FormColumnReq": {
@@ -15415,7 +15498,7 @@
           }
         },
         "x-stoplight": {
-          "id": "7x7zkufy7a93t"
+          "id": "21k1kvmq14s9a"
         }
       },
       "Formula": {
@@ -15456,7 +15539,7 @@
           }
         },
         "x-stoplight": {
-          "id": "3h68x9a08nvlu"
+          "id": "8ahp8va0147v1"
         }
       },
       "FormulaColumnReq": {
@@ -15493,7 +15576,7 @@
           }
         },
         "x-stoplight": {
-          "id": "rd9929r4qa3c0"
+          "id": "s3c9yjip3dank"
         }
       },
       "Gallery": {
@@ -15587,7 +15670,7 @@
         "title": "Gallery Model",
         "type": "object",
         "x-stoplight": {
-          "id": "at47gz5aqeuv5"
+          "id": "e1o8q9fieshbc"
         }
       },
       "GalleryColumn": {
@@ -15622,13 +15705,13 @@
         "title": "Gallery Column Model",
         "type": "object",
         "x-stoplight": {
-          "id": "4mx8vfd16y55g"
+          "id": "llcstnvsjdgz0"
         }
       },
       "GalleryUpdateReq": {
         "description": "Model for Gallery View Update Request",
         "x-stoplight": {
-          "id": "uiz5gs88mmt1a"
+          "id": "5cxhum5vh2nr2"
         },
         "examples": [
           {
@@ -15681,7 +15764,7 @@
         "title": "Geo Location Model",
         "type": "object",
         "x-stoplight": {
-          "id": "cphi852bw9h6n"
+          "id": "hwuzujovr9qwx"
         }
       },
       "Grid": {
@@ -15791,7 +15874,7 @@
           }
         },
         "x-stoplight": {
-          "id": "b84k9hlbnco1o"
+          "id": "xntep33dod0ys"
         }
       },
       "GridColumn": {
@@ -15875,7 +15958,7 @@
           }
         },
         "x-stoplight": {
-          "id": "r2fo58lue2zws"
+          "id": "2go3w0igl2243"
         }
       },
       "GridColumnReq": {
@@ -15913,13 +15996,13 @@
         "title": "Grid Column Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "1viyr55m2bzy3"
+          "id": "2j3uyoabzmsrz"
         }
       },
       "GridUpdateReq": {
         "description": "Model for Grid View Update",
         "x-stoplight": {
-          "id": "rmiv1e1jrzj71"
+          "id": "2q9ya4zmyr5x7"
         },
         "examples": [
           {
@@ -16039,13 +16122,13 @@
           }
         },
         "x-stoplight": {
-          "id": "0rlu88fc7ctax"
+          "id": "q8cxkpronjmyx"
         }
       },
       "HookReq": {
         "description": "Model for Hook",
         "x-stoplight": {
-          "id": "yogkf6qrh2el9"
+          "id": "4zlzrppfjxrqb"
         },
         "examples": [
           {
@@ -16223,7 +16306,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "xhy5z4cp53e19"
+          "id": "2tsq8h6hjctju"
         }
       },
       "HookLog": {
@@ -16304,7 +16387,7 @@
           }
         },
         "x-stoplight": {
-          "id": "uwhlr759v7ftb"
+          "id": "t3hlkw7zdqpom"
         }
       },
       "HookTestReq": {
@@ -16358,7 +16441,7 @@
         },
         "required": ["hook", "payload"],
         "x-stoplight": {
-          "id": "7fzbka372uhws"
+          "id": "p2t60nmuy6x26"
         }
       },
       "Id": {
@@ -16369,7 +16452,7 @@
         "title": "ID Model",
         "type": "string",
         "x-stoplight": {
-          "id": "q0pbjcp2vwe2s"
+          "id": "srvzhcm5j7d65"
         }
       },
       "Kanban": {
@@ -16436,7 +16519,7 @@
           }
         },
         "x-stoplight": {
-          "id": "y0wib3uswcjv3"
+          "id": "1jq82nu2uugxr"
         }
       },
       "KanbanColumn": {
@@ -16509,7 +16592,7 @@
           }
         },
         "x-stoplight": {
-          "id": "jq9x7ac9cr56v"
+          "id": "ipigcz5c7b5qy"
         }
       },
       "KanbanUpdateReq": {
@@ -16586,7 +16669,7 @@
           }
         },
         "x-stoplight": {
-          "id": "ds5bt314hgogd"
+          "id": "ufp4dyqfvlk6a"
         }
       },
       "LicenseReq": {
@@ -16608,7 +16691,7 @@
         "title": "License Key Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "ydf14317b0zdt"
+          "id": "2hys6jqfbam2w"
         }
       },
       "LinkToAnotherColumnReq": {
@@ -16657,7 +16740,7 @@
         "title": "LinkToAnotherColumn Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "72l8lzwwxd36o"
+          "id": "nx1h0s2wseid0"
         }
       },
       "LinkToAnotherRecord": {
@@ -16733,7 +16816,7 @@
         "title": "LinkToAnotherRecord Model",
         "type": "object",
         "x-stoplight": {
-          "id": "dyp9tqjqy0vjn"
+          "id": "845623nb0zp0w"
         }
       },
       "Lookup": {
@@ -16773,7 +16856,7 @@
           }
         },
         "x-stoplight": {
-          "id": "oin5vuleupbau"
+          "id": "22i9gmsgqt79n"
         }
       },
       "LookupColumnReq": {
@@ -16810,7 +16893,7 @@
           }
         },
         "x-stoplight": {
-          "id": "pas3o57wv14yl"
+          "id": "dhmss9g7ljbw7"
         }
       },
       "Map": {
@@ -16887,13 +16970,13 @@
         "title": "Map Model",
         "type": "object",
         "x-stoplight": {
-          "id": "g54ldc4p8ukcb"
+          "id": "2gkbn859ho3ct"
         }
       },
       "MapUpdateReq": {
         "description": "Model for Map",
         "x-stoplight": {
-          "id": "np6n7vwe0bpbc"
+          "id": "u7xywz40dryws"
         },
         "examples": [
           {
@@ -16968,7 +17051,7 @@
         "title": "Map Column Model",
         "type": "object",
         "x-stoplight": {
-          "id": "jwohh924xkrki"
+          "id": "ftaul6uruvc4z"
         }
       },
       "Meta": {
@@ -16987,7 +17070,7 @@
         ],
         "title": "Meta Model",
         "x-stoplight": {
-          "id": "3bua8s1l4ia18"
+          "id": "pqxyr0shwtrp5"
         }
       },
       "ModelRoleVisibility": {
@@ -17030,7 +17113,7 @@
         "title": "ModelRoleVisibility Model",
         "type": "object",
         "x-stoplight": {
-          "id": "qd2r14lgbgil5"
+          "id": "d3j1x4pulo4ng"
         }
       },
       "NormalColumnRequest": {
@@ -17209,7 +17292,7 @@
         "type": "object",
         "required": ["column_name"],
         "x-stoplight": {
-          "id": "lbdjjckrjmr9a"
+          "id": "uzaqliigop3nw"
         }
       },
       "OrgUserReq": {
@@ -17234,7 +17317,7 @@
         "title": "Organisation User Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "odog9hoqfpbii"
+          "id": "pk8a8itnqcis1"
         }
       },
       "Paginated": {
@@ -17276,7 +17359,7 @@
         "title": "Paginated Model",
         "type": "object",
         "x-stoplight": {
-          "id": "x9joizn5gys68"
+          "id": "a5zhehpll01cm"
         }
       },
       "Password": {
@@ -17287,7 +17370,7 @@
         "title": "Password Model",
         "type": "string",
         "x-stoplight": {
-          "id": "bn4nxlclrh5pl"
+          "id": "mleq9lljoh76x"
         }
       },
       "PasswordChangeReq": {
@@ -17311,7 +17394,7 @@
         "title": "Password Change Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "0bt6ueal1r1ai"
+          "id": "8a21c5za82w87"
         }
       },
       "PasswordForgotReq": {
@@ -17332,7 +17415,7 @@
         "title": "Password Forgot Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "ucprs67a4yk4e"
+          "id": "ggt9lpf2gz2va"
         }
       },
       "PasswordResetReq": {
@@ -17354,7 +17437,7 @@
         "title": "Password Reset Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "kgww333t4d6oi"
+          "id": "f63x3tpb8ti9r"
         }
       },
       "Plugin": {
@@ -17471,7 +17554,7 @@
           }
         },
         "x-stoplight": {
-          "id": "yddgye9ktoowm"
+          "id": "0atoct4o6csg1"
         }
       },
       "PluginReq": {
@@ -17495,7 +17578,7 @@
           }
         },
         "x-stoplight": {
-          "id": "8n2qkaa4mmbwk"
+          "id": "w6jwfvgpbhmt0"
         }
       },
       "PluginTestReq": {
@@ -17537,7 +17620,7 @@
         },
         "required": ["title", "input", "category"],
         "x-stoplight": {
-          "id": "xburi6p29sjxt"
+          "id": "yye6yekmme06k"
         }
       },
       "Project": {
@@ -17627,7 +17710,7 @@
           }
         },
         "x-stoplight": {
-          "id": "mws3mrzua4dgn"
+          "id": "xzqakuahxm8d1"
         }
       },
       "ProjectList": {
@@ -17723,7 +17806,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "xyl4jpahycz9z"
+          "id": "rb5o2yaf8ue64"
         }
       },
       "ProjectReq": {
@@ -17776,13 +17859,13 @@
         "title": "Project Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "q30kb0cjsqejc"
+          "id": "km2fj1ebsroys"
         }
       },
       "ProjectUpdateReq": {
         "description": "Model for Project Update Request",
         "x-stoplight": {
-          "id": "c3vcm2zuncet0"
+          "id": "ou8zri28ak9yl"
         },
         "examples": [
           {
@@ -17847,7 +17930,7 @@
         },
         "required": ["email", "roles"],
         "x-stoplight": {
-          "id": "9t06rq4mfxpsi"
+          "id": "9pgemwq7iirkp"
         }
       },
       "Rollup": {
@@ -17896,7 +17979,7 @@
           }
         },
         "x-stoplight": {
-          "id": "vx9w2nz7au6ra"
+          "id": "rq1o1yy2htfv0"
         }
       },
       "RollupColumnReq": {
@@ -17947,7 +18030,7 @@
           }
         },
         "x-stoplight": {
-          "id": "4dhjg4qtqyxgt"
+          "id": "8yc4ashgpj37h"
         }
       },
       "SelectOption": {
@@ -17989,7 +18072,7 @@
           }
         },
         "x-stoplight": {
-          "id": "phvjpv4bedapu"
+          "id": "sc5hl2s3rm8x7"
         }
       },
       "SelectOptions": {
@@ -18020,7 +18103,7 @@
         },
         "required": ["options"],
         "x-stoplight": {
-          "id": "kjpgrmx40vtbs"
+          "id": "r6d5rziqt288w"
         }
       },
       "SharedBaseReq": {
@@ -18048,7 +18131,7 @@
           }
         },
         "x-stoplight": {
-          "id": "oinjv6cau9px7"
+          "id": "ybt81tfrpfvd2"
         }
       },
       "SharedView": {
@@ -18086,7 +18169,7 @@
           }
         ],
         "x-stoplight": {
-          "id": "80fgtmpmd1hxi"
+          "id": "9wxqjviu1tfd4"
         }
       },
       "SharedViewList": {
@@ -18180,7 +18263,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "4nhixasc8ncwz"
+          "id": "jtlp6vswbc96e"
         }
       },
       "SharedViewReq": {
@@ -18204,7 +18287,7 @@
           }
         },
         "x-stoplight": {
-          "id": "bnn8fqklepl7j"
+          "id": "zja4lmiol065l"
         }
       },
       "SignInReq": {
@@ -18230,7 +18313,7 @@
         "title": "Signin Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "u8vbpvxi9gs2z"
+          "id": "2m1y6fuop0adc"
         }
       },
       "SignUpReq": {
@@ -18289,7 +18372,7 @@
         },
         "required": ["email", "password"],
         "x-stoplight": {
-          "id": "tw6fyw78ih8dx"
+          "id": "t7stkblz9wllz"
         }
       },
       "Sort": {
@@ -18342,7 +18425,7 @@
           }
         },
         "x-stoplight": {
-          "id": "9vo9f9qec4rwf"
+          "id": "tlcmtmjzcyhm6"
         }
       },
       "SortList": {
@@ -18423,7 +18506,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "wwcmyc9odjaxt"
+          "id": "7j3nbohh43tyy"
         }
       },
       "SortReq": {
@@ -18449,7 +18532,7 @@
           }
         },
         "x-stoplight": {
-          "id": "g320wvsh90rcp"
+          "id": "shzdd8k3xswo9"
         }
       },
       "StringOrNull": {
@@ -18466,7 +18549,7 @@
         ],
         "title": "StringOrNull Model",
         "x-stoplight": {
-          "id": "n57pb7pryq2zm"
+          "id": "1lecfrpmnndhi"
         }
       },
       "Table": {
@@ -18895,7 +18978,7 @@
         },
         "required": ["table_name", "title"],
         "x-stoplight": {
-          "id": "jnbkhtbvk6np6"
+          "id": "986a3bp33neka"
         }
       },
       "TableList": {
@@ -19025,7 +19108,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "dki89c4lat66i"
+          "id": "gemdr6sjuj4gl"
         }
       },
       "TableReq": {
@@ -19166,7 +19249,7 @@
         "title": "Table Request Model",
         "type": "object",
         "x-stoplight": {
-          "id": "rx8c69o5719vx"
+          "id": "3i0r55tix0aso"
         }
       },
       "User": {
@@ -19218,7 +19301,7 @@
         },
         "required": ["email", "email_verified", "firstname", "id", "lastname"],
         "x-stoplight": {
-          "id": "cls6abm42ey04"
+          "id": "2uxbpdjvs379s"
         }
       },
       "UserInfo": {
@@ -19262,7 +19345,7 @@
         "title": "User Info Model",
         "type": "object",
         "x-stoplight": {
-          "id": "tvl09i4n62jnc"
+          "id": "uatcf3jcnna1t"
         }
       },
       "UserList": {
@@ -19343,7 +19426,7 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "kxaws22o5xk74"
+          "id": "ygjybmp21hdgp"
         }
       },
       "View": {
@@ -19457,7 +19540,7 @@
         },
         "required": ["fk_model_id", "show", "title", "type"],
         "x-stoplight": {
-          "id": "t38y987y9rgv5"
+          "id": "66ki9gaxq3kwg"
         }
       },
       "ViewList": {
@@ -19585,13 +19668,13 @@
         },
         "required": ["list", "pageInfo"],
         "x-stoplight": {
-          "id": "kjdjlqsioesz5"
+          "id": "2iat5dhhl4hoa"
         }
       },
       "ViewCreateReq": {
         "type": "object",
         "x-stoplight": {
-          "id": "cuum3lv94tb57"
+          "id": "venaxkw5uod3n"
         },
         "title": "ViewCreateReq",
         "description": "Model for View Create Request",
@@ -19660,7 +19743,7 @@
       "ViewUpdateReq": {
         "description": "Model for View Update Request",
         "x-stoplight": {
-          "id": "zlgpq6n2pg2rj"
+          "id": "bo1mzzdpk82z0"
         },
         "examples": [
           {
@@ -19725,7 +19808,7 @@
       "ViewColumnUpdateReq": {
         "description": "Model for View Column Update Request",
         "x-stoplight": {
-          "id": "zt66lex00hzth"
+          "id": "jmhr4prd02ssy"
         },
         "examples": [
           {
@@ -19754,7 +19837,7 @@
       "ViewColumnReq": {
         "description": "Model for View Column Request",
         "x-stoplight": {
-          "id": "chpsc3sgvhehw"
+          "id": "05tr5rxotp432"
         },
         "examples": [
           {
@@ -19845,7 +19928,7 @@
         "title": "Visibility Rule Request Model",
         "type": "array",
         "x-stoplight": {
-          "id": "bmgsfkt8woxh5"
+          "id": "c6q9v9rtiduxg"
         }
       }
     },

From fad6868b54ae58491a8dc1848cd718e27d90d7d2 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 20:21:22 +0800
Subject: [PATCH 06/18] feat(nocodb): add commentUpdate

---
 packages/nocodb/src/lib/services/audit.svc.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/services/audit.svc.ts b/packages/nocodb/src/lib/services/audit.svc.ts
index fe1c48db7c..c4d140fafe 100644
--- a/packages/nocodb/src/lib/services/audit.svc.ts
+++ b/packages/nocodb/src/lib/services/audit.svc.ts
@@ -3,7 +3,7 @@ import DOMPurify from 'isomorphic-dompurify';
 import { validatePayload } from '../meta/api/helpers';
 import Audit from '../models/Audit';
 import Model from '../models/Model';
-import type { AuditRowUpdateReqType } from 'nocodb-sdk';
+import type { AuditRowUpdateReqType, CommentUpdateReqType } from 'nocodb-sdk';
 
 export async function commentRow(param: {
   rowId: string;
@@ -62,3 +62,15 @@ export async function commentsCount(param: {
     ids: param.ids as string[],
   });
 }
+
+export async function commentUpdate(param: {
+  auditId: string;
+  body: CommentUpdateReqType;
+}) {
+  validatePayload(
+    'swagger.json#/components/schemas/CommentUpdateReq',
+    param.body
+  );
+
+  return await Audit.commentUpdate(param.auditId, param.body);
+}

From 17189aba95d7d81570bceb99bdfa3d2368c53ba9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 20:22:11 +0800
Subject: [PATCH 07/18] feat(nocodb): add commentUpdate

---
 packages/nocodb/src/lib/models/Audit.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/nocodb/src/lib/models/Audit.ts b/packages/nocodb/src/lib/models/Audit.ts
index 4a4a7a4980..f8e2e84bb9 100644
--- a/packages/nocodb/src/lib/models/Audit.ts
+++ b/packages/nocodb/src/lib/models/Audit.ts
@@ -157,6 +157,7 @@ export default class Audit implements AuditType {
       offset,
     });
   }
+
   static async projectAuditCount(projectId: string): Promise<number> {
     return (
       await Noco.ncMeta
@@ -172,4 +173,19 @@ export default class Audit implements AuditType {
       fk_model_id,
     });
   }
+
+  static async commentUpdate(
+    auditId: string,
+    audit: Partial<AuditType>,
+    ncMeta = Noco.ncMeta
+  ) {
+    const updateObj = extractProps(audit, ['description']);
+    return await ncMeta.metaUpdate(
+      null,
+      null,
+      MetaTable.AUDIT,
+      updateObj,
+      auditId
+    );
+  }
 }

From 5961de6400136aee7f65e969d969a5c9ded17d2d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 20:22:26 +0800
Subject: [PATCH 08/18] feat(nocodb): add commentUpdate PATCH API

---
 packages/nocodb/src/lib/controllers/audit.ctl.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/nocodb/src/lib/controllers/audit.ctl.ts b/packages/nocodb/src/lib/controllers/audit.ctl.ts
index fc873e3ac0..53110c2dfb 100644
--- a/packages/nocodb/src/lib/controllers/audit.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/audit.ctl.ts
@@ -30,6 +30,15 @@ export async function commentList(req: Request<any, any, any>, res) {
   );
 }
 
+export async function commentUpdate(req: Request<any, any>, res) {
+  res.json(
+    await auditService.commentUpdate({
+      auditId: req.params.auditId,
+      body: req.body,
+    })
+  );
+}
+
 export async function auditList(req: Request, res: Response) {
   res.json(
     new PagedResponseImpl(
@@ -66,6 +75,11 @@ router.post(
   ncMetaAclMw(commentRow, 'commentRow')
 );
 
+router.patch(
+  '/api/v1/db/meta/audits/:auditId/comment',
+  ncMetaAclMw(commentUpdate, 'commentUpdate')
+);
+
 router.post(
   '/api/v1/db/meta/audits/rows/:rowId/update',
   ncMetaAclMw(auditRowUpdate, 'auditRowUpdate')

From 3e88d4337eeaa3de9ebfac21e95d65db02f8adf3 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 20:22:39 +0800
Subject: [PATCH 09/18] feat(sdk): add commentUpdate & CommentUpdateReqType

---
 packages/nocodb-sdk/src/lib/Api.ts | 34 ++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 0df3f14ade..be2fca8810 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -499,6 +499,17 @@ export interface CommentReqType {
   row_id: string;
 }
 
+/**
+ * Model for Comment Update Request
+ */
+export interface CommentUpdateReqType {
+  /**
+   * Description for the target row
+   * @example This is the comment for the row
+   */
+  description?: string;
+}
+
 /**
  * Model for Filter
  */
@@ -8105,6 +8116,29 @@ export class Api<
       }),
 
     /**
+     * @description Update comment in Audit
+     *
+     * @tags Utils
+     * @name CommentUpdate
+     * @summary Update Comment in Audit
+     * @request PATCH:/api/v1/db/meta/audits/{auditId}/comment
+     * @response `200` `number` OK
+     */
+    commentUpdate: (
+      auditId: string,
+      data: CommentUpdateReqType,
+      params: RequestParams = {}
+    ) =>
+      this.request<number, any>({
+        path: `/api/v1/db/meta/audits/${auditId}/comment`,
+        method: 'PATCH',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
  * @description Return the number of comments in the given query.
  * 
  * @tags Utils

From 891d4abd0b9caf6b49a477b930c215b9b4f414b9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 20:22:59 +0800
Subject: [PATCH 10/18] feat(nc-gui): include updateComment in
 useExpandedFormStore.ts

---
 packages/nc-gui/composables/useExpandedFormStore.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts
index 0f2f4f4cf6..a3f02c0f9b 100644
--- a/packages/nc-gui/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui/composables/useExpandedFormStore.ts
@@ -1,5 +1,5 @@
 import { UITypes, ViewTypes } from 'nocodb-sdk'
-import type { ColumnType, TableType } from 'nocodb-sdk'
+import type { AuditType, ColumnType, TableType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import dayjs from 'dayjs'
 import {
@@ -229,6 +229,10 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
     })
   }
 
+  const updateComment = async (auditId: string, audit: Partial<AuditType>) => {
+    return await $api.utils.commentUpdate(auditId, audit)
+  }
+
   return {
     ...rowStore,
     commentsOnly,
@@ -247,6 +251,7 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
     loadRow,
     primaryKey,
     saveRowAndStay,
+    updateComment,
   }
 }, 'expanded-form-store')
 

From 8226e1327394fc85c55d9e63d63f9cd4644fc82c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 22 Mar 2023 20:23:17 +0800
Subject: [PATCH 11/18] feat(nc-gui): add editComment logic

---
 .../smartsheet/expanded-form/Comments.vue     | 85 +++++++++++++++++--
 1 file changed, 76 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 5e643a0be8..163c297d41 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
+import type { VNodeRef } from '@vue/runtime-core'
+import type { AuditType } from 'nocodb-sdk'
 import { enumColor, ref, timeAgo, useCopy, useExpandedFormStoreOrThrow, useI18n, watch } from '#imports'
 
-const { loadCommentsAndLogs, commentsAndLogs, isCommentsLoading, commentsOnly, saveComment, isYou, comment } =
+const { loadCommentsAndLogs, commentsAndLogs, isCommentsLoading, commentsOnly, saveComment, isYou, comment, updateComment } =
   useExpandedFormStoreOrThrow()
 
 const commentsWrapperEl = ref<HTMLDivElement>()
@@ -18,6 +20,57 @@ const { isUIAllowed } = useUIPermission()
 
 const hasEditPermission = $computed(() => isUIAllowed('commentEditable'))
 
+let editLog = $ref<AuditType>()
+
+let isEditing = $ref<boolean>(false)
+
+const focusInput: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
+
+function onKeyDown(event: KeyboardEvent) {
+  if (event.key === 'Escape') {
+    onKeyEsc(event)
+  } else if (event.key === 'Enter') {
+    onKeyEnter(event)
+  }
+}
+
+function onKeyEnter(event: KeyboardEvent) {
+  event.stopImmediatePropagation()
+  event.preventDefault()
+  onEditComment()
+}
+
+function onKeyEsc(event: KeyboardEvent) {
+  event.stopImmediatePropagation()
+  event.preventDefault()
+  onCancel()
+}
+
+async function onEditComment() {
+  if (!isEditing || !editLog) return
+  await updateComment(editLog.id!, {
+    description: editLog.description,
+  })
+  onStopEdit()
+}
+
+function onCancel() {
+  if (!isEditing) return
+  editLog = undefined
+  onStopEdit()
+}
+
+function onStopEdit() {
+  isEditing = false
+  editLog = undefined
+}
+
+onKeyStroke('Enter', (event) => {
+  if (isEditing) {
+    onKeyEnter(event)
+  }
+})
+
 const _contextMenu = ref(false)
 
 const contextMenu = computed({
@@ -39,6 +92,11 @@ async function copyComment(val: string) {
   }
 }
 
+function editComment(log: AuditType) {
+  editLog = log
+  isEditing = true
+}
+
 watch(
   commentsAndLogs,
   () => {
@@ -67,13 +125,22 @@ watch(
                   {{ log.op_type === 'COMMENT' ? 'commented' : log.op_sub_type === 'INSERT' ? 'created' : 'edited' }}
                 </p>
 
-                <p
-                  v-if="log.op_type === 'COMMENT'"
-                  class="block caption my-2 nc-chip w-full min-h-20px p-2 rounded"
-                  :style="{ backgroundColor: enumColor.light[2] }"
-                >
-                  {{ log.description }}
-                </p>
+                <div v-if="log.op_type === 'COMMENT'">
+                  <a-input
+                    v-if="log.id === editLog?.id"
+                    :ref="focusInput"
+                    v-model:value="editLog.description"
+                    @blur="onCancel"
+                    @keydown.stop="onKeyDown($event)"
+                  />
+                  <p
+                    v-else
+                    class="block caption my-2 nc-chip w-full min-h-20px p-2 rounded"
+                    :style="{ backgroundColor: enumColor.light[2] }"
+                  >
+                    {{ log.description }}
+                  </p>
+                </div>
 
                 <p v-else v-dompurify-html="log.details" class="caption my-3" style="word-break: break-all" />
 
@@ -90,7 +157,7 @@ watch(
                     {{ t('activity.copyComment') }}
                   </div>
                 </a-menu-item>
-                <a-menu-item key="edit-comment">
+                <a-menu-item key="edit-comment" @click="editComment(log)">
                   <div v-e="['a:comment:edit']" class="nc-project-menu-item">
                     {{ t('activity.editComment') }}
                   </div>

From f2c3d9c93be83971fb7724f88abec2ddf7b4029d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 00:23:01 +0800
Subject: [PATCH 12/18] chore(nc-gui): remove copyComment & editComment

---
 packages/nc-gui/lang/en.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 93e179484c..1842c5d810 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -378,8 +378,6 @@
     "resendInvite": "Resend invite E-mail",
     "copyInviteURL": "Copy invite URL",
     "copyPasswordResetURL": "Copy password reset URL",
-    "copyComment": "Copy Comment",
-    "editComment": "Edit Comment",
     "newRole": "New role",
     "reloadRoles": "Reload roles",
     "nextPage": "Next page",

From f758b1d867dbd7217be268a5dcb26de2566832e5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 00:23:13 +0800
Subject: [PATCH 13/18] refactor(nc-gui): use copy & edit from general

---
 .../nc-gui/components/smartsheet/expanded-form/Comments.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 163c297d41..0636c96ce1 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -154,12 +154,12 @@ watch(
               <a-menu v-if="log.op_type === 'COMMENT'" @click="contextMenu = false">
                 <a-menu-item key="copy-comment" @click="copyComment(log.description)">
                   <div v-e="['a:comment:copy']" class="nc-project-menu-item">
-                    {{ t('activity.copyComment') }}
+                    {{ t('general.copy') }}
                   </div>
                 </a-menu-item>
                 <a-menu-item key="edit-comment" @click="editComment(log)">
                   <div v-e="['a:comment:edit']" class="nc-project-menu-item">
-                    {{ t('activity.editComment') }}
+                    {{ t('general.edit') }}
                   </div>
                 </a-menu-item>
               </a-menu>

From db9b2c04ce08a7ad3f8d690eead4117dc451167f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 12:18:44 +0800
Subject: [PATCH 14/18] feat(nc-gui): only allow comment owner to edit

---
 .../nc-gui/components/smartsheet/expanded-form/Comments.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 0636c96ce1..1d925f3d3f 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { VNodeRef } from '@vue/runtime-core'
 import type { AuditType } from 'nocodb-sdk'
-import { enumColor, ref, timeAgo, useCopy, useExpandedFormStoreOrThrow, useI18n, watch } from '#imports'
+import { enumColor, ref, timeAgo, useCopy, useExpandedFormStoreOrThrow, useGlobal, useI18n, watch } from '#imports'
 
 const { loadCommentsAndLogs, commentsAndLogs, isCommentsLoading, commentsOnly, saveComment, isYou, comment, updateComment } =
   useExpandedFormStoreOrThrow()
@@ -16,6 +16,8 @@ const { copy } = useCopy()
 
 const { t } = useI18n()
 
+const { user } = useGlobal()
+
 const { isUIAllowed } = useUIPermission()
 
 const hasEditPermission = $computed(() => isUIAllowed('commentEditable'))
@@ -157,7 +159,7 @@ watch(
                     {{ t('general.copy') }}
                   </div>
                 </a-menu-item>
-                <a-menu-item key="edit-comment" @click="editComment(log)">
+                <a-menu-item v-if="log.user === user.email" key="edit-comment" @click="editComment(log)">
                   <div v-e="['a:comment:edit']" class="nc-project-menu-item">
                     {{ t('general.edit') }}
                   </div>

From e3edb1b5e9a059a79f28fdb938a05ea4b8a1ae61 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 12:36:07 +0800
Subject: [PATCH 15/18] feat(nocodb): prevent non-owner edit log comment

---
 packages/nocodb/src/lib/controllers/audit.ctl.ts | 3 ++-
 packages/nocodb/src/lib/services/audit.svc.ts    | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/controllers/audit.ctl.ts b/packages/nocodb/src/lib/controllers/audit.ctl.ts
index 53110c2dfb..2a15e27785 100644
--- a/packages/nocodb/src/lib/controllers/audit.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/audit.ctl.ts
@@ -30,10 +30,11 @@ export async function commentList(req: Request<any, any, any>, res) {
   );
 }
 
-export async function commentUpdate(req: Request<any, any>, res) {
+export async function commentUpdate(req, res) {
   res.json(
     await auditService.commentUpdate({
       auditId: req.params.auditId,
+      userEmail: req?.session?.passport?.user.email,
       body: req.body,
     })
   );
diff --git a/packages/nocodb/src/lib/services/audit.svc.ts b/packages/nocodb/src/lib/services/audit.svc.ts
index c4d140fafe..d88fdf5e26 100644
--- a/packages/nocodb/src/lib/services/audit.svc.ts
+++ b/packages/nocodb/src/lib/services/audit.svc.ts
@@ -3,6 +3,7 @@ import DOMPurify from 'isomorphic-dompurify';
 import { validatePayload } from '../meta/api/helpers';
 import Audit from '../models/Audit';
 import Model from '../models/Model';
+import { NcError } from '../meta/helpers/catchError';
 import type { AuditRowUpdateReqType, CommentUpdateReqType } from 'nocodb-sdk';
 
 export async function commentRow(param: {
@@ -65,6 +66,7 @@ export async function commentsCount(param: {
 
 export async function commentUpdate(param: {
   auditId: string;
+  userEmail: string;
   body: CommentUpdateReqType;
 }) {
   validatePayload(
@@ -72,5 +74,10 @@ export async function commentUpdate(param: {
     param.body
   );
 
+  const log = await Audit.get(param.auditId);
+
+  if (log.user !== param.userEmail) {
+    NcError.unauthorized('Unauthorized access');
+  }
   return await Audit.commentUpdate(param.auditId, param.body);
 }

From a645a65673aaf91bd70b93effdec6c6cff740b13 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 13:10:04 +0800
Subject: [PATCH 16/18] feat(nc-gui): add empty comment message

---
 .../components/smartsheet/expanded-form/Comments.vue  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 1d925f3d3f..a04d613bc8 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -114,7 +114,16 @@ watch(
 <template>
   <div class="h-full flex flex-col w-full bg-[#eceff1] p-2">
     <div ref="commentsWrapperEl" class="flex-1 min-h-[100px] overflow-y-auto scrollbar-thin-dull p-2 space-y-2">
-      <a-skeleton v-if="isCommentsLoading && !commentsAndLogs" type="list-item-avatar-two-line@8" />
+      <a-skeleton v-if="isCommentsLoading" type="list-item-avatar-two-line@8" />
+      <template v-else-if="commentsAndLogs.length === 0">
+        <div class="flex flex-col text-center justify-center h-full">
+          <div class="text-center text-3xl">
+            <MdiChatProcessingOutline />
+          </div>
+          <div class="font-bold text-center my-1">Start a conversation</div>
+          <div>NocoDB allows you to inquire, monitor progress updates, and collaborate with your team members.</div>
+        </div>
+      </template>
       <template v-else>
         <div v-for="(log, idx) of commentsAndLogs" :key="log.id">
           <a-dropdown :trigger="['contextmenu']" :overlay-class-name="`nc-dropdown-comment-context-menu-${idx}`">

From 3dd4b47117b989192db364a475616a50829246ee Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 13:10:13 +0800
Subject: [PATCH 17/18] feat(nc-gui): add MdiChatProcessingOutline

---
 packages/nc-gui/components.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts
index 39a481c989..7c5b61f85e 100644
--- a/packages/nc-gui/components.d.ts
+++ b/packages/nc-gui/components.d.ts
@@ -137,6 +137,7 @@ declare module '@vue/runtime-core' {
     MdiCardsHeart: typeof import('~icons/mdi/cards-heart')['default']
     MdiCellphoneMessage: typeof import('~icons/mdi/cellphone-message')['default']
     MdiChat: typeof import('~icons/mdi/chat')['default']
+    MdiChatProcessingOutline: typeof import('~icons/mdi/chat-processing-outline')['default']
     MdiCheck: typeof import('~icons/mdi/check')['default']
     MdiChevronDown: typeof import('~icons/mdi/chevron-down')['default']
     MdiChevronLeft: typeof import('~icons/mdi/chevron-left')['default']

From 9f6ec8b1a449a509e51212586097ee07ffe9b537 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 23 Mar 2023 13:25:02 +0800
Subject: [PATCH 18/18] chore(nc-gui): disable edit comment option

---
 .../components/smartsheet/expanded-form/Comments.vue       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index a04d613bc8..4ea457b5f3 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -22,6 +22,11 @@ const { isUIAllowed } = useUIPermission()
 
 const hasEditPermission = $computed(() => isUIAllowed('commentEditable'))
 
+// currently, edit option is disable on purpose
+// since the current update wouldn't keep track of the previous values
+// need history of edit feature in order to enable it back
+const disableEditOption = ref(true)
+
 let editLog = $ref<AuditType>()
 
 let isEditing = $ref<boolean>(false)
@@ -168,7 +173,7 @@ watch(
                     {{ t('general.copy') }}
                   </div>
                 </a-menu-item>
-                <a-menu-item v-if="log.user === user.email" key="edit-comment" @click="editComment(log)">
+                <a-menu-item v-if="log.user === user.email && !disableEditOption" key="edit-comment" @click="editComment(log)">
                   <div v-e="['a:comment:edit']" class="nc-project-menu-item">
                     {{ t('general.edit') }}
                   </div>