From a2b81dc73c1423889e918e6600cc75762d035799 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 13 Jun 2024 21:26:32 +0000 Subject: [PATCH] fix: keep any local state value of filter after sync --- packages/nc-gui/composables/useViewFilters.ts | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/nc-gui/composables/useViewFilters.ts b/packages/nc-gui/composables/useViewFilters.ts index 681bb12bad..b22f42b26d 100644 --- a/packages/nc-gui/composables/useViewFilters.ts +++ b/packages/nc-gui/composables/useViewFilters.ts @@ -401,22 +401,26 @@ export function useViewFilters( }) } else { if (linkColId?.value) { - // set value with current value of filter since user can change value while saving + const savedFilter = await $api.dbTableLinkFilter.create(linkColId.value, { + ...filter, + fk_parent_id: parentId, + }) + // override any local changes with saved filter since user can change value while saving filters.value[i] = { - ...((await $api.dbTableLinkFilter.create(linkColId.value, { - ...filter, - fk_parent_id: parentId, - })) || {}), - value: (filters.value[i] || filter).value, + ...(savedFilter || {}), + ...filters.value[i], + status: undefined, } } else { - // set value with current value of filter since user can change value while saving + const savedFilter = await $api.dbTableFilter.create(view.value.id!, { + ...filter, + fk_parent_id: parentId.value, + }) + // override any local changes with saved filter since user can change value while saving filters.value[i] = { - ...((await $api.dbTableFilter.create(view.value.id!, { - ...filter, - fk_parent_id: parentId.value, - })) || {}), - value: (filters.value[i] || filter).value, + ...(savedFilter || {}), + ...filters.value[i], + status: undefined, } } if (!isLink && !isWebhook) allFilters.value.push(filters.value[+i])