From f37c49e8afdbbd3c7df05626d22168d7837560e3 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 6 Jun 2023 16:16:09 +0100 Subject: [PATCH 01/25] Initial commit --- .../src/components/start/AppRow.svelte | 2 +- .../builder/app/[application]/_layout.svelte | 78 ++++------- .../automate/[automationId]/_layout.svelte | 15 -- .../automate/[automationId]/index.svelte | 5 - .../app/[application]/automate/_layout.svelte | 131 ------------------ .../app/[application]/automate/index.svelte | 10 -- .../pages/builder/portal/apps/index.svelte | 5 +- 7 files changed, 31 insertions(+), 215 deletions(-) delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/[automationId]/_layout.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/[automationId]/index.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/index.svelte diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index 142c5c6e31..50e6b8466a 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -22,7 +22,7 @@ } const goToOverview = () => { - $goto(`../overview/${app.devId}`) + $goto(`../../app/${app.devId}/settings`) } diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index f13aa3dab6..d10657bdbe 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -12,6 +12,7 @@ Heading, Modal, notifications, + Button, } from "@budibase/bbui" import AppActions from "components/deploy/AppActions.svelte" import { API } from "api" @@ -144,53 +145,14 @@
{#if $store.initialised}
- -
- -
- $goto("../../portal/apps")}> - Exit to portal - - $goto(`../../portal/overview/${application}`)} - > - Overview - - - $goto(`../../portal/overview/${application}/access`)} - > - Access - - - $goto(`../../portal/overview/${application}/automation-history`)} - > - Automation history - - - $goto(`../../portal/overview/${application}/backups`)} - > - Backups - - - - $goto(`../../portal/overview/${application}/name-and-url`)} - > - Name and URL - - - $goto(`../../portal/overview/${application}/version`)} - > - Version - - - {$store.name} -
-
+ + $goto("../../portal/apps")} + /> + {#if $store.hasLock} {#each $layout.children as { path, title }} @@ -212,6 +174,9 @@
{/if}
+
+ {$store.name} +
@@ -236,6 +201,13 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/automate/index.svelte b/packages/builder/src/pages/builder/app/[application]/automate/index.svelte deleted file mode 100644 index ea2c853139..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/automate/index.svelte +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 8b8451f036..f2ea7b3896 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -100,7 +100,10 @@ const params = new URLSearchParams({ open: "error", }) - $goto(`../overview/${appId}/automation-history?${params.toString()}`) + $goto( + `/builder/app/${appId}/settings/automation-history?${params.toString()}` + ) + // $goto(`../overview/${appId}/automation-history?${params.toString()}`) } const errorCount = errors => { From e1b63842e5e50be106371fd165b704d2a177f9e0 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 6 Jun 2023 16:24:30 +0100 Subject: [PATCH 02/25] Adding in relocated screen components --- .../automation/[automationId]/_layout.svelte | 15 + .../automation/[automationId]/index.svelte | 5 + .../[application]/automation/_layout.svelte | 131 +++++++ .../app/[application]/automation/index.svelte | 10 + .../app/[application]/settings/_layout.svelte | 74 ++++ .../_components/HistoryDetailsPanel.svelte | 82 +++++ .../_components/StatusRenderer.svelte | 27 ++ .../settings/automation-history/index.svelte | 262 ++++++++++++++ .../_components/ActionsRenderer.svelte | 87 +++++ .../_components/AppSizeRenderer.svelte | 41 +++ .../_components/CreateRestoreModal.svelte | 27 ++ .../_components/DatasourceRenderer.svelte | 21 ++ .../backups/_components/StatusRenderer.svelte | 15 + .../_components/TimeAgoRenderer.svelte | 10 + .../backups/_components/TypeRenderer.svelte | 36 ++ .../backups/_components/UserRenderer.svelte | 18 + .../settings/backups/index.svelte | 340 ++++++++++++++++++ .../app/[application]/settings/embed.svelte | 23 ++ .../app/[application]/settings/index.svelte | 4 + .../settings/name-and-url.svelte | 79 ++++ .../app/[application]/settings/version.svelte | 39 ++ 21 files changed, 1346 insertions(+) create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/AppSizeRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/embed.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/version.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte new file mode 100644 index 0000000000..3be71a1bbe --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte @@ -0,0 +1,15 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte new file mode 100644 index 0000000000..1a15ed48c6 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte @@ -0,0 +1,5 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte new file mode 100644 index 0000000000..79ca5df168 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte @@ -0,0 +1,131 @@ + + + +
+ +
+ {#if $automationStore.automations?.length} + + {:else} +
+
+ + + + + You have no automations + Let's fix that. Call the bots! + + +
+
+ {/if} +
+ + {#if $automationStore.showTestPanel} +
+ +
+ {/if} + + + + + + +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/automation/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte new file mode 100644 index 0000000000..ea2c853139 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte @@ -0,0 +1,10 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte new file mode 100644 index 0000000000..3c0299d50a --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte @@ -0,0 +1,74 @@ + + + +
+ + + + + + + + + + + + + + +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte new file mode 100644 index 0000000000..5b9c925130 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte @@ -0,0 +1,82 @@ + + +{#if history} + +
+ + +
+ + {history.automationName} + + + {#if history.status === STOPPED_ERROR} +
+ +
+ {/if} + {#if exists} +
+ +
+ {/if} + {#key history} +
+ +
+ {/key} + +{:else} + No details found +{/if} + + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte new file mode 100644 index 0000000000..f041faa349 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte @@ -0,0 +1,27 @@ + + + + {info.message} + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte new file mode 100644 index 0000000000..c1c6be997b --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte @@ -0,0 +1,262 @@ + + + + + Automation History + View the automations your app has executed + + + +
+
+
+ +
+
+ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte new file mode 100644 index 0000000000..198339dae9 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte @@ -0,0 +1,21 @@ + + +
+ {#if value != null} + +
{value || 0}
+ {/if} +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte new file mode 100644 index 0000000000..3b3cce731d --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte @@ -0,0 +1,15 @@ + + + + {status} + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte new file mode 100644 index 0000000000..fd67b4010b --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte @@ -0,0 +1,10 @@ + + +{dayjs(value).fromNow()} diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte new file mode 100644 index 0000000000..86ad0f3d4e --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte @@ -0,0 +1,36 @@ + + +
+ {printTrigger(trigger)} + {type} +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte new file mode 100644 index 0000000000..399877a801 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte @@ -0,0 +1,18 @@ + + +
+ +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte new file mode 100644 index 0000000000..1d612117e2 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte @@ -0,0 +1,340 @@ + + + + +
+ Backups + {#if !$licensing.backupsEnabled} + + Premium + + {/if} +
+ Back up your apps and restore them to their previous state + + + + {#if !$licensing.backupsEnabled} + {#if !$auth.accountPortalAccess && $admin.cloud} + Contact your account holder to upgrade your plan. + {/if} +
+ {#if $auth.accountPortalAccess} + + {/if} + +
+ {:else if !backupData?.length && !loading && !filterOpt && !startDate} +
+ + BackupsDefault + + You have no backups yet + You can manually back up your app any time + +
+ +
+ +
+ {:else} + +
+
+
+ onChange(e, key)} value={inputData[key]} diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte index 477a115d08..84feb4f189 100644 --- a/packages/builder/src/components/deploy/AppActions.svelte +++ b/packages/builder/src/components/deploy/AppActions.svelte @@ -59,7 +59,6 @@ $store.upgradableVersion !== $store.version const initialiseApp = async () => { - console.log("AppActions :: Reinitialise") const applicationPkg = await API.fetchAppPackage($store.devId) await store.actions.initialise(applicationPkg) } @@ -73,8 +72,6 @@ : "" } - $: deploymentString = updateDeploymentString(deployments) - const reviewPendingDeployments = (deployments, newDeployments) => { if (deployments.length > 0) { const pending = checkIncomingDeploymentStatus(deployments, newDeployments) @@ -185,8 +182,10 @@ {#if updateAvailable}
- - Update + + + Update +
{/if} @@ -196,41 +195,44 @@ : TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT} >
- -
{ - store.update(state => { - state.builderSidePanel = true - return state - }) - }} - > - - Users +
+ { + store.update(state => { + state.builderSidePanel = true + return state + }) + }} + > + Users +
- -
- - - Preview +
+ + Preview +
-
+ +
{ + if (!appActionPopoverOpen) { + appActionPopover.show() + } else { + appActionPopover.hide() + } + }} + >
- -
{ - appActionPopover.show() - }} - > +
@@ -248,7 +250,7 @@ align="right" disabled={!isPublished} anchor={appActionPopoverAnchor} - offset={10} + offset={35} on:close={() => { appActionPopoverOpen = false }} @@ -283,7 +285,9 @@ {#if isPublished} - {deploymentString} + + {updateDeploymentString(deployments)} + Unpublish @@ -297,16 +301,18 @@
{#if $store.hasLock} - + {#if isPublished} + { + $goto("./settings/embed") + appActionPopover.hide() + }} + > + Embed + + {/if} -
- -
- You have no users assigned yet -
-
- - - {/if} - - {#if $usersFetch.loaded && $licensing.groupsEnabled} - -
- Groups - -
- -
- You have no groups assigned yet -
-
- - {/if} - - - - - - - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/HistoryDetailsPanel.svelte deleted file mode 100644 index 565c0d1f2f..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/HistoryDetailsPanel.svelte +++ /dev/null @@ -1,82 +0,0 @@ - - -{#if history} - -
- - -
- - {history.automationName} - - - {#if history.status === STOPPED_ERROR} -
- -
- {/if} - {#if exists} -
- -
- {/if} - {#key history} -
- -
- {/key} - -{:else} - No details found -{/if} - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/StatusRenderer.svelte deleted file mode 100644 index f041faa349..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/StatusRenderer.svelte +++ /dev/null @@ -1,27 +0,0 @@ - - - - {info.message} - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte deleted file mode 100644 index 5eb8b9d965..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte +++ /dev/null @@ -1,263 +0,0 @@ - - - - - Automation History - View the automations your app has executed - - - -
-
-
- -
-
- - - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/DatasourceRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/DatasourceRenderer.svelte deleted file mode 100644 index 198339dae9..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/DatasourceRenderer.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
- {#if value != null} - -
{value || 0}
- {/if} -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/StatusRenderer.svelte deleted file mode 100644 index 3b3cce731d..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/StatusRenderer.svelte +++ /dev/null @@ -1,15 +0,0 @@ - - - - {status} - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte deleted file mode 100644 index fd67b4010b..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - -{dayjs(value).fromNow()} diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TypeRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TypeRenderer.svelte deleted file mode 100644 index 86ad0f3d4e..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TypeRenderer.svelte +++ /dev/null @@ -1,36 +0,0 @@ - - -
- {printTrigger(trigger)} - {type} -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte deleted file mode 100644 index 399877a801..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - -
- -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte deleted file mode 100644 index 77d76c9609..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte +++ /dev/null @@ -1,344 +0,0 @@ - - - - -
- Backups - {#if !$licensing.backupsEnabled} - - Premium - - {/if} -
- Back up your apps and restore them to their previous state - - - - {#if !$licensing.backupsEnabled} - {#if !$auth.accountPortalAccess && $admin.cloud} - Contact your account holder to upgrade your plan. - {/if} -
- {#if $auth.accountPortalAccess} - - {/if} - -
- {:else if !backupData?.length && !loading && !filterOpt && !startDate} -
- - BackupsDefault - - You have no backups yet - You can manually back up your app any time - -
- -
- -
- {:else} - -
-
-
- { - let clone = { ...config } - clone.platformTitle = e.detail ? e.detail : "" - config = clone - }} - value={config.platformTitle || ""} - disabled={!brandingEnabled || saving} - /> -
- {/if} +
+ + { + let clone = { ...config } + clone.platformTitle = e.detail ? e.detail : "" + config = clone + }} + value={config.platformTitle || ""} + disabled={!brandingEnabled || saving} + /> +
- {#if !isCloud} - - - Login page - - -