From c01c35386bf1e8b3988e7a10a164fa01c9141bbc Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 27 May 2022 17:11:41 +0100 Subject: [PATCH] Updating UI after pulling in latest changes. --- .../overview/HistoryDetailsPanel.svelte | 21 ++++------ .../portal/overview/HistoryTab.svelte | 10 ++--- .../portal/overview/StatusRenderer.svelte | 24 +++++++----- .../overview/[application]/index.svelte | 39 ++----------------- .../overview/_components/OverviewTab.svelte | 10 ++--- packages/server/yarn.lock | 18 ++++----- packages/worker/yarn.lock | 18 ++++----- 7 files changed, 54 insertions(+), 86 deletions(-) diff --git a/packages/builder/src/components/portal/overview/HistoryDetailsPanel.svelte b/packages/builder/src/components/portal/overview/HistoryDetailsPanel.svelte index 7c569aa467..7e1f1e9705 100644 --- a/packages/builder/src/components/portal/overview/HistoryDetailsPanel.svelte +++ b/packages/builder/src/components/portal/overview/HistoryDetailsPanel.svelte @@ -1,35 +1,29 @@ {#if history}
- - Run log details +
- {capitalise(history.appName || "")} -
- {history.name} +
{history.name}
{#each history.steps as step} - + {/each}
{:else} - No details found +
No details found
{/if} diff --git a/packages/builder/src/components/portal/overview/HistoryTab.svelte b/packages/builder/src/components/portal/overview/HistoryTab.svelte index e229a92a70..8e34a41123 100644 --- a/packages/builder/src/components/portal/overview/HistoryTab.svelte +++ b/packages/builder/src/components/portal/overview/HistoryTab.svelte @@ -15,7 +15,6 @@ const runHistorySchema = { status: { displayName: "Status" }, timestamp: { displayName: "Time" }, - appName: { displayName: "App" }, name: { displayName: "Automation" }, } @@ -59,7 +58,6 @@ { status: "Error", timestamp: "2022-05-11T16:06:14.438Z", - appName: "App name", name: "automation name", steps: [ { @@ -76,7 +74,6 @@ { status: "Success", timestamp: "2022-05-11T16:03:14.438Z", - appName: "App name", name: "automation name", steps: [ { @@ -137,7 +134,7 @@ } .panelOpen { - grid-template-columns: 1fr 360px; + grid-template-columns: auto 360px; } .search { @@ -161,9 +158,12 @@ .panel { display: none; + position: absolute; right: 0; height: 100%; - width: 100%; + width: 360px; + overflow: hidden; + background-color: var(--background); } .panelShow { diff --git a/packages/builder/src/components/portal/overview/StatusRenderer.svelte b/packages/builder/src/components/portal/overview/StatusRenderer.svelte index f0f86d0d46..7abfebb2f2 100644 --- a/packages/builder/src/components/portal/overview/StatusRenderer.svelte +++ b/packages/builder/src/components/portal/overview/StatusRenderer.svelte @@ -1,25 +1,31 @@
- - {value} + +
{value}
diff --git a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte index 0c25f372e6..04d99710c1 100644 --- a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte @@ -26,8 +26,8 @@ import { AppStatus } from "constants" import AppLockModal from "components/common/AppLockModal.svelte" import EditableIcon from "components/common/EditableIcon.svelte" - import HistoryTab from "components/portal/overview/HistoryTab.svelte" import ConfirmDialog from "components/common/ConfirmDialog.svelte" + import HistoryTab from "components/portal/overview/HistoryTab.svelte" import { checkIncomingDeploymentStatus } from "components/deploy/utils" import { onDestroy, onMount } from "svelte" @@ -110,7 +110,7 @@ reviewPendingDeployments(deployments, newDeployments) return newDeployments } catch (err) { - notifications.error("Error fetching deployment overview") + notifications.error("Error fetching deployment history") } } @@ -215,7 +215,7 @@
{:then _} - + Back @@ -292,32 +292,6 @@ -
- - - - - -
Backups contents
{/if} - - - diff --git a/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte b/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte index a78ed27eea..5ce0161978 100644 --- a/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte +++ b/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte @@ -47,18 +47,18 @@ } -
+
-
+
-
-
+
+
{#if isPublished} Published {:else} - Unpublished + Unpublished {/if}
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index dd801e8dae..8a13e5ce0a 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1014,10 +1014,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.188-alpha.0": - version "1.0.188-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.188-alpha.0.tgz#1799eb96756a59606ab87ffc923e00af1733f00a" - integrity sha512-0L8WRjyDEmUf7VFAUtKd5ddyyA+3JyzjMm43AiMjD3rhHbjwZQBlxxP0q3BBaeobM5FBf3xUzYQ+8qRDUJtcQQ== +"@budibase/backend-core@1.0.188-alpha.1": + version "1.0.188-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.188-alpha.1.tgz#46eaa947ca9f62d9ca75188e59039e1cad356212" + integrity sha512-0JB0LZTqjKyPdziiDGOxvhaVUA3YfK7SkbdHSA7wgh6XAqpWn1dHf9NnE2LIT2Mmqd0YLtkmRy0mmI6/928AGQ== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -1092,12 +1092,12 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.0.188-alpha.0": - version "1.0.188-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.188-alpha.0.tgz#30fdaf06e11b5ddff35cd484c1bf226cc2df78cd" - integrity sha512-pWkHYTqxmMTYaLYOi3TwoI0Rdz539dR40GuhnnKN4rsX5aL+dxcKTartscTJlZGvY+rrk1Cfbq2LLbGSRWDdIA== +"@budibase/pro@1.0.188-alpha.1": + version "1.0.188-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.188-alpha.1.tgz#f23b9b95190cbb785aca88aa31dc593602d2288b" + integrity sha512-kFeQU5ePBaxN5xuPCuVpLgCZhIMxGoOyY60iYdvpldB4aVBkO5bmSeJ5Mbrdf/HwuF8K+wQoG5AA9+vd2lElMg== dependencies: - "@budibase/backend-core" "1.0.188-alpha.0" + "@budibase/backend-core" "1.0.188-alpha.1" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index e9933636a1..d228cd407a 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -293,10 +293,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.188-alpha.0": - version "1.0.188-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.188-alpha.0.tgz#1799eb96756a59606ab87ffc923e00af1733f00a" - integrity sha512-0L8WRjyDEmUf7VFAUtKd5ddyyA+3JyzjMm43AiMjD3rhHbjwZQBlxxP0q3BBaeobM5FBf3xUzYQ+8qRDUJtcQQ== +"@budibase/backend-core@1.0.188-alpha.1": + version "1.0.188-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.188-alpha.1.tgz#46eaa947ca9f62d9ca75188e59039e1cad356212" + integrity sha512-0JB0LZTqjKyPdziiDGOxvhaVUA3YfK7SkbdHSA7wgh6XAqpWn1dHf9NnE2LIT2Mmqd0YLtkmRy0mmI6/928AGQ== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -322,12 +322,12 @@ uuid "^8.3.2" zlib "^1.0.5" -"@budibase/pro@1.0.188-alpha.0": - version "1.0.188-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.188-alpha.0.tgz#30fdaf06e11b5ddff35cd484c1bf226cc2df78cd" - integrity sha512-pWkHYTqxmMTYaLYOi3TwoI0Rdz539dR40GuhnnKN4rsX5aL+dxcKTartscTJlZGvY+rrk1Cfbq2LLbGSRWDdIA== +"@budibase/pro@1.0.188-alpha.1": + version "1.0.188-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.188-alpha.1.tgz#f23b9b95190cbb785aca88aa31dc593602d2288b" + integrity sha512-kFeQU5ePBaxN5xuPCuVpLgCZhIMxGoOyY60iYdvpldB4aVBkO5bmSeJ5Mbrdf/HwuF8K+wQoG5AA9+vd2lElMg== dependencies: - "@budibase/backend-core" "1.0.188-alpha.0" + "@budibase/backend-core" "1.0.188-alpha.1" node-fetch "^2.6.1" "@cspotcode/source-map-consumer@0.8.0":