From 5dc6917fb253c19c569a949290c40e6628272a77 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 20 Dec 2021 10:50:58 -0500
Subject: [PATCH] Fix dynamic variable deletion and move utils

---
 packages/builder/src/helpers/data/utils.js    | 60 ------------------
 .../rest/[query]/index.svelte                 | 63 +++++++++++++++----
 2 files changed, 52 insertions(+), 71 deletions(-)

diff --git a/packages/builder/src/helpers/data/utils.js b/packages/builder/src/helpers/data/utils.js
index 6d7843e0e5..b6478680ec 100644
--- a/packages/builder/src/helpers/data/utils.js
+++ b/packages/builder/src/helpers/data/utils.js
@@ -120,62 +120,6 @@ export function flipHeaderState(headersActivity) {
   return enabled
 }
 
-// convert dynamic variables list to simple key/val object
-export function getDynamicVariables(datasource, queryId) {
-  const variablesList = datasource?.config?.dynamicVariables
-  if (variablesList && variablesList.length > 0) {
-    const filtered = queryId
-      ? variablesList.filter(variable => variable.queryId === queryId)
-      : variablesList
-    return filtered.reduce(
-      (acc, next) => ({ ...acc, [next.name]: next.value }),
-      {}
-    )
-  }
-  return {}
-}
-
-// convert dynamic variables object back to a list, enrich with query id
-export function rebuildVariables(datasource, queryId, variables) {
-  let newVariables = []
-  if (variables) {
-    newVariables = Object.entries(variables).map(entry => {
-      return {
-        name: entry[0],
-        value: entry[1],
-        queryId,
-      }
-    })
-  }
-  let existing = datasource?.config?.dynamicVariables || []
-  // filter out any by same name
-  existing = existing.filter(
-    variable =>
-      !newVariables.find(
-        newVar => newVar.name.toLowerCase() === variable.name.toLowerCase()
-      )
-  )
-  return [...existing, ...newVariables]
-}
-
-export function shouldShowVariables(dynamicVariables, variablesReadOnly) {
-  return !!(
-    dynamicVariables &&
-    // show when editable or when read only and not empty
-    (!variablesReadOnly || Object.keys(dynamicVariables).length > 0)
-  )
-}
-
-export function buildAuthConfigs(datasource) {
-  if (datasource?.config?.authConfigs) {
-    return datasource.config.authConfigs.map(c => ({
-      label: c.name,
-      value: c._id,
-    }))
-  }
-  return []
-}
-
 export default {
   breakQueryString,
   buildQueryString,
@@ -184,8 +128,4 @@ export default {
   keyValueToQueryParameters,
   queryParametersToKeyValue,
   schemaToFields,
-  getDynamicVariables,
-  rebuildVariables,
-  shouldShowVariables,
-  buildAuthConfigs,
 }
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 a54a4f205a..1d53b64c2d 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
@@ -52,13 +52,10 @@
   $: checkQueryName(url)
   $: responseSuccess = response?.info?.code >= 200 && response?.info?.code < 400
   $: isGet = query?.queryVerb === "read"
-  $: authConfigs = restUtils.buildAuthConfigs(datasource)
+  $: authConfigs = buildAuthConfigs(datasource)
   $: schemaReadOnly = !responseSuccess
   $: variablesReadOnly = !responseSuccess
-  $: showVariablesTab = restUtils.shouldShowVariables(
-    dynamicVariables,
-    variablesReadOnly
-  )
+  $: showVariablesTab = shouldShowVariables(dynamicVariables, variablesReadOnly)
 
   function getSelectedQuery() {
     return cloneDeep(
@@ -115,11 +112,7 @@
       notifications.success(`Request saved successfully.`)
 
       if (dynamicVariables) {
-        datasource.config.dynamicVariables = restUtils.rebuildVariables(
-          datasource,
-          saveId,
-          dynamicVariables
-        )
+        datasource.config.dynamicVariables = rebuildVariables(saveId)
         datasource = await datasources.save(datasource)
       }
     } catch (err) {
@@ -158,6 +151,16 @@
     return id
   }
 
+  const buildAuthConfigs = datasource => {
+    if (datasource?.config?.authConfigs) {
+      return datasource.config.authConfigs.map(c => ({
+        label: c.name,
+        value: c._id,
+      }))
+    }
+    return []
+  }
+
   const schemaMenuItems = [
     {
       text: "Create dynamic variable",
@@ -177,6 +180,44 @@
     },
   ]
 
+  // convert dynamic variables list to simple key/val object
+  const getDynamicVariables = (datasource, queryId) => {
+    const variablesList = datasource?.config?.dynamicVariables
+    if (variablesList && variablesList.length > 0) {
+      const filtered = queryId
+        ? variablesList.filter(variable => variable.queryId === queryId)
+        : variablesList
+      return filtered.reduce(
+        (acc, next) => ({ ...acc, [next.name]: next.value }),
+        {}
+      )
+    }
+    return {}
+  }
+
+  // convert dynamic variables object back to a list, enrich with query id
+  const rebuildVariables = queryId => {
+    let variables = []
+    if (dynamicVariables) {
+      variables = Object.entries(dynamicVariables).map(entry => {
+        return {
+          name: entry[0],
+          value: entry[1],
+          queryId,
+        }
+      })
+    }
+    return variables
+  }
+
+  const shouldShowVariables = (dynamicVariables, variablesReadOnly) => {
+    return !!(
+      dynamicVariables &&
+      // show when editable or when read only and not empty
+      (!variablesReadOnly || Object.keys(dynamicVariables).length > 0)
+    )
+  }
+
   onMount(async () => {
     query = getSelectedQuery()
     // clear any unsaved changes to the datasource
@@ -214,7 +255,7 @@
     if (query && !query.fields.bodyType) {
       query.fields.bodyType = "none"
     }
-    dynamicVariables = restUtils.getDynamicVariables(datasource, query._id)
+    dynamicVariables = getDynamicVariables(datasource, query._id)
   })
 </script>