Browse Source

few bugfixes

master
Martin McKeaveney 6 years ago
parent
commit
491d3afafd
  1. 2
      packages/builder/package.json
  2. 4
      packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte
  3. 2
      packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
  4. 7
      packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiOptionSelect.svelte
  5. 2
      packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
  6. 8
      packages/builder/src/components/start/AppCard.svelte
  7. 903
      packages/builder/yarn.lock
  8. 5
      packages/client/src/utils/buttonActions.js

2
packages/builder/package.json

@ -63,7 +63,7 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.58.0", "@budibase/bbui": "^1.58.1",
"@budibase/client": "^0.7.5", "@budibase/client": "^0.7.5",
"@budibase/colorpicker": "1.0.1", "@budibase/colorpicker": "1.0.1",
"@budibase/string-templates": "^0.7.5", "@budibase/string-templates": "^0.7.5",

4
packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte

@ -13,6 +13,7 @@
import { createEventDispatcher } from "svelte" import { createEventDispatcher } from "svelte"
import { isValid } from "@budibase/string-templates" import { isValid } from "@budibase/string-templates"
import { handlebarsCompletions } from "constants/completions" import { handlebarsCompletions } from "constants/completions"
import { readableToRuntimeBinding } from "builderStore/dataBinding"
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
@ -45,7 +46,8 @@
} }
function checkValid() { function checkValid() {
validity = isValid(value) const runtimeValue = readableToRuntimeBinding(bindings, valueToParse)
validity = isValid(runtimeValue)
} }
</script> </script>

2
packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte

@ -16,7 +16,7 @@
...property, ...property,
category: property.type === "instance" ? "Component" : "Table", category: property.type === "instance" ? "Component" : "Table",
label: property.readableBinding, label: property.readableBinding,
path: property.readableBinding, path: property.runtimeBinding,
})) }))
$: query = $: query =

7
packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiOptionSelect.svelte

@ -22,7 +22,12 @@
</script> </script>
<div> <div>
<Multiselect align="right" extraThin secondary value={boundValue} on:change={setValue}> <Multiselect
align="right"
extraThin
secondary
value={boundValue}
on:change={setValue}>
{#each options as option} {#each options as option}
<option value={option}>{option}</option> <option value={option}>{option}</option>
{/each} {/each}

2
packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte

@ -53,7 +53,7 @@
} }
} }
// The "safe" value is the value with eny bindings made readable // The "safe" value is the value with any bindings made readable
// If there is no value set, any default value is used // If there is no value set, any default value is used
const getSafeValue = (value, defaultValue, bindableProperties) => { const getSafeValue = (value, defaultValue, bindableProperties) => {
const enriched = runtimeToReadableBinding(bindableProperties, value) const enriched = runtimeToReadableBinding(bindableProperties, value)

8
packages/builder/src/components/start/AppCard.svelte

@ -32,13 +32,13 @@
<Spacer medium /> <Spacer medium />
<div class="card-footer"> <div class="card-footer">
<TextButton text medium blue href="/_builder/{_id}"> <TextButton text medium blue href="/_builder/{_id}">
Open {name} → Open
{name}
→
</TextButton> </TextButton>
{#if appExportLoading} {#if appExportLoading}
<Spinner size="10" /> <Spinner size="10" />
{:else} {:else}<i class="ri-folder-download-line" on:click={exportApp} />{/if}
<i class="ri-folder-download-line" on:click={exportApp} />
{/if}
</div> </div>
</div> </div>

903
packages/builder/yarn.lock

File diff suppressed because it is too large

5
packages/client/src/utils/buttonActions.js

@ -51,7 +51,10 @@ const navigationHandler = action => {
const queryExecutionHandler = async (action, context) => { const queryExecutionHandler = async (action, context) => {
const { datasourceId, queryId, queryParams } = action.parameters const { datasourceId, queryId, queryParams } = action.parameters
const enrichedQueryParameters = enrichDataBindings(queryParams || {}, context) const enrichedQueryParameters = await enrichDataBindings(
queryParams || {},
context
)
await executeQuery({ await executeQuery({
datasourceId, datasourceId,
queryId, queryId,

Loading…
Cancel
Save