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 } } diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 40abc7a9a0..bf73286933 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -6973,6 +6973,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 0ee2cf1487..55e5a2bd66 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 @@ -117,6 +118,7 @@ datasource={table} {API} {stripeRows} + {quiet} {initialFilter} {initialSortColumn} {initialSortOrder} diff --git a/packages/frontend-core/src/components/FilterBuilder.svelte b/packages/frontend-core/src/components/FilterBuilder.svelte index 1b252d5b06..074c2dbd9b 100644 --- a/packages/frontend-core/src/components/FilterBuilder.svelte +++ b/packages/frontend-core/src/components/FilterBuilder.svelte @@ -67,6 +67,11 @@ const removeFilter = id => { filters = filters.filter(field => field.id !== id) + + // Clear all filters when no fields are specified + if (filters.length === 1 && filters[0].onEmptyFilter) { + filters = [] + } } const duplicateFilter = id => { 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; + } 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 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",