Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7916

lerna.json

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

packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte

@@ -13,6 +13,7 @@
     Icon,
   } from "@budibase/bbui"
   import { capitalise } from "helpers"
+  import { getFormattedPlanName } from "helpers/planTitle"
   import { get } from "svelte/store"
 
   export let resourceId
@@ -99,7 +100,9 @@
     {#if requiresPlanToModify}
       <span class="lock-tag">
         <Tags>
-          <Tag icon="LockClosed">{capitalise(requiresPlanToModify)}</Tag>
+          <Tag icon="LockClosed"
+            >{getFormattedPlanName(requiresPlanToModify)}</Tag
+          >
         </Tags>
       </span>
     {/if}

packages/builder/src/helpers/planTitle.js

@@ -0,0 +1,11 @@
+import { PlanType } from "@budibase/types"
+
+export function getFormattedPlanName(userPlanType) {
+  let planName = "Free"
+  if (userPlanType === PlanType.PREMIUM_PLUS) {
+    planName = "Premium"
+  } else if (userPlanType === PlanType.ENTERPRISE_BASIC) {
+    planName = "Enterprise"
+  }
+  return `${planName} Plan`
+}

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

@@ -15,7 +15,7 @@
   import { DashCard, Usage } from "components/usage"
   import { PlanModel } from "constants"
   import { sdk } from "@budibase/shared-core"
-  import { PlanType } from "@budibase/types"
+  import { getFormattedPlanName } from "helpers/planTitle"
 
   let staticUsage = []
   let monthlyUsage = []
@@ -100,23 +100,6 @@
     cancelAt = license?.billing?.subscription?.cancelAt
   }
 
-  const capitalise = string => {
-    if (string) {
-      return string.charAt(0).toUpperCase() + string.slice(1)
-    }
-  }
-
-  const planTitle = () => {
-    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 => {
     if (!timestamp) {
       return
@@ -227,7 +210,7 @@
 
     <DashCard
       description="YOUR CURRENT PLAN"
-      title={planTitle()}
+      title={getFormattedPlanName(license?.plan.type)}
       {primaryActionText}
       primaryAction={showButton ? goToAccountPortal : undefined}
       {textRows}

packages/client/manifest.json

@@ -6098,23 +6098,6 @@
           }
         ]
       },
-      {
-        "tag": "style",
-        "type": "select",
-        "label": "Size",
-        "key": "size",
-        "options": [
-          {
-            "label": "Medium",
-            "value": "spectrum--medium"
-          },
-          {
-            "label": "Large",
-            "value": "spectrum--large"
-          }
-        ],
-        "defaultValue": "spectrum--medium"
-      },
       {
         "tag": "style",
         "type": "select",
@@ -6131,6 +6114,23 @@
           }
         ],
         "defaultValue": "bottom"
+      },
+      {
+        "tag": "style",
+        "type": "select",
+        "label": "Size",
+        "key": "size",
+        "options": [
+          {
+            "label": "Medium",
+            "value": "spectrum--medium"
+          },
+          {
+            "label": "Large",
+            "value": "spectrum--large"
+          }
+        ],
+        "defaultValue": "spectrum--medium"
       }
     ],
     "actions": [

packages/client/src/components/app/ButtonGroup.svelte

@@ -29,7 +29,7 @@
           type,
           quiet,
           disabled,
-          size,
+          size: size || "M",
         }}
       />
     {/each}

packages/client/src/components/app/forms/RelationshipField.svelte

@@ -108,8 +108,16 @@
     }
   }
 
+  $: forceFetchRows(filter)
   $: debouncedFetchRows(searchTerm, primaryDisplay, defaultValue)
 
+  const forceFetchRows = async () => {
+    // if the filter has changed, then we need to reset the options, clear the selection, and re-fetch
+    optionsObj = {}
+    fieldApi.setValue([])
+    selectedValue = []
+    debouncedFetchRows(searchTerm, primaryDisplay, defaultValue)
+  }
   const fetchRows = async (searchTerm, primaryDisplay, defaultVal) => {
     const allRowsFetched =
       $fetch.loaded &&

packages/server/src/api/controllers/datasource.ts

@@ -9,8 +9,11 @@ import {
   CreateDatasourceResponse,
   Datasource,
   DatasourcePlus,
+  Document,
   FetchDatasourceInfoRequest,
   FetchDatasourceInfoResponse,
+  FieldType,
+  RelationshipFieldMetadata,
   SourceName,
   UpdateDatasourceResponse,
   UserCtx,
@@ -218,9 +221,26 @@ async function destroyInternalTablesBySourceId(datasourceId: string) {
     []
   )
 
+  function updateRevisions(deletedLinks: RelationshipFieldMetadata[]) {
+    for (const link of deletedLinks) {
+      datasourceTableDocs.forEach((doc: Document) => {
+        if (doc._id === link.tableId) {
+          doc._rev = link.tableRev
+        }
+      })
+    }
+  }
+
   // Destroy the tables.
   for (const table of datasourceTableDocs) {
-    await sdk.tables.internal.destroy(table)
+    const deleted = await sdk.tables.internal.destroy(table)
+    // Update the revisions of any tables that remain to be deleted
+    const deletedLinks: RelationshipFieldMetadata[] = Object.values(
+      deleted.table.schema
+    )
+      .filter(field => field.type === FieldType.LINK)
+      .map(field => field as RelationshipFieldMetadata)
+    updateRevisions(deletedLinks)
   }
 }
 

packages/server/src/db/defaultData/employeeImport.ts

@@ -13,6 +13,7 @@ export const employeeImport = [
     type: "row",
     "Employee Level": ["Senior"],
     "Start Date": "2015-02-12T12:00:00.000",
+    "Badge Photo": [],
   },
   {
     "First Name": "Mandy",
@@ -28,6 +29,7 @@ export const employeeImport = [
     type: "row",
     "Employee Level": ["Senior"],
     "Start Date": "2017-09-10T12:00:00.000",
+    "Badge Photo": [],
   },
   {
     "First Name": "Holly",
@@ -43,6 +45,7 @@ export const employeeImport = [
     type: "row",
     "Employee Level": ["Senior"],
     "Start Date": "2022-02-12T12:00:00.000",
+    "Badge Photo": [],
   },
   {
     "First Name": "Francis",
@@ -58,6 +61,7 @@ export const employeeImport = [
     type: "row",
     "Employee Level": ["Apprentice"],
     "Start Date": "2021-03-10T12:00:00.000",
+    "Badge Photo": [],
   },
   {
     "First Name": "Richard",
@@ -73,6 +77,7 @@ export const employeeImport = [
     type: "row",
     "Employee Level": ["Apprentice"],
     "Start Date": "2020-07-09T12:00:00.000",
+    "Badge Photo": [],
   },
   {
     "First Name": "Donald",
@@ -88,6 +93,7 @@ export const employeeImport = [
     type: "row",
     "Employee Level": ["Junior"],
     "Start Date": "2018-04-13T12:00:00.000",
+    "Badge Photo": [],
   },
   {
     "First Name": "Maria",
@@ -103,6 +109,7 @@ export const employeeImport = [
     type: "row",
     "Employee Level": ["Manager"],
     "Start Date": "2016-05-22T12:00:00.000",
+    "Badge Photo": [],
   },
   {
     "First Name": "Suzy",
@@ -118,6 +125,7 @@ export const employeeImport = [
     type: "row",
     "Employee Level": ["Senior", "Manager"],
     "Start Date": "2019-05-01T12:00:00.000",
+    "Badge Photo": [],
   },
   {
     "First Name": "Patrick",
@@ -133,6 +141,7 @@ export const employeeImport = [
     type: "row",
     "Employee Level": ["Apprentice"],
     "Start Date": "2014-08-30T12:00:00.000",
+    "Badge Photo": [],
   },
   {
     "First Name": "Brayden",
@@ -148,5 +157,6 @@ export const employeeImport = [
     type: "row",
     "Employee Level": ["Contractor"],
     "Start Date": "2022-11-09T12:00:00.000",
+    "Badge Photo": [],
   },
 ]

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

@@ -440,7 +440,7 @@ class LinkController {
         if (field.type === FieldTypes.LINK && field.fieldName) {
           const linkedTable = await this._db.get<Table>(field.tableId)
           delete linkedTable.schema[field.fieldName]
-          await this._db.put(linkedTable)
+          field.tableRev = (await this._db.put(linkedTable)).rev
         }
       } catch (err: any) {
         logging.logWarn(err?.message, err)

packages/server/src/sdk/app/permissions/index.ts

@@ -61,7 +61,7 @@ export async function getInheritablePermissions(
 export async function allowsExplicitPermissions(resourceId: string) {
   if (isViewID(resourceId)) {
     const allowed = await features.isViewPermissionEnabled()
-    const minPlan = !allowed ? PlanType.BUSINESS : undefined
+    const minPlan = !allowed ? PlanType.PREMIUM_PLUS : undefined
 
     return {
       allowed,

packages/types/src/documents/app/table/schema.ts

@@ -21,6 +21,7 @@ interface BaseRelationshipFieldMetadata
   main?: boolean
   fieldName: string
   tableId: string
+  tableRev?: string
   subtype?: AutoFieldSubTypes.CREATED_BY | AutoFieldSubTypes.UPDATED_BY
 }