From 08de8f48dd9620dcb18ffb5e2831cee5495cdefc Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 9 Apr 2024 08:50:17 +0100 Subject: [PATCH 1/6] Rename borderless to quiet --- packages/client/manifest.json | 6 ++++++ packages/client/src/components/app/GridBlock.svelte | 2 ++ .../frontend-core/src/components/grid/layout/Grid.svelte | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 08d614391b..1d5f35905c 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -6708,6 +6708,12 @@ "key": "stripeRows", "defaultValue": false }, + { + "type": "boolean", + "label": "Quiet", + "key": "quiet", + "defaultValue": false + }, { "section": true, "name": "Columns", diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 46a507387d..9bf113a46e 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -11,6 +11,7 @@ export let allowEditRows = true export let allowDeleteRows = true export let stripeRows = false + export let quiet = false export let initialFilter = null export let initialSortColumn = null export let initialSortOrder = null @@ -116,6 +117,7 @@ datasource={table} {API} {stripeRows} + {quiet} {initialFilter} {initialSortColumn} {initialSortOrder} diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index 1d2220951c..b6c686fd62 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -39,6 +39,7 @@ export let canEditColumns = true export let canSaveSchema = true export let stripeRows = false + export let quiet = false export let collaboration = true export let showAvatars = true export let showControls = true @@ -91,6 +92,7 @@ canEditColumns, canSaveSchema, stripeRows, + quiet, collaboration, showAvatars, showControls, @@ -124,6 +126,7 @@ class:is-resizing={$isResizing} class:is-reordering={$isReordering} class:stripe={stripeRows} + class:quiet on:mouseenter={() => gridFocused.set(true)} on:mouseleave={() => gridFocused.set(false)} style="--row-height:{$rowHeight}px; --default-row-height:{DefaultRowHeight}px; --gutter-width:{GutterWidth}px; --max-cell-render-height:{MaxCellRenderHeight}px; --max-cell-render-width-overflow:{MaxCellRenderWidthOverflow}px; --content-lines:{$contentLines};" @@ -331,4 +334,9 @@ .grid-data-outer :global(.spectrum-Checkbox-partialCheckmark) { transition: none; } + + /* Overrides */ + .grid.quiet :global(.grid-data-content .row > .cell:not(:last-child)) { + border-right: none; + } From 4c5f20bfe8d179ff102615c90774ac362cdcc927 Mon Sep 17 00:00:00 2001 From: jvcalderon Date: Thu, 18 Apr 2024 18:21:37 +0200 Subject: [PATCH 2/6] WIP --- packages/types/src/sdk/licensing/plan.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/types/src/sdk/licensing/plan.ts b/packages/types/src/sdk/licensing/plan.ts index 5ac8b1c9f6..016caf8c38 100644 --- a/packages/types/src/sdk/licensing/plan.ts +++ b/packages/types/src/sdk/licensing/plan.ts @@ -7,6 +7,7 @@ export enum PlanType { /** @deprecated */ PREMIUM = "premium", PREMIUM_PLUS = "premium_plus", + PREMIUM_PLUS_TRIAL = "premium_plus_trial", /** @deprecated */ BUSINESS = "business", ENTERPRISE_BASIC = "enterprise_basic", From cb8564f73eab62af6715aec2b4c936dd349278bd Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 19 Apr 2024 12:53:23 +0100 Subject: [PATCH 3/6] Clear the onEmptyFilter from datasource filtering when no fields are specified --- packages/frontend-core/src/components/FilterBuilder.svelte | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/frontend-core/src/components/FilterBuilder.svelte b/packages/frontend-core/src/components/FilterBuilder.svelte index 1b252d5b06..b90882449f 100644 --- a/packages/frontend-core/src/components/FilterBuilder.svelte +++ b/packages/frontend-core/src/components/FilterBuilder.svelte @@ -67,6 +67,12 @@ const removeFilter = id => { filters = filters.filter(field => field.id !== id) + + // Clear all filters when no fields are specified + let [first] = filters + if (filters.length == 1 && first?.onEmptyFilter) { + filters = [] + } } const duplicateFilter = id => { From 51933c124418c2673c8c51e3074a514200d39c41 Mon Sep 17 00:00:00 2001 From: jvcalderon Date: Mon, 22 Apr 2024 10:11:31 +0200 Subject: [PATCH 4/6] Update submodules --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 06b1064f7e..b55d5b3200 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 06b1064f7e2f7cac5d4bef2ee999796a2a1f0f2c +Subproject commit b55d5b32003e3e999a1cbf2e5f3e6ce8d71eace7 From ed3073a20dee097cb9d1a9c38d3ac735173c97ed Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 22 Apr 2024 09:12:05 +0100 Subject: [PATCH 5/6] PR feedback --- packages/frontend-core/src/components/FilterBuilder.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/frontend-core/src/components/FilterBuilder.svelte b/packages/frontend-core/src/components/FilterBuilder.svelte index b90882449f..074c2dbd9b 100644 --- a/packages/frontend-core/src/components/FilterBuilder.svelte +++ b/packages/frontend-core/src/components/FilterBuilder.svelte @@ -69,8 +69,7 @@ filters = filters.filter(field => field.id !== id) // Clear all filters when no fields are specified - let [first] = filters - if (filters.length == 1 && first?.onEmptyFilter) { + if (filters.length === 1 && filters[0].onEmptyFilter) { filters = [] } } From a18799a139820f4bfe353aaf9e1a19546b28d84e Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 22 Apr 2024 11:50:08 +0100 Subject: [PATCH 6/6] Getting rid of previous check for docker-compose/docker compose as due to recent changes there is no alias for the docker compose command anymore to find. --- packages/cli/src/hosting/utils.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/cli/src/hosting/utils.ts b/packages/cli/src/hosting/utils.ts index cbf6d9b0c3..5c3ac33f44 100644 --- a/packages/cli/src/hosting/utils.ts +++ b/packages/cli/src/hosting/utils.ts @@ -54,11 +54,9 @@ export async function downloadDockerCompose() { export async function checkDockerConfigured() { const error = - "docker/docker-compose has not been installed, please follow instructions at: https://docs.budibase.com/docs/docker-compose" + "docker has not been installed, please follow instructions at: https://docs.budibase.com/docs/docker-compose" const docker = await lookpath("docker") - const compose = await lookpath("docker-compose") - const composeV2 = await lookpath("docker compose") - if (!docker || (!compose && !composeV2)) { + if (!docker) { throw error } }