From 838123c11527d3f3dc854593864f295698c348cf Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 23 Sep 2022 15:41:39 +0800
Subject: [PATCH] fix(nc-gui): link to row

---
 packages/nc-gui/components/smartsheet/Gallery.vue | 5 +++--
 packages/nc-gui/components/smartsheet/Grid.vue    | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Gallery.vue b/packages/nc-gui/components/smartsheet/Gallery.vue
index 728efc86fb..a9d23cb682 100644
--- a/packages/nc-gui/components/smartsheet/Gallery.vue
+++ b/packages/nc-gui/components/smartsheet/Gallery.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { onMounted } from '@vue/runtime-core'
+import type { ColumnType } from 'nocodb-sdk'
 import { isVirtualCol } from 'nocodb-sdk'
 import {
   ActiveViewInj,
@@ -85,10 +86,10 @@ const attachments = (record: any): Array<Attachment> => {
   }
 }
 
-const expandForm = (row: RowType, _state?: Record<string, any>) => {
+const expandForm = (row: RowType, state?: Record<string, any>) => {
   if (!isUIAllowed('xcDatatableEditable')) return
 
-  const rowId = extractPkFromRow(row.row, meta.value.columns)
+  const rowId = extractPkFromRow(row.row, meta.value?.columns as ColumnType[])
 
   if (rowId) {
     router.push({
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 4b4c37d97c..76427546f8 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -135,7 +135,9 @@ reloadViewDataHook?.on(async (shouldShowLoading) => {
 const skipRowRemovalOnCancel = ref(false)
 
 const expandForm = (row: Row, state?: Record<string, any>, fromToolbar = false) => {
-  const rowId = extractPkFromRow(row.row, meta.value.columns)
+  if (!isUIAllowed('xcDatatableEditable')) return
+
+  const rowId = extractPkFromRow(row.row, meta.value?.columns as ColumnType[])
 
   if (rowId) {
     router.push({