diff --git a/packages/bbui/src/InlineAlert/InlineAlert.svelte b/packages/bbui/src/InlineAlert/InlineAlert.svelte index 94ac6b2c2a..57e7296234 100644 --- a/packages/bbui/src/InlineAlert/InlineAlert.svelte +++ b/packages/bbui/src/InlineAlert/InlineAlert.svelte @@ -56,5 +56,6 @@ --spectrum-semantic-positive-icon-color: #2d9d78; --spectrum-semantic-negative-icon-color: #e34850; min-width: 100px; + margin: 0; } diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 6750005c74..02f089b340 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -1,15 +1,52 @@ -
- +
+
+
+ +
+
+
{ + sidePanelVisble = false + }} + > + +
diff --git a/packages/builder/package.json b/packages/builder/package.json index 4a09ede0ac..e809d3fef9 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -87,7 +87,7 @@ "shortid": "2.2.15", "svelte-dnd-action": "^0.9.8", "svelte-loading-spinners": "^0.1.1", - "svelte-portal": "0.1.0", + "svelte-portal": "1.0.0", "uuid": "8.3.1", "yup": "0.29.2" }, diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index cc9dbc37e3..2a5b5ed4df 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -304,7 +304,6 @@ justify-content: center; align-items: stretch; overflow: auto; - padding: 50px 50px 0 50px; } @media (max-width: 640px) { diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index 12e3a56d31..9ffdee1e42 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -177,68 +177,63 @@ {#if loaded} - - - - Usage - -
Get information about your current usage within Budibase
- - - + + + Usage - To upgrade your plan and usage limits visit your - account. +
Get information about your current usage within Budibase
- -
+ + + + To upgrade your plan and usage limits visit your + account. + + +
+
+ + {#each staticUsage as usage} +
+ +
+ {/each} + +
+ + {#if monthlyUsage.length}
- - {#each staticUsage as usage} -
+ + + Monthly limits +
+ + + Resets in {daysRemainingInMonth} days + + +
+ + + {#each monthlyUsage as usage} -
- {/each} + {/each} +
- - {#if monthlyUsage.length} -
- - - Monthly limits -
- - - Resets in {daysRemainingInMonth} days - - -
- - - {#each monthlyUsage as usage} - - {/each} - - -
- {/if} -
- - - + {/if} +
+ + {/if} 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 index 02414f4a2b..3968011914 100644 --- 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 @@ -14,14 +14,16 @@ import HistoryDetailsPanel from "./_components/HistoryDetailsPanel.svelte" import { automationStore } from "builderStore" import { createPaginationStore } from "helpers/pagination" - import { onMount } from "svelte" + import { getContext, onDestroy, onMount } from "svelte" import dayjs from "dayjs" import { auth, licensing, admin, overview } from "stores/portal" import { Constants } from "@budibase/frontend-core" + import Portal from "svelte-portal" const ERROR = "error", SUCCESS = "success", STOPPED = "stopped" + const sidePanel = getContext("side-panel") let pageInfo = createPaginationStore() let runHistory = null @@ -109,7 +111,7 @@ function viewDetails({ detail }) { selectedHistory = detail - showPanel = true + sidePanel.open() } onMount(async () => { @@ -130,6 +132,10 @@ automationOptions.push({ value: automation._id, label: automation.name }) } }) + + onDestroy(() => { + sidePanel.close() + }) @@ -209,15 +215,15 @@ {/if} -
- { - showPanel = false - }} - /> -
+{#if selectedHistory} + + + +{/if} diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index 21ad9bcb8b..4ca6636207 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -5813,10 +5813,10 @@ svelte-loading-spinners@^0.1.1: resolved "https://registry.yarnpkg.com/svelte-loading-spinners/-/svelte-loading-spinners-0.1.7.tgz#3fa6fa0ef67ab635773bf20b07d0b071debbadaa" integrity sha512-EKCId1DjVL2RSUVJJsvtNcqQHox03XIgh4xh/4p7r6ST7d8mut6INY9/LqK4A17PFU64+3quZmqiSfOlf480CA== -svelte-portal@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-0.1.0.tgz#cc2821cc84b05ed5814e0218dcdfcbebc53c1742" - integrity sha512-kef+ksXVKun224mRxat+DdO4C+cGHla+fEcZfnBAvoZocwiaceOfhf5azHYOPXSSB1igWVFTEOF3CDENPnuWxg== +svelte-portal@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" + integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== svelte@^3.48.0: version "3.49.0"