Merge branch 'master' into update-dd-trace

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.13.44",
+  "version": "2.13.45",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte

@@ -257,7 +257,7 @@
 
 <LockedFeature
   title={"Audit Logs"}
-  planType={"Business plan"}
+  planType={"Enterprise plan"}
   description={"View all events that have occurred in your Budibase installation"}
   enabled={$licensing.auditLogsEnabled}
   upgradeButtonClick={async () => {

packages/builder/src/pages/builder/portal/account/usage.svelte

@@ -15,6 +15,7 @@
   import { DashCard, Usage } from "components/usage"
   import { PlanModel } from "constants"
   import { sdk } from "@budibase/shared-core"
+  import { PlanType } from "@budibase/types"
 
   let staticUsage = []
   let monthlyUsage = []
@@ -106,7 +107,14 @@
   }
 
   const planTitle = () => {
-    return `${capitalise(license?.plan.type)} Plan`
+    const planType = license?.plan.type
+    let planName = license?.plan.type
+    if (planType === PlanType.PREMIUM_PLUS) {
+      planName = "Premium"
+    } else if (planType === PlanType.ENTERPRISE_BASIC) {
+      planName = "Enterprise"
+    }
+    return `${capitalise(planName)} Plan`
   }
 
   const getDaysRemaining = timestamp => {

packages/builder/src/pages/builder/portal/settings/auth/index.svelte

@@ -283,7 +283,7 @@
         </div>
         {#if !$licensing.enforceableSSO}
           <Tags>
-            <Tag icon="LockClosed">Enterprise</Tag>
+            <Tag icon="LockClosed">Enterprise plan</Tag>
           </Tags>
         {/if}
       </div>

packages/builder/src/pages/builder/portal/settings/environment/index.svelte

@@ -59,7 +59,7 @@
 
 <LockedFeature
   title={"Environment Variables"}
-  planType={"Business plan"}
+  planType={"Enterprise plan"}
   description={"Add and manage environment variables for development and production"}
   enabled={$licensing.environmentVariablesEnabled}
   upgradeButtonClick={async () => {

packages/server/src/db/linkedRows/linkUtils.ts

@@ -56,7 +56,7 @@ export async function getLinkDocuments(args: {
   try {
     let linkRows = (await db.query(getQueryIndex(ViewName.LINK), params)).rows
     // filter to get unique entries
-    const foundIds: string[] = []
+    const foundIds = new Set()
     linkRows = linkRows.filter(link => {
       // make sure anything unique is the correct key
       if (
@@ -65,9 +65,9 @@ export async function getLinkDocuments(args: {
       ) {
         return false
       }
-      const unique = foundIds.indexOf(link.id) === -1
+      const unique = !foundIds.has(link.id)
       if (unique) {
-        foundIds.push(link.id)
+        foundIds.add(link.id)
       }
       return unique
     })