From 9c78e031249e16174b67412a9c151f7a9e3a6583 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Mon, 13 Nov 2023 05:52:51 +0000
Subject: [PATCH] fix: Close modal when record created through links modal and
 reload the list and count

---
 .../smartsheet/expanded-form/index.vue        |  5 +++++
 .../virtual-cell/components/ListItems.vue     | 22 +++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index e7d4b84c58..d1ba6d245a 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -41,6 +41,7 @@ interface Props {
   showNextPrevIcons?: boolean
   firstRow?: boolean
   lastRow?: boolean
+  closeAfterSave?: boolean
 }
 
 const props = defineProps<Props>()
@@ -201,6 +202,10 @@ const save = async () => {
     reloadTrigger?.trigger()
   }
   isUnsavedFormExist.value = false
+
+  if (props.closeAfterSave) {
+    isExpanded.value = false
+  }
 }
 
 const isPreventChangeModalOpen = ref(false)
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index 7e91152058..01eafc23ab 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -53,6 +53,8 @@ const { addLTARRef, isNew, removeLTARRef, state: rowState } = useSmartsheetRowSt
 
 const isPublic = inject(IsPublicInj, ref(false))
 
+const isExpandedFormCloseAfterSave = ref(false)
+
 isChildrenExcludedLoading.value = true
 
 const isForm = inject(IsFormInj, ref(false))
@@ -113,7 +115,7 @@ const newRowState = computed(() => {
   const colOpt = (injectedColumn?.value as ColumnType)?.colOptions as LinkToAnotherRecordType
   const colInRelatedTable: ColumnType | undefined = relatedTableMeta?.value?.columns?.find((col) => {
     // Links as for the case of 'mm' we need the 'Links' column
-    if (col.uidt !== UITypes.LinkToAnotherRecord && col.uidt !== UITypes.Links) return false
+    if (!isLinksOrLTAR(col)) return false
     const colOpt1 = col?.colOptions as LinkToAnotherRecordType
     if (colOpt1?.fk_related_model_id !== meta.value.id) return false
 
@@ -158,6 +160,10 @@ const relation = computed(() => {
 
 watch(expandedFormDlg, () => {
   if (!expandedFormDlg.value) {
+    isExpandedFormCloseAfterSave.value = false
+    if (!isForm.value) {
+      loadChildrenList()
+    }
     loadChildrenExcludedList(rowState.value)
   }
 })
@@ -174,6 +180,12 @@ const onClick = (refRow: any, id: string) => {
     linkRow(refRow, Number.parseInt(id))
   }
 }
+
+const addNewRecord = () => {
+  expandedFormRow.value = {}
+  expandedFormDlg.value = true
+  isExpandedFormCloseAfterSave.value = true
+}
 </script>
 
 <template>
@@ -224,12 +236,7 @@ const onClick = (refRow: any, id: string) => {
         type="secondary"
         :size="isMobileMode ? 'medium' : 'small'"
         class="!text-brand-500"
-        @click="
-          () => {
-            expandedFormRow = {}
-            expandedFormDlg = true
-          }
-        "
+        @click="addNewRecord"
       >
         <div class="flex items-center gap-1 px-4"><MdiPlus v-if="!isMobileMode" /> {{ $t('activity.newRecord') }}</div>
       </NcButton>
@@ -345,6 +352,7 @@ const onClick = (refRow: any, id: string) => {
         :row-id="extractPkFromRow(expandedFormRow, relatedTableMeta.columns as ColumnType[])"
         :state="newRowState"
         use-meta-fields
+        :close-after-save="isExpandedFormCloseAfterSave"
       />
     </Suspense>
   </NcModal>