ufkc7e3d
/
budibase
forked from tsai/budibase
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #5086 from Budibase/continue-if-button-action 

'Continue if' button action
master
Andrew Kingston 5 years ago
committed by GitHub
parent
c27c2fbfa6 ff327423e1
commit
9f3a0ce3c9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 109 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      packages/builder/src/builderStore/store/frontend.js
  2. 78
      packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ContinueIf.svelte
  3. 1
      packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/index.js
  4. 7
      packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/manifest.json
  5. 3
      packages/client/manifest.json
  6. 21
      packages/client/src/utils/buttonActions.js

1
packages/builder/src/builderStore/store/frontend.js
View File

@ -45,6 +45,7 @@ const INITIAL_FRONTEND_STATE = {
customThemes: false, customThemes: false,
devicePreview: false, devicePreview: false,
messagePassing: false, messagePassing: false,
continueIfAction: false,
}, },
currentFrontEndType: "none", currentFrontEndType: "none",
selectedScreenId: "", selectedScreenId: "",

78
packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ContinueIf.svelte
View File

@ -0,0 +1,78 @@
<script>
import { Select, Body } from "@budibase/bbui"
import { onMount } from "svelte"
import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
export let parameters
export let bindings
const typeOptions = [
{
label: "Continue if",
value: "continue",
},
{
label: "Stop if",
value: "stop",
},
]
const operatorOptions = [
{
label: "Equals",
value: "equal",
},
{
label: "Not equals",
value: "notEqual",
},
]
onMount(() => {
if (!parameters.type) {
parameters.type = "continue"
}
if (!parameters.operator) {
parameters.operator = "equal"
}
})
</script>
<div class="root">
<Body size="S">
Configure a condition to be evaluated which can stop further actions from
being executed.
</Body>
<Select
bind:value={parameters.type}
options={typeOptions}
placeholder={null}
/>
<DrawerBindableInput
placeholder="Value"
value={parameters.value}
on:change={e => (parameters.value = e.detail)}
{bindings}
/>
<Select
bind:value={parameters.operator}
options={operatorOptions}
placeholder={null}
/>
<DrawerBindableInput
placeholder="Reference value"
bind:value={parameters.referenceValue}
on:change={e => (parameters.referenceValue = e.detail)}
{bindings}
/>
</div>
<style>
.root {
display: flex;
flex-direction: column;
gap: var(--spacing-l);
justify-content: flex-start;
align-items: stretch;
max-width: 400px;
margin: 0 auto;
}
</style>

1
packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/index.js
View File

@ -13,3 +13,4 @@ export { default as RefreshDataProvider } from "./RefreshDataProvider.svelte"
export { default as DuplicateRow } from "./DuplicateRow.svelte" export { default as DuplicateRow } from "./DuplicateRow.svelte"
export { default as S3Upload } from "./S3Upload.svelte" export { default as S3Upload } from "./S3Upload.svelte"
export { default as ExportData } from "./ExportData.svelte" export { default as ExportData } from "./ExportData.svelte"
export { default as ContinueIf } from "./ContinueIf.svelte"

7
packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/manifest.json
View File

@ -84,6 +84,11 @@
{ {
"name": "Export Data", "name": "Export Data",
"component": "ExportData" "component": "ExportData"
},
{
"name": "Continue if / Stop if",
"component": "ContinueIf",
"dependsOnFeature": "continueIfAction"
} }
] ]
} }

3
packages/client/manifest.json
View File

@ -7,7 +7,8 @@
"customThemes": true, "customThemes": true,
"devicePreview": true, "devicePreview": true,
"messagePassing": true, "messagePassing": true,
"rowSelection": true "rowSelection": true,
"continueIfAction": true
}, },
"layout": { "layout": {
"name": "Layout", "name": "Layout",

21
packages/client/src/utils/buttonActions.js
View File

@ -261,6 +261,26 @@ const exportDataHandler = async action => {
} }
} }
const continueIfHandler = action => {
const { type, value, operator, referenceValue } = action.parameters
if (!type || !operator) {
return
}
let match = false
if (value == null && referenceValue == null) {
match = true
} else if (value === referenceValue) {
match = true
} else {
match = JSON.stringify(value) === JSON.stringify(referenceValue)
}
if (type === "continue") {
return operator === "equal" ? match : !match
} else {
return operator === "equal" ? !match : match
}
}
const handlerMap = { const handlerMap = {
["Save Row"]: saveRowHandler, ["Save Row"]: saveRowHandler,
["Duplicate Row"]: duplicateRowHandler, ["Duplicate Row"]: duplicateRowHandler,
@ -277,6 +297,7 @@ const handlerMap = {
["Update State"]: updateStateHandler, ["Update State"]: updateStateHandler,
["Upload File to S3"]: s3UploadHandler, ["Upload File to S3"]: s3UploadHandler,
["Export Data"]: exportDataHandler, ["Export Data"]: exportDataHandler,
["Continue if / Stop if"]: continueIfHandler,
} }
const confirmTextMap = { const confirmTextMap = {

Write Preview
Loading…
Cancel
Save