MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Budibase/budibase into dnd

This commit is contained in:
Andrew Kingston 2021-09-17 12:53:06 +01:00
parent e625d2e4a3 bf20f3854b
commit f0b7188db3
33 changed files with 173 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/release.yml vendored
View File

@ -68,4 +68,3 @@ jobs:
charts_dir: docs charts_dir: docs
env: env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "0.9.125-alpha.12", "version": "0.9.125-alpha.14",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

2
packages/auth/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/auth", "name": "@budibase/auth",
"version": "0.9.125-alpha.12", "version": "0.9.125-alpha.14",
"description": "Authentication middlewares for budibase builder and apps", "description": "Authentication middlewares for budibase builder and apps",
"main": "src/index.js", "main": "src/index.js",
"author": "Budibase", "author": "Budibase",

2
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/bbui", "name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.", "description": "A UI solution used in the different Budibase projects.",
"version": "0.9.125-alpha.12", "version": "0.9.125-alpha.14",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"module": "dist/bbui.es.js", "module": "dist/bbui.es.js",

8
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "0.9.125-alpha.12", "version": "0.9.125-alpha.14",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -65,10 +65,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^0.9.125-alpha.12", "@budibase/bbui": "^0.9.125-alpha.14",
"@budibase/client": "^0.9.125-alpha.12", "@budibase/client": "^0.9.125-alpha.14",
"@budibase/colorpicker": "1.1.2", "@budibase/colorpicker": "1.1.2",
"@budibase/string-templates": "^0.9.125-alpha.12", "@budibase/string-templates": "^0.9.125-alpha.14",
"@sentry/browser": "5.19.1", "@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1", "@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1", "@spectrum-css/vars": "^3.0.1",

21
packages/builder/src/builderStore/store/automation/index.js
View File

@ -45,21 +45,24 @@ const automationActions = store => ({
return state return state
}) })
}, },
save: async ({ automation }) => { save: async automation => {
const UPDATE_AUTOMATION_URL = `/api/automations` const UPDATE_AUTOMATION_URL = `/api/automations`
const response = await api.put(UPDATE_AUTOMATION_URL, automation) const response = await api.put(UPDATE_AUTOMATION_URL, automation)
const json = await response.json() const json = await response.json()
store.update(state => { store.update(state => {
const newAutomation = json.automation
const existingIdx = state.automations.findIndex( const existingIdx = state.automations.findIndex(
existing => existing._id === automation._id existing => existing._id === automation._id
) )
state.automations.splice(existingIdx, 1, json.automation) if (existingIdx !== -1) {
state.automations = state.automations state.automations.splice(existingIdx, 1, newAutomation)
store.actions.select(json.automation) state.automations = [...state.automations]
return state store.actions.select(newAutomation)
return state
}
}) })
}, },
delete: async ({ automation }) => { delete: async automation => {
const { _id, _rev } = automation const { _id, _rev } = automation
const DELETE_AUTOMATION_URL = `/api/automations/${_id}/${_rev}` const DELETE_AUTOMATION_URL = `/api/automations/${_id}/${_rev}`
await api.delete(DELETE_AUTOMATION_URL) await api.delete(DELETE_AUTOMATION_URL)
@ -69,17 +72,17 @@ const automationActions = store => ({
existing => existing._id === _id existing => existing._id === _id
) )
state.automations.splice(existingIdx, 1) state.automations.splice(existingIdx, 1)
state.automations = state.automations state.automations = [...state.automations]
state.selectedAutomation = null state.selectedAutomation = null
state.selectedBlock = null state.selectedBlock = null
return state return state
}) })
}, },
trigger: async ({ automation }) => { trigger: async automation => {
const { _id } = automation const { _id } = automation
return await api.post(`/api/automations/${_id}/trigger`) return await api.post(`/api/automations/${_id}/trigger`)
}, },
test: async ({ automation }, testData) => { test: async (automation, testData) => {
const { _id } = automation const { _id } = automation
const response = await api.post(`/api/automations/${_id}/test`, testData) const response = await api.post(`/api/automations/${_id}/test`, testData)
const json = await response.json() const json = await response.json()

7
packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
View File

@ -38,10 +38,9 @@
actionVal actionVal
) )
automationStore.actions.addBlockToAutomation(newBlock) automationStore.actions.addBlockToAutomation(newBlock)
await automationStore.actions.save({ await automationStore.actions.save(
instanceId, $automationStore.selectedAutomation?.automation
automation: $automationStore.selectedAutomation?.automation, )
})
} }
</script> </script>

13
packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
View File

@ -32,16 +32,15 @@
} }
async function deleteAutomation() { async function deleteAutomation() {
await automationStore.actions.delete({ await automationStore.actions.delete(
instanceId, $automationStore.selectedAutomation?.automation
automation: $automationStore.selectedAutomation?.automation, )
})
} }
async function testAutomation() { async function testAutomation() {
const result = await automationStore.actions.trigger({ const result = await automationStore.actions.trigger(
automation: $automationStore.selectedAutomation.automation, $automationStore.selectedAutomation.automation
}) )
if (result.status === 200) { if (result.status === 200) {
notifications.success( notifications.success(
`Automation ${$automationStore.selectedAutomation.automation.name} triggered successfully.` `Automation ${$automationStore.selectedAutomation.automation.name} triggered successfully.`

7
packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
View File

@ -52,10 +52,9 @@
async function deleteStep() { async function deleteStep() {
automationStore.actions.deleteAutomationBlock(block) automationStore.actions.deleteAutomationBlock(block)
await automationStore.actions.save({ await automationStore.actions.save(
instanceId, $automationStore.selectedAutomation?.automation
automation: $automationStore.selectedAutomation?.automation, )
})
} }
</script> </script>

5
packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
View File

@ -42,7 +42,10 @@
disabled={isError} disabled={isError}
onConfirm={() => { onConfirm={() => {
automationStore.actions.addTestDataToAutomation(testData) automationStore.actions.addTestDataToAutomation(testData)
automationStore.actions.test($automationStore.selectedAutomation, testData) automationStore.actions.test(
$automationStore.selectedAutomation?.automation,
testData
)
}} }}
cancelText="Cancel" cancelText="Cancel"
> >

7
packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
View File

@ -29,10 +29,9 @@
webhookModal.show webhookModal.show
} }
await automationStore.actions.save({ await automationStore.actions.save(
instanceId, $automationStore.selectedAutomation?.automation
automation: $automationStore.selectedAutomation?.automation, )
})
notifications.success(`Automation ${name} created.`) notifications.success(`Automation ${name} created.`)

15
packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
View File

@ -1,20 +1,17 @@
<script> <script>
import { goto } from "@roxi/routify" import { goto } from "@roxi/routify"
import { automationStore } from "builderStore" import { automationStore } from "builderStore"
import { database } from "stores/backend"
import { ActionMenu, MenuItem, notifications, Icon } from "@budibase/bbui" import { ActionMenu, MenuItem, notifications, Icon } from "@budibase/bbui"
import ConfirmDialog from "components/common/ConfirmDialog.svelte" import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import UpdateAutomationModal from "components/automation/AutomationPanel/UpdateAutomationModal.svelte"
export let automation export let automation
let confirmDeleteDialog let confirmDeleteDialog
$: instanceId = $database._id let updateAutomationDialog
async function deleteAutomation() { async function deleteAutomation() {
await automationStore.actions.delete({ await automationStore.actions.delete(automation)
instanceId,
automation,
})
notifications.success("Automation deleted.") notifications.success("Automation deleted.")
$goto("../automate") $goto("../automate")
} }
@ -24,9 +21,8 @@
<div slot="control" class="icon"> <div slot="control" class="icon">
<Icon s hoverable name="MoreSmallList" /> <Icon s hoverable name="MoreSmallList" />
</div> </div>
<MenuItem noClose icon="Delete" on:click={confirmDeleteDialog.show}> <MenuItem icon="Edit" on:click={updateAutomationDialog.show}>Edit</MenuItem>
Delete <MenuItem icon="Delete" on:click={confirmDeleteDialog.show}>Delete</MenuItem>
</MenuItem>
</ActionMenu> </ActionMenu>
<ConfirmDialog <ConfirmDialog
@ -39,6 +35,7 @@
<i>{automation.name}?</i> <i>{automation.name}?</i>
This action cannot be undone. This action cannot be undone.
</ConfirmDialog> </ConfirmDialog>
<UpdateAutomationModal {automation} bind:this={updateAutomationDialog} />
<style> <style>
div.icon { div.icon {

76
packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte Normal file
View File

@ -0,0 +1,76 @@
<script>
import { automationStore } from "builderStore"
import { notifications } from "@budibase/bbui"
import { Icon, Input, ModalContent, Modal } from "@budibase/bbui"
import analytics from "analytics"
let name
let error = ""
let modal
export let automation
export let onCancel = undefined
export const show = () => {
name = automation?.name
modal.show()
}
export const hide = () => {
modal.hide()
}
async function saveAutomation() {
const updatedAutomation = {
...automation,
name,
}
await automationStore.actions.save(updatedAutomation)
notifications.success(`Automation ${name} updated successfully.`)
analytics.captureEvent("Automation Saved", { name })
hide()
}
function checkValid(evt) {
name = evt.target.value
if (!name) {
error = "Name is required"
return
}
error = ""
}
</script>
<Modal bind:this={modal} on:hide={onCancel}>
<ModalContent
title="Edit Automation"
confirmText="Save"
size="L"
onConfirm={saveAutomation}
disabled={error}
>
<Input bind:value={name} label="Name" on:input={checkValid} {error} />
<a
slot="footer"
target="_blank"
href="https://docs.budibase.com/automate/introduction-to-automate"
>
<Icon name="InfoOutline" />
<span>Learn about automations</span>
</a>
</ModalContent>
</Modal>
<style>
a {
color: var(--ink);
font-size: 14px;
vertical-align: middle;
display: flex;
align-items: center;
text-decoration: none;
}
a span {
text-decoration: underline;
margin-left: var(--spectrum-alias-item-padding-s);
}
</style>

7
packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
View File

@ -56,10 +56,9 @@
testData[key] = e.detail testData[key] = e.detail
} else { } else {
block.inputs[key] = e.detail block.inputs[key] = e.detail
await automationStore.actions.save({ await automationStore.actions.save(
instanceId, $automationStore.selectedAutomation?.automation
automation: $automationStore.selectedAutomation?.automation, )
})
} }
}, },
isTestModal ? 0 : 800 isTestModal ? 0 : 800

5
packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
View File

@ -18,10 +18,7 @@
onMount(async () => { onMount(async () => {
if (!automation?.definition?.trigger?.inputs.schemaUrl) { if (!automation?.definition?.trigger?.inputs.schemaUrl) {
// save the automation initially // save the automation initially
await automationStore.actions.save({ await automationStore.actions.save(automation)
instanceId,
automation,
})
} }
interval = setInterval(async () => { interval = setInterval(async () => {
await automationStore.actions.fetch() await automationStore.actions.fetch()

4
packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventPropertyControl.svelte
View File

@ -46,7 +46,9 @@
} }
automationStore.actions.addBlockToAutomation(newBlock) automationStore.actions.addBlockToAutomation(newBlock)
await automationStore.actions.save($automationStore.selectedAutomation) await automationStore.actions.save(
$automationStore.selectedAutomation?.automation
)
parameters.automationId = $automationStore.selectedAutomation.automation._id parameters.automationId = $automationStore.selectedAutomation.automation._id
delete parameters.newAutomationName delete parameters.newAutomationName
} }

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "0.9.125-alpha.12", "version": "0.9.125-alpha.14",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js", "main": "src/index.js",
"bin": { "bin": {

6
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "0.9.125-alpha.12", "version": "0.9.125-alpha.14",
"license": "MPL-2.0", "license": "MPL-2.0",
"module": "dist/budibase-client.js", "module": "dist/budibase-client.js",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^0.9.125-alpha.12", "@budibase/bbui": "^0.9.125-alpha.14",
"@budibase/standard-components": "^0.9.124", "@budibase/standard-components": "^0.9.124",
"@budibase/string-templates": "^0.9.125-alpha.12", "@budibase/string-templates": "^0.9.125-alpha.14",
"regexparam": "^1.3.0", "regexparam": "^1.3.0",
"shortid": "^2.2.15", "shortid": "^2.2.15",
"svelte-spa-router": "^3.0.5" "svelte-spa-router": "^3.0.5"

8
packages/server/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/server", "name": "@budibase/server",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "0.9.125-alpha.12", "version": "0.9.125-alpha.14",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.js", "main": "src/index.js",
"repository": { "repository": {
@ -64,9 +64,9 @@
"author": "Budibase", "author": "Budibase",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@budibase/auth": "^0.9.125-alpha.12", "@budibase/auth": "^0.9.125-alpha.14",
"@budibase/client": "^0.9.125-alpha.12", "@budibase/client": "^0.9.125-alpha.14",
"@budibase/string-templates": "^0.9.125-alpha.12", "@budibase/string-templates": "^0.9.125-alpha.14",
"@elastic/elasticsearch": "7.10.0", "@elastic/elasticsearch": "7.10.0",
"@koa/router": "8.0.0", "@koa/router": "8.0.0",
"@sendgrid/mail": "7.1.1", "@sendgrid/mail": "7.1.1",

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/string-templates", "name": "@budibase/string-templates",
"version": "0.9.125-alpha.12", "version": "0.9.125-alpha.14",
"description": "Handlebars wrapper for Budibase templating.", "description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs", "main": "src/index.cjs",
"module": "dist/bundle.mjs", "module": "dist/bundle.mjs",

6
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/worker", "name": "@budibase/worker",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "0.9.125-alpha.12", "version": "0.9.125-alpha.14",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.js", "main": "src/index.js",
"repository": { "repository": {
@ -25,8 +25,8 @@
"author": "Budibase", "author": "Budibase",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@budibase/auth": "^0.9.125-alpha.12", "@budibase/auth": "^0.9.125-alpha.14",
"@budibase/string-templates": "^0.9.125-alpha.12", "@budibase/string-templates": "^0.9.125-alpha.14",
"@koa/router": "^8.0.0", "@koa/router": "^8.0.0",
"@techpass/passport-openidconnect": "^0.3.0", "@techpass/passport-openidconnect": "^0.3.0",
"aws-sdk": "^2.811.0", "aws-sdk": "^2.811.0",