From f7f9a359b24fe7d152a747afdaa49f08ade0abcc Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 5 Jun 2023 08:27:14 +0100 Subject: [PATCH 1/5] Ensure edit button in overview is never disabled as we don't use the lock any more --- .../portal/overview/[appId]/_layout.svelte | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte index 8ee469a914..333a10bef7 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte @@ -20,7 +20,7 @@ Breadcrumb, Header, } from "components/portal/page" - import { apps, auth, overview } from "stores/portal" + import { apps, overview } from "stores/portal" import { AppStatus } from "constants" import analytics, { Events, EventSource } from "analytics" import { store } from "builderStore" @@ -52,8 +52,6 @@ $: appId = $overview.selectedAppId $: initialiseApp(appId) $: isPublished = app?.status === AppStatus.DEPLOYED - $: appLocked = !!app?.lockedBy - $: lockedByYou = $auth.user.email === app?.lockedBy?.email const initialiseApp = async appId => { loaded = false @@ -139,14 +137,7 @@ - + @@ -158,13 +149,7 @@ - - Edit - + Edit exportApp({ published: false })} From 4f176b3edda8b6d0aba2633e31c3664a719d1f8b Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 5 Jun 2023 08:30:53 +0100 Subject: [PATCH 2/5] Increase padding around the grid --- packages/frontend-core/src/components/grid/lib/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/lib/constants.js b/packages/frontend-core/src/components/grid/lib/constants.js index a7209d6ea4..f078ef7274 100644 --- a/packages/frontend-core/src/components/grid/lib/constants.js +++ b/packages/frontend-core/src/components/grid/lib/constants.js @@ -1,4 +1,4 @@ -export const Padding = 128 +export const Padding = 256 export const MaxCellRenderHeight = 252 export const MaxCellRenderWidthOverflow = 200 export const ScrollBarSize = 8 From 920fea7b1f1d5233d9a154644cf07e0bf137e1a6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 5 Jun 2023 08:48:02 +0100 Subject: [PATCH 3/5] Remove beta button from grid, add feedback button to data section linking to collaboration maze --- .../data/_components}/BetaButton.svelte | 24 ++++--------------- .../DatasourceOption.svelte} | 0 .../app/[application]/data/_layout.svelte | 3 +++ .../builder/app/[application]/data/new.svelte | 2 +- .../src/components/grid/layout/Grid.svelte | 2 -- 5 files changed, 8 insertions(+), 23 deletions(-) rename packages/{frontend-core/src/components/grid/controls => builder/src/pages/builder/app/[application]/data/_components}/BetaButton.svelte (50%) rename packages/builder/src/pages/builder/app/[application]/data/{_DatasourceOption.svelte => _components/DatasourceOption.svelte} (100%) diff --git a/packages/frontend-core/src/components/grid/controls/BetaButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/BetaButton.svelte similarity index 50% rename from packages/frontend-core/src/components/grid/controls/BetaButton.svelte rename to packages/builder/src/pages/builder/app/[application]/data/_components/BetaButton.svelte index e5069388e7..1349fdb13c 100644 --- a/packages/frontend-core/src/components/grid/controls/BetaButton.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_components/BetaButton.svelte @@ -2,13 +2,11 @@ import { Button } from "@budibase/bbui" -
- Enjoying the Grid? @@ -17,30 +15,16 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/data/_DatasourceOption.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/DatasourceOption.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/data/_DatasourceOption.svelte rename to packages/builder/src/pages/builder/app/[application]/data/_components/DatasourceOption.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte index 87c4db81df..c0813fd2b8 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte @@ -3,6 +3,7 @@ import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte" import Panel from "components/design/Panel.svelte" import { isActive, goto } from "@roxi/routify" + import BetaButton from "./_components/BetaButton.svelte" @@ -19,6 +20,7 @@
+
diff --git a/packages/builder/src/pages/builder/app/[application]/data/new.svelte b/packages/builder/src/pages/builder/app/[application]/data/new.svelte index f8e8fd85e7..fedaf013da 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte @@ -13,7 +13,7 @@ import DatasourceConfigModal from "components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte" import GoogleDatasourceConfigModal from "components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte" import { createRestDatasource } from "builderStore/datasource" - import DatasourceOption from "./_DatasourceOption.svelte" + import DatasourceOption from "./_components/DatasourceOption.svelte" import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte" import ICONS from "components/backend/DatasourceNavigator/icons/index.js" import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte" diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index 08325857d6..81f42ca257 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -7,7 +7,6 @@ import { createAPIClient } from "../../../api" import { attachStores } from "../stores" import BulkDeleteHandler from "../controls/BulkDeleteHandler.svelte" - import BetaButton from "../controls/BetaButton.svelte" import GridBody from "./GridBody.svelte" import ResizeOverlay from "../overlays/ResizeOverlay.svelte" import ReorderOverlay from "../overlays/ReorderOverlay.svelte" @@ -144,7 +143,6 @@
- {#if allowAddRows} {/if} From ffde512307e9eeb2486e8bd6be5bdda15bbc63fc Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 5 Jun 2023 08:49:35 +0100 Subject: [PATCH 4/5] Update position of floating buttons to be consistent --- packages/builder/src/components/common/HelpMenu.svelte | 2 +- .../app/[application]/data/_components/BetaButton.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/common/HelpMenu.svelte b/packages/builder/src/components/common/HelpMenu.svelte index 274565b255..06ff277d18 100644 --- a/packages/builder/src/components/common/HelpMenu.svelte +++ b/packages/builder/src/components/common/HelpMenu.svelte @@ -83,7 +83,7 @@ .help { z-index: 2; position: absolute; - bottom: var(--spacing-xl); + bottom: 24px; right: 24px; } diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/BetaButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/BetaButton.svelte index 1349fdb13c..3cfe4b4d8d 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_components/BetaButton.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_components/BetaButton.svelte @@ -15,7 +15,7 @@