Merge pull request #14384 from Budibase/feature-flag-cleanup

Feature flag cleanup

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. |

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:
   # <https://docs.budibase.com/docs/analytics>.
   enableAnalytics: "1"

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

packages/account-portal

@@ -1 +1 @@
-Subproject commit 32b8fa4643b4f0f74ee89760deffe431ab347ad9
+Subproject commit 516b27b74cbcb7069a25f5e738dc91c22d7c4538

packages/backend-core/src/features/index.ts

@@ -265,9 +265,5 @@ export class FlagSet<V extends Flag<any>, 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),
 })

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) &&
+    isEnabled("DEFAULT_VALUES") && canHaveDefaultColumn(editableColumn.type)
-    canHaveDefaultColumn(editableColumn.type)
   $: canBeRequired =
     editableColumn?.type !== LINK_TYPE &&
     !uneditable &&

packages/builder/src/components/common/HelpMenu.svelte

@@ -1,7 +1,6 @@
 <script>
   import FontAwesomeIcon from "./FontAwesomeIcon.svelte"
   import { Popover, Heading, Body } from "@budibase/bbui"
-  import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags"
   import { licensing } from "stores/portal"
   import { isPremiumOrAbove } from "helpers/planTitle"
   import { ChangelogURL } from "constants"
@@ -62,16 +61,12 @@
         <Body size="S">Budibase University</Body>
       </a>
       <div class="divider" />
-      {#if isEnabled(TENANT_FEATURE_FLAGS.LICENSING)}
       <a
         href={premiumOrAboveLicense
           ? "mailto:support@budibase.com"
           : "/builder/portal/account/usage"}
       >
-          <div
+        <div class="premiumLinkContent" class:disabled={!premiumOrAboveLicense}>
-            class="premiumLinkContent"
-            class:disabled={!premiumOrAboveLicense}
-          >
           <div class="icon">
             <FontAwesomeIcon name="fa-solid fa-envelope" />
           </div>
@@ -86,7 +81,6 @@
           </div>
         {/if}
       </a>
-      {/if}
     </nav>
   </Popover>
 </div>

packages/builder/src/components/portal/licensing/LicensingOverlays.svelte

@@ -7,7 +7,6 @@
   import { ExpiringKeys } from "./constants"
   import { getBanners } from "./licensingBanners"
   import { banner } from "@budibase/bbui"
-  import { TENANT_FEATURE_FLAGS, isEnabled } from "helpers/featureFlags"
 
   const oneDayInSeconds = 86400
 
@@ -89,8 +88,7 @@
     userLoaded &&
     $licensing.usageMetrics &&
     domLoaded &&
-    !licensingLoaded &&
+    !licensingLoaded
-    isEnabled(TENANT_FEATURE_FLAGS.LICENSING)
   ) {
     licensingLoaded = true
     queuedModals = processModals()

packages/builder/src/helpers/featureFlags.js

@@ -1,14 +1,6 @@
 import { auth } from "../stores/portal"
 import { get } from "svelte/store"
 
-export const TENANT_FEATURE_FLAGS = {
-  LICENSING: "LICENSING",
-  USER_GROUPS: "USER_GROUPS",
-  ONBOARDING_TOUR: "ONBOARDING_TOUR",
-  GOOGLE_SHEETS: "GOOGLE_SHEETS",
-  DEFAULT_VALUES: "DEFAULT_VALUES",
-}
-
 export const isEnabled = featureFlag => {
   const user = get(auth).user
   return !!user?.flags?.[featureFlag]

packages/builder/src/pages/builder/app/[application]/_layout.svelte

@@ -9,7 +9,6 @@
     deploymentStore,
   } from "stores/builder"
   import { auth, appsStore } from "stores/portal"
-  import { TENANT_FEATURE_FLAGS, isEnabled } from "helpers/featureFlags"
   import {
     Icon,
     Tabs,
@@ -90,7 +89,6 @@
 
   const initTour = async () => {
     // Check if onboarding is enabled.
-    if (isEnabled(TENANT_FEATURE_FLAGS.ONBOARDING_TOUR)) {
     if (!$auth.user?.onboardedAt) {
       builderStore.startBuilderOnboarding()
     } else {
@@ -102,7 +100,6 @@
       }
     }
   }
-  }
 
   onMount(async () => {
     if (!hasSynced && application) {

packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte

@@ -2,11 +2,10 @@
   import { Button } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
   import { auth, admin, licensing } from "stores/portal"
-  import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags"
   import { sdk } from "@budibase/shared-core"
 </script>
 
-{#if isEnabled(TENANT_FEATURE_FLAGS.LICENSING) && !$licensing.isEnterprisePlan && !$licensing.isEnterpriseTrial}
+{#if !$licensing.isEnterprisePlan && !$licensing.isEnterpriseTrial}
   {#if $admin.cloud && $auth?.user?.accountPortalAccess}
     <Button
       cta

packages/builder/src/stores/portal/licensing.js

@@ -3,7 +3,6 @@ import { API } from "api"
 import { auth, admin } from "stores/portal"
 import { Constants } from "@budibase/frontend-core"
 import { StripeStatus } from "components/portal/licensing/constants"
-import { TENANT_FEATURE_FLAGS, isEnabled } from "helpers/featureFlags"
 import { PlanModel } from "@budibase/types"
 
 const UNLIMITED = -1
@@ -183,7 +182,6 @@ export const createLicensingStore = () => {
       return usersLimitExceeded(userCount, get(store).userLimit)
     },
     setUsageMetrics: async () => {
-      if (isEnabled(TENANT_FEATURE_FLAGS.LICENSING)) {
       const usage = get(store).quotaUsage
       const license = get(auth).user.license
       const now = new Date()
@@ -269,7 +267,6 @@ export const createLicensingStore = () => {
           errUserLimit,
         }
       })
-      }
     },
   }
 

packages/builder/src/stores/portal/menu.js

@@ -1,5 +1,4 @@
 import { derived } from "svelte/store"
-import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags"
 import { admin } from "./admin"
 import { auth } from "./auth"
 import { sdk } from "@budibase/shared-core"
@@ -15,12 +14,10 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => {
       href: "/builder/portal/users/users",
     },
   ]
-  if (isEnabled(TENANT_FEATURE_FLAGS.USER_GROUPS)) {
   userSubPages.push({
     title: "Groups",
     href: "/builder/portal/users/groups",
   })
-  }
 
   // Pages that all devs and admins can access
   let menu = [
@@ -83,7 +80,6 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => {
   }
 
   // Add account page
-  if (isEnabled(TENANT_FEATURE_FLAGS.LICENSING)) {
   let accountSubPages = [
     {
       title: "Usage",
@@ -126,7 +122,6 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => {
     href: "/builder/portal/account",
     subPages: accountSubPages,
   })
-  }
 
   return menu
 })

packages/pro

@@ -1 +1 @@
-Subproject commit 94747fd5bb67c218244bb60b9540f3a6f1c3f6f1
+Subproject commit bc43c5230520d83f23afb14489aa9a2a92e7cd27

packages/server/Dockerfile

@@ -12,7 +12,6 @@ ENV COUCH_DB_URL=https://couchdb.budi.live:5984
 ENV BUDIBASE_ENVIRONMENT=PRODUCTION
 ENV SERVICE=app-service
 ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
-ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR
 ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
 ENV TOP_LEVEL_PATH=/
 

packages/server/scripts/dev/manage.js

@@ -43,7 +43,6 @@ async function init() {
     BB_ADMIN_USER_EMAIL: "",
     BB_ADMIN_USER_PASSWORD: "",
     PLUGINS_DIR: "",
-    TENANT_FEATURE_FLAGS: "*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR",
     HTTP_MIGRATIONS: "0",
     HTTP_LOGGING: "0",
     VERSION: "0.0.0+local",

packages/types/src/sdk/featureFlag.ts

@@ -1,5 +1,4 @@
 export enum FeatureFlag {
-  LICENSING = "LICENSING",
   PER_CREATOR_PER_USER_PRICE = "PER_CREATOR_PER_USER_PRICE",
   PER_CREATOR_PER_USER_PRICE_ALERT = "PER_CREATOR_PER_USER_PRICE_ALERT",
 }

packages/worker/Dockerfile

@@ -44,7 +44,6 @@ ENV NODE_OPTIONS="--no-node-snapshot"
 ENV CLUSTER_MODE=${CLUSTER_MODE}
 ENV SERVICE=worker-service
 ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
-ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR
 ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
 
 ARG BUDIBASE_VERSION

packages/worker/scripts/dev/manage.js

@@ -26,7 +26,6 @@ async function init() {
     APPS_URL: "http://localhost:4001",
     SERVICE: "worker-service",
     DEPLOYMENT_ENVIRONMENT: "development",
-    TENANT_FEATURE_FLAGS: "*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR",
     ENABLE_EMAIL_TEST_MODE: "1",
     HTTP_LOGGING: "0",
     VERSION: "0.0.0+local",