-
+
+
+
+
+
diff --git a/packages/builder/src/components/common/DashCard.svelte b/packages/builder/src/components/common/DashCard.svelte
new file mode 100644
index 0000000000..d5d9d2ff37
--- /dev/null
+++ b/packages/builder/src/components/common/DashCard.svelte
@@ -0,0 +1,55 @@
+
+
+
- {automation.name}
-
+ Are you sure you wish to delete the automation
+ {automation.name}?
+ This action cannot be undone.
+
+
+
+
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ResultsModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ResultsModal.svelte
deleted file mode 100644
index 9662bc8ade..0000000000
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ResultsModal.svelte
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index ffd59b4e6a..fecd0fcc7e 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -51,6 +51,7 @@
$automationStore.selectedAutomation?.automation,
testData
)
+ $automationStore.selectedAutomation.automation.showTestPanel = true
} catch (error) {
notifications.error("Error testing notification")
}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
new file mode 100644
index 0000000000..8c38d8a689
--- /dev/null
+++ b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
@@ -0,0 +1,146 @@
+
+
+
{/if}
diff --git a/packages/builder/src/components/automation/Shared/WebhookDisplay.svelte b/packages/builder/src/components/automation/Shared/WebhookDisplay.svelte
index dcd96ce2b9..9ba4140b51 100644
--- a/packages/builder/src/components/automation/Shared/WebhookDisplay.svelte
+++ b/packages/builder/src/components/automation/Shared/WebhookDisplay.svelte
@@ -12,4 +12,4 @@
}
-
-
- Are you sure you wish to delete the automation
- {automation.name}?
- This action cannot be undone.
-
-
-
-
+
-
+
-
-
+ {automation.name}
+
+
+
-
+
- {#each blocks as block, idx (block.id)}
-
+ {
+ testDataModal.show()
+ }}
+ icon="MultipleCheck"
+ size="M">Run test
+
{
- testDataModal.show()
+ $automationStore.selectedAutomation.automation.showTestPanel = true
}}
- icon="MultipleCheck"
- size="M">Run test Test Details
+
+
- {#if block.stepId !== "LOOP"}
-
- {/each}
+ {#each blocks as block, idx (block.id)}
+
+
+ {#if block.stepId !== "LOOP"}
+
+ {/each}
+
- Test Results
-
-
- {#if testResult[0].outputs.iterations}
-
- {#if isTrigger || testResult[0].outputs.success}
-
-
-
- {:else}
-
-
- {/if}
-
-
- {/if}
-
-
-
-
- {
- inputToggled = !inputToggled
- }}
- class="toggle splitHeader"
- >
-
- {#if inputToggled}
-
-
-
-
- Input
-
-
-
- {#if inputToggled}
-
-
-
-
- {/if}
-
- {
- outputToggled = !outputToggled
- }}
- class="toggle splitHeader"
- >
-
- {#if outputToggled}
-
-
-
-
- Output
-
-
-
- {#if outputToggled}
-
-
-
-
- {/if}
-
+
+
+
+
+ Test Details
+
+ {
+ $automationStore.selectedAutomation.automation.showTestPanel = false
+ }}
+ hoverable
+ name="Close"
+ />
+
+
+ {#each blocks as block, idx}
+
+
+
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 1af40694a3..7b189ad109 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -53,6 +53,7 @@
: { schema: {} }
$: schema = getSchemaForTable(tableId, { searchableSchema: true }).schema
$: schemaFields = Object.values(schema || {})
+ $: queryLimit = tableId?.includes("datasource") ? "∞" : "1000"
const onChange = Utils.sequential(async (e, key) => {
try {
@@ -330,6 +331,7 @@
on:change={e => onChange(e, key)}
{bindings}
updateOnChange={false}
+ placeholder={value.customType === "queryLimit" ? queryLimit : ""}
/>
+ {#if block.stepId !== "LOOP"}
+
+ {#if blocks.length - 1 !== idx}
+
+ {/if}
+ {/each}
+
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+
+ {/if}
+ {/if}
+
+
+
+
+
+
+ {#if lockedBy}
+
+ {/if}
+
+
++ Apps are locked to prevent work from being lost from overlapping changes + between your team. +
+ + {#if lockedByYou && getExpiryDuration(app) > 0} + + {processStringSync( + "This lock will expire in {{ duration time 'millisecond' }} from now", + { + time: getExpiryDuration(app), + } + )} + + {/if} +
+
+
+ {#if lockedByYou}
+
+ {/if}
+
+
+
+
+
+
diff --git a/packages/builder/src/components/common/EditableIcon.svelte b/packages/builder/src/components/common/EditableIcon.svelte
new file mode 100644
index 0000000000..313d1b88b0
--- /dev/null
+++ b/packages/builder/src/components/common/EditableIcon.svelte
@@ -0,0 +1,47 @@
+
+
+
+
+
+ {title}
+
+
+ {#if actionDefined}
+
+
+
+
-
-
-
+
+
diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte
index ea2f005216..d7ebbf63ef 100644
--- a/packages/builder/src/components/start/AppRow.svelte
+++ b/packages/builder/src/components/start/AppRow.svelte
@@ -1,32 +1,26 @@
-
copyToClipboard(value || copyValue)}>
+
diff --git a/packages/builder/src/components/deploy/VersionModal.svelte b/packages/builder/src/components/deploy/VersionModal.svelte
index 9707517c54..3ddc7a1115 100644
--- a/packages/builder/src/components/deploy/VersionModal.svelte
+++ b/packages/builder/src/components/deploy/VersionModal.svelte
@@ -11,6 +11,16 @@
import { API } from "api"
import clientPackage from "@budibase/client/package.json"
+ export function show() {
+ updateModal.show()
+ }
+
+ export function hide() {
+ updateModal.hide()
+ }
+
+ export let hideIcon = false
+
let updateModal
$: appId = $store.appId
@@ -57,9 +67,11 @@
}
- copyToClipboard(value)}>
-
+{#if !hideIcon}
+
+
+{/if}
+
-
editApp(app)}>
+
{/if}
+
+ {#if automation?.showTestPanel}
+
@@ -52,7 +63,9 @@
flex: 1 1 auto;
height: 0;
display: grid;
- grid-template-columns: 260px minmax(510px, 1fr);
+ grid-auto-flow: column dense;
+ grid-template-columns: 260px minmax(510px, 1fr) fit-content(500px);
+ overflow: hidden;
}
.nav {
@@ -64,17 +77,18 @@
border-right: var(--border-light);
background-color: var(--background);
padding-bottom: 60px;
+ overflow: hidden;
}
.content {
position: relative;
- padding: var(--spacing-l) 40px;
+ padding-top: var(--spacing-l);
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: stretch;
gap: var(--spacing-l);
- overflow: hidden;
+ overflow: auto;
}
.centered {
top: 0;
@@ -92,4 +106,17 @@
.main {
width: 300px;
}
+
+ .setup {
+ padding-top: var(--spectrum-global-dimension-size-200);
+ border-left: var(--border-light);
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ align-items: stretch;
+ gap: var(--spacing-l);
+ background-color: var(--background);
+ grid-column: 3;
+ overflow: auto;
+ }
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/DynamicVariableModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/DynamicVariableModal.svelte
index 61d0a1993c..5c0cd0f883 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/DynamicVariableModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/DynamicVariableModal.svelte
@@ -1,5 +1,8 @@
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 e870c2f6db..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
@@ -299,6 +299,7 @@
{dynamicVariables}
bind:binding={varBinding}
bind:this={addVariableModal}
+ on:change={saveQuery}
/>
{#if query && queryConfig}
appOverview(app)}>
{app.name}
@@ -43,19 +37,7 @@
{/if}
-
- {#if app.lockedYou}
- Locked by you
- {:else if app.lockedOther}
- Locked by {app.lockedBy.email}
- {:else}
- Open
- {/if}
-
+
@@ -70,23 +52,15 @@
- {#if app.deployed}
-
- {:else}
-
- {/if}
+
+
+ {/if}
diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 39cc780ac7..03d39ddc45 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -69,7 +69,7 @@
-
+
-
+
$goto("./forgot")}>
Forgot password?
diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte
index 39a5def7d6..ae0362af72 100644
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@@ -31,7 +31,20 @@
$: menu = buildMenu($auth.isAdmin)
const buildMenu = admin => {
- let menu = [{ title: "Apps", href: "/builder/portal/apps" }]
+ let menu = [
+ {
+ title: "Apps",
+ href: "/builder/portal/apps",
+ },
+ ]
+ if (isEnabled(FEATURE_FLAGS.LICENSING)) {
+ menu = menu.concat([
+ {
+ title: "Usage",
+ href: "/builder/portal/settings/usage",
+ },
+ ])
+ }
if (admin) {
menu = menu.concat([
{
@@ -160,7 +173,7 @@
/>
@@ -315,7 +334,7 @@
.mobile-toggle,
.user-dropdown {
- flex: 1 1 0;
+ flex: 0 1 0;
}
/* Reduce BBUI page padding */
diff --git a/packages/builder/src/pages/builder/portal/apps/create.svelte b/packages/builder/src/pages/builder/portal/apps/create.svelte
index cd2d47ea4c..4fd69bc815 100644
--- a/packages/builder/src/pages/builder/portal/apps/create.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/create.svelte
@@ -9,6 +9,7 @@
Body,
Modal,
Divider,
+ ActionButton,
} from "@budibase/bbui"
import CreateAppModal from "components/start/CreateAppModal.svelte"
import TemplateDisplay from "components/common/TemplateDisplay.svelte"
@@ -60,16 +61,15 @@
-
+
-
+
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 494cf0df92..2892a9b723 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -2,7 +2,6 @@
import {
Heading,
Layout,
- Detail,
Button,
Input,
Select,
@@ -11,7 +10,7 @@
notifications,
Body,
Search,
- Divider,
+ Helpers,
} from "@budibase/bbui"
import TemplateDisplay from "components/common/TemplateDisplay.svelte"
import Spinner from "components/common/Spinner.svelte"
@@ -68,6 +67,9 @@
app?.name?.toLowerCase().includes(searchTerm.toLowerCase())
)
+ $: lockedApps = filteredApps.filter(app => app?.lockedYou || app?.lockedOther)
+ $: unlocked = lockedApps?.length == 0
+
const enrichApps = (apps, user, sortBy) => {
const enrichedApps = apps.map(app => ({
...app,
@@ -180,8 +182,8 @@
}
}
- const previewApp = app => {
- window.open(`/${app.devId}`)
+ const appOverview = app => {
+ $goto(`../overview/${app.devId}`)
}
const editApp = app => {
@@ -262,6 +264,11 @@
}
}
+ const copyAppId = async app => {
+ await Helpers.copyToClipboard(app.prodId)
+ notifications.success("App ID copied to clipboard.")
+ }
+
function createAppFromTemplateUrl(templateKey) {
// validate the template key just to make sure
const templateParts = templateKey.split("/")
@@ -299,7 +306,7 @@
-
+
{#if loaded}
@@ -309,29 +316,17 @@
{welcomeBody}