From e96467a7cd8b8e59666d4a61e74e70fa44437d17 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 21 Dec 2021 11:26:45 -0500 Subject: [PATCH] Further fix for dynamic variable deletion across different queries --- .../[selectedDatasource]/rest/[query]/index.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte index 15b2b574a6..43037242f3 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte @@ -208,7 +208,12 @@ } }) } - return variables + + let existing = datasource?.config?.dynamicVariables || [] + // remove existing query variables (for changes and deletions) + existing = existing.filter(variable => variable.queryId !== queryId) + // re-add the new query variables + return [...existing, ...variables] } const shouldShowVariables = (dynamicVariables, variablesReadOnly) => {