From dcc24fef103ca5be3e5c435951a0cc2af0a11245 Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Thu, 19 Oct 2023 11:31:13 +0000 Subject: [PATCH] fix: Comments are adding to FE state before api calls --- .../composables/useExpandedFormStore.ts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts index a602a6b1d8..96804dfb22 100644 --- a/packages/nc-gui/composables/useExpandedFormStore.ts +++ b/packages/nc-gui/composables/useExpandedFormStore.ts @@ -31,6 +31,8 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m const { t } = useI18n() + const { user } = useGlobal() + const commentsOnly = ref(false) const commentsAndLogs = ref([]) @@ -58,6 +60,8 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m const { isUIAllowed } = useRoles() + const isSaving = ref(false) + // getters const displayValue = computed(() => { if (row?.value?.row) { @@ -135,6 +139,22 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m if (!rowId) return + isSaving.value = true + + const createdDate = new Date().toISOString() + + commentsAndLogs.value.push({ + created_at: createdDate, + description: `The following comment has been created:${comment.value}`, + email: user?.value?.email, + user: user?.value?.email, + id: '', + display_name: user.value?.display_name, + row_id: rowId, + updated_at: createdDate, + op_type: 'COMMENT', + }) + await api.utils.commentRow({ fk_model_id: meta.value?.id as string, row_id: rowId, @@ -148,6 +168,8 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m await loadCommentsAndLogs() } catch (e: any) { message.error(e.message) + } finally { + isSaving.value = false } $e('a:row-expand:comment')