From c1f4cb685c8972ffe2c66bbe70e256f246b741f7 Mon Sep 17 00:00:00 2001
From: Gerard Burns <Ghrehh@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:07:47 +0000
Subject: [PATCH 1/2] update sdk packages (#13120)

---
 packages/sdk/package.json |  9 +++++----
 yarn.lock                 | 15 +--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 0fc14b03c4..ed625e10fa 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -11,9 +11,10 @@
     "build:sdk": "yarn run generate && rollup -c"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "rollup": "^2.44.0",
-    "rollup-plugin-terser": "^7.0.2"
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "rollup": "^4.9.6",
+    "rollup-plugin-terser": "^7.0.2",
+    "rollup-plugin-polyfill-node": "^0.13.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 21d3c5a76b..2c367e469b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3902,19 +3902,6 @@
     magic-string "^0.25.7"
     resolve "^1.17.0"
 
-"@rollup/plugin-commonjs@^18.0.0":
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-18.1.0.tgz#5a760d757af168a50727c0ae080251fbfcc5eb02"
-  integrity sha512-h3e6T9rUxVMAQswpDIobfUHn/doMzM9sgkMrsMWCFLmB84PSoC8mV8tOloAJjSRwdqhXBqstlX2BwBpHJvbhxg==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    commondir "^1.0.1"
-    estree-walker "^2.0.1"
-    glob "^7.1.6"
-    is-reference "^1.2.1"
-    magic-string "^0.25.7"
-    resolve "^1.17.0"
-
 "@rollup/plugin-commonjs@^25.0.7":
   version "25.0.7"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz#145cec7589ad952171aeb6a585bbeabd0fd3b4cf"
@@ -19257,7 +19244,7 @@ rollup@2.45.2:
   optionalDependencies:
     fsevents "~2.3.1"
 
-rollup@^2.36.2, rollup@^2.44.0, rollup@^2.45.2:
+rollup@^2.36.2, rollup@^2.45.2:
   version "2.79.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
   integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==

From af7b6a46a9e4d4834ededef6d8b564ded32253bf Mon Sep 17 00:00:00 2001
From: Conor Webb <126772285+ConorWebb96@users.noreply.github.com>
Date: Mon, 26 Feb 2024 11:45:47 +0000
Subject: [PATCH 2/2] Help popout email support license validation check
 (#13133)

* Added helper function to check user plan type.

* Updated help menu email support license check.

* Removed stray output check

* Updated function name as per feedback.

* Reworked code to use the licensing store over the auth store.

* Removed unnecessary variable declaration and return instead.

* Updated function name to maintain consistency.
---
 .../src/components/common/HelpMenu.svelte       | 17 ++++++++++-------
 packages/builder/src/helpers/planTitle.js       |  4 ++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/components/common/HelpMenu.svelte b/packages/builder/src/components/common/HelpMenu.svelte
index f6e2f42c98..baff9a5a27 100644
--- a/packages/builder/src/components/common/HelpMenu.svelte
+++ b/packages/builder/src/components/common/HelpMenu.svelte
@@ -1,11 +1,11 @@
 <script>
   import FontAwesomeIcon from "./FontAwesomeIcon.svelte"
   import { Popover, Heading, Body } from "@budibase/bbui"
-  import { licensing } from "stores/portal"
   import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags"
+  import { licensing } from "stores/portal"
+  import { isPremiumOrAbove } from "helpers/planTitle"
 
-  $: isBusinessAndAbove =
-    $licensing.isBusinessPlan || $licensing.isEnterprisePlan
+  $: premiumOrAboveLicense = isPremiumOrAbove($licensing?.license.plan.type)
 
   let show
   let hide
@@ -56,22 +56,25 @@
       <div class="divider" />
       {#if isEnabled(TENANT_FEATURE_FLAGS.LICENSING)}
         <a
-          href={isBusinessAndAbove
+          href={premiumOrAboveLicense
             ? "mailto:support@budibase.com"
             : "/builder/portal/account/usage"}
         >
-          <div class="premiumLinkContent" class:disabled={!isBusinessAndAbove}>
+          <div
+            class="premiumLinkContent"
+            class:disabled={!premiumOrAboveLicense}
+          >
             <div class="icon">
               <FontAwesomeIcon name="fa-solid fa-envelope" />
             </div>
             <Body size="S">Email support</Body>
           </div>
-          {#if !isBusinessAndAbove}
+          {#if !premiumOrAboveLicense}
             <div class="premiumBadge">
               <div class="icon">
                 <FontAwesomeIcon name="fa-solid fa-lock" />
               </div>
-              <Body size="XS">Business</Body>
+              <Body size="XS">Premium</Body>
             </div>
           {/if}
         </a>
diff --git a/packages/builder/src/helpers/planTitle.js b/packages/builder/src/helpers/planTitle.js
index 098bfb4529..79f2bc2382 100644
--- a/packages/builder/src/helpers/planTitle.js
+++ b/packages/builder/src/helpers/planTitle.js
@@ -25,3 +25,7 @@ export function getFormattedPlanName(userPlanType) {
   }
   return `${planName} Plan`
 }
+
+export function isPremiumOrAbove(userPlanType) {
+  return ![PlanType.PRO, PlanType.TEAM, PlanType.FREE].includes(userPlanType)
+}