Browse Source

Merge pull request #5983 from Budibase/pc-fixes

Misc bug fixes
master
Peter Clement 4 years ago
committed by GitHub
parent
commit
fa326f8c7c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
  2. 2
      packages/client/manifest.json
  3. 4
      packages/client/src/components/app/table/Table.svelte
  4. 2
      packages/server/src/threads/automation.js

3
packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte

@ -28,7 +28,6 @@
let blockComplete
let showLooping = false
$: rowControl = $automationStore.selectedAutomation.automation.rowControl
$: showBindingPicker =
block.stepId === "CREATE_ROW" || block.stepId === "UPDATE_ROW"
@ -256,7 +255,7 @@
on:change={toggleFieldControl}
defaultValue="Use values"
autoWidth
value={rowControl ? "Use bindings" : "Use values"}
value={block.rowControl ? "Use bindings" : "Use values"}
options={["Use values", "Use bindings"]}
placeholder={null}
/>

2
packages/client/manifest.json

@ -3007,6 +3007,7 @@
"illegalChildren": ["section"],
"hasChildren": true,
"showEmptyState": false,
"info": "Row selection is only compatible with internal or SQL tables",
"settings": [
{
"type": "dataProvider",
@ -3295,6 +3296,7 @@
{
"section": true,
"name": "Table",
"info": "Row selection is only compatible with internal or SQL tables",
"settings": [
{
"type": "number",

4
packages/client/src/components/app/table/Table.svelte

@ -39,6 +39,8 @@
dataProvider?.id,
ActionTypes.SetDataProviderSorting
)
$: table = dataProvider?.datasource?.type === "table"
$: {
rowSelectionStore.actions.updateSelection(
$component.id,
@ -142,7 +144,7 @@
{quiet}
{compact}
{customRenderers}
allowSelectRows={!!allowSelectRows}
allowSelectRows={allowSelectRows && table}
bind:selectedRows
allowEditRows={false}
allowEditColumns={false}

2
packages/server/src/threads/automation.js

@ -219,7 +219,7 @@ class Orchestrator {
}
if (
index === parseInt(env.AUTOMATION_MAX_ITERATIONS) ||
index === loopStep.inputs.iterations
index === parseInt(loopStep.inputs.iterations)
) {
this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
status: AutomationErrors.MAX_ITERATIONS,

Loading…
Cancel
Save