Merge branch 'master' of github.com:Budibase/budibase into feature/sqs-table-cleanup

2024-04-22 12:03:31 +01:00 · 2024-04-22 12:03:31 +01:00 · 961b5654fb
parent 8189952f0b bff6340763
commit 961b5654fb
3 changed files with 7 additions and 1 deletions
--- 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 => {
--- a/packages/pro
+++ b/packages/pro
@ -1 +1 @@
-Subproject commit 06b1064f7e2f7cac5d4bef2ee999796a2a1f0f2c
+Subproject commit b55d5b32003e3e999a1cbf2e5f3e6ce8d71eace7
--- 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",