From a3b9eca9a0bb9305523c1da0aa0066f38a83e717 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 12 May 2022 15:30:32 +0100 Subject: [PATCH 1/2] Revert "Adding to the REST query UI to make it more obvious when it needs saved, such as the user has changed a dynamic variable." This reverts commit 4982cad56d3d47521ac8289de766a5f0c993c4bb. --- .../rest/[query]/index.svelte | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) 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 d2914146ce..2baa6aab41 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 @@ -37,7 +37,7 @@ import AccessLevelSelect from "components/integration/AccessLevelSelect.svelte" import DynamicVariableModal from "../../_components/DynamicVariableModal.svelte" import Placeholder from "assets/bb-spaceship.svg" - import { cloneDeep, isEqual } from "lodash/fp" + import { cloneDeep } from "lodash/fp" import { RawRestBodyTypes } from "constants/backend" let query, datasource @@ -47,7 +47,6 @@ let response, schema, enabledHeaders let authConfigId let dynamicVariables, addVariableModal, varBinding - let baseQuery, baseDatasource, baseVariables $: datasourceType = datasource?.source $: integrationInfo = $integrations[datasourceType] @@ -63,15 +62,6 @@ $: hasSchema = Object.keys(schema || {}).length !== 0 || Object.keys(query?.schema || {}).length !== 0 - $: baseQuery = !baseQuery ? cloneDeep(query) : baseQuery - $: baseDatasource = !baseDatasource ? cloneDeep(datasource) : baseDatasource - $: baseVariables = !baseVariables - ? cloneDeep(dynamicVariables) - : baseVariables - $: hasChanged = - !isEqual(baseQuery, query) || - !isEqual(baseDatasource, datasource) || - !isEqual(baseVariables, dynamicVariables) function getSelectedQuery() { return cloneDeep( @@ -130,9 +120,6 @@ datasource.config.dynamicVariables = rebuildVariables(saveId) datasource = await datasources.save(datasource) } - baseQuery = query - baseDatasource = datasource - baseVariables = dynamicVariables } catch (err) { notifications.error(`Error saving query`) } @@ -346,7 +333,7 @@