Merge pull request #7945 from Budibase/fix/licensing-overlay-flags

Fix to ensure licensing flags display correctly

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

@@ -8,7 +8,6 @@
   import { ExpiringKeys } from "./constants"
   import { getBanners } from "./licensingBanners"
   import { banner } from "@budibase/bbui"
-  import { FEATURE_FLAGS, isEnabled } from "../../../helpers/featureFlags"
 
   const oneDayInSeconds = 86400
 
@@ -18,8 +17,8 @@
   let paymentFailedModal
   let accountDowngradeModal
   let userLoaded = false
-  let loaded = false
   let licensingLoaded = false
+  let domLoaded = false
   let currentModalCfg = null
 
   const processModals = () => {
@@ -82,12 +81,17 @@
     }
   }
 
+  $: if (!userLoaded && $auth.user) {
+    userLoaded = true
+  }
+
   $: if (
     userLoaded &&
-    licensingLoaded &&
+    $licensing.usageMetrics &&
-    loaded &&
+    domLoaded &&
-    isEnabled(FEATURE_FLAGS.LICENSING)
+    !licensingLoaded
   ) {
+    licensingLoaded = true
     queuedModals = processModals()
     queuedBanners = getBanners()
     showNextModal()
@@ -95,18 +99,7 @@
   }
 
   onMount(async () => {
-    auth.subscribe(state => {
+    domLoaded = true
-      if (state.user && !userLoaded) {
-        userLoaded = true
-      }
-    })
-
-    licensing.subscribe(state => {
-      if (state.usageMetrics && !licensingLoaded) {
-        licensingLoaded = true
-      }
-    })
-    loaded = true
   })
 </script>
 

packages/builder/src/pages/builder/portal/apps/create.svelte

@@ -45,7 +45,7 @@
   })
 
   const initiateAppCreation = () => {
-    if ($licensing.usageMetrics.apps >= 100) {
+    if ($licensing?.usageMetrics?.apps >= 100) {
       appLimitModal.show()
     } else {
       template = null
@@ -60,7 +60,7 @@
   }
 
   const initiateAppImport = () => {
-    if ($licensing.usageMetrics.apps >= 100) {
+    if ($licensing?.usageMetrics?.apps >= 100) {
       appLimitModal.show()
     } else {
       template = { fromFile: true }

packages/builder/src/pages/builder/portal/apps/index.svelte

@@ -127,7 +127,7 @@
   }
 
   const initiateAppCreation = async () => {
-    if ($licensing.usageMetrics.apps >= 100) {
+    if ($licensing?.usageMetrics?.apps >= 100) {
       appLimitModal.show()
     } else if ($apps?.length) {
       $goto("/builder/portal/apps/create")

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

@@ -17,7 +17,7 @@ export const createLicensingStore = () => {
     // the currently used quotas from the db
     quotaUsage: undefined,
     // derived quota metrics for percentages used
-    usageMetrics: {},
+    usageMetrics: undefined,
     // quota reset
     quotaResetDaysRemaining: undefined,
     quotaResetDate: undefined,