From 4a1fd6481fe38ed71ed470a19fca7dcb112f8a65 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 15 Aug 2024 10:53:43 +0100 Subject: [PATCH] Remove old, unused feature flags. --- charts/budibase/README.md | 2 +- charts/budibase/values.yaml | 2 +- hosting/single/runner.sh | 1 - packages/backend-core/src/features/index.ts | 4 - .../DataTable/modals/CreateEditColumn.svelte | 5 +- .../src/components/common/HelpMenu.svelte | 42 +- .../portal/licensing/LicensingOverlays.svelte | 4 +- packages/builder/src/helpers/featureFlags.js | 8 - .../builder/app/[application]/_layout.svelte | 19 +- .../portal/_components/UpgradeButton.svelte | 3 +- .../builder/src/stores/portal/licensing.js | 167 +- packages/builder/src/stores/portal/menu.js | 85 +- packages/server/Dockerfile | 1 - packages/server/scripts/dev/manage.js | 1 - packages/types/src/sdk/featureFlag.ts | 1 - packages/worker/Dockerfile | 1 - packages/worker/scripts/dev/manage.js | 1 - yarn.lock | 1372 +---------------- 18 files changed, 211 insertions(+), 1508 deletions(-) diff --git a/charts/budibase/README.md b/charts/budibase/README.md index c944ed1397..c10b42d75b 100644 --- a/charts/budibase/README.md +++ b/charts/budibase/README.md @@ -139,7 +139,7 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml | globals.smtp.user | string | `""` | The username to use when authenticating with your SMTP server. | | globals.sqs.enabled | bool | `false` | Whether to use the CouchDB "structured query service" or not. This is disabled by default for now, but will become the default in a future release. | | globals.tempBucketName | string | `""` | | -| globals.tenantFeatureFlags | string | `"*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR"` | Sets what feature flags are enabled and for which tenants. Should not ordinarily need to be changed. | +| globals.tenantFeatureFlags | string | `` | Sets what feature flags are enabled and for which tenants. Should not ordinarily need to be changed. | | imagePullSecrets | list | `[]` | Passed to all pods created by this chart. Should not ordinarily need to be changed. | | ingress.className | string | `""` | What ingress class to use. | | ingress.enabled | bool | `true` | Whether to create an Ingress resource pointing to the Budibase proxy. | diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index 4e80be7322..dde912410c 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -62,7 +62,7 @@ globals: budibaseEnv: PRODUCTION # -- Sets what feature flags are enabled and for which tenants. Should not ordinarily need to be # changed. - tenantFeatureFlags: "*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR" + tenantFeatureFlags: "" # -- Whether to enable analytics or not. You can read more about our analytics here: # . enableAnalytics: "1" diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index b89bf8ffd4..89c5540370 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -10,7 +10,6 @@ declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONME [[ -z "${MINIO_URL}" ]] && [[ -z "${USE_S3}" ]] && export MINIO_URL=http://127.0.0.1:9000 [[ -z "${NODE_ENV}" ]] && export NODE_ENV=production [[ -z "${POSTHOG_TOKEN}" ]] && export POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU -[[ -z "${TENANT_FEATURE_FLAGS}" ]] && export TENANT_FEATURE_FLAGS="*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR" [[ -z "${ACCOUNT_PORTAL_URL}" ]] && export ACCOUNT_PORTAL_URL=https://account.budibase.app [[ -z "${REDIS_URL}" ]] && export REDIS_URL=127.0.0.1:6379 [[ -z "${SELF_HOSTED}" ]] && export SELF_HOSTED=1 diff --git a/packages/backend-core/src/features/index.ts b/packages/backend-core/src/features/index.ts index 67084c8486..0063830417 100644 --- a/packages/backend-core/src/features/index.ts +++ b/packages/backend-core/src/features/index.ts @@ -265,9 +265,5 @@ export class FlagSet, T extends { [key: string]: V }> { // All of the machinery in this file is to make sure that flags have their // default values set correctly and their types flow through the system. export const flags = new FlagSet({ - LICENSING: Flag.boolean(false), - GOOGLE_SHEETS: Flag.boolean(false), - USER_GROUPS: Flag.boolean(false), - ONBOARDING_TOUR: Flag.boolean(false), DEFAULT_VALUES: Flag.boolean(false), }) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index 98243c6e2f..1d66a0ba00 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -46,7 +46,7 @@ import { RowUtils } from "@budibase/frontend-core" import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte" import OptionsEditor from "./OptionsEditor.svelte" - import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags" + import { isEnabled } from "helpers/featureFlags" const AUTO_TYPE = FieldType.AUTO const FORMULA_TYPE = FieldType.FORMULA @@ -168,8 +168,7 @@ $: canBeDisplay = canBeDisplayColumn(editableColumn.type) && !editableColumn.autocolumn $: canHaveDefault = - isEnabled(TENANT_FEATURE_FLAGS.DEFAULT_VALUES) && - canHaveDefaultColumn(editableColumn.type) + isEnabled("DEFAULT_VALUES") && canHaveDefaultColumn(editableColumn.type) $: canBeRequired = editableColumn?.type !== LINK_TYPE && !uneditable && diff --git a/packages/builder/src/components/common/HelpMenu.svelte b/packages/builder/src/components/common/HelpMenu.svelte index 0ce5ab9c8e..bba55e88dc 100644 --- a/packages/builder/src/components/common/HelpMenu.svelte +++ b/packages/builder/src/components/common/HelpMenu.svelte @@ -1,7 +1,6 @@ -{#if isEnabled(TENANT_FEATURE_FLAGS.LICENSING) && !$licensing.isEnterprisePlan && !$licensing.isEnterpriseTrial} +{#if !$licensing.isEnterprisePlan && !$licensing.isEnterpriseTrial} {#if $admin.cloud && $auth?.user?.accountPortalAccess}