From 0daab21eec7db649c32983ab40a5bc7e8b6a61bd Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Thu, 4 Aug 2022 11:14:31 +0530 Subject: [PATCH] fix/fixed rollup column validation issue --- .../nc-gui-v2/components/smartsheet-column/RollupOptions.vue | 4 ++++ packages/nc-gui-v2/composables/useColumnCreateStore.ts | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui-v2/components/smartsheet-column/RollupOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/RollupOptions.vue index 86bd412256..e3fa65240d 100644 --- a/packages/nc-gui-v2/components/smartsheet-column/RollupOptions.vue +++ b/packages/nc-gui-v2/components/smartsheet-column/RollupOptions.vue @@ -31,6 +31,10 @@ const aggrFunctionsList = [ { text: 'avgDistinct', value: 'avgDistinct' }, ] +if (!formState.fk_relation_column_id) formState.fk_relation_column_id = null +if (!formState.fk_rollup_column_id) formState.fk_rollup_column_id = null +if (!formState.rollup_function) formState.rollup_function = null + const refTables = $computed(() => { if (!tables || !tables.length) { return [] diff --git a/packages/nc-gui-v2/composables/useColumnCreateStore.ts b/packages/nc-gui-v2/composables/useColumnCreateStore.ts index 59c0b9dc37..f1d37686d1 100644 --- a/packages/nc-gui-v2/composables/useColumnCreateStore.ts +++ b/packages/nc-gui-v2/composables/useColumnCreateStore.ts @@ -198,7 +198,8 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState } onSuccess() } catch (e: any) { - toast.error(await extractSdkResponseErrorMsg(e)) + const error = await extractSdkResponseErrorMsg(e) + if (error) toast.error(await extractSdkResponseErrorMsg(e)) } }