From fe169e8a13cf2e6b83fc5831ff8851d1d0462b30 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 30 Nov 2023 11:17:31 +0000
Subject: [PATCH 01/38] Merge commit

---
 .../design/settings/componentSettings.js      |  2 ++
 packages/client/manifest.json                 | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
index c2bd08760a..f20f1aaeec 100644
--- a/packages/builder/src/components/design/settings/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -25,6 +25,7 @@ import BarButtonList from "./controls/BarButtonList.svelte"
 import FieldConfiguration from "./controls/FieldConfiguration/FieldConfiguration.svelte"
 import ButtonConfiguration from "./controls/ButtonConfiguration/ButtonConfiguration.svelte"
 import RelationshipFilterEditor from "./controls/RelationshipFilterEditor.svelte"
+import FormStepConfiguration from "./controls/FormStepConfiguration.svelte"
 
 const componentMap = {
   text: DrawerBindableInput,
@@ -50,6 +51,7 @@ const componentMap = {
   url: URLSelect,
   fieldConfiguration: FieldConfiguration,
   buttonConfiguration: ButtonConfiguration,
+  stepConfiguration: FormStepConfiguration,
   columns: ColumnEditor,
   "columns/basic": BasicColumnEditor,
   "columns/grid": GridColumnEditor,
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 07645d874a..d71156f7fc 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -6017,6 +6017,37 @@
       }
     ]
   },
+  "multistepformblock": {
+    "name": "Multi step Formblock",
+    "icon": "AssetsAdded",
+    "block": true,
+    "settings": [
+      {
+        "type": "table",
+        "label": "Data",
+        "key": "dataSource"
+      },
+      {
+        "type": "radio",
+        "label": "Type",
+        "key": "actionType",
+        "options": ["Create", "Update", "View"],
+        "defaultValue": "Create"
+      },
+      {
+        "name": "Details",
+        "section": true,
+        "settings": [
+          {
+            "type": "stepConfiguration",
+            "key": "steps",
+            "label": "Multi Steps"
+          }
+        ],
+        "resetOn": ["dataSource", "actionType"]
+      }
+    ]
+  },
   "formblock": {
     "name": "Form Block",
     "icon": "Form",

From 4785ccb49f4b2d982361b1a5926fae337821f3a7 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 5 Dec 2023 16:14:48 +0000
Subject: [PATCH 02/38] Merge commit

---
 packages/client/manifest.json | 56 ++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 9e11ef3084..83554854a3 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -6037,6 +6037,7 @@
     "name": "Multi step Formblock",
     "icon": "AssetsAdded",
     "block": true,
+    "hasChildren": false,
     "settings": [
       {
         "type": "table",
@@ -6057,11 +6058,64 @@
           {
             "type": "stepConfiguration",
             "key": "steps",
-            "label": "Multi Steps"
+            "nested": true
           }
         ],
         "resetOn": ["dataSource", "actionType"]
       }
+    ],
+    "actions": [
+      {
+        "type": "ValidateForm",
+        "suffix": "form"
+      },
+      {
+        "type": "ClearForm",
+        "suffix": "form"
+      },
+      {
+        "type": "UpdateFieldValue",
+        "suffix": "form"
+      },
+      {
+        "type": "ScrollTo",
+        "suffix": "form"
+      },
+      {
+        "type": "ChangeFormStep",
+        "suffix": "form"
+      }
+    ],
+    "context": [
+      {
+        "type": "form",
+        "suffix": "form"
+      },
+      {
+        "type": "static",
+        "values": [
+          {
+            "label": "Value",
+            "key": "__value",
+            "type": "object"
+          },
+          {
+            "label": "Valid",
+            "key": "__valid",
+            "type": "boolean"
+          },
+          {
+            "label": "Current Step",
+            "key": "__currentStep",
+            "type": "number"
+          },
+          {
+            "label": "Current Step Valid",
+            "key": "__currentStepValid",
+            "type": "boolean"
+          }
+        ]
+      }
     ]
   },
   "formblock": {

From 1a03d9d729ef5c9acfeecab8b01a43aa948fb9ec Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 6 Dec 2023 20:39:35 +0000
Subject: [PATCH 03/38] Initial pass at the multistep form block

---
 .../src/DetailSummary/DetailSummary.svelte    |   6 +
 .../ButtonConfiguration.svelte                |   3 +
 .../FieldConfiguration.svelte                 |   5 +-
 .../controls/FormStepConfiguration.svelte     | 274 ++++++++++++++++++
 .../settings/controls/FormStepControls.svelte |  81 ++++++
 .../settings/controls/PropertyControl.svelte  |  15 +-
 .../Component/ComponentSettingsSection.svelte |  26 +-
 .../new/_components/componentStructure.json   |   1 +
 packages/client/manifest.json                 |  10 +-
 .../app/blocks/MultiStepFormblock.svelte      | 166 +++++++++++
 .../client/src/components/app/blocks/index.js |   1 +
 .../src/components/app/forms/Form.svelte      |  10 +
 packages/client/src/index.js                  |   5 +
 13 files changed, 595 insertions(+), 8 deletions(-)
 create mode 100644 packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
 create mode 100644 packages/builder/src/components/design/settings/controls/FormStepControls.svelte
 create mode 100644 packages/client/src/components/app/blocks/MultiStepFormblock.svelte

diff --git a/packages/bbui/src/DetailSummary/DetailSummary.svelte b/packages/bbui/src/DetailSummary/DetailSummary.svelte
index daa9f3f5ca..808e12b6c4 100644
--- a/packages/bbui/src/DetailSummary/DetailSummary.svelte
+++ b/packages/bbui/src/DetailSummary/DetailSummary.svelte
@@ -5,6 +5,7 @@
   export let name
   export let show = false
   export let collapsible = true
+  export let noPadding = false
 
   const dispatch = createEventDispatcher()
   const onHeaderClick = () => {
@@ -31,6 +32,7 @@
     class="property-panel"
     class:show={show || !collapsible}
     class:no-title={!name}
+    class:no-padding={noPadding}
   >
     <slot />
   </div>
@@ -84,6 +86,10 @@
     padding: var(--spacing-xl);
   }
 
+  .property-panel.no-title.no-padding {
+    padding: 0px;
+  }
+
   .show {
     display: flex;
     flex-direction: column;
diff --git a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
index ce91c8f7b5..63bfecf386 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
@@ -34,6 +34,9 @@
   $: canAddButtons = max == null || buttonList.length < max
 
   const sanitizeValue = val => {
+    if (!Array.isArray(val)) {
+      return null
+    }
     return val?.map(button => {
       return button._component ? button : buildPseudoInstance(button)
     })
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
index 7f1ac1cf25..4d436a4679 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -39,7 +39,10 @@
     )
   }
 
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
+  $: datasource =
+    componentInstance.dataSource ||
+    getDatasourceForProvider($currentAsset, componentInstance)
+
   $: resourceId = datasource?.resourceId || datasource?.tableId
 
   $: if (!isEqual(value, cachedValue)) {
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
new file mode 100644
index 0000000000..dbaefaac96
--- /dev/null
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -0,0 +1,274 @@
+<script>
+  // import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
+  // import { getComponentForSetting } from "components/design/settings/componentSettings"
+  import { createEventDispatcher } from "svelte"
+  import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
+  import { getDatasourceForProvider } from "builderStore/dataBinding"
+  import { currentAsset, store } from "builderStore"
+  import { Helpers } from "@budibase/bbui"
+  import FormStepControls from "./FormStepControls.svelte"
+  import { setContext } from "svelte"
+  import { writable } from "svelte/store"
+
+  export let componentInstance
+  export let componentBindings
+  export let value //steps
+  export let bindings
+
+  const dispatch = createEventDispatcher()
+
+  let stepState = [...(value || [])]
+
+  const stepStore = writable({
+    stepsCount: stepState?.length || 1,
+    currentStep: 0,
+  })
+
+  setContext("step-form-block", stepStore)
+
+  $: ({ currentStep } = $stepStore)
+  $: lastIdx = stepState?.length - 1
+
+  $: if (stepState.length) {
+    stepStore.update(state => ({
+      ...state,
+      stepsCount: stepState.length || 0,
+    }))
+  }
+
+  // Step Definition Settings
+  let compSettings = [
+    {
+      customType: "formStepControl",
+      label: "Multi-steps",
+      key: "steps",
+    },
+    {
+      type: "text",
+      label: "Title",
+      key: "title",
+      nested: true,
+    },
+    {
+      type: "text",
+      label: "Description",
+      key: "desc",
+      nested: true,
+    },
+    {
+      type: "fieldConfiguration",
+      key: "fields",
+      nested: true,
+    },
+    {
+      type: "buttonConfiguration",
+      label: "Buttons",
+      key: "buttons",
+      wide: true,
+      nested: true,
+    },
+  ]
+
+  const emitCurrentStep = step => {
+    store.actions.preview.sendEvent("builder-meta", {
+      component: {
+        _id: componentInstance._id,
+        step: step,
+      },
+    })
+  }
+
+  $: dataSource = getDatasourceForProvider($currentAsset, componentInstance)
+
+  $: stepDef = {
+    component: "@budibase/standard-components/multistepformblock-step",
+    name: "Formblock step",
+    settings: compSettings,
+  }
+
+  const addStep = () => {
+    const newStepIdx = currentStep + 1
+
+    stepState = [
+      ...stepState.slice(0, newStepIdx),
+      {},
+      ...stepState.slice(newStepIdx),
+    ]
+
+    stepStore.update(state => ({
+      ...state,
+      currentStep: newStepIdx,
+    }))
+
+    dispatch("change", stepState)
+    emitCurrentStep(newStepIdx)
+  }
+
+  const removeStep = () => {
+    const clone = stepState.map(x => x)
+    clone.splice(currentStep, 1)
+
+    const targetStepIdx = Math.max(currentStep - 1, 0)
+    stepState = clone.map(x => x)
+
+    stepStore.update(state => ({
+      ...state,
+      currentStep: targetStepIdx,
+    }))
+
+    dispatch("change", stepState)
+    emitCurrentStep(targetStepIdx)
+  }
+
+  const previousStep = () => {
+    const prevStepIdx = Math.max(currentStep - 1, 0)
+    stepStore.update(state => ({
+      ...state,
+      currentStep: prevStepIdx,
+    }))
+    emitCurrentStep(prevStepIdx)
+  }
+
+  const nextStep = () => {
+    const nextStepIdx = currentStep + 1
+    stepStore.update(state => ({
+      ...state,
+      currentStep: Math.min(nextStepIdx, stepState.length - 1),
+    }))
+    emitCurrentStep(nextStepIdx)
+  }
+
+  const updateStep = (field, val) => {
+    stepState[currentStep] ||= {}
+    stepState[currentStep][field.key] = val
+    dispatch("change", stepState)
+  }
+
+  const handleStepAction = action => {
+    switch (action) {
+      case "addStep":
+        addStep()
+        break
+      case "removeStep":
+        removeStep()
+        break
+      case "nextStep":
+        nextStep()
+        break
+      case "previousStep":
+        previousStep()
+        break
+      default:
+        console.log("Nothing")
+    }
+  }
+
+  const processUpdate = (field, val) => {
+    if (field.key === "steps") {
+      handleStepAction(val.action)
+    } else {
+      updateStep(field, val)
+    }
+  }
+
+  // Multistep button generation
+  // This kind of behaviour should be shifted to frontend-core
+  /*
+    Also, look at this unicorn
+    	\
+			 \_
+			 /.(((
+			(,/"(((__,--.
+			    \  ) _( /{
+			     || "  ||
+			     ||    ||
+			     ''    ''
+   */
+  const generateButtons = () => {
+    const buttons = []
+
+    if (stepState.length > 1) {
+      if (currentStep > 0) {
+        buttons.push({
+          _id: Helpers.uuid(),
+          _component: "@budibase/standard-components/button",
+          _instanceName: Helpers.uuid(),
+          text: "Back",
+          type: "secondary",
+          size: "M",
+          onClick: [
+            {
+              parameters: {
+                type: "prev",
+                componentId: `${componentInstance._id}-form`,
+              },
+              "##eventHandlerType": "Change Form Step",
+            },
+          ],
+        })
+      }
+      buttons.push({
+        _id: Helpers.uuid(),
+        _component: "@budibase/standard-components/button",
+        _instanceName: Helpers.uuid(),
+        text: "Next",
+        type: "cta",
+        size: "M",
+        disabled: lastIdx === currentStep,
+        onClick: [
+          {
+            parameters: {
+              type: "next",
+              componentId: `${componentInstance._id}-form`,
+            },
+            "##eventHandlerType": "Change Form Step",
+          },
+        ],
+      })
+    }
+    return buttons
+  }
+
+  const buildPseudoInstance = ({ buttons, fields, title, desc }) => {
+    return {
+      _id: Helpers.uuid(),
+      _component: "@budibase/standard-components/multistepformblock-step",
+      buttons: buttons || generateButtons(),
+      fields,
+      title,
+      desc,
+      dataSource,
+      step: currentStep + 1,
+      _instanceName: `Step ${currentStep + 1}`,
+    }
+  }
+
+  $: stepConfigInstance = buildPseudoInstance(stepState?.[currentStep] || {})
+</script>
+
+<span class="settings-wrap">
+  <ComponentSettingsSection
+    includeHidden
+    componentInstance={stepConfigInstance}
+    componentDefinition={stepDef}
+    onUpdateSetting={processUpdate}
+    getCustomComponent={type => {
+      const types = { formStepControl: FormStepControls }
+      return types[type]
+    }}
+    getCustomSectionTitle={section => {
+      console.log(section.name)
+      if (section.name === "Details" && stepState?.length > 0) {
+        return `Details (${currentStep}/${stepState?.length})`
+      }
+      return section.name
+    }}
+    showSectionTitle={false}
+    showInstanceName={false}
+    isScreen={false}
+    noPadding={true}
+    nested={true}
+    {bindings}
+    {componentBindings}
+  />
+</span>
diff --git a/packages/builder/src/components/design/settings/controls/FormStepControls.svelte b/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
new file mode 100644
index 0000000000..9aa6b43d10
--- /dev/null
+++ b/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
@@ -0,0 +1,81 @@
+<script>
+  import { createEventDispatcher, getContext } from "svelte"
+  import { ActionButton } from "@budibase/bbui"
+
+  const stepState = getContext("step-form-block")
+  const dispatch = createEventDispatcher()
+
+  $: ({ stepsCount, currentStep } = $stepState)
+
+  const parseLastIdx = stepsCount => {
+    return Math.max(stepsCount - 1, 0)
+  }
+  $: lastIdx = parseLastIdx(stepsCount)
+
+  const stepAction = action => {
+    dispatch("change", {
+      action,
+    })
+  }
+</script>
+
+{#if stepsCount === 1}
+  <ActionButton
+    icon="MultipleAdd"
+    secondary
+    on:click={() => {
+      stepAction("addStep")
+    }}
+  >
+    Add Step
+  </ActionButton>
+{:else}
+  <div class="step-actions">
+    <ActionButton
+      size="S"
+      secondary
+      icon="ChevronLeft"
+      disabled={currentStep === 0}
+      on:click={() => {
+        stepAction("previousStep")
+      }}
+    />
+    <ActionButton
+      size="S"
+      secondary
+      disabled={currentStep === lastIdx}
+      icon="ChevronRight"
+      on:click={() => {
+        stepAction("nextStep")
+      }}
+    />
+    <ActionButton
+      size="S"
+      secondary
+      icon="Close"
+      disabled={stepsCount === 1}
+      on:click={() => {
+        stepAction("removeStep")
+      }}
+    />
+    <ActionButton
+      size="S"
+      secondary
+      icon="MultipleAdd"
+      on:click={() => {
+        stepAction("addStep")
+      }}
+    />
+  </div>
+{/if}
+
+<style>
+  .step-actions {
+    display: flex;
+    gap: var(--spacing-s);
+  }
+
+  .step-actions :global(.spectrum-ActionButton) {
+    height: 32px;
+  }
+</style>
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index a6f3d1b218..78f299f237 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -24,6 +24,7 @@
   export let propertyFocus = false
   export let info = null
   export let disableBindings = false
+  export let wide
 
   $: nullishValue = value == null || value === ""
   $: allBindings = getAllBindings(bindings, componentBindings, nested)
@@ -78,7 +79,7 @@
 
 <div
   class="property-control"
-  class:wide={!label || labelHidden}
+  class:wide={!label || labelHidden || wide === true}
   class:highlighted={highlighted && nullishValue}
   class:property-focus={propertyFocus}
 >
@@ -104,6 +105,7 @@
       {...props}
       on:drawerHide
       on:drawerShow
+      on:meta
     />
   </div>
   {#if info}
@@ -147,7 +149,16 @@
     position: relative;
   }
   .property-control.wide .control {
-    grid-column: 1 / -1;
+    flex: 1;
+  }
+  .property-control.wide {
+    grid-template-columns: unset;
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+  }
+  .property-control.wide > * {
+    width: 100%;
   }
   .text {
     font-size: var(--spectrum-global-dimension-font-size-75);
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
index 6093d2a45e..6bc5f33398 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
@@ -15,9 +15,12 @@
   export let componentBindings
   export let isScreen = false
   export let onUpdateSetting
+  export let getCustomComponent
+  export let getCustomSectionTitle
   export let showSectionTitle = true
   export let includeHidden = false
   export let tag
+  export let noPadding = false
 
   $: sections = getSections(
     componentInstance,
@@ -129,13 +132,30 @@
     })
   }
 
+  const resolveComponentByType = setting => {
+    if (setting.type) {
+      return getComponentForSetting(setting)
+    } else if (setting.customType && typeof getCustomComponent === "function") {
+      return getCustomComponent(setting.customType)
+    }
+  }
+
+  const resolveSectionName = section => {
+    console.log(resolveSectionName)
+    if (typeof getCustomSectionTitle === "function") {
+      return getCustomSectionTitle(section)
+    } else {
+      return section.name
+    }
+  }
+
   const canRenderControl = (instance, setting, isScreen, includeHidden) => {
     // Prevent rendering on click setting for screens
     if (setting?.type === "event" && isScreen) {
       return false
     }
     // Check we have a component to render for this setting
-    const control = getComponentForSetting(setting)
+    const control = resolveComponentByType(setting)
     if (!control) {
       return false
     }
@@ -152,6 +172,7 @@
     <DetailSummary
       name={showSectionTitle ? section.name : ""}
       show={section.collapsed !== true}
+      {noPadding}
     >
       {#if section.info}
         <div class="section-info">
@@ -168,9 +189,10 @@
           {#if setting.visible}
             <PropertyControl
               type={setting.type}
-              control={getComponentForSetting(setting)}
+              control={resolveComponentByType(setting)}
               label={setting.label}
               labelHidden={setting.labelHidden}
+              wide={setting.wide}
               key={setting.key}
               value={componentInstance[setting.key]}
               defaultValue={setting.defaultValue}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json
index dd129be11e..96e8faf93c 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json
@@ -8,6 +8,7 @@
       "cardsblock",
       "repeaterblock",
       "formblock",
+      "multistepformblock",
       "chartblock",
       "rowexplorer"
     ]
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index c38c4240b5..c4141787d3 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -6058,10 +6058,14 @@
           {
             "type": "stepConfiguration",
             "key": "steps",
-            "nested": true
+            "nested": true,
+            "labelHidden": true,
+            "resetOn": ["dataSource", "actionType"],
+            "defaultValue": [
+              { "title": null, "desc": null, "fields": null, "buttons": {} }
+            ]
           }
-        ],
-        "resetOn": ["dataSource", "actionType"]
+        ]
       }
     ],
     "actions": [
diff --git a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
new file mode 100644
index 0000000000..a4255e334c
--- /dev/null
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@@ -0,0 +1,166 @@
+<script>
+  import BlockComponent from "components/BlockComponent.svelte"
+  import Block from "components/Block.svelte"
+  import { getContext } from "svelte"
+  import { builderStore } from "stores"
+
+  export let componentInstance
+  export let steps
+  export let dataSource
+  export let initialFormStep = 1
+
+  const { fetchDatasourceSchema } = getContext("sdk")
+  const component = getContext("component")
+
+  let schema
+  let formId
+
+  const getCurrentStep = () => {
+    if ($builderStore?.component?._id === $component.id) {
+      return $builderStore?.component.step
+    }
+    return 0
+  }
+
+  $: currentStep = getCurrentStep(
+    $builderStore?.component?._id,
+    componentInstance
+  )
+
+  $: fetchSchema(dataSource)
+
+  const getPropsForField = field => {
+    let fieldProps = field._component
+      ? {
+          ...field,
+        }
+      : {
+          field: field.name,
+          label: field.name,
+          placeholder: field.name,
+          _instanceName: field.name,
+        }
+    return fieldProps
+  }
+
+  const getDefaultFields = (fields, schema) => {
+    if (!schema) {
+      return []
+    }
+    let defaultFields = []
+
+    if (!fields || fields.length === 0) {
+      Object.values(schema)
+        .filter(field => !field.autocolumn)
+        .forEach(field => {
+          defaultFields.push({
+            name: field.name,
+            active: true,
+          })
+        })
+    }
+    return [...fields, ...defaultFields].filter(field => field.active)
+  }
+
+  const FieldTypeToComponentMap = {
+    string: "stringfield",
+    number: "numberfield",
+    bigint: "bigintfield",
+    options: "optionsfield",
+    array: "multifieldselect",
+    boolean: "booleanfield",
+    longform: "longformfield",
+    datetime: "datetimefield",
+    attachment: "attachmentfield",
+    link: "relationshipfield",
+    json: "jsonfield",
+    barcodeqr: "codescanner",
+    bb_reference: "bbreferencefield",
+  }
+
+  const getComponentForField = field => {
+    const fieldSchemaName = field.field || field.name
+    if (!fieldSchemaName || !schema?.[fieldSchemaName]) {
+      return null
+    }
+    const type = schema[fieldSchemaName].type
+    return FieldTypeToComponentMap[type]
+  }
+
+  const fetchSchema = async () => {
+    schema = (await fetchDatasourceSchema(dataSource)) || {}
+  }
+
+  $: stepProps = steps?.map(step => {
+    const { title, desc, fields, buttons } = step
+    return {
+      fields: getDefaultFields(fields || [], schema),
+      title,
+      desc,
+      buttons,
+    }
+  })
+</script>
+
+{#key stepProps}
+  <Block>
+    <BlockComponent
+      type="form"
+      props={{
+        dataSource,
+        initialFormStep,
+        step: $builderStore.inBuilder === true ? currentStep + 1 : null,
+      }}
+      context="form"
+      bind:id={formId}
+    >
+      {#each steps || [] as step, idx ("step" + step._id)}
+        <BlockComponent
+          type="formstep"
+          props={{ step: idx + 1, _instanceName: `Step ${idx + 1}` }}
+        >
+          <BlockComponent
+            type="container"
+            props={{
+              gap: "M",
+              direction: "column",
+              hAlign: "stretch",
+              vAlign: "top",
+              size: "shrink",
+            }}
+          >
+            <BlockComponent type="container">
+              <BlockComponent
+                type="heading"
+                props={{ text: stepProps?.[idx]?.title }}
+              />
+            </BlockComponent>
+
+            <BlockComponent
+              type="text"
+              props={{ text: stepProps?.[idx]?.desc }}
+            />
+
+            <BlockComponent type="fieldgroup">
+              {#each stepProps?.[idx]?.fields || [] as field, fieldIdx ("field_" + fieldIdx)}
+                {#if getComponentForField(field) && field.active}
+                  <BlockComponent
+                    type={getComponentForField(field)}
+                    props={getPropsForField(field)}
+                    order={idx}
+                    interactive
+                    name={field?.field}
+                  />
+                {/if}
+              {/each}
+            </BlockComponent>
+            <BlockComponent
+              type="buttongroup"
+              props={{ buttons: stepProps?.[idx]?.buttons }}
+            />
+          </BlockComponent>
+        </BlockComponent>
+      {/each}
+    </BlockComponent>
+  </Block>
+{/key}
diff --git a/packages/client/src/components/app/blocks/index.js b/packages/client/src/components/app/blocks/index.js
index f74d2f0e12..2c8d81cf96 100644
--- a/packages/client/src/components/app/blocks/index.js
+++ b/packages/client/src/components/app/blocks/index.js
@@ -4,3 +4,4 @@ export { default as repeaterblock } from "./RepeaterBlock.svelte"
 export { default as formblock } from "./form/FormBlock.svelte"
 export { default as chartblock } from "./ChartBlock.svelte"
 export { default as rowexplorer } from "./RowExplorer.svelte"
+export { default as multistepformblock } from "./MultiStepFormblock.svelte"
diff --git a/packages/client/src/components/app/forms/Form.svelte b/packages/client/src/components/app/forms/Form.svelte
index 1a740585f3..5b09a420fe 100644
--- a/packages/client/src/components/app/forms/Form.svelte
+++ b/packages/client/src/components/app/forms/Form.svelte
@@ -11,6 +11,7 @@
   export let readonly = false
   export let actionType = "Create"
   export let initialFormStep = 1
+  export let step
 
   // Not exposed as a builder setting. Used internally to disable validation
   // for fields rendered in things like search blocks.
@@ -36,6 +37,15 @@
   let table
   let currentStep = writable(getInitialFormStep())
 
+  $: if (
+    currentStep &&
+    Number.isInteger($currentStep) &&
+    Number.isInteger(step) &&
+    step !== currentStep
+  ) {
+    currentStep.set(step)
+  }
+
   $: fetchSchema(dataSource)
   $: schemaKey = generateSchemaKey(schema)
   $: initialValues = getInitialValues(actionType, dataSource, $context)
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index 415d9fa5f2..730425abfd 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -75,6 +75,11 @@ const loadBudibase = async () => {
       } else {
         dndStore.actions.reset()
       }
+    } else if ("builder-meta") {
+      builderStore.update(state => ({
+        ...state,
+        ...data,
+      }))
     }
   }
 

From ece410c623920cb805d307a300f258f8fd971536 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 8 Dec 2023 13:53:19 +0000
Subject: [PATCH 04/38] Update manifest

---
 packages/client/manifest.json | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index c4141787d3..66dea46ccd 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -4877,7 +4877,7 @@
   },
   "chartblock": {
     "block": true,
-    "name": "Chart block",
+    "name": "Chart Block",
     "icon": "GraphPie",
     "hasChildren": false,
     "settings": [
@@ -5367,7 +5367,7 @@
   },
   "tableblock": {
     "block": true,
-    "name": "Table block",
+    "name": "Table Block",
     "icon": "Table",
     "styles": ["size"],
     "size": {
@@ -5613,7 +5613,7 @@
   },
   "cardsblock": {
     "block": true,
-    "name": "Cards block",
+    "name": "Cards Block",
     "icon": "PersonalizationField",
     "styles": ["size"],
     "size": {
@@ -5793,7 +5793,7 @@
   },
   "repeaterblock": {
     "block": true,
-    "name": "Repeater block",
+    "name": "Repeater Block",
     "icon": "ViewList",
     "illegalChildren": ["section"],
     "hasChildren": true,
@@ -6034,7 +6034,7 @@
     ]
   },
   "multistepformblock": {
-    "name": "Multi step Formblock",
+    "name": "Multi-step Form Block",
     "icon": "AssetsAdded",
     "block": true,
     "hasChildren": false,
@@ -6060,10 +6060,7 @@
             "key": "steps",
             "nested": true,
             "labelHidden": true,
-            "resetOn": ["dataSource", "actionType"],
-            "defaultValue": [
-              { "title": null, "desc": null, "fields": null, "buttons": {} }
-            ]
+            "resetOn": ["dataSource", "actionType"]
           }
         ]
       }
@@ -6377,7 +6374,7 @@
     }
   },
   "gridblock": {
-    "name": "Grid block",
+    "name": "Grid Block",
     "icon": "Table",
     "styles": ["size"],
     "size": {

From 5a8c12c91b02af55096c6f76e21e9cfd8f94ce74 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 8 Dec 2023 14:15:23 +0000
Subject: [PATCH 05/38] Move multi step button config into frontend core and
 fix button config setting layout

---
 .../src/builderStore/store/frontend.js        |  4 +-
 .../controls/FormStepConfiguration.svelte     | 75 +++----------------
 .../settings/controls/PropertyControl.svelte  | 14 ++--
 packages/client/manifest.json                 |  3 +-
 .../components/app/blocks/TableBlock.svelte   |  4 +-
 .../app/blocks/form/FormBlock.svelte          |  2 +-
 packages/frontend-core/src/utils/utils.js     | 56 +++++++++++++-
 7 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 7e510c3d26..206becedd5 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -609,12 +609,12 @@ export const getFrontendStore = () => {
           // Use default config if the 'buttons' prop has never been initialised
           if (!("buttons" in enrichedComponent)) {
             enrichedComponent["buttons"] =
-              Utils.buildDynamicButtonConfig(enrichedComponent)
+              Utils.buildFormBlockButtonConfig(enrichedComponent)
             migrated = true
           } else if (enrichedComponent["buttons"] == null) {
             // Ignore legacy config if 'buttons' has been reset by 'resetOn'
             const { _id, actionType, dataSource } = enrichedComponent
-            enrichedComponent["buttons"] = Utils.buildDynamicButtonConfig({
+            enrichedComponent["buttons"] = Utils.buildFormBlockButtonConfig({
               _id,
               actionType,
               dataSource,
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index dbaefaac96..77e7367d87 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -1,18 +1,16 @@
 <script>
-  // import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
-  // import { getComponentForSetting } from "components/design/settings/componentSettings"
-  import { createEventDispatcher } from "svelte"
+  import { createEventDispatcher, setContext } from "svelte"
   import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
   import { getDatasourceForProvider } from "builderStore/dataBinding"
   import { currentAsset, store } from "builderStore"
   import { Helpers } from "@budibase/bbui"
   import FormStepControls from "./FormStepControls.svelte"
-  import { setContext } from "svelte"
   import { writable } from "svelte/store"
+  import { buildMultiStepFormBlockButtonConfig } from "@budibase/frontend-core/src/utils/utils"
 
   export let componentInstance
   export let componentBindings
-  export let value //steps
+  export let value
   export let bindings
 
   const dispatch = createEventDispatcher()
@@ -27,14 +25,17 @@
   setContext("step-form-block", stepStore)
 
   $: ({ currentStep } = $stepStore)
-  $: lastIdx = stepState?.length - 1
-
   $: if (stepState.length) {
     stepStore.update(state => ({
       ...state,
       stepsCount: stepState.length || 0,
     }))
   }
+  $: defaultButtonConfig = buildMultiStepFormBlockButtonConfig({
+    _id: componentInstance._id,
+    steps: value,
+    currentStep,
+  })
 
   // Step Definition Settings
   let compSettings = [
@@ -171,69 +172,11 @@
     }
   }
 
-  // Multistep button generation
-  // This kind of behaviour should be shifted to frontend-core
-  /*
-    Also, look at this unicorn
-    	\
-			 \_
-			 /.(((
-			(,/"(((__,--.
-			    \  ) _( /{
-			     || "  ||
-			     ||    ||
-			     ''    ''
-   */
-  const generateButtons = () => {
-    const buttons = []
-
-    if (stepState.length > 1) {
-      if (currentStep > 0) {
-        buttons.push({
-          _id: Helpers.uuid(),
-          _component: "@budibase/standard-components/button",
-          _instanceName: Helpers.uuid(),
-          text: "Back",
-          type: "secondary",
-          size: "M",
-          onClick: [
-            {
-              parameters: {
-                type: "prev",
-                componentId: `${componentInstance._id}-form`,
-              },
-              "##eventHandlerType": "Change Form Step",
-            },
-          ],
-        })
-      }
-      buttons.push({
-        _id: Helpers.uuid(),
-        _component: "@budibase/standard-components/button",
-        _instanceName: Helpers.uuid(),
-        text: "Next",
-        type: "cta",
-        size: "M",
-        disabled: lastIdx === currentStep,
-        onClick: [
-          {
-            parameters: {
-              type: "next",
-              componentId: `${componentInstance._id}-form`,
-            },
-            "##eventHandlerType": "Change Form Step",
-          },
-        ],
-      })
-    }
-    return buttons
-  }
-
   const buildPseudoInstance = ({ buttons, fields, title, desc }) => {
     return {
       _id: Helpers.uuid(),
       _component: "@budibase/standard-components/multistepformblock-step",
-      buttons: buttons || generateButtons(),
+      buttons: buttons || defaultButtonConfig,
       fields,
       title,
       desc,
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index 78f299f237..c20dd9310b 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -148,6 +148,12 @@
   .control {
     position: relative;
   }
+  .text {
+    font-size: var(--spectrum-global-dimension-font-size-75);
+    color: var(--grey-6);
+    grid-column: 2 / 2;
+  }
+
   .property-control.wide .control {
     flex: 1;
   }
@@ -160,12 +166,10 @@
   .property-control.wide > * {
     width: 100%;
   }
-  .text {
-    font-size: var(--spectrum-global-dimension-font-size-75);
-    color: var(--grey-6);
-    grid-column: 2 / 2;
-  }
   .property-control.wide .text {
     grid-column: 1 / -1;
   }
+  .property-control.wide .label {
+    margin-bottom: -8px;
+  }
 </style>
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 66dea46ccd..252d4e1312 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -6060,7 +6060,8 @@
             "key": "steps",
             "nested": true,
             "labelHidden": true,
-            "resetOn": ["dataSource", "actionType"]
+            "resetOn": ["dataSource", "actionType"],
+            "defaultValue": [{}]
           }
         ]
       }
diff --git a/packages/client/src/components/app/blocks/TableBlock.svelte b/packages/client/src/components/app/blocks/TableBlock.svelte
index c8b6a07e3d..04a7134ca0 100644
--- a/packages/client/src/components/app/blocks/TableBlock.svelte
+++ b/packages/client/src/components/app/blocks/TableBlock.svelte
@@ -265,7 +265,7 @@
             props={{
               dataSource,
               buttonPosition: "top",
-              buttons: Utils.buildDynamicButtonConfig({
+              buttons: Utils.buildFormBlockButtonConfig({
                 _id: $component.id + "-form-edit",
                 showDeleteButton: deleteLabel !== "",
                 showSaveButton: true,
@@ -299,7 +299,7 @@
             props={{
               dataSource,
               buttonPosition: "top",
-              buttons: Utils.buildDynamicButtonConfig({
+              buttons: Utils.buildFormBlockButtonConfig({
                 _id: $component.id + "-form-new",
                 showDeleteButton: false,
                 showSaveButton: true,
diff --git a/packages/client/src/components/app/blocks/form/FormBlock.svelte b/packages/client/src/components/app/blocks/form/FormBlock.svelte
index f23ecf451d..c0f1a53bae 100644
--- a/packages/client/src/components/app/blocks/form/FormBlock.svelte
+++ b/packages/client/src/components/app/blocks/form/FormBlock.svelte
@@ -106,7 +106,7 @@
     notificationOverride,
     buttons:
       buttons ||
-      Utils.buildDynamicButtonConfig({
+      Utils.buildFormBlockButtonConfig({
         _id: $component.id,
         showDeleteButton,
         showSaveButton,
diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index 93884c719f..53ce6ba934 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -116,7 +116,7 @@ export const domDebounce = callback => {
  *
  * @param {any} props
  * */
-export const buildDynamicButtonConfig = props => {
+export const buildFormBlockButtonConfig = props => {
   const {
     _id,
     actionType,
@@ -130,7 +130,6 @@ export const buildDynamicButtonConfig = props => {
   } = props || {}
 
   if (!_id) {
-    console.log("MISSING ID")
     return
   }
   const formId = `${_id}-form`
@@ -241,3 +240,56 @@ export const buildDynamicButtonConfig = props => {
 
   return defaultButtons
 }
+
+export const buildMultiStepFormBlockButtonConfig = props => {
+  const { _id, steps, currentStep } = props || {}
+
+  // Sanity check
+  if (!_id || !steps?.length) {
+    return
+  }
+
+  let buttons = []
+
+  // Add previous step button if we aren't the first step
+  buttons.push({
+    _id: Helpers.uuid(),
+    _component: "@budibase/standard-components/button",
+    _instanceName: Helpers.uuid(),
+    text: "Back",
+    type: "secondary",
+    size: "M",
+    disabled: currentStep === 0,
+    onClick: [
+      {
+        parameters: {
+          type: "prev",
+          componentId: `${_id}-form`,
+        },
+        "##eventHandlerType": "Change Form Step",
+      },
+    ],
+  })
+
+  // Add a next button if we aren't the last step
+  buttons.push({
+    _id: Helpers.uuid(),
+    _component: "@budibase/standard-components/button",
+    _instanceName: Helpers.uuid(),
+    text: "Next",
+    type: "cta",
+    size: "M",
+    disabled: currentStep === steps.length - 1,
+    onClick: [
+      {
+        parameters: {
+          type: "next",
+          componentId: `${_id}-form`,
+        },
+        "##eventHandlerType": "Change Form Step",
+      },
+    ],
+  })
+
+  return buttons
+}

From 223a3158011651a6cdeac76223771d8864ddba93 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 8 Dec 2023 14:39:47 +0000
Subject: [PATCH 06/38] Update multi step form block to use core button config
 generation

---
 .../controls/FormStepConfiguration.svelte     |  2 +-
 .../app/blocks/MultiStepFormblock.svelte      | 23 +++++++++++++++++--
 packages/frontend-core/src/utils/utils.js     |  6 ++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 77e7367d87..2c8a7eac67 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -33,7 +33,7 @@
   }
   $: defaultButtonConfig = buildMultiStepFormBlockButtonConfig({
     _id: componentInstance._id,
-    steps: value,
+    stepCount: value?.length,
     currentStep,
   })
 
diff --git a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
index a4255e334c..b17deb9708 100644
--- a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@@ -3,6 +3,7 @@
   import Block from "components/Block.svelte"
   import { getContext } from "svelte"
   import { builderStore } from "stores"
+  import { Utils } from "@budibase/frontend-core"
 
   export let componentInstance
   export let steps
@@ -91,13 +92,19 @@
     schema = (await fetchDatasourceSchema(dataSource)) || {}
   }
 
-  $: stepProps = steps?.map(step => {
+  $: stepProps = steps?.map((step, idx) => {
     const { title, desc, fields, buttons } = step
     return {
       fields: getDefaultFields(fields || [], schema),
       title,
       desc,
-      buttons,
+      buttons:
+        buttons ||
+        Utils.buildMultiStepFormBlockButtonConfig({
+          _id: $component.id,
+          stepCount: steps?.length,
+          currentStep: idx,
+        }),
     }
   })
 </script>
@@ -118,6 +125,13 @@
         <BlockComponent
           type="formstep"
           props={{ step: idx + 1, _instanceName: `Step ${idx + 1}` }}
+          styles={{
+            normal: {
+              width: "600px",
+              "margin-left": "auto",
+              "margin-right": "auto",
+            },
+          }}
         >
           <BlockComponent
             type="container"
@@ -157,6 +171,11 @@
             <BlockComponent
               type="buttongroup"
               props={{ buttons: stepProps?.[idx]?.buttons }}
+              styles={{
+                normal: {
+                  "margin-top": "16px",
+                },
+              }}
             />
           </BlockComponent>
         </BlockComponent>
diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index 53ce6ba934..3f5fa5d3a0 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -242,10 +242,10 @@ export const buildFormBlockButtonConfig = props => {
 }
 
 export const buildMultiStepFormBlockButtonConfig = props => {
-  const { _id, steps, currentStep } = props || {}
+  const { _id, stepCount, currentStep } = props || {}
 
   // Sanity check
-  if (!_id || !steps?.length) {
+  if (!_id || !stepCount) {
     return
   }
 
@@ -279,7 +279,7 @@ export const buildMultiStepFormBlockButtonConfig = props => {
     text: "Next",
     type: "cta",
     size: "M",
-    disabled: currentStep === steps.length - 1,
+    disabled: currentStep === stepCount - 1,
     onClick: [
       {
         parameters: {

From 1bf556b4f2cabf56e38a2b8ccd5ca011cd30c0cd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 8 Dec 2023 14:45:06 +0000
Subject: [PATCH 07/38] Add width setting to multi step form block and fix
 layout

---
 packages/client/manifest.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 252d4e1312..3b22f17581 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -6038,6 +6038,11 @@
     "icon": "AssetsAdded",
     "block": true,
     "hasChildren": false,
+    "size": {
+      "width": 400,
+      "height": 400
+    },
+    "styles": ["size"],
     "settings": [
       {
         "type": "table",

From 173a76dc52838243ff9072c10ea60e2401667a72 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 8 Dec 2023 16:10:56 +0000
Subject: [PATCH 08/38] Improve setting rendering and add dynamic section title

---
 .../src/DetailSummary/DetailSummary.svelte    |   6 -
 .../design/settings/componentSettings.js      |   2 +
 .../controls/FormStepConfiguration.svelte     | 194 ++++++++----------
 .../settings/controls/FormStepControls.svelte |  15 +-
 .../Component/ComponentSettingsSection.svelte |  27 +--
 packages/client/manifest.json                 |  18 +-
 .../app/blocks/MultiStepFormblock.svelte      |   2 +-
 7 files changed, 105 insertions(+), 159 deletions(-)

diff --git a/packages/bbui/src/DetailSummary/DetailSummary.svelte b/packages/bbui/src/DetailSummary/DetailSummary.svelte
index 4188422e20..e5d6fda86b 100644
--- a/packages/bbui/src/DetailSummary/DetailSummary.svelte
+++ b/packages/bbui/src/DetailSummary/DetailSummary.svelte
@@ -4,7 +4,6 @@
   export let name
   export let initiallyShow = false
   export let collapsible = true
-  export let noPadding = false
 
   let show = initiallyShow
 
@@ -29,7 +28,6 @@
     class="property-panel"
     class:show={show || !collapsible}
     class:no-title={!name}
-    class:no-padding={noPadding}
   >
     <slot />
   </div>
@@ -83,10 +81,6 @@
     padding: var(--spacing-xl);
   }
 
-  .property-panel.no-title.no-padding {
-    padding: 0px;
-  }
-
   .show {
     display: flex;
     flex-direction: column;
diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
index 4228ff2b1e..f2d1520878 100644
--- a/packages/builder/src/components/design/settings/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -26,6 +26,7 @@ import FieldConfiguration from "./controls/FieldConfiguration/FieldConfiguration
 import ButtonConfiguration from "./controls/ButtonConfiguration/ButtonConfiguration.svelte"
 import RelationshipFilterEditor from "./controls/RelationshipFilterEditor.svelte"
 import FormStepConfiguration from "./controls/FormStepConfiguration.svelte"
+import FormStepControls from "components/design/settings/controls/FormStepControls.svelte"
 
 const componentMap = {
   text: DrawerBindableInput,
@@ -53,6 +54,7 @@ const componentMap = {
   fieldConfiguration: FieldConfiguration,
   buttonConfiguration: ButtonConfiguration,
   stepConfiguration: FormStepConfiguration,
+  formStepControls: FormStepControls,
   columns: ColumnEditor,
   "columns/basic": BasicColumnEditor,
   "columns/grid": GridColumnEditor,
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 2c8a7eac67..098c6277fb 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -4,7 +4,6 @@
   import { getDatasourceForProvider } from "builderStore/dataBinding"
   import { currentAsset, store } from "builderStore"
   import { Helpers } from "@budibase/bbui"
-  import FormStepControls from "./FormStepControls.svelte"
   import { writable } from "svelte/store"
   import { buildMultiStepFormBlockButtonConfig } from "@budibase/frontend-core/src/utils/utils"
 
@@ -14,61 +13,70 @@
   export let bindings
 
   const dispatch = createEventDispatcher()
-
-  let stepState = [...(value || [])]
-
-  const stepStore = writable({
-    stepsCount: stepState?.length || 1,
+  const multiStepStore = writable({
+    stepCount: value?.length ?? 0,
     currentStep: 0,
   })
 
-  setContext("step-form-block", stepStore)
+  setContext("multi-step-form-block", multiStepStore)
 
-  $: ({ currentStep } = $stepStore)
-  $: if (stepState.length) {
-    stepStore.update(state => ({
-      ...state,
-      stepsCount: stepState.length || 0,
-    }))
-  }
+  $: currentStep = $multiStepStore.currentStep
+  $: stepCount = value?.length || 0
+  $: multiStepStore.update(state => ({ ...state, stepCount }))
   $: defaultButtonConfig = buildMultiStepFormBlockButtonConfig({
     _id: componentInstance._id,
-    stepCount: value?.length,
-    currentStep,
+    stepCount: stepCount,
+    currentStep: currentStep,
   })
+  $: dataSource = getDatasourceForProvider($currentAsset, componentInstance)
+  $: emitCurrentStep(currentStep)
+  $: sectionName = getSectionName($multiStepStore)
+  $: stepDef = {
+    settings: [
+      {
+        section: true,
+        name: sectionName,
+        settings: [
+          {
+            type: "formStepControls",
+            label: "Multi-steps",
+            key: "steps",
+          },
+          {
+            type: "text",
+            label: "Title",
+            key: "title",
+            nested: true,
+          },
+          {
+            type: "text",
+            label: "Description",
+            key: "desc",
+            nested: true,
+          },
+          {
+            type: "fieldConfiguration",
+            key: "fields",
+            nested: true,
+          },
+          {
+            type: "buttonConfiguration",
+            label: "Buttons",
+            key: "buttons",
+            wide: true,
+            nested: true,
+          },
+        ],
+      },
+    ],
+  }
 
-  // Step Definition Settings
-  let compSettings = [
-    {
-      customType: "formStepControl",
-      label: "Multi-steps",
-      key: "steps",
-    },
-    {
-      type: "text",
-      label: "Title",
-      key: "title",
-      nested: true,
-    },
-    {
-      type: "text",
-      label: "Description",
-      key: "desc",
-      nested: true,
-    },
-    {
-      type: "fieldConfiguration",
-      key: "fields",
-      nested: true,
-    },
-    {
-      type: "buttonConfiguration",
-      label: "Buttons",
-      key: "buttons",
-      wide: true,
-      nested: true,
-    },
-  ]
+  const getSectionName = ({ stepCount, currentStep }) => {
+    if (stepCount <= 1) {
+      return "Details"
+    }
+    return `Details (Step ${currentStep + 1}/${stepCount})`
+  }
 
   const emitCurrentStep = step => {
     store.actions.preview.sendEvent("builder-meta", {
@@ -79,70 +87,52 @@
     })
   }
 
-  $: dataSource = getDatasourceForProvider($currentAsset, componentInstance)
-
-  $: stepDef = {
-    component: "@budibase/standard-components/multistepformblock-step",
-    name: "Formblock step",
-    settings: compSettings,
-  }
-
   const addStep = () => {
-    const newStepIdx = currentStep + 1
-
-    stepState = [
-      ...stepState.slice(0, newStepIdx),
+    const nextStep = currentStep + 1
+    dispatch("change", [
+      ...value.slice(0, nextStep),
       {},
-      ...stepState.slice(newStepIdx),
-    ]
-
-    stepStore.update(state => ({
+      ...value.slice(nextStep),
+    ])
+    multiStepStore.update(state => ({
       ...state,
-      currentStep: newStepIdx,
+      currentStep: nextStep,
     }))
-
-    dispatch("change", stepState)
-    emitCurrentStep(newStepIdx)
   }
 
   const removeStep = () => {
-    const clone = stepState.map(x => x)
-    clone.splice(currentStep, 1)
-
-    const targetStepIdx = Math.max(currentStep - 1, 0)
-    stepState = clone.map(x => x)
-
-    stepStore.update(state => ({
+    dispatch("change", value.toSpliced(currentStep, 1))
+    const newStep = Math.min(currentStep, stepCount - 2)
+    multiStepStore.update(state => ({
       ...state,
-      currentStep: targetStepIdx,
+      currentStep: newStep,
     }))
-
-    dispatch("change", stepState)
-    emitCurrentStep(targetStepIdx)
   }
 
   const previousStep = () => {
     const prevStepIdx = Math.max(currentStep - 1, 0)
-    stepStore.update(state => ({
+    multiStepStore.update(state => ({
       ...state,
       currentStep: prevStepIdx,
     }))
-    emitCurrentStep(prevStepIdx)
   }
 
   const nextStep = () => {
     const nextStepIdx = currentStep + 1
-    stepStore.update(state => ({
+    multiStepStore.update(state => ({
       ...state,
-      currentStep: Math.min(nextStepIdx, stepState.length - 1),
+      currentStep: Math.min(nextStepIdx, value.length - 1),
     }))
-    emitCurrentStep(nextStepIdx)
   }
 
   const updateStep = (field, val) => {
-    stepState[currentStep] ||= {}
-    stepState[currentStep][field.key] = val
-    dispatch("change", stepState)
+    const newStep = {
+      ...value[currentStep],
+      [field.key]: val,
+    }
+    let newValue = value.slice()
+    newValue[currentStep] = newStep
+    dispatch("change", newValue)
   }
 
   const handleStepAction = action => {
@@ -158,9 +148,6 @@
         break
       case "previousStep":
         previousStep()
-        break
-      default:
-        console.log("Nothing")
     }
   }
 
@@ -186,32 +173,27 @@
     }
   }
 
-  $: stepConfigInstance = buildPseudoInstance(stepState?.[currentStep] || {})
+  $: stepConfigInstance = buildPseudoInstance(value[currentStep] || {})
 </script>
 
-<span class="settings-wrap">
+<div class="nested-section">
   <ComponentSettingsSection
     includeHidden
     componentInstance={stepConfigInstance}
     componentDefinition={stepDef}
     onUpdateSetting={processUpdate}
-    getCustomComponent={type => {
-      const types = { formStepControl: FormStepControls }
-      return types[type]
-    }}
-    getCustomSectionTitle={section => {
-      console.log(section.name)
-      if (section.name === "Details" && stepState?.length > 0) {
-        return `Details (${currentStep}/${stepState?.length})`
-      }
-      return section.name
-    }}
-    showSectionTitle={false}
     showInstanceName={false}
     isScreen={false}
-    noPadding={true}
     nested={true}
     {bindings}
     {componentBindings}
   />
-</span>
+</div>
+
+<style>
+  .nested-section {
+    margin: 0 calc(-1 * var(--spacing-xl)) calc(-1 * var(--spacing-xl))
+      calc(-1 * var(--spacing-xl));
+    border-top: var(--border-light);
+  }
+</style>
diff --git a/packages/builder/src/components/design/settings/controls/FormStepControls.svelte b/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
index 9aa6b43d10..603b2631f5 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
@@ -2,15 +2,10 @@
   import { createEventDispatcher, getContext } from "svelte"
   import { ActionButton } from "@budibase/bbui"
 
-  const stepState = getContext("step-form-block")
+  const multiStepStore = getContext("multi-step-form-block")
   const dispatch = createEventDispatcher()
 
-  $: ({ stepsCount, currentStep } = $stepState)
-
-  const parseLastIdx = stepsCount => {
-    return Math.max(stepsCount - 1, 0)
-  }
-  $: lastIdx = parseLastIdx(stepsCount)
+  $: ({ stepCount, currentStep } = $multiStepStore)
 
   const stepAction = action => {
     dispatch("change", {
@@ -19,7 +14,7 @@
   }
 </script>
 
-{#if stepsCount === 1}
+{#if stepCount === 1}
   <ActionButton
     icon="MultipleAdd"
     secondary
@@ -43,7 +38,7 @@
     <ActionButton
       size="S"
       secondary
-      disabled={currentStep === lastIdx}
+      disabled={currentStep === stepCount - 1}
       icon="ChevronRight"
       on:click={() => {
         stepAction("nextStep")
@@ -53,7 +48,7 @@
       size="S"
       secondary
       icon="Close"
-      disabled={stepsCount === 1}
+      disabled={stepCount === 1}
       on:click={() => {
         stepAction("removeStep")
       }}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
index 97a56e1667..f6f4cf9c90 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
@@ -15,12 +15,9 @@
   export let componentBindings
   export let isScreen = false
   export let onUpdateSetting
-  export let getCustomComponent
-  export let getCustomSectionTitle
   export let showSectionTitle = true
   export let includeHidden = false
   export let tag
-  export let noPadding = false
 
   $: sections = getSections(
     componentInstance,
@@ -133,30 +130,13 @@
     })
   }
 
-  const resolveComponentByType = setting => {
-    if (setting.type) {
-      return getComponentForSetting(setting)
-    } else if (setting.customType && typeof getCustomComponent === "function") {
-      return getCustomComponent(setting.customType)
-    }
-  }
-
-  const resolveSectionName = section => {
-    console.log(resolveSectionName)
-    if (typeof getCustomSectionTitle === "function") {
-      return getCustomSectionTitle(section)
-    } else {
-      return section.name
-    }
-  }
-
   const canRenderControl = (instance, setting, isScreen, includeHidden) => {
     // Prevent rendering on click setting for screens
     if (setting?.type === "event" && isScreen) {
       return false
     }
     // Check we have a component to render for this setting
-    const control = resolveComponentByType(setting)
+    const control = getComponentForSetting(setting)
     if (!control) {
       return false
     }
@@ -172,9 +152,8 @@
   {#if section.visible}
     <DetailSummary
       name={showSectionTitle ? section.name : ""}
-      show={section.collapsed !== true}
-      {noPadding}
       initiallyShow={section.collapsed !== true}
+      collapsible={section.name !== "General"}
     >
       {#if section.info}
         <div class="section-info">
@@ -191,7 +170,7 @@
           {#if setting.visible}
             <PropertyControl
               type={setting.type}
-              control={resolveComponentByType(setting)}
+              control={getComponentForSetting(setting)}
               label={setting.label}
               labelHidden={setting.labelHidden}
               wide={setting.wide}
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 3b22f17581..1676958cf4 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -6057,18 +6057,12 @@
         "defaultValue": "Create"
       },
       {
-        "name": "Details",
-        "section": true,
-        "settings": [
-          {
-            "type": "stepConfiguration",
-            "key": "steps",
-            "nested": true,
-            "labelHidden": true,
-            "resetOn": ["dataSource", "actionType"],
-            "defaultValue": [{}]
-          }
-        ]
+        "type": "stepConfiguration",
+        "key": "steps",
+        "nested": true,
+        "labelHidden": true,
+        "resetOn": ["dataSource", "actionType"],
+        "defaultValue": [{}]
       }
     ],
     "actions": [
diff --git a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
index b17deb9708..9aa59c8128 100644
--- a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@@ -102,7 +102,7 @@
         buttons ||
         Utils.buildMultiStepFormBlockButtonConfig({
           _id: $component.id,
-          stepCount: steps?.length,
+          stepCount: steps?.length ?? 0,
           currentStep: idx,
         }),
     }

From f4d2efdaa16da3fa0f627b39ea1d624b9ea74c35 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 8 Dec 2023 16:40:50 +0000
Subject: [PATCH 09/38] Cleanup

---
 .../controls/FormStepConfiguration.svelte     | 34 +++++++------------
 .../settings/controls/FormStepControls.svelte | 24 +++++++------
 .../Component/ComponentSettingsSection.svelte |  2 +-
 packages/client/manifest.json                 |  1 +
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 098c6277fb..8e37d1b058 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -31,6 +31,7 @@
   $: dataSource = getDatasourceForProvider($currentAsset, componentInstance)
   $: emitCurrentStep(currentStep)
   $: sectionName = getSectionName($multiStepStore)
+  $: stepConfigInstance = buildPseudoInstance(value[currentStep] || {})
   $: stepDef = {
     settings: [
       {
@@ -39,7 +40,7 @@
         settings: [
           {
             type: "formStepControls",
-            label: "Multi-steps",
+            label: "Steps",
             key: "steps",
           },
           {
@@ -88,40 +89,32 @@
   }
 
   const addStep = () => {
-    const nextStep = currentStep + 1
-    dispatch("change", [
-      ...value.slice(0, nextStep),
-      {},
-      ...value.slice(nextStep),
-    ])
+    dispatch("change", value.toSpliced(currentStep + 1, 0, {}))
     multiStepStore.update(state => ({
       ...state,
-      currentStep: nextStep,
+      currentStep: currentStep + 1,
     }))
   }
 
   const removeStep = () => {
     dispatch("change", value.toSpliced(currentStep, 1))
-    const newStep = Math.min(currentStep, stepCount - 2)
     multiStepStore.update(state => ({
       ...state,
-      currentStep: newStep,
+      currentStep: Math.min(currentStep, stepCount - 2),
     }))
   }
 
   const previousStep = () => {
-    const prevStepIdx = Math.max(currentStep - 1, 0)
     multiStepStore.update(state => ({
       ...state,
-      currentStep: prevStepIdx,
+      currentStep: Math.max(currentStep - 1, 0),
     }))
   }
 
   const nextStep = () => {
-    const nextStepIdx = currentStep + 1
     multiStepStore.update(state => ({
       ...state,
-      currentStep: Math.min(nextStepIdx, value.length - 1),
+      currentStep: Math.min(currentStep + 1, value.length - 1),
     }))
   }
 
@@ -130,9 +123,7 @@
       ...value[currentStep],
       [field.key]: val,
     }
-    let newValue = value.slice()
-    newValue[currentStep] = newStep
-    dispatch("change", newValue)
+    dispatch("change", value.toSpliced(currentStep, 1, newStep))
   }
 
   const handleStepAction = action => {
@@ -162,18 +153,17 @@
   const buildPseudoInstance = ({ buttons, fields, title, desc }) => {
     return {
       _id: Helpers.uuid(),
-      _component: "@budibase/standard-components/multistepformblock-step",
+      _component: "@budibase/standard-components/multistepformblockstep",
+      _instanceName: `Step ${currentStep + 1}`,
       buttons: buttons || defaultButtonConfig,
       fields,
       title,
       desc,
+
+      // Needed for field configuration
       dataSource,
-      step: currentStep + 1,
-      _instanceName: `Step ${currentStep + 1}`,
     }
   }
-
-  $: stepConfigInstance = buildPseudoInstance(value[currentStep] || {})
 </script>
 
 <div class="nested-section">
diff --git a/packages/builder/src/components/design/settings/controls/FormStepControls.svelte b/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
index 603b2631f5..054f9c0ed1 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
@@ -15,15 +15,17 @@
 </script>
 
 {#if stepCount === 1}
-  <ActionButton
-    icon="MultipleAdd"
-    secondary
-    on:click={() => {
-      stepAction("addStep")
-    }}
-  >
-    Add Step
-  </ActionButton>
+  <div class="stretch">
+    <ActionButton
+      icon="MultipleAdd"
+      secondary
+      on:click={() => {
+        stepAction("addStep")
+      }}
+    >
+      Add Step
+    </ActionButton>
+  </div>
 {:else}
   <div class="step-actions">
     <ActionButton
@@ -65,11 +67,13 @@
 {/if}
 
 <style>
+  .stretch :global(.spectrum-ActionButton) {
+    width: 100%;
+  }
   .step-actions {
     display: flex;
     gap: var(--spacing-s);
   }
-
   .step-actions :global(.spectrum-ActionButton) {
     height: 32px;
   }
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
index f6f4cf9c90..d96729d3d2 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
@@ -210,7 +210,7 @@
     </DetailSummary>
   {/if}
 {/each}
-{#if componentDefinition?.block && !tag}
+{#if componentDefinition?.block && !tag && componentDefinition.ejectable !== false}
   <DetailSummary name="Eject" collapsible={false}>
     <EjectBlockButton />
   </DetailSummary>
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 1676958cf4..bc774b0598 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -6038,6 +6038,7 @@
     "icon": "AssetsAdded",
     "block": true,
     "hasChildren": false,
+    "ejectable": false,
     "size": {
       "width": 400,
       "height": 400

From 9da641f8488ed58de250f386f521fc38bdf1af51 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 29 Nov 2023 09:27:15 +0000
Subject: [PATCH 10/38] Standardise field help text and error icon size and
 colors

---
 packages/bbui/src/Form/Field.svelte           |  8 +++-----
 .../src/components/app/forms/Field.svelte     | 19 +++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/packages/bbui/src/Form/Field.svelte b/packages/bbui/src/Form/Field.svelte
index 0c031b0235..1770438c3c 100644
--- a/packages/bbui/src/Form/Field.svelte
+++ b/packages/bbui/src/Form/Field.svelte
@@ -51,15 +51,13 @@
     margin-top: var(--spectrum-global-dimension-size-75);
     align-items: center;
   }
-
   .helpText :global(svg) {
-    width: 14px;
-    color: var(--grey-5);
+    width: 13px;
+    color: var(--spectrum-global-color-gray-600);
     margin-right: 6px;
   }
-
   .helpText span {
-    color: var(--grey-7);
+    color: var(--spectrum-global-color-gray-800);
     font-size: var(--spectrum-global-dimension-font-size-75);
   }
 </style>
diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte
index 22420b7430..adf5d10df7 100644
--- a/packages/client/src/components/app/forms/Field.svelte
+++ b/packages/client/src/components/app/forms/Field.svelte
@@ -137,21 +137,23 @@
     width: 100%;
   }
 
+  .error :global(svg),
+  .helpText :global(svg) {
+    width: 13px;
+    margin-right: 6px;
+  }
+
   .error {
     display: flex;
     margin-top: var(--spectrum-global-dimension-size-75);
     align-items: center;
   }
-
   .error :global(svg) {
-    width: 14px;
     color: var(
       --spectrum-semantic-negative-color-default,
       var(--spectrum-global-color-red-500)
     );
-    margin-right: 4px;
   }
-
   .error span {
     color: var(
       --spectrum-semantic-negative-color-default,
@@ -165,17 +167,14 @@
     margin-top: var(--spectrum-global-dimension-size-75);
     align-items: center;
   }
-
   .helpText :global(svg) {
-    width: 14px;
-    color: var(--grey-7);
-    margin-right: 6px;
+    color: var(--spectrum-global-color-gray-600);
   }
-
   .helpText span {
-    color: var(--grey-5);
+    color: var(--spectrum-global-color-gray-800);
     font-size: var(--spectrum-global-dimension-font-size-75);
   }
+
   .spectrum-FieldLabel--right,
   .spectrum-FieldLabel--left {
     padding-right: var(--spectrum-global-dimension-size-200);

From ee452f75fedb03c5c7770645375207196892f334 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 8 Dec 2023 16:52:34 +0000
Subject: [PATCH 11/38] Fix error when trying to scroll to an invalid field

---
 .../client/src/components/app/forms/InnerForm.svelte   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte
index 6ebe9de7ec..9d0db43bf4 100644
--- a/packages/client/src/components/app/forms/InnerForm.svelte
+++ b/packages/client/src/components/app/forms/InnerForm.svelte
@@ -423,10 +423,14 @@
     }
     const fieldId = field.fieldState.fieldId
     const fieldElement = document.getElementById(fieldId)
-    fieldElement.focus({ preventScroll: true })
+    if (fieldElement) {
+      fieldElement.focus({ preventScroll: true })
+    }
     const label = document.querySelector(`label[for="${fieldId}"]`)
-    label.style.scrollMargin = "100px"
-    label.scrollIntoView({ behavior: "smooth", block: "nearest" })
+    if (label) {
+      label.style.scrollMargin = "100px"
+      label.scrollIntoView({ behavior: "smooth", block: "nearest" })
+    }
   }
 
   // Action context to pass to children

From 368b22708625985f06ac4ae083c4bfc3cd31cbcf Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 8 Dec 2023 16:52:49 +0000
Subject: [PATCH 12/38] Add validation to default form step button actions

---
 packages/frontend-core/src/utils/utils.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index 3f5fa5d3a0..75c2f0b675 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -281,6 +281,12 @@ export const buildMultiStepFormBlockButtonConfig = props => {
     size: "M",
     disabled: currentStep === stepCount - 1,
     onClick: [
+      {
+        "##eventHandlerType": "Validate Form",
+        parameters: {
+          componentId: `${_id}-form`,
+        },
+      },
       {
         parameters: {
           type: "next",

From 01c8ef9f0fa5a6e5558d092931ed7768094f2f13 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 11 Dec 2023 17:32:51 +0000
Subject: [PATCH 13/38] Update multistep button generation to show/hide buttons
 rather than disabling them

---
 packages/frontend-core/src/utils/utils.js | 100 +++++++++++++---------
 1 file changed, 61 insertions(+), 39 deletions(-)

diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index 75c2f0b675..84244f6bc4 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -252,50 +252,72 @@ export const buildMultiStepFormBlockButtonConfig = props => {
   let buttons = []
 
   // Add previous step button if we aren't the first step
-  buttons.push({
-    _id: Helpers.uuid(),
-    _component: "@budibase/standard-components/button",
-    _instanceName: Helpers.uuid(),
-    text: "Back",
-    type: "secondary",
-    size: "M",
-    disabled: currentStep === 0,
-    onClick: [
-      {
-        parameters: {
-          type: "prev",
-          componentId: `${_id}-form`,
+  if (currentStep !== 0) {
+    buttons.push({
+      _id: Helpers.uuid(),
+      _component: "@budibase/standard-components/button",
+      _instanceName: Helpers.uuid(),
+      text: "Back",
+      type: "secondary",
+      size: "M",
+      onClick: [
+        {
+          parameters: {
+            type: "prev",
+            componentId: `${_id}-form`,
+          },
+          "##eventHandlerType": "Change Form Step",
         },
-        "##eventHandlerType": "Change Form Step",
-      },
-    ],
-  })
+      ],
+    })
+  }
 
   // Add a next button if we aren't the last step
-  buttons.push({
-    _id: Helpers.uuid(),
-    _component: "@budibase/standard-components/button",
-    _instanceName: Helpers.uuid(),
-    text: "Next",
-    type: "cta",
-    size: "M",
-    disabled: currentStep === stepCount - 1,
-    onClick: [
-      {
-        "##eventHandlerType": "Validate Form",
-        parameters: {
-          componentId: `${_id}-form`,
+  if (currentStep !== stepCount - 1) {
+    buttons.push({
+      _id: Helpers.uuid(),
+      _component: "@budibase/standard-components/button",
+      _instanceName: Helpers.uuid(),
+      text: "Next",
+      type: "cta",
+      size: "M",
+      onClick: [
+        {
+          "##eventHandlerType": "Validate Form",
+          parameters: {
+            componentId: `${_id}-form`,
+          },
         },
-      },
-      {
-        parameters: {
-          type: "next",
-          componentId: `${_id}-form`,
+        {
+          parameters: {
+            type: "next",
+            componentId: `${_id}-form`,
+          },
+          "##eventHandlerType": "Change Form Step",
         },
-        "##eventHandlerType": "Change Form Step",
-      },
-    ],
-  })
+      ],
+    })
+  }
+
+  // Add save button if we are the last step
+  if (currentStep === stepCount - 1) {
+    buttons.push({
+      _id: Helpers.uuid(),
+      _component: "@budibase/standard-components/button",
+      _instanceName: Helpers.uuid(),
+      text: "Save",
+      type: "cta",
+      size: "M",
+      onClick: [
+        {
+          "##eventHandlerType": "Validate Form",
+          parameters: {
+            componentId: `${_id}-form`,
+          },
+        },
+      ],
+    })
+  }
 
   return buttons
 }

From 69ea28ad46e0ff3467535a36defc13390b39eb3b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 12 Dec 2023 20:22:48 +0000
Subject: [PATCH 14/38] Clean up and improve multi step form block

---
 .../builder/src/builderStore/dataBinding.js   |  19 +--
 .../src/builderStore/store/frontend.js        |  13 +-
 .../controls/FormStepConfiguration.svelte     |  21 +--
 packages/client/manifest.json                 |   1 +
 .../app/blocks/MultiStepFormblock.svelte      | 152 ++++++++----------
 packages/frontend-core/src/utils/utils.js     |  11 +-
 6 files changed, 104 insertions(+), 113 deletions(-)

diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index d86e94aba2..52368a0723 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -465,8 +465,8 @@ const filterCategoryByContext = (component, context) => {
   const { _component } = component
   if (_component.endsWith("formblock")) {
     if (
-      (component.actionType == "Create" && context.type === "schema") ||
-      (component.actionType == "View" && context.type === "form")
+      (component.actionType === "Create" && context.type === "schema") ||
+      (component.actionType === "View" && context.type === "form")
     ) {
       return false
     }
@@ -474,20 +474,21 @@ const filterCategoryByContext = (component, context) => {
   return true
 }
 
+// Enrich binding category information for certain components
 const getComponentBindingCategory = (component, context, def) => {
   let icon = def.icon
   let category = component._instanceName
 
   if (component._component.endsWith("formblock")) {
-    let contextCategorySuffix = {
-      form: "Fields",
-      schema: "Row",
+    if (context.type === "form") {
+      category = `${component._instanceName} - Fields`
+      icon = "Form"
+    } else if (context.type === "schema") {
+      category = `${component._instanceName} - Row`
+      icon = "Data"
     }
-    category = `${component._instanceName} - ${
-      contextCategorySuffix[context.type]
-    }`
-    icon = context.type === "form" ? "Form" : "Data"
   }
+
   return {
     icon,
     category,
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 7a72b7a9c3..2d62a0667e 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -1289,15 +1289,14 @@ export const getFrontendStore = () => {
           const settings = getComponentSettings(component._component)
           const updatedSetting = settings.find(setting => setting.key === name)
 
-          // Can be a single string or array of strings
-          const resetFields = settings.filter(setting => {
-            return (
+          // Reset dependent fields
+          settings.forEach(setting => {
+            const needsReset =
               name === setting.resetOn ||
               (Array.isArray(setting.resetOn) && setting.resetOn.includes(name))
-            )
-          })
-          resetFields?.forEach(setting => {
-            component[setting.key] = null
+            if (needsReset) {
+              component[setting.key] = setting.defaultValue || null
+            }
           })
 
           if (
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 8e37d1b058..184057e45e 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -5,7 +5,7 @@
   import { currentAsset, store } from "builderStore"
   import { Helpers } from "@budibase/bbui"
   import { writable } from "svelte/store"
-  import { buildMultiStepFormBlockButtonConfig } from "@budibase/frontend-core/src/utils/utils"
+  import { Utils } from "@budibase/frontend-core"
 
   export let componentInstance
   export let componentBindings
@@ -20,18 +20,18 @@
 
   setContext("multi-step-form-block", multiStepStore)
 
-  $: currentStep = $multiStepStore.currentStep
-  $: stepCount = value?.length || 0
-  $: multiStepStore.update(state => ({ ...state, stepCount }))
-  $: defaultButtonConfig = buildMultiStepFormBlockButtonConfig({
+  $: defaultProps = Utils.buildMultiStepFormBlockDefaultProps({
     _id: componentInstance._id,
     stepCount: stepCount,
     currentStep: currentStep,
   })
+  $: currentStep = $multiStepStore.currentStep
+  $: stepCount = value?.length || 0
+  $: multiStepStore.update(state => ({ ...state, stepCount }))
   $: dataSource = getDatasourceForProvider($currentAsset, componentInstance)
   $: emitCurrentStep(currentStep)
   $: sectionName = getSectionName($multiStepStore)
-  $: stepConfigInstance = buildPseudoInstance(value[currentStep] || {})
+  $: stepInstance = buildPseudoInstance(value[currentStep], defaultProps)
   $: stepDef = {
     settings: [
       {
@@ -150,14 +150,15 @@
     }
   }
 
-  const buildPseudoInstance = ({ buttons, fields, title, desc }) => {
+  const buildPseudoInstance = (instance, defaultProps) => {
+    const { buttons, fields, title, desc } = instance || {}
     return {
       _id: Helpers.uuid(),
       _component: "@budibase/standard-components/multistepformblockstep",
       _instanceName: `Step ${currentStep + 1}`,
-      buttons: buttons || defaultButtonConfig,
+      title: title ?? defaultProps.title,
+      buttons: buttons || defaultProps.buttons,
       fields,
-      title,
       desc,
 
       // Needed for field configuration
@@ -169,7 +170,7 @@
 <div class="nested-section">
   <ComponentSettingsSection
     includeHidden
-    componentInstance={stepConfigInstance}
+    componentInstance={stepInstance}
     componentDefinition={stepDef}
     onUpdateSetting={processUpdate}
     showInstanceName={false}
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index bc774b0598..a85af63d28 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -6095,6 +6095,7 @@
       },
       {
         "type": "static",
+        "suffix": "form",
         "values": [
           {
             "label": "Value",
diff --git a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
index 9aa59c8128..9c5d62d945 100644
--- a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@@ -13,56 +13,6 @@
   const { fetchDatasourceSchema } = getContext("sdk")
   const component = getContext("component")
 
-  let schema
-  let formId
-
-  const getCurrentStep = () => {
-    if ($builderStore?.component?._id === $component.id) {
-      return $builderStore?.component.step
-    }
-    return 0
-  }
-
-  $: currentStep = getCurrentStep(
-    $builderStore?.component?._id,
-    componentInstance
-  )
-
-  $: fetchSchema(dataSource)
-
-  const getPropsForField = field => {
-    let fieldProps = field._component
-      ? {
-          ...field,
-        }
-      : {
-          field: field.name,
-          label: field.name,
-          placeholder: field.name,
-          _instanceName: field.name,
-        }
-    return fieldProps
-  }
-
-  const getDefaultFields = (fields, schema) => {
-    if (!schema) {
-      return []
-    }
-    let defaultFields = []
-
-    if (!fields || fields.length === 0) {
-      Object.values(schema)
-        .filter(field => !field.autocolumn)
-        .forEach(field => {
-          defaultFields.push({
-            name: field.name,
-            active: true,
-          })
-        })
-    }
-    return [...fields, ...defaultFields].filter(field => field.active)
-  }
-
   const FieldTypeToComponentMap = {
     string: "stringfield",
     number: "numberfield",
@@ -79,6 +29,35 @@
     bb_reference: "bbreferencefield",
   }
 
+  let schema
+
+  $: fetchSchema(dataSource)
+  $: enrichedSteps = enrichSteps(steps, schema, $component.id)
+  $: currentStep = getCurrentStep(
+    $builderStore?.component?._id,
+    componentInstance
+  )
+
+  const getCurrentStep = () => {
+    if ($builderStore?.component?._id === $component.id) {
+      return $builderStore?.component.step
+    }
+    return 0
+  }
+
+  const getPropsForField = field => {
+    return field._component
+      ? {
+          ...field,
+        }
+      : {
+          field: field.name,
+          label: field.name,
+          placeholder: field.name,
+          _instanceName: field.name,
+        }
+  }
+
   const getComponentForField = field => {
     const fieldSchemaName = field.field || field.name
     if (!fieldSchemaName || !schema?.[fieldSchemaName]) {
@@ -92,24 +71,37 @@
     schema = (await fetchDatasourceSchema(dataSource)) || {}
   }
 
-  $: stepProps = steps?.map((step, idx) => {
-    const { title, desc, fields, buttons } = step
-    return {
-      fields: getDefaultFields(fields || [], schema),
-      title,
-      desc,
-      buttons:
-        buttons ||
-        Utils.buildMultiStepFormBlockButtonConfig({
-          _id: $component.id,
-          stepCount: steps?.length ?? 0,
-          currentStep: idx,
-        }),
+  const getDefaultFields = (fields, schema) => {
+    if (fields?.length) {
+      return fields.filter(field => field.active)
     }
-  })
+    return Object.values(schema || {})
+      .filter(field => !field.autocolumn)
+      .map(field => ({
+        name: field.name,
+      }))
+  }
+
+  const enrichSteps = (steps, schema, id) => {
+    const safeSteps = steps?.length ? steps : [{}]
+    return safeSteps.map((step, idx) => {
+      const { title, desc, fields, buttons } = step
+      const defaultProps = Utils.buildMultiStepFormBlockDefaultProps({
+        _id: id,
+        stepCount: safeSteps.length,
+        currentStep: idx,
+      })
+      return {
+        fields: getDefaultFields(fields || [], schema),
+        title: title ?? defaultProps.title,
+        desc,
+        buttons: buttons || defaultProps.buttons,
+      }
+    })
+  }
 </script>
 
-{#key stepProps}
+{#key enrichedSteps}
   <Block>
     <BlockComponent
       type="form"
@@ -119,9 +111,8 @@
         step: $builderStore.inBuilder === true ? currentStep + 1 : null,
       }}
       context="form"
-      bind:id={formId}
     >
-      {#each steps || [] as step, idx ("step" + step._id)}
+      {#each enrichedSteps as step, idx}
         <BlockComponent
           type="formstep"
           props={{ step: idx + 1, _instanceName: `Step ${idx + 1}` }}
@@ -143,39 +134,32 @@
               size: "shrink",
             }}
           >
-            <BlockComponent type="container">
-              <BlockComponent
-                type="heading"
-                props={{ text: stepProps?.[idx]?.title }}
-              />
+            <BlockComponent type="container" order={0}>
+              <BlockComponent type="heading" props={{ text: step.title }} />
             </BlockComponent>
-
-            <BlockComponent
-              type="text"
-              props={{ text: stepProps?.[idx]?.desc }}
-            />
-
-            <BlockComponent type="fieldgroup">
-              {#each stepProps?.[idx]?.fields || [] as field, fieldIdx ("field_" + fieldIdx)}
-                {#if getComponentForField(field) && field.active}
+            <BlockComponent type="text" props={{ text: step.desc }} order={1} />
+            <BlockComponent type="fieldgroup" order={2}>
+              {#each step.fields as field, fieldIdx}
+                {#if getComponentForField(field)}
                   <BlockComponent
                     type={getComponentForField(field)}
                     props={getPropsForField(field)}
-                    order={idx}
+                    order={fieldIdx}
                     interactive
-                    name={field?.field}
+                    name={field.field}
                   />
                 {/if}
               {/each}
             </BlockComponent>
             <BlockComponent
               type="buttongroup"
-              props={{ buttons: stepProps?.[idx]?.buttons }}
+              props={{ buttons: step.buttons }}
               styles={{
                 normal: {
                   "margin-top": "16px",
                 },
               }}
+              order={3}
             />
           </BlockComponent>
         </BlockComponent>
diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index 84244f6bc4..7c3dc2f3b5 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -227,7 +227,7 @@ export const buildFormBlockButtonConfig = props => {
     })
   }
 
-  if (actionType == "Update" && showDeleteButton !== false) {
+  if (actionType === "Update" && showDeleteButton !== false) {
     defaultButtons.push({
       text: deleteText || "Delete",
       _id: Helpers.uuid(),
@@ -241,7 +241,7 @@ export const buildFormBlockButtonConfig = props => {
   return defaultButtons
 }
 
-export const buildMultiStepFormBlockButtonConfig = props => {
+export const buildMultiStepFormBlockDefaultProps = props => {
   const { _id, stepCount, currentStep } = props || {}
 
   // Sanity check
@@ -249,6 +249,8 @@ export const buildMultiStepFormBlockButtonConfig = props => {
     return
   }
 
+  // Default the title to "Step X"
+  const title = `Step {{ [${_id}-form].[__currentStep] }}`
   let buttons = []
 
   // Add previous step button if we aren't the first step
@@ -319,5 +321,8 @@ export const buildMultiStepFormBlockButtonConfig = props => {
     })
   }
 
-  return buttons
+  return {
+    buttons,
+    title,
+  }
 }

From 1579fe36c7489ca3870e728e3b355757d76d4691 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 12 Dec 2023 21:00:45 +0000
Subject: [PATCH 15/38] Fix multiple issues with resetting state in both
 builder and client lib when updating multi step form config

---
 .../controls/FormStepConfiguration.svelte     | 48 +++++++++++--------
 .../app/blocks/MultiStepFormblock.svelte      | 19 ++++----
 packages/client/src/index.js                  |  7 +--
 packages/client/src/stores/builder.js         |  7 +++
 4 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 184057e45e..b6f30a875e 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -4,7 +4,7 @@
   import { getDatasourceForProvider } from "builderStore/dataBinding"
   import { currentAsset, store } from "builderStore"
   import { Helpers } from "@budibase/bbui"
-  import { writable } from "svelte/store"
+  import { derived, writable } from "svelte/store"
   import { Utils } from "@budibase/frontend-core"
 
   export let componentInstance
@@ -17,21 +17,21 @@
     stepCount: value?.length ?? 0,
     currentStep: 0,
   })
+  const currentStep = derived(multiStepStore, state => state.currentStep)
 
   setContext("multi-step-form-block", multiStepStore)
 
   $: defaultProps = Utils.buildMultiStepFormBlockDefaultProps({
     _id: componentInstance._id,
     stepCount: stepCount,
-    currentStep: currentStep,
+    step: $multiStepStore.currentStep,
   })
-  $: currentStep = $multiStepStore.currentStep
   $: stepCount = value?.length || 0
-  $: multiStepStore.update(state => ({ ...state, stepCount }))
+  $: updateStore(stepCount)
   $: dataSource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: emitCurrentStep(currentStep)
+  $: emitCurrentStep($currentStep)
   $: sectionName = getSectionName($multiStepStore)
-  $: stepInstance = buildPseudoInstance(value[currentStep], defaultProps)
+  $: stepInstance = buildPseudoInstance(value, $currentStep, defaultProps)
   $: stepDef = {
     settings: [
       {
@@ -72,6 +72,16 @@
     ],
   }
 
+  const updateStore = stepCount => {
+    multiStepStore.update(state => {
+      state.stepCount = stepCount
+      if (state.currentStep >= stepCount) {
+        state.currentStep = 0
+      }
+      return { ...state }
+    })
+  }
+
   const getSectionName = ({ stepCount, currentStep }) => {
     if (stepCount <= 1) {
       return "Details"
@@ -81,49 +91,47 @@
 
   const emitCurrentStep = step => {
     store.actions.preview.sendEvent("builder-meta", {
-      component: {
-        _id: componentInstance._id,
-        step: step,
-      },
+      componentId: componentInstance._id,
+      step: step,
     })
   }
 
   const addStep = () => {
-    dispatch("change", value.toSpliced(currentStep + 1, 0, {}))
+    dispatch("change", value.toSpliced($currentStep + 1, 0, {}))
     multiStepStore.update(state => ({
       ...state,
-      currentStep: currentStep + 1,
+      currentStep: $currentStep + 1,
     }))
   }
 
   const removeStep = () => {
-    dispatch("change", value.toSpliced(currentStep, 1))
+    dispatch("change", value.toSpliced($currentStep, 1))
     multiStepStore.update(state => ({
       ...state,
-      currentStep: Math.min(currentStep, stepCount - 2),
+      currentStep: Math.min($currentStep, stepCount - 2),
     }))
   }
 
   const previousStep = () => {
     multiStepStore.update(state => ({
       ...state,
-      currentStep: Math.max(currentStep - 1, 0),
+      currentStep: Math.max($currentStep - 1, 0),
     }))
   }
 
   const nextStep = () => {
     multiStepStore.update(state => ({
       ...state,
-      currentStep: Math.min(currentStep + 1, value.length - 1),
+      currentStep: Math.min($currentStep + 1, value.length - 1),
     }))
   }
 
   const updateStep = (field, val) => {
     const newStep = {
-      ...value[currentStep],
+      ...value[$currentStep],
       [field.key]: val,
     }
-    dispatch("change", value.toSpliced(currentStep, 1, newStep))
+    dispatch("change", value.toSpliced($currentStep, 1, newStep))
   }
 
   const handleStepAction = action => {
@@ -150,8 +158,8 @@
     }
   }
 
-  const buildPseudoInstance = (instance, defaultProps) => {
-    const { buttons, fields, title, desc } = instance || {}
+  const buildPseudoInstance = (value, currentStep, defaultProps) => {
+    const { buttons, fields, title, desc } = value?.[currentStep] || {}
     return {
       _id: Helpers.uuid(),
       _component: "@budibase/standard-components/multistepformblockstep",
diff --git a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
index 9c5d62d945..5742df92fe 100644
--- a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@@ -33,16 +33,17 @@
 
   $: fetchSchema(dataSource)
   $: enrichedSteps = enrichSteps(steps, schema, $component.id)
-  $: currentStep = getCurrentStep(
-    $builderStore?.component?._id,
-    componentInstance
-  )
+  $: currentStep = getCurrentStep($builderStore, $component)
 
-  const getCurrentStep = () => {
-    if ($builderStore?.component?._id === $component.id) {
-      return $builderStore?.component.step
+  const getCurrentStep = (builderStore, component) => {
+    if (
+      !component.selected ||
+      !builderStore.inBuilder ||
+      builderStore.metadata?.componentId !== component.id
+    ) {
+      return null
     }
-    return 0
+    return (builderStore.metadata.step || 0) + 1
   }
 
   const getPropsForField = field => {
@@ -108,7 +109,7 @@
       props={{
         dataSource,
         initialFormStep,
-        step: $builderStore.inBuilder === true ? currentStep + 1 : null,
+        step: currentStep,
       }}
       context="form"
     >
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index 36c3f24fc1..a3cb4206c3 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -76,11 +76,8 @@ const loadBudibase = async () => {
       } else {
         dndStore.actions.reset()
       }
-    } else if ("builder-meta") {
-      builderStore.update(state => ({
-        ...state,
-        ...data,
-      }))
+    } else if (type === "builder-meta") {
+      builderStore.actions.setMetadata(data)
     }
   }
 
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index f92e6b9df9..4a9eaa8d2f 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -18,6 +18,7 @@ const createBuilderStore = () => {
     hiddenComponentIds: [],
     usedPlugins: null,
     eventResolvers: {},
+    metadata: null,
 
     // Legacy - allow the builder to specify a layout
     layout: null,
@@ -123,6 +124,12 @@ const createBuilderStore = () => {
         parentType,
       })
     },
+    setMetadata: metadata => {
+      store.update(state => ({
+        ...state,
+        metadata,
+      }))
+    },
   }
   return {
     ...store,

From 235cfa3660b88f4fc28b76eac068abe1d157b0cd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 13 Dec 2023 10:24:26 +0000
Subject: [PATCH 16/38] Mutate state when working with form steps to prevent
 latency issues

---
 .../controls/FormStepConfiguration.svelte     |   9 +-
 .../app/blocks/MultiStepFormblock.svelte      | 161 +++++++++---------
 2 files changed, 91 insertions(+), 79 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index b6f30a875e..e19a8df608 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -97,7 +97,8 @@
   }
 
   const addStep = () => {
-    dispatch("change", value.toSpliced($currentStep + 1, 0, {}))
+    value = value.toSpliced($currentStep + 1, 0, {})
+    dispatch("change", value)
     multiStepStore.update(state => ({
       ...state,
       currentStep: $currentStep + 1,
@@ -105,7 +106,8 @@
   }
 
   const removeStep = () => {
-    dispatch("change", value.toSpliced($currentStep, 1))
+    value = value.toSpliced($currentStep, 1)
+    dispatch("change", value)
     multiStepStore.update(state => ({
       ...state,
       currentStep: Math.min($currentStep, stepCount - 2),
@@ -131,7 +133,8 @@
       ...value[$currentStep],
       [field.key]: val,
     }
-    dispatch("change", value.toSpliced($currentStep, 1, newStep))
+    value = value.toSpliced($currentStep, 1, newStep)
+    dispatch("change", value)
   }
 
   const handleStepAction = action => {
diff --git a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
index 5742df92fe..db7d31eef1 100644
--- a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@@ -5,7 +5,6 @@
   import { builderStore } from "stores"
   import { Utils } from "@budibase/frontend-core"
 
-  export let componentInstance
   export let steps
   export let dataSource
   export let initialFormStep = 1
@@ -33,30 +32,42 @@
 
   $: fetchSchema(dataSource)
   $: enrichedSteps = enrichSteps(steps, schema, $component.id)
-  $: currentStep = getCurrentStep($builderStore, $component)
+  $: currentStep = getCurrentStep(enrichedSteps, $builderStore, $component)
 
-  const getCurrentStep = (builderStore, component) => {
+  const getCurrentStep = (steps, builderStore, component) => {
+    const { componentId, step } = builderStore.metadata || {}
+
+    // If we aren't in the builder or aren't selected then don't return a form
+    // step at all. This will let the form component take over state for which
+    // step is active.
     if (
       !component.selected ||
       !builderStore.inBuilder ||
-      builderStore.metadata?.componentId !== component.id
+      componentId !== component.id
     ) {
       return null
     }
-    return (builderStore.metadata.step || 0) + 1
+
+    // Ensure we have a valid step selected
+    let currentStep = Math.min(step || 0, steps.length - 1)
+
+    // Sanity check
+    currentStep = Math.max(currentStep, 0)
+
+    // Add 1 because the form component expects 1 indexed rather than 0 indexed
+    return currentStep + 1
   }
 
   const getPropsForField = field => {
-    return field._component
-      ? {
-          ...field,
-        }
-      : {
-          field: field.name,
-          label: field.name,
-          placeholder: field.name,
-          _instanceName: field.name,
-        }
+    if (field._component) {
+      return field
+    }
+    return {
+      field: field.name,
+      label: field.name,
+      placeholder: field.name,
+      _instanceName: field.name,
+    }
   }
 
   const getComponentForField = field => {
@@ -102,69 +113,67 @@
   }
 </script>
 
-{#key enrichedSteps}
-  <Block>
-    <BlockComponent
-      type="form"
-      props={{
-        dataSource,
-        initialFormStep,
-        step: currentStep,
-      }}
-      context="form"
-    >
-      {#each enrichedSteps as step, idx}
+<Block>
+  <BlockComponent
+    type="form"
+    props={{
+      dataSource,
+      initialFormStep,
+      step: currentStep,
+    }}
+    context="form"
+  >
+    {#each enrichedSteps as step, idx}
+      <BlockComponent
+        type="formstep"
+        props={{ step: idx + 1, _instanceName: `Step ${idx + 1}` }}
+        styles={{
+          normal: {
+            width: "600px",
+            "margin-left": "auto",
+            "margin-right": "auto",
+          },
+        }}
+      >
         <BlockComponent
-          type="formstep"
-          props={{ step: idx + 1, _instanceName: `Step ${idx + 1}` }}
-          styles={{
-            normal: {
-              width: "600px",
-              "margin-left": "auto",
-              "margin-right": "auto",
-            },
+          type="container"
+          props={{
+            gap: "M",
+            direction: "column",
+            hAlign: "stretch",
+            vAlign: "top",
+            size: "shrink",
           }}
         >
-          <BlockComponent
-            type="container"
-            props={{
-              gap: "M",
-              direction: "column",
-              hAlign: "stretch",
-              vAlign: "top",
-              size: "shrink",
-            }}
-          >
-            <BlockComponent type="container" order={0}>
-              <BlockComponent type="heading" props={{ text: step.title }} />
-            </BlockComponent>
-            <BlockComponent type="text" props={{ text: step.desc }} order={1} />
-            <BlockComponent type="fieldgroup" order={2}>
-              {#each step.fields as field, fieldIdx}
-                {#if getComponentForField(field)}
-                  <BlockComponent
-                    type={getComponentForField(field)}
-                    props={getPropsForField(field)}
-                    order={fieldIdx}
-                    interactive
-                    name={field.field}
-                  />
-                {/if}
-              {/each}
-            </BlockComponent>
-            <BlockComponent
-              type="buttongroup"
-              props={{ buttons: step.buttons }}
-              styles={{
-                normal: {
-                  "margin-top": "16px",
-                },
-              }}
-              order={3}
-            />
+          <BlockComponent type="container" order={0}>
+            <BlockComponent type="heading" props={{ text: step.title }} />
           </BlockComponent>
+          <BlockComponent type="text" props={{ text: step.desc }} order={1} />
+          <BlockComponent type="fieldgroup" order={2}>
+            {#each step.fields as field, fieldIdx}
+              {#if getComponentForField(field)}
+                <BlockComponent
+                  type={getComponentForField(field)}
+                  props={getPropsForField(field)}
+                  order={fieldIdx}
+                  interactive
+                  name={field.field}
+                />
+              {/if}
+            {/each}
+          </BlockComponent>
+          <BlockComponent
+            type="buttongroup"
+            props={{ buttons: step.buttons }}
+            styles={{
+              normal: {
+                "margin-top": "16px",
+              },
+            }}
+            order={3}
+          />
         </BlockComponent>
-      {/each}
-    </BlockComponent>
-  </Block>
-{/key}
+      </BlockComponent>
+    {/each}
+  </BlockComponent>
+</Block>

From ac0f034ff4359f2f364c7c774d0ff79eee66b761 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 13 Dec 2023 12:01:16 +0000
Subject: [PATCH 17/38] Fix multi step settings definition to allow rendering
 of other sections in the correct order

---
 .../src/DetailSummary/DetailSummary.svelte    |  2 +-
 .../controls/FormStepConfiguration.svelte     | 55 +++----------
 packages/client/manifest.json                 | 82 +++++++++++++++++--
 3 files changed, 89 insertions(+), 50 deletions(-)

diff --git a/packages/bbui/src/DetailSummary/DetailSummary.svelte b/packages/bbui/src/DetailSummary/DetailSummary.svelte
index e5d6fda86b..598d82ed61 100644
--- a/packages/bbui/src/DetailSummary/DetailSummary.svelte
+++ b/packages/bbui/src/DetailSummary/DetailSummary.svelte
@@ -78,7 +78,7 @@
       var(--spacing-xl);
   }
   .property-panel.no-title {
-    padding: var(--spacing-xl);
+    padding-top: 0;
   }
 
   .show {
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index e19a8df608..6a69079e90 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -6,6 +6,7 @@
   import { Helpers } from "@budibase/bbui"
   import { derived, writable } from "svelte/store"
   import { Utils } from "@budibase/frontend-core"
+  import { cloneDeep } from "lodash"
 
   export let componentInstance
   export let componentBindings
@@ -18,6 +19,7 @@
     currentStep: 0,
   })
   const currentStep = derived(multiStepStore, state => state.currentStep)
+  const componentType = "@budibase/standard-components/multistepformblockstep"
 
   setContext("multi-step-form-block", multiStepStore)
 
@@ -30,46 +32,14 @@
   $: updateStore(stepCount)
   $: dataSource = getDatasourceForProvider($currentAsset, componentInstance)
   $: emitCurrentStep($currentStep)
-  $: sectionName = getSectionName($multiStepStore)
+  $: stepLabel = getStepLabel($multiStepStore)
+  $: stepDef = getDefinition(stepLabel)
   $: stepInstance = buildPseudoInstance(value, $currentStep, defaultProps)
-  $: stepDef = {
-    settings: [
-      {
-        section: true,
-        name: sectionName,
-        settings: [
-          {
-            type: "formStepControls",
-            label: "Steps",
-            key: "steps",
-          },
-          {
-            type: "text",
-            label: "Title",
-            key: "title",
-            nested: true,
-          },
-          {
-            type: "text",
-            label: "Description",
-            key: "desc",
-            nested: true,
-          },
-          {
-            type: "fieldConfiguration",
-            key: "fields",
-            nested: true,
-          },
-          {
-            type: "buttonConfiguration",
-            label: "Buttons",
-            key: "buttons",
-            wide: true,
-            nested: true,
-          },
-        ],
-      },
-    ],
+
+  const getDefinition = stepLabel => {
+    let def = cloneDeep(store.actions.components.getDefinition(componentType))
+    def.settings.find(x => x.key === "steps").label = stepLabel
+    return def
   }
 
   const updateStore = stepCount => {
@@ -82,7 +52,7 @@
     })
   }
 
-  const getSectionName = ({ stepCount, currentStep }) => {
+  const getStepLabel = ({ stepCount, currentStep }) => {
     if (stepCount <= 1) {
       return "Details"
     }
@@ -165,7 +135,7 @@
     const { buttons, fields, title, desc } = value?.[currentStep] || {}
     return {
       _id: Helpers.uuid(),
-      _component: "@budibase/standard-components/multistepformblockstep",
+      _component: componentType,
       _instanceName: `Step ${currentStep + 1}`,
       title: title ?? defaultProps.title,
       buttons: buttons || defaultProps.buttons,
@@ -184,7 +154,7 @@
     componentInstance={stepInstance}
     componentDefinition={stepDef}
     onUpdateSetting={processUpdate}
-    showInstanceName={false}
+    showSectionTitle={false}
     isScreen={false}
     nested={true}
     {bindings}
@@ -196,6 +166,5 @@
   .nested-section {
     margin: 0 calc(-1 * var(--spacing-xl)) calc(-1 * var(--spacing-xl))
       calc(-1 * var(--spacing-xl));
-    border-top: var(--border-light);
   }
 </style>
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index a85af63d28..6a4ad30cc1 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -6058,12 +6058,48 @@
         "defaultValue": "Create"
       },
       {
-        "type": "stepConfiguration",
-        "key": "steps",
-        "nested": true,
-        "labelHidden": true,
-        "resetOn": ["dataSource", "actionType"],
-        "defaultValue": [{}]
+        "section": true,
+        "dependsOn": {
+          "setting": "actionType",
+          "value": "Create",
+          "invert": true
+        },
+        "name": "Row ID",
+        "info": "<a href='https://docs.budibase.com/docs/form-block' target='_blank'>How to pass a row ID using bindings</a>",
+        "settings": [
+          {
+            "type": "text",
+            "label": "Row ID",
+            "key": "rowId",
+            "nested": true
+          },
+          {
+            "type": "text",
+            "label": "No rows found",
+            "key": "noRowsMessage",
+            "defaultValue": "We couldn't find a row to display",
+            "nested": true
+          }
+        ]
+      },
+      {
+        "section": true,
+        "name": "Details",
+        "settings": [
+          {
+            "type": "stepConfiguration",
+            "key": "steps",
+            "nested": true,
+            "labelHidden": true,
+            "resetOn": [
+              "dataSource",
+              "actionType"
+            ],
+            "defaultValue": [
+              {}
+            ]
+          }
+        ]
       }
     ],
     "actions": [
@@ -6121,6 +6157,40 @@
       }
     ]
   },
+  "multistepformblockstep": {
+    "name": "Multi-step Form Block Step",
+    "settings": [
+      {
+        "type": "formStepControls",
+        "label": "Steps",
+        "key": "steps"
+      },
+      {
+        "type": "text",
+        "label": "Title",
+        "key": "title",
+        "nested": true
+      },
+      {
+        "type": "text",
+        "label": "Description",
+        "key": "desc",
+        "nested": true
+      },
+      {
+        "type": "fieldConfiguration",
+        "key": "fields",
+        "nested": true
+      },
+      {
+        "type": "buttonConfiguration",
+        "label": "Buttons",
+        "key": "buttons",
+        "wide": true,
+        "nested": true
+      }
+    ]
+  },
   "formblock": {
     "name": "Form Block",
     "icon": "Form",

From 08cd5bbb91b8504b38879280d262e9573f066f47 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 13 Dec 2023 13:09:57 +0000
Subject: [PATCH 18/38] Refactor form block layout and add functional update
 and view multi step forms

---
 .../src/DetailSummary/DetailSummary.svelte    |  2 +-
 .../Component/ComponentSettingsSection.svelte | 22 +++----
 .../app/blocks/MultiStepFormblock.svelte      | 29 +++++----
 .../app/blocks/form/FormBlock.svelte          | 60 ++---------------
 .../app/blocks/form/FormBlockWrapper.svelte   | 64 +++++++++++++++++++
 packages/frontend-core/src/utils/utils.js     | 33 ++++++++--
 6 files changed, 123 insertions(+), 87 deletions(-)
 create mode 100644 packages/client/src/components/app/blocks/form/FormBlockWrapper.svelte

diff --git a/packages/bbui/src/DetailSummary/DetailSummary.svelte b/packages/bbui/src/DetailSummary/DetailSummary.svelte
index 598d82ed61..2cbb6796f3 100644
--- a/packages/bbui/src/DetailSummary/DetailSummary.svelte
+++ b/packages/bbui/src/DetailSummary/DetailSummary.svelte
@@ -78,7 +78,7 @@
       var(--spacing-xl);
   }
   .property-panel.no-title {
-    padding-top: 0;
+    padding-top: var(--spacing-xl);
   }
 
   .show {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
index d96729d3d2..27f0f7bf7a 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
@@ -32,21 +32,19 @@
     const generalSettings = settings.filter(
       setting => !setting.section && setting.tag === tag
     )
-
     const customSections = settings.filter(
       setting => setting.section && setting.tag === tag
     )
-    let sections = [
-      ...(generalSettings?.length
-        ? [
-            {
-              name: "General",
-              settings: generalSettings,
-            },
-          ]
-        : []),
-      ...(customSections || []),
-    ]
+    let sections = []
+    if (generalSettings.length) {
+      sections.push({
+        name: "General",
+        settings: generalSettings,
+      })
+    }
+    if (customSections.length) {
+      sections = sections.concat(customSections)
+    }
 
     // Filter out settings which shouldn't be rendered
     sections.forEach(section => {
diff --git a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
index db7d31eef1..4a9621f68e 100644
--- a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@@ -1,10 +1,13 @@
 <script>
   import BlockComponent from "components/BlockComponent.svelte"
-  import Block from "components/Block.svelte"
   import { getContext } from "svelte"
   import { builderStore } from "stores"
   import { Utils } from "@budibase/frontend-core"
+  import FormBlockWrapper from "./form/FormBlockWrapper.svelte"
 
+  export let actionType
+  export let rowId
+  export let noRowsMessage
   export let steps
   export let dataSource
   export let initialFormStep = 1
@@ -102,6 +105,8 @@
         _id: id,
         stepCount: safeSteps.length,
         currentStep: idx,
+        actionType,
+        dataSource,
       })
       return {
         fields: getDefaultFields(fields || [], schema),
@@ -113,27 +118,29 @@
   }
 </script>
 
-<Block>
+<FormBlockWrapper {actionType} {dataSource} {rowId} {noRowsMessage}>
   <BlockComponent
     type="form"
+    context="form"
     props={{
       dataSource,
       initialFormStep,
       step: currentStep,
+      actionType: actionType === "Create" ? "Create" : "Update",
+      readonly: actionType === "View",
+    }}
+    styles={{
+      normal: {
+        width: "600px",
+        "margin-left": "auto",
+        "margin-right": "auto",
+      },
     }}
-    context="form"
   >
     {#each enrichedSteps as step, idx}
       <BlockComponent
         type="formstep"
         props={{ step: idx + 1, _instanceName: `Step ${idx + 1}` }}
-        styles={{
-          normal: {
-            width: "600px",
-            "margin-left": "auto",
-            "margin-right": "auto",
-          },
-        }}
       >
         <BlockComponent
           type="container"
@@ -176,4 +183,4 @@
       </BlockComponent>
     {/each}
   </BlockComponent>
-</Block>
+</FormBlockWrapper>
diff --git a/packages/client/src/components/app/blocks/form/FormBlock.svelte b/packages/client/src/components/app/blocks/form/FormBlock.svelte
index c0f1a53bae..cdf1a05628 100644
--- a/packages/client/src/components/app/blocks/form/FormBlock.svelte
+++ b/packages/client/src/components/app/blocks/form/FormBlock.svelte
@@ -1,10 +1,8 @@
 <script>
   import { getContext } from "svelte"
-  import BlockComponent from "components/BlockComponent.svelte"
-  import Block from "components/Block.svelte"
-  import { makePropSafe as safe } from "@budibase/string-templates"
   import InnerFormBlock from "./InnerFormBlock.svelte"
   import { Utils } from "@budibase/frontend-core"
+  import FormBlockWrapper from "./FormBlockWrapper.svelte"
 
   export let actionType
   export let dataSource
@@ -71,22 +69,10 @@
   }
 
   let schema
-  let providerId
-  let repeaterId
 
   $: formattedFields = convertOldFieldFormat(fields)
   $: fieldsOrDefault = getDefaultFields(formattedFields, schema)
   $: fetchSchema(dataSource)
-  $: dataProvider = `{{ literal ${safe(providerId)} }}`
-  $: filter = [
-    {
-      field: "_id",
-      operator: "equal",
-      type: "string",
-      value: !rowId ? `{{ ${safe("url")}.${safe("id")} }}` : rowId,
-      valueType: "Binding",
-    },
-  ]
   // We could simply spread $$props into the inner form and append our
   // additions, but that would create svelte warnings about unused props and
   // make maintenance in future more confusing as we typically always have a
@@ -102,7 +88,6 @@
     title,
     description,
     schema,
-    repeaterId,
     notificationOverride,
     buttons:
       buttons ||
@@ -124,43 +109,6 @@
   }
 </script>
 
-<Block>
-  {#if actionType === "Create"}
-    <BlockComponent
-      type="container"
-      props={{
-        direction: "column",
-        hAlign: "left",
-        vAlign: "stretch",
-      }}
-    >
-      <InnerFormBlock {...innerProps} />
-    </BlockComponent>
-  {:else}
-    <BlockComponent
-      type="dataprovider"
-      context="provider"
-      bind:id={providerId}
-      props={{
-        dataSource,
-        filter,
-        limit: 1,
-        paginate: false,
-      }}
-    >
-      <BlockComponent
-        type="repeater"
-        context="repeater"
-        bind:id={repeaterId}
-        props={{
-          dataProvider,
-          noRowsMessage: noRowsMessage || "We couldn't find a row to display",
-          direction: "column",
-          hAlign: "center",
-        }}
-      >
-        <InnerFormBlock {...innerProps} />
-      </BlockComponent>
-    </BlockComponent>
-  {/if}
-</Block>
+<FormBlockWrapper {actionType} {dataSource} {rowId} {noRowsMessage}>
+  <InnerFormBlock {...innerProps} />
+</FormBlockWrapper>
diff --git a/packages/client/src/components/app/blocks/form/FormBlockWrapper.svelte b/packages/client/src/components/app/blocks/form/FormBlockWrapper.svelte
new file mode 100644
index 0000000000..26767f84b3
--- /dev/null
+++ b/packages/client/src/components/app/blocks/form/FormBlockWrapper.svelte
@@ -0,0 +1,64 @@
+<script>
+  import BlockComponent from "components/BlockComponent.svelte"
+  import Block from "components/Block.svelte"
+  import { makePropSafe as safe } from "@budibase/string-templates"
+  import { getContext } from "svelte"
+
+  export let actionType
+  export let dataSource
+  export let rowId
+  export let noRowsMessage
+
+  const component = getContext("component")
+
+  $: providerId = `${$component.id}-provider`
+  $: dataProvider = `{{ literal ${safe(providerId)} }}`
+  $: filter = [
+    {
+      field: "_id",
+      operator: "equal",
+      type: "string",
+      value: !rowId ? `{{ ${safe("url")}.${safe("id")} }}` : rowId,
+      valueType: "Binding",
+    },
+  ]
+</script>
+
+<Block>
+  {#if actionType === "Create"}
+    <BlockComponent
+      type="container"
+      props={{
+        direction: "column",
+        hAlign: "left",
+        vAlign: "stretch",
+      }}
+    >
+      <slot />
+    </BlockComponent>
+  {:else}
+    <BlockComponent
+      type="dataprovider"
+      context="provider"
+      props={{
+        dataSource,
+        filter,
+        limit: 1,
+        paginate: false,
+      }}
+    >
+      <BlockComponent
+        type="repeater"
+        context="repeater"
+        props={{
+          dataProvider,
+          noRowsMessage: noRowsMessage || "We couldn't find a row to display",
+          direction: "column",
+          hAlign: "center",
+        }}
+      >
+        <slot />
+      </BlockComponent>
+    </BlockComponent>
+  {/if}
+</Block>
diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index 7c3dc2f3b5..65690cd535 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -242,15 +242,16 @@ export const buildFormBlockButtonConfig = props => {
 }
 
 export const buildMultiStepFormBlockDefaultProps = props => {
-  const { _id, stepCount, currentStep } = props || {}
+  const { _id, stepCount, currentStep, actionType, dataSource } = props || {}
 
   // Sanity check
   if (!_id || !stepCount) {
     return
   }
 
-  // Default the title to "Step X"
   const title = `Step {{ [${_id}-form].[__currentStep] }}`
+  const resourceId = dataSource?.resourceId
+  const formId = `${_id}-form`
   let buttons = []
 
   // Add previous step button if we aren't the first step
@@ -266,7 +267,7 @@ export const buildMultiStepFormBlockDefaultProps = props => {
         {
           parameters: {
             type: "prev",
-            componentId: `${_id}-form`,
+            componentId: formId,
           },
           "##eventHandlerType": "Change Form Step",
         },
@@ -287,13 +288,13 @@ export const buildMultiStepFormBlockDefaultProps = props => {
         {
           "##eventHandlerType": "Validate Form",
           parameters: {
-            componentId: `${_id}-form`,
+            componentId: formId,
           },
         },
         {
           parameters: {
             type: "next",
-            componentId: `${_id}-form`,
+            componentId: formId,
           },
           "##eventHandlerType": "Change Form Step",
         },
@@ -302,7 +303,7 @@ export const buildMultiStepFormBlockDefaultProps = props => {
   }
 
   // Add save button if we are the last step
-  if (currentStep === stepCount - 1) {
+  if (actionType !== "View" && currentStep === stepCount - 1) {
     buttons.push({
       _id: Helpers.uuid(),
       _component: "@budibase/standard-components/button",
@@ -314,9 +315,27 @@ export const buildMultiStepFormBlockDefaultProps = props => {
         {
           "##eventHandlerType": "Validate Form",
           parameters: {
-            componentId: `${_id}-form`,
+            componentId: formId,
           },
         },
+        {
+          "##eventHandlerType": "Save Row",
+          parameters: {
+            tableId: resourceId,
+            providerId: formId,
+          },
+        },
+        // Clear a create form once submitted
+        ...(actionType !== "Create"
+          ? []
+          : [
+              {
+                "##eventHandlerType": "Clear Form",
+                parameters: {
+                  componentId: formId,
+                },
+              },
+            ]),
       ],
     })
   }

From 40ac6c7aec31e14e82a14bad782e4b74665a8076 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 13 Dec 2023 13:11:38 +0000
Subject: [PATCH 19/38] Fix layout of nested sections

---
 .../design/settings/controls/FormStepConfiguration.svelte      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 6a69079e90..f91f398fe7 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -167,4 +167,7 @@
     margin: 0 calc(-1 * var(--spacing-xl)) calc(-1 * var(--spacing-xl))
       calc(-1 * var(--spacing-xl));
   }
+  .nested-section :global(.property-panel) {
+    padding-top: 0;
+  }
 </style>

From a244b34e53b5cbb8aa8b8708aaef57beafc739b5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 14 Dec 2023 14:33:43 +0000
Subject: [PATCH 20/38] Fix multi step settings rendering and improve multi
 step form block client rendering when inside builder

---
 .../controls/FormStepConfiguration.svelte     | 42 +++++++++----------
 .../app/blocks/MultiStepFormblock.svelte      | 27 ++++++------
 .../src/components/app/forms/Form.svelte      | 12 +-----
 packages/frontend-core/src/utils/utils.js     |  2 +-
 4 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index f91f398fe7..7004102576 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -23,18 +23,32 @@
 
   setContext("multi-step-form-block", multiStepStore)
 
-  $: defaultProps = Utils.buildMultiStepFormBlockDefaultProps({
-    _id: componentInstance._id,
-    stepCount: stepCount,
-    step: $multiStepStore.currentStep,
-  })
   $: stepCount = value?.length || 0
   $: updateStore(stepCount)
   $: dataSource = getDatasourceForProvider($currentAsset, componentInstance)
   $: emitCurrentStep($currentStep)
   $: stepLabel = getStepLabel($multiStepStore)
   $: stepDef = getDefinition(stepLabel)
-  $: stepInstance = buildPseudoInstance(value, $currentStep, defaultProps)
+  $: stepSettings = value?.[$currentStep] || {}
+  $: defaults = Utils.buildMultiStepFormBlockDefaultProps({
+    _id: componentInstance._id,
+    stepCount: $multiStepStore.stepCount,
+    currentStep: $multiStepStore.currentStep,
+    actionType: componentInstance.actionType,
+    dataSource: componentInstance.dataSource,
+  })
+  $: stepInstance = {
+    _id: Helpers.uuid(),
+    _component: componentType,
+    _instanceName: `Step ${currentStep + 1}`,
+    title: stepSettings.title ?? defaults.title,
+    buttons: stepSettings.buttons || defaults.buttons,
+    fields: stepSettings.fields,
+    desc: stepSettings.desc,
+
+    // Needed for field configuration
+    dataSource,
+  }
 
   const getDefinition = stepLabel => {
     let def = cloneDeep(store.actions.components.getDefinition(componentType))
@@ -130,22 +144,6 @@
       updateStep(field, val)
     }
   }
-
-  const buildPseudoInstance = (value, currentStep, defaultProps) => {
-    const { buttons, fields, title, desc } = value?.[currentStep] || {}
-    return {
-      _id: Helpers.uuid(),
-      _component: componentType,
-      _instanceName: `Step ${currentStep + 1}`,
-      title: title ?? defaultProps.title,
-      buttons: buttons || defaultProps.buttons,
-      fields,
-      desc,
-
-      // Needed for field configuration
-      dataSource,
-    }
-  }
 </script>
 
 <div class="nested-section">
diff --git a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
index 4a9621f68e..ce4804047d 100644
--- a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@@ -1,20 +1,24 @@
 <script>
   import BlockComponent from "components/BlockComponent.svelte"
-  import { getContext } from "svelte"
+  import { getContext, setContext } from "svelte"
   import { builderStore } from "stores"
   import { Utils } from "@budibase/frontend-core"
   import FormBlockWrapper from "./form/FormBlockWrapper.svelte"
+  import { writable } from "svelte/store"
 
   export let actionType
   export let rowId
   export let noRowsMessage
   export let steps
   export let dataSource
-  export let initialFormStep = 1
 
   const { fetchDatasourceSchema } = getContext("sdk")
   const component = getContext("component")
 
+  // Set current step context to force child form to use it
+  const currentStep = writable(1)
+  setContext("current-step", currentStep)
+
   const FieldTypeToComponentMap = {
     string: "stringfield",
     number: "numberfield",
@@ -35,30 +39,29 @@
 
   $: fetchSchema(dataSource)
   $: enrichedSteps = enrichSteps(steps, schema, $component.id)
-  $: currentStep = getCurrentStep(enrichedSteps, $builderStore, $component)
+  $: updateCurrentStep(enrichedSteps, $builderStore, $component)
 
-  const getCurrentStep = (steps, builderStore, component) => {
+  const updateCurrentStep = (steps, builderStore, component) => {
     const { componentId, step } = builderStore.metadata || {}
 
-    // If we aren't in the builder or aren't selected then don't return a form
-    // step at all. This will let the form component take over state for which
-    // step is active.
+    // If we aren't in the builder or aren't selected then don't update the step
+    // context at all, allowing the normal form to take control.
     if (
       !component.selected ||
       !builderStore.inBuilder ||
       componentId !== component.id
     ) {
-      return null
+      return
     }
 
     // Ensure we have a valid step selected
-    let currentStep = Math.min(step || 0, steps.length - 1)
+    let newStep = Math.min(step || 0, steps.length - 1)
 
     // Sanity check
-    currentStep = Math.max(currentStep, 0)
+    newStep = Math.max(newStep, 0)
 
     // Add 1 because the form component expects 1 indexed rather than 0 indexed
-    return currentStep + 1
+    currentStep.set(newStep + 1)
   }
 
   const getPropsForField = field => {
@@ -124,8 +127,6 @@
     context="form"
     props={{
       dataSource,
-      initialFormStep,
-      step: currentStep,
       actionType: actionType === "Create" ? "Create" : "Update",
       readonly: actionType === "View",
     }}
diff --git a/packages/client/src/components/app/forms/Form.svelte b/packages/client/src/components/app/forms/Form.svelte
index 5b09a420fe..94559ab7be 100644
--- a/packages/client/src/components/app/forms/Form.svelte
+++ b/packages/client/src/components/app/forms/Form.svelte
@@ -11,7 +11,6 @@
   export let readonly = false
   export let actionType = "Create"
   export let initialFormStep = 1
-  export let step
 
   // Not exposed as a builder setting. Used internally to disable validation
   // for fields rendered in things like search blocks.
@@ -35,16 +34,7 @@
   let loaded = false
   let schema
   let table
-  let currentStep = writable(getInitialFormStep())
-
-  $: if (
-    currentStep &&
-    Number.isInteger($currentStep) &&
-    Number.isInteger(step) &&
-    step !== currentStep
-  ) {
-    currentStep.set(step)
-  }
+  let currentStep = getContext("current-step") || writable(getInitialFormStep())
 
   $: fetchSchema(dataSource)
   $: schemaKey = generateSchemaKey(schema)
diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index 65690cd535..141977c626 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -241,7 +241,7 @@ export const buildFormBlockButtonConfig = props => {
   return defaultButtons
 }
 
-export const buildMultiStepFormBlockDefaultProps = props => {
+export const buildMultiStepFormBlockDefaultProps = (props, log = false) => {
   const { _id, stepCount, currentStep, actionType, dataSource } = props || {}
 
   // Sanity check

From b5f369d5959d8762870385812a3b74817f3f170e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 14 Dec 2023 15:49:32 +0000
Subject: [PATCH 21/38] Remove leftover debug flag

---
 packages/frontend-core/src/utils/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index 141977c626..65690cd535 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -241,7 +241,7 @@ export const buildFormBlockButtonConfig = props => {
   return defaultButtons
 }
 
-export const buildMultiStepFormBlockDefaultProps = (props, log = false) => {
+export const buildMultiStepFormBlockDefaultProps = props => {
   const { _id, stepCount, currentStep, actionType, dataSource } = props || {}
 
   // Sanity check

From 9ac5a8e8870273768d28998ddcff5bae88550826 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 3 Jan 2024 12:15:15 +0000
Subject: [PATCH 22/38] Wrap redis password in double quotes

---
 hosting/docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index 7803916069..34cae92dc7 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -109,7 +109,7 @@ services:
   redis-service:
     restart: unless-stopped
     image: redis
-    command: redis-server --requirepass ${REDIS_PASSWORD}
+    command: redis-server --requirepass "${REDIS_PASSWORD}"
     volumes:
       - redis_data:/data
 

From cb63848245560b55207e535534dcb50a8af9569e Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 3 Jan 2024 15:23:27 +0000
Subject: [PATCH 23/38] Fix for Multistep Formblock bindings not being
 available to the step settings UI

---
 .../controls/FieldConfiguration/FieldConfiguration.svelte  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
index 4d436a4679..e864a4c2aa 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -14,6 +14,7 @@
   import { convertOldFieldFormat, getComponentForField } from "./utils"
 
   export let componentInstance
+  export let bindings
   export let value
 
   const dispatch = createEventDispatcher()
@@ -28,7 +29,9 @@
 
   let selectAll = true
 
-  $: bindings = getBindableProperties($selectedScreen, componentInstance._id)
+  $: resolvedBindings =
+    bindings || getBindableProperties($selectedScreen, componentInstance._id)
+
   $: actionType = componentInstance.actionType
   let componentBindings = []
 
@@ -182,7 +185,7 @@
       listType={FieldSetting}
       listTypeProps={{
         componentBindings,
-        bindings,
+        bindings: resolvedBindings,
       }}
     />
   {/if}

From 4343c431485eeff2821a77f1ffe207979f971525 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 3 Jan 2024 15:30:58 +0000
Subject: [PATCH 24/38] Fix for datasource resolution in validation editor
 drawer

---
 .../ValidationEditor/ValidationDrawer.svelte      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
index cd50f526b5..25c7651d35 100644
--- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
@@ -12,7 +12,10 @@
   } from "@budibase/bbui"
   import { currentAsset, selectedComponent } from "builderStore"
   import { findClosestMatchingComponent } from "builderStore/componentUtils"
-  import { getSchemaForDatasource } from "builderStore/dataBinding"
+  import {
+    getSchemaForDatasource,
+    getDatasourceForProvider,
+  } from "builderStore/dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
 
@@ -124,6 +127,12 @@
     ],
   }
 
+  const resolveDatasource = (currentAsset, componentInstance, parent) => {
+    return (
+      getDatasourceForProvider(currentAsset, parent || componentInstance) || {}
+    )
+  }
+
   $: dataSourceSchema = getDataSourceSchema($currentAsset, $selectedComponent)
   $: field = fieldName || $selectedComponent?.field
   $: schemaRules = parseRulesFromSchema(field, dataSourceSchema || {})
@@ -146,8 +155,8 @@
         component._component.endsWith("/formblock") ||
         component._component.endsWith("/tableblock")
     )
-
-    return getSchemaForDatasource(asset, formParent?.dataSource)
+    const dataSource = resolveDatasource(asset, component, formParent)
+    return getSchemaForDatasource(asset, dataSource)
   }
 
   const parseRulesFromSchema = (field, dataSourceSchema) => {

From e94f70a940cb137e8c5d906e15aee779ca585ac7 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 4 Jan 2024 12:12:51 +0000
Subject: [PATCH 25/38] Added key for fields to ensure they are re-rendering
 correctly when updating the field config

---
 .../src/components/app/blocks/MultiStepFormblock.svelte     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
index ce4804047d..0573ba15b5 100644
--- a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@@ -138,10 +138,10 @@
       },
     }}
   >
-    {#each enrichedSteps as step, idx}
+    {#each enrichedSteps as step, stepIdx}
       <BlockComponent
         type="formstep"
-        props={{ step: idx + 1, _instanceName: `Step ${idx + 1}` }}
+        props={{ step: stepIdx + 1, _instanceName: `Step ${stepIdx + 1}` }}
       >
         <BlockComponent
           type="container"
@@ -158,7 +158,7 @@
           </BlockComponent>
           <BlockComponent type="text" props={{ text: step.desc }} order={1} />
           <BlockComponent type="fieldgroup" order={2}>
-            {#each step.fields as field, fieldIdx}
+            {#each step.fields as field, fieldIdx (`${field.field || field.name}_${stepIdx}_${fieldIdx}`)}
               {#if getComponentForField(field)}
                 <BlockComponent
                   type={getComponentForField(field)}

From dce941c794e0c9afc4d358066b35d9958cb45e86 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 4 Jan 2024 16:34:30 +0000
Subject: [PATCH 26/38] UX feedback updates

---
 packages/bbui/src/ActionButton/ActionButton.svelte            | 1 +
 .../design/settings/controls/FormStepConfiguration.svelte     | 4 ++--
 .../design/settings/controls/FormStepControls.svelte          | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte
index 427a98f888..0e6ec3d155 100644
--- a/packages/bbui/src/ActionButton/ActionButton.svelte
+++ b/packages/bbui/src/ActionButton/ActionButton.svelte
@@ -130,5 +130,6 @@
     max-width: 150px;
     transform: translateX(-50%);
     text-align: center;
+    z-index: 1;
   }
 </style>
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 7004102576..bd28347e08 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -68,9 +68,9 @@
 
   const getStepLabel = ({ stepCount, currentStep }) => {
     if (stepCount <= 1) {
-      return "Details"
+      return "Steps"
     }
-    return `Details (Step ${currentStep + 1}/${stepCount})`
+    return `Steps (${currentStep + 1}/${stepCount})`
   }
 
   const emitCurrentStep = step => {
diff --git a/packages/builder/src/components/design/settings/controls/FormStepControls.svelte b/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
index 054f9c0ed1..638d80945d 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepControls.svelte
@@ -36,6 +36,7 @@
       on:click={() => {
         stepAction("previousStep")
       }}
+      tooltip={"Previous step"}
     />
     <ActionButton
       size="S"
@@ -45,6 +46,7 @@
       on:click={() => {
         stepAction("nextStep")
       }}
+      tooltip={"Next step"}
     />
     <ActionButton
       size="S"
@@ -54,6 +56,7 @@
       on:click={() => {
         stepAction("removeStep")
       }}
+      tooltip={"Remove step"}
     />
     <ActionButton
       size="S"
@@ -62,6 +65,7 @@
       on:click={() => {
         stepAction("addStep")
       }}
+      tooltip={"Add step"}
     />
   </div>
 {/if}

From 1aebdea51285c1857ee93a49cb11375abb396b1e Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 4 Jan 2024 17:20:47 +0000
Subject: [PATCH 27/38] Added an internal drag zone id/type to DraggableList
 and its items to restrict items to their respective lists

---
 .../settings/controls/DraggableList/DraggableList.svelte     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte b/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
index cce11e4b17..384f9bf098 100644
--- a/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
+++ b/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
@@ -13,6 +13,8 @@
   export let draggable = true
   export let focus
 
+  let zoneType = generate()
+
   let store = writable({
     selected: null,
     actions: {
@@ -46,6 +48,7 @@
         return {
           id: listItemKey ? item[listItemKey] : generate(),
           item,
+          type: zoneType,
         }
       })
       .filter(item => item.id)
@@ -83,6 +86,8 @@
     items: draggableItems,
     dropTargetStyle: { outline: "none" },
     dragDisabled: !draggable || inactive,
+    type: zoneType,
+    dropFromOthersDisabled: true,
   }}
   on:finalize={handleFinalize}
   on:consider={updateRowOrder}

From bbeaed48a74636e74c38c4fd131389c3c5923d76 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 4 Jan 2024 17:38:54 +0000
Subject: [PATCH 28/38] Removing the use of the addQueries quota functionality
 from row API - we don't make use of these statistics anymore (and haven't in
 a while) counting them is pointless and could be causing some loss in
 performance in these heavily used endpoints.

---
 .../backend-core/src/redis/redlockImpl.ts     |   1 -
 packages/pro                                  |   2 +-
 .../server/src/api/controllers/query/index.ts |  13 +-
 .../server/src/api/controllers/row/index.ts   | 114 +--
 .../server/src/api/controllers/row/views.ts   |   5 +-
 yarn.lock                                     | 800 +-----------------
 6 files changed, 80 insertions(+), 855 deletions(-)

diff --git a/packages/backend-core/src/redis/redlockImpl.ts b/packages/backend-core/src/redis/redlockImpl.ts
index e57a3721b5..7009dc6f55 100644
--- a/packages/backend-core/src/redis/redlockImpl.ts
+++ b/packages/backend-core/src/redis/redlockImpl.ts
@@ -2,7 +2,6 @@ import Redlock from "redlock"
 import { getLockClient } from "./init"
 import { LockOptions, LockType } from "@budibase/types"
 import * as context from "../context"
-import { logWarn } from "../logging"
 import { utils } from "@budibase/shared-core"
 import { Duration } from "../utils"
 
diff --git a/packages/pro b/packages/pro
index dc2b1b22e7..ac87f51b9b 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit dc2b1b22e7f9bac705746bf1fb72c817db043fa3
+Subproject commit ac87f51b9bd9d4427f0dc6473b6e136b436f2ba1
diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts
index 4d307e9593..2aa5526c30 100644
--- a/packages/server/src/api/controllers/query/index.ts
+++ b/packages/server/src/api/controllers/query/index.ts
@@ -161,11 +161,8 @@ export async function preview(ctx: UserCtx) {
         auth: { ...authConfigCtx },
       },
     }
-    const runFn = () => Runner.run(inputs)
 
-    const { rows, keys, info, extra } = await quotas.addQuery<any>(runFn, {
-      datasourceId: datasource._id,
-    })
+    const { rows, keys, info, extra } = (await Runner.run(inputs)) as any
     const schemaFields: any = {}
     if (rows?.length > 0) {
       for (let key of [...new Set(keys)] as string[]) {
@@ -259,14 +256,8 @@ async function execute(
       },
       schema: query.schema,
     }
-    const runFn = () => Runner.run(inputs)
 
-    const { rows, pagination, extra, info } = await quotas.addQuery<any>(
-      runFn,
-      {
-        datasourceId: datasource._id,
-      }
-    )
+    const { rows, pagination, extra, info } = (await Runner.run(inputs)) as any
     // remove the raw from execution incase transformer being used to hide data
     if (extra?.raw) {
       delete extra.raw
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index 7ff8d83e71..1ad8a2a695 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -4,20 +4,20 @@ import * as external from "./external"
 import { isExternalTableID } from "../../../integrations/utils"
 import {
   Ctx,
-  UserCtx,
-  DeleteRowRequest,
   DeleteRow,
+  DeleteRowRequest,
   DeleteRows,
-  Row,
-  PatchRowRequest,
-  PatchRowResponse,
-  SearchRowResponse,
-  SearchRowRequest,
-  SearchParams,
-  GetRowResponse,
-  ValidateResponse,
   ExportRowsRequest,
   ExportRowsResponse,
+  GetRowResponse,
+  PatchRowRequest,
+  PatchRowResponse,
+  Row,
+  SearchParams,
+  SearchRowRequest,
+  SearchRowResponse,
+  UserCtx,
+  ValidateResponse,
 } from "@budibase/types"
 import * as utils from "./utils"
 import { gridSocket } from "../../../websockets"
@@ -25,8 +25,8 @@ import { addRev } from "../public/utils"
 import { fixRow } from "../public/rows"
 import sdk from "../../../sdk"
 import * as exporters from "../view/exporters"
-import { apiFileReturn } from "../../../utilities/fileSystem"
 import { Format } from "../view/exporters"
+import { apiFileReturn } from "../../../utilities/fileSystem"
 
 export * as views from "./views"
 
@@ -49,12 +49,7 @@ export async function patch(
     return save(ctx)
   }
   try {
-    const { row, table } = await quotas.addQuery(
-      () => pickApi(tableId).patch(ctx),
-      {
-        datasourceId: tableId,
-      }
-    )
+    const { row, table } = await pickApi(tableId).patch(ctx)
     if (!row) {
       ctx.throw(404, "Row not found")
     }
@@ -84,12 +79,7 @@ export const save = async (ctx: UserCtx<Row, Row>) => {
     return patch(ctx as UserCtx<PatchRowRequest, PatchRowResponse>)
   }
   const { row, table, squashed } = await quotas.addRow(() =>
-    quotas.addQuery(
-      () => sdk.rows.save(tableId, ctx.request.body, ctx.user?._id),
-      {
-        datasourceId: tableId,
-      }
-    )
+    sdk.rows.save(tableId, ctx.request.body, ctx.user?._id)
   )
   ctx.status = 200
   ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row, table)
@@ -105,31 +95,21 @@ export async function fetchView(ctx: any) {
 
   const { calculation, group, field } = ctx.query
 
-  ctx.body = await quotas.addQuery(
-    () =>
-      sdk.rows.fetchView(tableId, viewName, {
-        calculation,
-        group: calculation ? group : null,
-        field,
-      }),
-    {
-      datasourceId: tableId,
-    }
-  )
+  ctx.body = await sdk.rows.fetchView(tableId, viewName, {
+    calculation,
+    group: calculation ? group : null,
+    field,
+  })
 }
 
 export async function fetch(ctx: any) {
   const tableId = utils.getTableId(ctx)
-  ctx.body = await quotas.addQuery(() => sdk.rows.fetch(tableId), {
-    datasourceId: tableId,
-  })
+  ctx.body = await sdk.rows.fetch(tableId)
 }
 
 export async function find(ctx: UserCtx<void, GetRowResponse>) {
   const tableId = utils.getTableId(ctx)
-  ctx.body = await quotas.addQuery(() => pickApi(tableId).find(ctx), {
-    datasourceId: tableId,
-  })
+  ctx.body = await pickApi(tableId).find(ctx)
 }
 
 function isDeleteRows(input: any): input is DeleteRows {
@@ -160,15 +140,9 @@ async function deleteRows(ctx: UserCtx<DeleteRowRequest>) {
 
   let deleteRequest = ctx.request.body as DeleteRows
 
-  const rowDeletes: Row[] = await processDeleteRowsRequest(ctx)
-  deleteRequest.rows = rowDeletes
+  deleteRequest.rows = await processDeleteRowsRequest(ctx)
 
-  const { rows } = await quotas.addQuery(
-    () => pickApi(tableId).bulkDestroy(ctx),
-    {
-      datasourceId: tableId,
-    }
-  )
+  const { rows } = await pickApi(tableId).bulkDestroy(ctx)
   await quotas.removeRows(rows.length)
 
   for (let row of rows) {
@@ -183,9 +157,7 @@ async function deleteRow(ctx: UserCtx<DeleteRowRequest>) {
   const appId = ctx.appId
   const tableId = utils.getTableId(ctx)
 
-  const resp = await quotas.addQuery(() => pickApi(tableId).destroy(ctx), {
-    datasourceId: tableId,
-  })
+  const resp = await pickApi(tableId).destroy(ctx)
   await quotas.removeRow()
 
   ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, resp.row)
@@ -223,9 +195,7 @@ export async function search(ctx: Ctx<SearchRowRequest, SearchRowResponse>) {
   }
 
   ctx.status = 200
-  ctx.body = await quotas.addQuery(() => sdk.rows.search(searchParams), {
-    datasourceId: tableId,
-  })
+  ctx.body = await sdk.rows.search(searchParams)
 }
 
 export async function validate(ctx: Ctx<Row, ValidateResponse>) {
@@ -243,12 +213,7 @@ export async function validate(ctx: Ctx<Row, ValidateResponse>) {
 
 export async function fetchEnrichedRow(ctx: any) {
   const tableId = utils.getTableId(ctx)
-  ctx.body = await quotas.addQuery(
-    () => pickApi(tableId).fetchEnrichedRow(ctx),
-    {
-      datasourceId: tableId,
-    }
-  )
+  ctx.body = await pickApi(tableId).fetchEnrichedRow(ctx)
 }
 
 export const exportRows = async (
@@ -268,22 +233,15 @@ export const exportRows = async (
     )
   }
 
-  ctx.body = await quotas.addQuery(
-    async () => {
-      const { fileName, content } = await sdk.rows.exportRows({
-        tableId,
-        format: format as Format,
-        rowIds: rows,
-        columns,
-        query,
-        sort,
-        sortOrder,
-      })
-      ctx.attachment(fileName)
-      return apiFileReturn(content)
-    },
-    {
-      datasourceId: tableId,
-    }
-  )
+  const { fileName, content } = await sdk.rows.exportRows({
+    tableId,
+    format: format as Format,
+    rowIds: rows,
+    columns,
+    query,
+    sort,
+    sortOrder,
+  })
+  ctx.attachment(fileName)
+  ctx.body = apiFileReturn(content)
 }
diff --git a/packages/server/src/api/controllers/row/views.ts b/packages/server/src/api/controllers/row/views.ts
index 36a0b588b6..188fe86f17 100644
--- a/packages/server/src/api/controllers/row/views.ts
+++ b/packages/server/src/api/controllers/row/views.ts
@@ -68,10 +68,7 @@ export async function searchView(
     paginate: body.paginate,
   }
 
-  const result = await quotas.addQuery(() => sdk.rows.search(searchOptions), {
-    datasourceId: view.tableId,
-  })
-
+  const result = await sdk.rows.search(searchOptions)
   result.rows.forEach(r => (r._viewId = view.id))
   ctx.body = result
 }
diff --git a/yarn.lock b/yarn.lock
index 091dc04baa..150585ce1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -625,13 +625,6 @@
   dependencies:
     tslib "^2.5.0"
 
-"@aws/dynamodb-auto-marshaller@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@aws/dynamodb-auto-marshaller/-/dynamodb-auto-marshaller-0.7.1.tgz#70676c056e4ecb798c08ec2e398a3d93e703858d"
-  integrity sha512-LeURlf6/avrfFo9+4Yht9J3CUTJ72yoBpm1FOUmlexuHNW4Ka61tG30w3ZDCXXXmCO2rG0k3ywAgNJEo3WPbyw==
-  dependencies:
-    tslib "^1.8.1"
-
 "@azure/abort-controller@^1.0.0", "@azure/abort-controller@^1.0.4":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249"
@@ -2003,14 +1996,7 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/runtime@^7.13.10":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.7.tgz#dd7c88deeb218a0f8bd34d5db1aa242e0f203193"
-  integrity sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA==
-  dependencies:
-    regenerator-runtime "^0.14.0"
-
-"@babel/template@^7.22.15", "@babel/template@^7.22.5", "@babel/template@^7.3.3":
+"@babel/template@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
   integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
@@ -2270,13 +2256,6 @@
   dependencies:
     node-gyp-build "^3.9.0"
 
-"@datadog/native-appsec@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-4.0.0.tgz#ee08138b987dec557eac3650a43a972dac85b6a6"
-  integrity sha512-myTguXJ3VQHS2E1ylNsSF1avNpDmq5t+K4Q47wdzeakGc3sDIDDyEbvuFTujl9c9wBIkup94O1mZj5DR37ajzA==
-  dependencies:
-    node-gyp-build "^3.9.0"
-
 "@datadog/native-iast-rewriter@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-1.1.2.tgz#793cbf92d218ec80d645be0830023656b81018ea"
@@ -2284,14 +2263,6 @@
   dependencies:
     node-gyp-build "^4.5.0"
 
-"@datadog/native-iast-rewriter@2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.2.1.tgz#3c74c5a8caa0b876e091e9c5a95256add0d73e1c"
-  integrity sha512-DyZlE8gNa5AoOFNKGRJU4RYF/Y/tJzv4bIAMuVBbEnMA0xhiIYqpYQG8T3OKkALl3VSEeBMjYwuOR2fCrJ6gzA==
-  dependencies:
-    lru-cache "^7.14.0"
-    node-gyp-build "^4.5.0"
-
 "@datadog/native-iast-taint-tracking@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-1.1.0.tgz#8f7d0016157b32dbf5c01b15b8afb1c4286b4a18"
@@ -2299,13 +2270,6 @@
   dependencies:
     node-gyp-build "^3.9.0"
 
-"@datadog/native-iast-taint-tracking@1.6.4":
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-1.6.4.tgz#16c21ad7c36a53420c0d3c5a3720731809cc7e98"
-  integrity sha512-Owxk7hQ4Dxwv4zJAoMjRga0IvE6lhvxnNc8pJCHsemCWBXchjr/9bqg05Zy5JnMbKUWn4XuZeJD6RFZpRa8bfw==
-  dependencies:
-    node-gyp-build "^3.9.0"
-
 "@datadog/native-metrics@^1.5.0":
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/@datadog/native-metrics/-/native-metrics-1.6.0.tgz#1c7958964460149911f6964c32b1a8692ee3ce8f"
@@ -2313,25 +2277,6 @@
   dependencies:
     node-gyp-build "^3.9.0"
 
-"@datadog/native-metrics@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@datadog/native-metrics/-/native-metrics-2.0.0.tgz#65bf03313ee419956361e097551db36173e85712"
-  integrity sha512-YklGVwUtmKGYqFf1MNZuOHvTYdKuR4+Af1XkWcMD8BwOAjxmd9Z+97328rCOY8TFUJzlGUPaXzB8j2qgG/BMwA==
-  dependencies:
-    node-addon-api "^6.1.0"
-    node-gyp-build "^3.9.0"
-
-"@datadog/pprof@4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-4.0.1.tgz#f8629ecb62646d90ed49b6252dd0583d8d5001d3"
-  integrity sha512-TavqyiyQZOaUM9eQB07r8+K/T1CqKyOdsUGxpN79+BF+eOQBpTj/Cte6KdlhcUSKL3h5hSjC+vlgA7uW2qtVhA==
-  dependencies:
-    delay "^5.0.0"
-    node-gyp-build "<4.0"
-    p-limit "^3.1.0"
-    pprof-format "^2.0.7"
-    source-map "^0.7.4"
-
 "@datadog/pprof@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-1.1.1.tgz#17e86035140523ac3a96f3662e5dd29822042d61"
@@ -2716,14 +2661,6 @@
     teeny-request "^8.0.0"
     uuid "^8.0.0"
 
-"@grpc/grpc-js@1.9.7":
-  version "1.9.7"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.9.7.tgz#7d0e29bc162287bee2523901c9bc9320d8402397"
-  integrity sha512-yMaA/cIsRhGzW3ymCNpdlPcInXcovztlgu/rirThj2b87u3RzWUszliOqZ/pldy7yhmJPS8uwog+kZSTa4A0PQ==
-  dependencies:
-    "@grpc/proto-loader" "^0.7.8"
-    "@types/node" ">=12.12.47"
-
 "@grpc/grpc-js@~1.8.0":
   version "1.8.21"
   resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.8.21.tgz#d282b122c71227859bf6c5866f4c40f4a2696513"
@@ -2732,7 +2669,7 @@
     "@grpc/proto-loader" "^0.7.0"
     "@types/node" ">=12.12.47"
 
-"@grpc/proto-loader@0.7.10", "@grpc/proto-loader@^0.7.0", "@grpc/proto-loader@^0.7.8":
+"@grpc/proto-loader@^0.7.0":
   version "0.7.10"
   resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.10.tgz#6bf26742b1b54d0a473067743da5d3189d06d720"
   integrity sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==
@@ -2754,20 +2691,6 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
-"@hubspot/api-client@7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@hubspot/api-client/-/api-client-7.1.2.tgz#a405b0a18b8caa27f129fd510b2555e5a5cc2708"
-  integrity sha512-JVQqh0fdHf97ePk0Hg/7BJsiXNlS9HQRPiM/CLgvVWt5CIviSLQ/kHLZXREmZqTWu7BisjCgHxnSx/d7gRdr2g==
-  dependencies:
-    bluebird "^3.7.2"
-    bottleneck "^2.19.5"
-    btoa "^1.2.1"
-    es6-promise "^4.2.4"
-    form-data "^2.5.0"
-    lodash "^4.17.21"
-    node-fetch "^2.6.0"
-    url-parse "^1.4.3"
-
 "@humanwhocodes/config-array@^0.11.13":
   version "0.11.13"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
@@ -3419,13 +3342,6 @@
   dependencies:
     lodash "^4.17.21"
 
-"@koa/cors@^3.1.0":
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/@koa/cors/-/cors-3.4.3.tgz#d669ee6e8d6e4f0ec4a7a7b0a17e7a3ed3752ebb"
-  integrity sha512-WPXQUaAeAMVaLTEFpoq3T2O1C+FstkjJnDQqy95Ck1UdILajsRhu6mhJ8H2f4NFPRBoCNN+qywTJfq/gGki5mw==
-  dependencies:
-    vary "^1.1.2"
-
 "@koa/router@8.0.8":
   version "8.0.8"
   resolved "https://registry.yarnpkg.com/@koa/router/-/router-8.0.8.tgz#95f32d11373d03d89dcb63fabe9ac6f471095236"
@@ -3835,23 +3751,11 @@
   dependencies:
     "@octokit/openapi-types" "^18.0.0"
 
-"@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.0.1":
+"@opentelemetry/api@^1.0.1":
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.7.0.tgz#b139c81999c23e3c8d3c0a7234480e945920fc40"
   integrity sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==
 
-"@opentelemetry/core@^1.14.0":
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.19.0.tgz#6563bb65465bf232d8435553b9a122d9351c0fbb"
-  integrity sha512-w42AukJh3TP8R0IZZOVJVM/kMWu8g+lm4LzT70WtuKqhwq7KVhcDzZZuZinWZa6TtQCl7Smt2wolEYzpHabOgw==
-  dependencies:
-    "@opentelemetry/semantic-conventions" "1.19.0"
-
-"@opentelemetry/semantic-conventions@1.19.0":
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.19.0.tgz#0c17f80b45de1c8778dfdf17acb1e9d4c4aa4ba8"
-  integrity sha512-14jRpC8f5c0gPSwoZ7SbEJni1PqI+AhAE8m1bMz6v+RPM4OlP1PT2UHBJj5Qh/ALLPjhVU/aZUK3YyjTUqqQVg==
-
 "@parcel/watcher@2.0.4":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b"
@@ -4034,14 +3938,6 @@
     is-module "^1.0.0"
     resolve "^1.19.0"
 
-"@rollup/plugin-replace@^2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a"
-  integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    magic-string "^0.25.7"
-
 "@rollup/plugin-replace@^5.0.2", "@rollup/plugin-replace@^5.0.3":
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.3.tgz#55a4550bd6d5e83a65df3d201e0b3d219be7b4b2"
@@ -4084,23 +3980,6 @@
     estree-walker "^2.0.2"
     picomatch "^2.3.1"
 
-"@roxi/routify@2.18.0":
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/@roxi/routify/-/routify-2.18.0.tgz#8f88bedd936312d0dbe44cbc11ab179b1f938ec2"
-  integrity sha512-MVB50HN+VQWLzfjLplcBjsSBvwOiExKOmht2DuWR3WQ60JxQi9pSejkB06tFVkFKNXz2X5iYtKDqKBTdae/gRg==
-  dependencies:
-    "@roxi/ssr" "^0.2.1"
-    "@types/node" ">=4.2.0 < 13"
-    chalk "^4.0.0"
-    cheap-watch "^1.0.2"
-    commander "^7.1.0"
-    configent "^2.1.4"
-    esm "^3.2.25"
-    fs-extra "^9.0.1"
-    log-symbols "^3.0.0"
-    picomatch "^2.2.2"
-    rollup-pluginutils "^2.8.2"
-
 "@roxi/routify@2.18.12":
   version "2.18.12"
   resolved "https://registry.yarnpkg.com/@roxi/routify/-/routify-2.18.12.tgz#901ca95b96f274ddddaefbf18424557ee1ae3fae"
@@ -4182,11 +4061,6 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
-"@sindresorhus/is@^4.0.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
-  integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
-
 "@sinonjs/commons@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3"
@@ -5010,13 +4884,6 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
-"@szmarczak/http-timer@^4.0.5":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
-  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
-  dependencies:
-    defer-to-connect "^2.0.0"
-
 "@techpass/passport-openidconnect@0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@techpass/passport-openidconnect/-/passport-openidconnect-0.3.2.tgz#f8fd5d97256286665dbf26dac92431f977ab1e63"
@@ -5028,17 +4895,6 @@
     request "^2.88.0"
     webfinger "^0.4.2"
 
-"@techpass/passport-openidconnect@^0.3.0":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@techpass/passport-openidconnect/-/passport-openidconnect-0.3.3.tgz#6c01c78bd8da0ca8917378dfbe18024702620352"
-  integrity sha512-i2X/CofjnGBqpTmw6b+Ex3Co/NrR2xjnIHvnOJk62XIlJJHNSTwmhJ1PkXoA5RGKlxZWchADFGjLTJnebvRj7A==
-  dependencies:
-    base64url "^3.0.1"
-    oauth "^0.9.15"
-    passport-strategy "^1.0.0"
-    request "^2.88.0"
-    webfinger "^0.4.2"
-
 "@techteamer/ocsp@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@techteamer/ocsp/-/ocsp-1.0.0.tgz#7b82b02093fbe351e915bb37685ac1ac5a1233d3"
@@ -5211,16 +5067,6 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/cacheable-request@^6.0.1":
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
-  integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
-  dependencies:
-    "@types/http-cache-semantics" "*"
-    "@types/keyv" "^3.1.4"
-    "@types/node" "*"
-    "@types/responselike" "^1.0.0"
-
 "@types/caseless@*":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
@@ -5385,11 +5231,6 @@
   resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.3.tgz#ef8e3d1a8d46c387f04ab0f2e8ab8cb0c5078661"
   integrity sha512-FyAOrDuQmBi8/or3ns4rwPno7/9tJTijVW6aQQjK02+kOQ8zmoNg2XJtAuQhvQcy1ASJq38wirX5//9J1EqoUA==
 
-"@types/http-cache-semantics@*":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4"
-  integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==
-
 "@types/http-errors@*":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.1.tgz#20172f9578b225f6c7da63446f56d4ce108d5a65"
@@ -5451,13 +5292,6 @@
   resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.2.tgz#513abfd256d7ad0bf1ee1873606317b33b1b2a72"
   integrity sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw==
 
-"@types/keyv@^3.1.4":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
-  integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/koa-compose@*":
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.5.tgz#85eb2e80ac50be95f37ccf8c407c09bbe3468e9d"
@@ -5465,29 +5299,6 @@
   dependencies:
     "@types/koa" "*"
 
-"@types/koa-passport@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@types/koa-passport/-/koa-passport-4.0.3.tgz#063ec6310edee76cf854aadaa717b97f04b104fb"
-  integrity sha512-tNMYd/bcv0Zw7fc0CzEBYM9uUzVtn4XWzdUYfkTgSkEljP6nap7eI4E5x43ukrUQvztgXSYFkz3Uk+ujFeUzTg==
-  dependencies:
-    "@types/koa" "*"
-    "@types/passport" "*"
-
-"@types/koa-send@*":
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/@types/koa-send/-/koa-send-4.1.6.tgz#15d90e95e3ccce669a15b6a3c56c3a650a167cea"
-  integrity sha512-vgnNGoOJkx7FrF0Jl6rbK1f8bBecqAchKpXtKuXzqIEdXTDO6dsSTjr+eZ5m7ltSjH4K/E7auNJEQCAd0McUPA==
-  dependencies:
-    "@types/koa" "*"
-
-"@types/koa-static@^4.0.2":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/koa-static/-/koa-static-4.0.4.tgz#ce6f2a5d14cc7ef19f9bf6ee8e4f3eadfcc77323"
-  integrity sha512-j1AUzzl7eJYEk9g01hNTlhmipFh8RFbOQmaMNLvLcNNAkPw0bdTs3XTa3V045XFlrWN0QYnblbDJv2RzawTn6A==
-  dependencies:
-    "@types/koa" "*"
-    "@types/koa-send" "*"
-
 "@types/koa@*":
   version "2.13.5"
   resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.5.tgz#64b3ca4d54e08c0062e89ec666c9f45443b21a61"
@@ -5516,13 +5327,6 @@
     "@types/koa-compose" "*"
     "@types/node" "*"
 
-"@types/koa__cors@^3.1.1":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@types/koa__cors/-/koa__cors-3.3.1.tgz#0ec7543c4c620fd23451bfdd3e21b9a6aadedccd"
-  integrity sha512-aFGYhTFW7651KhmZZ05VG0QZJre7QxBxDj2LF1lf6GA/wSXEfKVAJxiQQWzRV4ZoMzQIO8vJBXKsUcRuvYK9qw==
-  dependencies:
-    "@types/koa" "*"
-
 "@types/koa__router@8.0.8":
   version "8.0.8"
   resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-8.0.8.tgz#b1e0e9a512498777d3366bbdf0e853df27ec831c"
@@ -5617,11 +5421,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708"
   integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==
 
-"@types/node@18.17.0":
-  version "18.17.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.0.tgz#35d44267a33dd46b49ee0f73d31b05fd7407e290"
-  integrity sha512-GXZxEtOxYGFchyUzxvKI14iff9KZ2DI+A6a37o6EQevtg6uO9t+aUZKcaC1Te5Ng1OnLM7K9NVVj+FbecD9cJg==
-
 "@types/node@20.10.0":
   version "20.10.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.0.tgz#16ddf9c0a72b832ec4fcce35b8249cf149214617"
@@ -5629,42 +5428,21 @@
   dependencies:
     undici-types "~5.26.4"
 
-"@types/node@>=4.2.0 < 13", "@types/node@^12.20.52":
-  version "12.20.55"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240"
-  integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==
-
 "@types/node@>=8.0.0 <15":
   version "14.18.37"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.37.tgz#0bfcd173e8e1e328337473a8317e37b3b14fd30d"
   integrity sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg==
 
-"@types/node@>=8.1.0":
-  version "20.10.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.6.tgz#a3ec84c22965802bf763da55b2394424f22bfbb5"
-  integrity sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/nodemailer@^6.4.4":
-  version "6.4.14"
-  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.14.tgz#5c81a5e856db7f8ede80013e6dbad7c5fb2283e2"
-  integrity sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA==
-  dependencies:
-    "@types/node" "*"
+"@types/node@^12.20.52":
+  version "12.20.55"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240"
+  integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
-"@types/oauth@*":
-  version "0.9.4"
-  resolved "https://registry.yarnpkg.com/@types/oauth/-/oauth-0.9.4.tgz#dcbab5efa2f34f312b915f80685760ccc8111e0a"
-  integrity sha512-qk9orhti499fq5XxKCCEbd0OzdPZuancneyse3KtR+vgMiHRbh+mn8M4G6t64ob/Fg+GZGpa565MF/2dKWY32A==
-  dependencies:
-    "@types/node" "*"
-
 "@types/oracledb@5.2.2":
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/@types/oracledb/-/oracledb-5.2.2.tgz#ae7ba795969e3bbd8d57ab141873a1aa012b86cd"
@@ -5673,37 +5451,6 @@
     "@types/node" "*"
     dotenv "^8.2.0"
 
-"@types/passport-google-oauth@^1.0.42":
-  version "1.0.45"
-  resolved "https://registry.yarnpkg.com/@types/passport-google-oauth/-/passport-google-oauth-1.0.45.tgz#c986c787ec9706b4a596d2bae43342b50b54973d"
-  integrity sha512-O3Y3DDKnf9lR8+DSaUOCEGF6aFjVYdI8TLhQYtySZ3Sq75c5tGYJ0KJRDZw0GsyLD/Que0nqFkP/GnDVwZZL9w==
-  dependencies:
-    "@types/express" "*"
-    "@types/passport" "*"
-
-"@types/passport-microsoft@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/passport-microsoft/-/passport-microsoft-1.0.0.tgz#a2ddc2200843570d38c35c53f6388e33df915b58"
-  integrity sha512-vD9ajSUc9Sz/8gdCj0ODUbPYQDxcI/imIDdgMPh//c5yMK/PgV6SNUXFLBzJo89Y30LU6bYAfXKn40WJqtMBiA==
-  dependencies:
-    "@types/passport-oauth2" "*"
-
-"@types/passport-oauth2@*":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@types/passport-oauth2/-/passport-oauth2-1.4.15.tgz#34f2684f53aad36e664cd01ca9879224229f47e7"
-  integrity sha512-9cUTP/HStNSZmhxXGuRrBJfEWzIEJRub2eyJu3CvkA+8HAMc9W3aKdFhVq+Qz1hi42qn+GvSAnz3zwacDSYWpw==
-  dependencies:
-    "@types/express" "*"
-    "@types/oauth" "*"
-    "@types/passport" "*"
-
-"@types/passport@*":
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.16.tgz#5a2918b180a16924c4d75c31254c31cdca5ce6cf"
-  integrity sha512-FD0qD5hbPWQzaM0wHUnJ/T0BBCJBxCeemtnCwc/ThhTg3x9jfrAcRUmj5Dopza+MfFS9acTe3wk7rcVnRIp/0A==
-  dependencies:
-    "@types/express" "*"
-
 "@types/pg@8.6.6":
   version "8.6.6"
   resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.6.6.tgz#21cdf873a3e345a6e78f394677e3b3b1b543cb80"
@@ -5908,13 +5655,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/responselike@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.3.tgz#cc29706f0a397cfe6df89debfe4bf5cea159db50"
-  integrity sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/rimraf@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8"
@@ -5943,13 +5683,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/server-destroy@^1.0.1":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@types/server-destroy/-/server-destroy-1.0.3.tgz#2460932ea3a02a70ec99669c8f40ff089a5b8a2b"
-  integrity sha512-Qq0fn70C7TLDG1W9FCblKufNWW1OckQ41dVKV2Dku5KdZF7bexezG4e2WBaBKhdwL3HZ+cYCEIKwg2BRgzrWmA==
-  dependencies:
-    "@types/node" "*"
-
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
@@ -6031,7 +5764,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/uuid@8.3.4", "@types/uuid@^8.3.4":
+"@types/uuid@8.3.4":
   version "8.3.4"
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
   integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
@@ -6415,7 +6148,7 @@ abortcontroller-polyfill@^1.4.0:
   resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz#6738495f4e901fbb57b6c0611d0c75f76c485bed"
   integrity sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==
 
-abstract-leveldown@^6.2.1, abstract-leveldown@^6.3.0:
+abstract-leveldown@^6.2.1:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz#d25221d1e6612f820c35963ba4bd739928f6026a"
   integrity sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==
@@ -6971,13 +6704,6 @@ async-retry@^1.3.3:
   dependencies:
     retry "0.13.1"
 
-async@^2.6.3:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
-  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
-  dependencies:
-    lodash "^4.17.14"
-
 async@^3.2.1, async@^3.2.3:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
@@ -7369,11 +7095,6 @@ bootstrap@3.4.1:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
   integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
 
-bottleneck@^2.19.5:
-  version "2.19.5"
-  resolved "https://registry.yarnpkg.com/bottleneck/-/bottleneck-2.19.5.tgz#5df0b90f59fd47656ebe63c78a98419205cadd91"
-  integrity sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==
-
 bowser@^2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f"
@@ -7538,11 +7259,6 @@ bson@^5.4.0:
   resolved "https://registry.yarnpkg.com/bson/-/bson-5.4.0.tgz#0eea77276d490953ad8616b483298dbff07384c6"
   integrity sha512-WRZ5SQI5GfUuKnPTNmAYPiKIof3ORXAF4IRU5UcgmivNIon01rWQlw5RUH954dpu8yGL8T59YShVddIPaU/gFA==
 
-btoa@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73"
-  integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==
-
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
@@ -7556,7 +7272,7 @@ buffer-alloc@^1.2.0:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
 
-buffer-crc32@^0.2.13, buffer-crc32@~0.2.3:
+buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
@@ -7756,11 +7472,6 @@ cache-content-type@^1.0.0:
     mime-types "^2.1.18"
     ylru "^1.2.0"
 
-cacheable-lookup@^5.0.3:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
-  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
-
 cacheable-request@^2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
@@ -7787,19 +7498,6 @@ cacheable-request@^6.0.0:
     normalize-url "^4.1.0"
     responselike "^1.0.2"
 
-cacheable-request@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
-  integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==
-  dependencies:
-    clone-response "^1.0.2"
-    get-stream "^5.1.0"
-    http-cache-semantics "^4.0.0"
-    keyv "^4.0.0"
-    lowercase-keys "^2.0.0"
-    normalize-url "^6.0.1"
-    responselike "^2.0.0"
-
 call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
@@ -7838,52 +7536,6 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-camunda-8-credentials-from-env@^1.1.1, camunda-8-credentials-from-env@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/camunda-8-credentials-from-env/-/camunda-8-credentials-from-env-1.2.2.tgz#abe5d216e7e4cfc970e0463e9aa5e802487b1062"
-  integrity sha512-uj2PY5/IoAgu0cHmeEUp+qmSXCtpQafStzGJ8ORYvyupBN/gVpdP9X+A+UlQRCGmApcaIuPUw8/9FsXig5NWXg==
-  dependencies:
-    neon-env "^0.1.1"
-
-camunda-8-sdk@^0.15.0:
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/camunda-8-sdk/-/camunda-8-sdk-0.15.0.tgz#13754dca499d16802675b6f2790e2d06bd8034d6"
-  integrity sha512-felyQU+rD8uupPjBArmyy0E/k9mrmeZvfFliF3y/pxYkGBoaC5kjDHDsx+hNpbnIwShET0RLjklit7f+98yIBw==
-  dependencies:
-    camunda-console-client "^0.9.1"
-    camunda-tasklist-client "0.9.5"
-    operate-api-client "1.2.3"
-    optimize-api-client "^1.0.3"
-    zeebe-node "^8.2.5"
-
-camunda-console-client@^0.9.1:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/camunda-console-client/-/camunda-console-client-0.9.2.tgz#137dbd2e61bb5bbfff38aebe5d53e775653aabb8"
-  integrity sha512-ni+7lSc5oG0FevCagrBV6juZzwcQ4ciATBZxyOMFQK0yVTmZxOUz5efN9XWP4E36PGpuqALQXsViUDlGZcfZBA==
-  dependencies:
-    camunda-8-credentials-from-env "^1.2.2"
-    camunda-saas-oauth "^1.2.4"
-    debug "^4.3.4"
-    dotenv "^16.3.1"
-    got "^11.8.6"
-
-camunda-saas-oauth@^1.2.0, camunda-saas-oauth@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/camunda-saas-oauth/-/camunda-saas-oauth-1.2.4.tgz#348a8422f266dafed98cf2a73046aa62c89d03f2"
-  integrity sha512-AO/kcnZXcsodwM3qgMZj/5wn8SBoKmSDpuFYUpPS+HqQhG9GvWY8noBx/4pvX3gYPKiPTYi9/e9ApAe02NARzA==
-  dependencies:
-    camunda-8-credentials-from-env "^1.2.2"
-    got "^11.8.5"
-
-camunda-tasklist-client@0.9.5:
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/camunda-tasklist-client/-/camunda-tasklist-client-0.9.5.tgz#c0f2685ef7fb7fdb198a37e5b35a911e3b233b28"
-  integrity sha512-gipH8ON/ttTgLfleWecQith1g9SpC5Q8CoLXFq2yw3cVJ1JVrcn0ArtgCxA1QCgtZBlV7EuGt9QWGc9UCfbbGw==
-  dependencies:
-    camunda-8-credentials-from-env "^1.1.1"
-    camunda-saas-oauth "^1.2.0"
-    gotql "^2.1.0-alpha1"
-
 caniuse-api@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
@@ -7977,7 +7629,7 @@ charenc@0.0.2:
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
   integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
 
-cheap-watch@^1.0.2, cheap-watch@^1.0.4:
+cheap-watch@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cheap-watch/-/cheap-watch-1.0.4.tgz#0bcb4a3a8fbd9d5327936493f6b56baa668d8fef"
   integrity sha512-QR/9FrtRL5fjfUJBhAKCdi0lSRQ3rVRRum3GF9wDKp2TJbEIMGhUEr2yU8lORzm9Isdjx7/k9S0DFDx+z5VGtw==
@@ -8322,7 +7974,7 @@ commander@^5.1.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
-commander@^7.0.0, commander@^7.1.0, commander@^7.2.0:
+commander@^7.0.0, commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
@@ -8431,7 +8083,7 @@ config-chain@^1.1.13:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-configent@^2.1.4, configent@^2.2.0:
+configent@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994"
   integrity sha512-yIN6zfOWk2nycNJ2JFNiWEai0oiqAhISIht8+pbEBP8bdcpwoQ74AhCZPbUv9aRVJwo7wh1MbCBDUV44UJa7Kw==
@@ -8455,14 +8107,6 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
-console-stamp@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/console-stamp/-/console-stamp-3.1.2.tgz#35dac393e16069a4d9d37b71ca6d5d13d7f3f8fd"
-  integrity sha512-ab66x3NxOTxPuq71dI6gXEiw2X6ql4Le5gZz0bm7FW3FSCB00eztra/oQUuCoCGlsyKOxtULnHwphzMrRtzMBg==
-  dependencies:
-    chalk "^4.1.2"
-    dateformat "^4.6.3"
-
 consolidate@^0.16.0:
   version "0.16.0"
   resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.16.0.tgz#a11864768930f2f19431660a65906668f5fbdc16"
@@ -8960,16 +8604,11 @@ dateformat@^4.6.3:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5"
   integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==
 
-dayjs@^1.10.8, dayjs@^1.8.15:
+dayjs@^1.10.8:
   version "1.11.10"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
   integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
 
-dc-polyfill@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/dc-polyfill/-/dc-polyfill-0.1.3.tgz#fe9eefc86813439dd46d6f9ad9582ec079c39720"
-  integrity sha512-Wyk5n/5KUj3GfVKV2jtDbtChC/Ff9fjKsBcg4ZtYW1yQe3DXNHcGURvmoxhqQdfOQ9TwyMjnfyv1lyYcOkFkFA==
-
 dd-trace@3.13.2:
   version "3.13.2"
   resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-3.13.2.tgz#95b1ec480ab9ac406e1da7591a8c6f678d3799fd"
@@ -9003,46 +8642,7 @@ dd-trace@3.13.2:
     retry "^0.10.1"
     semver "^5.5.0"
 
-dd-trace@4.20.0:
-  version "4.20.0"
-  resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-4.20.0.tgz#9a2cc3f28ff558c5605927b1362eb64605df76c1"
-  integrity sha512-y7IDLSSt6nww6zMdw/I8oLdfgOQADIOkERCNdfSzlBrXHz5CHimEOFfsHN87ag0mn6vusr06aoi+CQRZSNJz2g==
-  dependencies:
-    "@datadog/native-appsec" "4.0.0"
-    "@datadog/native-iast-rewriter" "2.2.1"
-    "@datadog/native-iast-taint-tracking" "1.6.4"
-    "@datadog/native-metrics" "^2.0.0"
-    "@datadog/pprof" "4.0.1"
-    "@datadog/sketches-js" "^2.1.0"
-    "@opentelemetry/api" "^1.0.0"
-    "@opentelemetry/core" "^1.14.0"
-    crypto-randomuuid "^1.0.0"
-    dc-polyfill "^0.1.2"
-    ignore "^5.2.4"
-    import-in-the-middle "^1.4.2"
-    int64-buffer "^0.1.9"
-    ipaddr.js "^2.1.0"
-    istanbul-lib-coverage "3.2.0"
-    jest-docblock "^29.7.0"
-    koalas "^1.0.2"
-    limiter "^1.1.4"
-    lodash.kebabcase "^4.1.1"
-    lodash.pick "^4.4.0"
-    lodash.sortby "^4.7.0"
-    lodash.uniq "^4.5.0"
-    lru-cache "^7.14.0"
-    methods "^1.1.2"
-    module-details-from-path "^1.0.3"
-    msgpack-lite "^0.1.26"
-    node-abort-controller "^3.1.1"
-    opentracing ">=0.12.1"
-    path-to-regexp "^0.1.2"
-    pprof-format "^2.0.7"
-    protobufjs "^7.2.4"
-    retry "^0.13.1"
-    semver "^7.5.4"
-
-debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -9098,13 +8698,6 @@ decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
-decompress-response@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
-  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
-  dependencies:
-    mimic-response "^3.1.0"
-
 decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1"
@@ -9237,11 +8830,6 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
-defer-to-connect@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
-  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
-
 deferred-leveldown@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz#2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"
@@ -9307,11 +8895,6 @@ defined@^1.0.0:
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf"
   integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==
 
-defined@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-0.0.0.tgz#f35eea7d705e933baf13b2f03b3f83d921403b3e"
-  integrity sha512-zpqiCT8bODLu3QSmLLic8xJnYWBFjOSu/fBCm189oAiTtPq/PSanNACKZDS7kgSyCJY7P+IcODzlIogBK/9RBg==
-
 delay@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
@@ -9612,7 +9195,7 @@ docker-compose@0.24.0:
   dependencies:
     yaml "^1.10.2"
 
-docker-compose@^0.23.5, docker-compose@^0.23.6:
+docker-compose@^0.23.5:
   version "0.23.19"
   resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.19.tgz#9947726e2fe67bdfa9e8efe1ff15aa0de2e10eb8"
   integrity sha512-v5vNLIdUqwj4my80wxFDkNH+4S85zsRuH29SO7dCWVWPCMt/ohZBsGN6g6KXWifT0pzQ7uOxqEKCYCDPJ8Vz4g==
@@ -9753,11 +9336,6 @@ dotenv@8.6.0, dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
-dotenv@^16.3.1:
-  version "16.3.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
-  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
-
 dotenv@~10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
@@ -9810,24 +9388,6 @@ duplexify@^4.0.0, duplexify@^4.1.2:
     readable-stream "^3.1.1"
     stream-shift "^1.0.0"
 
-dynalite@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/dynalite/-/dynalite-3.2.2.tgz#34b4f4dd69638f17c0f7551a867959972c892441"
-  integrity sha512-sx9ZjTgMs/D4gHnba4rnBkw29648dHwHmywJet132KAbiq1ZyWx9W1fMd/eP9cPwTKDXyCBuTYOChE0qMDjaXQ==
-  dependencies:
-    async "^2.6.3"
-    big.js "^5.2.2"
-    buffer-crc32 "^0.2.13"
-    lazy "^1.0.11"
-    levelup "^4.4.0"
-    lock "^1.1.0"
-    memdown "^5.1.0"
-    minimist "^1.2.5"
-    once "^1.4.0"
-    subleveldown "^5.0.1"
-  optionalDependencies:
-    leveldown "^5.6.0"
-
 eastasianwidth@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
@@ -9934,7 +9494,7 @@ encodeurl@^1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-encoding-down@^6.2.0, encoding-down@^6.3.0:
+encoding-down@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/encoding-down/-/encoding-down-6.3.0.tgz#b1c4eb0e1728c146ecaef8e32963c549e76d082b"
   integrity sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==
@@ -10042,11 +9602,6 @@ envinfo@7.8.1, envinfo@^7.7.3:
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
   integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
-err-code@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
-  integrity sha512-CJAN+O0/yA1CKfRn9SXOGctSpEM7DCon/r/5r2eXFMY2zCCJBasFhcM5I+1kh3Ap11FsQCX+vGHceNPvpWKhoA==
-
 err-code@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
@@ -10184,11 +9739,6 @@ es6-error@^4.0.1, es6-error@^4.1.1:
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
-es6-promise@^4.2.4:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
 esbuild-loader@^2.16.0:
   version "2.21.0"
   resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.21.0.tgz#2698a3e565b0db2bb19a3dd91c2b6c9aad526c80"
@@ -10544,11 +10094,6 @@ esutils@^2.0.2, esutils@^2.0.3:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-event-lite@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/event-lite/-/event-lite-0.1.3.tgz#3dfe01144e808ac46448f0c19b4ab68e403a901d"
-  integrity sha512-8qz9nOz5VeD2z96elrEKD2U433+L3DWdUdDkOINLGOJvx1GsMBbMn0aCeu28y8/e85A6mCigBiFlYMnTBEGlSw==
-
 event-target-shim@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
@@ -10822,7 +10367,7 @@ fast-xml-parser@4.2.5:
   dependencies:
     strnum "^1.0.5"
 
-fast-xml-parser@^4.1.3, fast-xml-parser@^4.2.2, fast-xml-parser@^4.2.5:
+fast-xml-parser@^4.2.2, fast-xml-parser@^4.2.5:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz#761e641260706d6e13251c4ef8e3f5694d4b0d79"
   integrity "sha1-dh5kEmBwbW4TJRxO+OP1aU1LDXk= sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg=="
@@ -11182,11 +10727,6 @@ formidable@^2.1.2:
     once "^1.4.0"
     qs "^6.11.0"
 
-fp-ts@^2.5.1:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.16.1.tgz#6abc401ce42b65364ca8f0b0d995c5840c68a930"
-  integrity sha512-by7U5W8dkIzcvDofUcO42yl9JbnHTEDBrzu3pt5fKT+Z4Oy85I21K80EYJYdjQGC2qum4Vo55Ag57iiIK4FYuA==
-
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -11235,7 +10775,7 @@ fs-extra@^11.1.0, fs-extra@^11.1.1:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
+fs-extra@^9.0.0, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -11284,7 +10824,7 @@ function.prototype.name@^1.1.6:
     es-abstract "^1.22.1"
     functions-have-names "^1.2.3"
 
-functional-red-black-tree@^1.0.1, functional-red-black-tree@~1.0.1:
+functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
@@ -11883,23 +11423,6 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-got@^11.5.1, got@^11.8.5, got@^11.8.6:
-  version "11.8.6"
-  resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
-  integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
-  dependencies:
-    "@sindresorhus/is" "^4.0.0"
-    "@szmarczak/http-timer" "^4.0.5"
-    "@types/cacheable-request" "^6.0.1"
-    "@types/responselike" "^1.0.0"
-    cacheable-lookup "^5.0.3"
-    cacheable-request "^7.0.2"
-    decompress-response "^6.0.0"
-    http2-wrapper "^1.0.0-beta.5.2"
-    lowercase-keys "^2.0.0"
-    p-cancelable "^2.0.0"
-    responselike "^2.0.0"
-
 got@^8.3.1:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
@@ -11940,15 +11463,6 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-gotql@^2.1.0-alpha1:
-  version "2.1.0-alpha1"
-  resolved "https://registry.yarnpkg.com/gotql/-/gotql-2.1.0-alpha1.tgz#b04e9adb0d1751a0c2de05bd4399f5c57aec79ba"
-  integrity sha512-4xG1AczSpK+tdKUDM4kB1ah/2LoNlmFU5IhGNktuYNBLgyWB5iDs4OE36NE7k59iTKYi2B7vudQz2Itw1ZXrRg==
-  dependencies:
-    debug "^4.1.1"
-    got "^11.5.1"
-    prepend-http "^3.0.1"
-
 graceful-fs@4.2.11, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
@@ -12344,14 +11858,6 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-http2-wrapper@^1.0.0-beta.5.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
-  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
-  dependencies:
-    quick-lru "^5.1.1"
-    resolve-alpn "^1.0.0"
-
 https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
@@ -12425,7 +11931,7 @@ ieee754@1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
-ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.1.8, ieee754@^1.2.1:
+ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -12449,7 +11955,7 @@ ignore-walk@^6.0.0:
   dependencies:
     minimatch "^7.4.2"
 
-ignore@^5.0.4, ignore@^5.2.0, ignore@^5.2.4:
+ignore@^5.0.4, ignore@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78"
   integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
@@ -12471,11 +11977,6 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
 
-immediate@~3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c"
-  integrity sha512-RrGCXRm/fRVqMIhqXrGEX9rRADavPiDFSoMb/k64i9XMk8uH4r/Omi5Ctierj6XzNecwDbO4WuFbDD1zmpl3Tg==
-
 import-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92"
@@ -12498,7 +11999,7 @@ import-from@^3.0.0:
   dependencies:
     resolve-from "^5.0.0"
 
-import-in-the-middle@^1.3.4, import-in-the-middle@^1.4.2:
+import-in-the-middle@^1.3.4:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.7.2.tgz#31c44088271b50ecb9cacbdfb1e5732c802e0658"
   integrity sha512-coz7AjRnPyKW36J6JX5Bjz1mcX7MX1H2XsEGseVcnXMdzsAbbAu0HBZhiAem+3SAmuZdi+p8OwoB2qUpTRgjOQ==
@@ -12632,11 +12133,6 @@ inquirer@^8.2.4:
     through "^2.3.6"
     wrap-ansi "^7.0.0"
 
-int64-buffer@^0.1.9:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/int64-buffer/-/int64-buffer-0.1.10.tgz#277b228a87d95ad777d07c13832022406a473423"
-  integrity sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA==
-
 internal-slot@^1.0.4, internal-slot@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930"
@@ -12712,7 +12208,7 @@ ip@^2.0.0:
   resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
   integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
 
-ipaddr.js@^2.0.1, ipaddr.js@^2.1.0:
+ipaddr.js@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
   integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
@@ -13466,15 +12962,6 @@ jest-docblock@^29.7.0:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-dynalite@^3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/jest-dynalite/-/jest-dynalite-3.6.1.tgz#8bae305a3c33d9a8036f563827b173b54a323ca5"
-  integrity sha512-MERtTt8Pj39vFmbItMC3YuIaqLf1kh/pJIE0DRcjeP/2Fa8Nni9IxwN6XWIMgXNbFKtlOM6ppH+Bsy0rWIdPiw==
-  dependencies:
-    "@aws/dynamodb-auto-marshaller" "^0.7.1"
-    dynalite "^3.2.1"
-    setimmediate "^1.0.5"
-
 jest-each@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
@@ -13994,11 +13481,6 @@ json-buffer@3.0.0:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
   integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
 
-json-buffer@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
-  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
-
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -14167,13 +13649,6 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-keyv@^4.0.0:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
-  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
-  dependencies:
-    json-buffer "3.0.1"
-
 kill-port@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/kill-port/-/kill-port-1.6.1.tgz#560fe79484583bdf3a5e908557dae614447618aa"
@@ -14301,7 +13776,7 @@ koa-mount@^4.0.0:
     debug "^4.0.1"
     koa-compose "^4.1.0"
 
-koa-passport@4.1.4, koa-passport@^4.1.4:
+koa-passport@4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/koa-passport/-/koa-passport-4.1.4.tgz#5f1665c1c2a37ace79af9f970b770885ca30ccfa"
   integrity sha512-dJBCkl4X+zdYxbI2V2OtoGy0PUenpvp2ZLLWObc8UJhsId0iQpTFT8RVcuA0709AL2txGwRHnSPoT1bYNGa6Kg==
@@ -14345,7 +13820,7 @@ koa-send@5.0.1, koa-send@^5.0.0:
     http-errors "^1.7.3"
     resolve-path "^1.4.0"
 
-koa-session@5.13.1, koa-session@^5.12.0:
+koa-session@5.13.1:
   version "5.13.1"
   resolved "https://registry.yarnpkg.com/koa-session/-/koa-session-5.13.1.tgz#a47e39015a4b464e21e3e1e2deeca48eb83916ee"
   integrity sha512-TfYiun6xiFosyfIJKnEw0aoG5XmLIwM+K3OVWfkz84qY0NP2gbk0F/olRn0/Hrxq0f14s8amHVXeWyKYH3Cx3Q==
@@ -14363,7 +13838,7 @@ koa-static@5.0.0, koa-static@^5.0.0:
     debug "^3.1.0"
     koa-send "^5.0.0"
 
-koa-useragent@4.1.0, koa-useragent@^4.1.0:
+koa-useragent@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/koa-useragent/-/koa-useragent-4.1.0.tgz#d3f128b552c6da3e5e9e9e9c887b2922b16e4468"
   integrity sha512-x/HUDZ1zAmNNh5hA9hHbPm9p3UVg2prlpHzxCXQCzbibrNS0kmj7MkCResCbAbG7ZT6FVxNSMjR94ZGamdMwxA==
@@ -14463,11 +13938,6 @@ latest-version@^5.1.0:
   dependencies:
     package-json "^6.3.0"
 
-lazy@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/lazy/-/lazy-1.0.11.tgz#daa068206282542c088288e975c297c1ae77b690"
-  integrity sha512-Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA==
-
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
@@ -14653,13 +14123,6 @@ level-js@^5.0.0:
     inherits "^2.0.3"
     ltgt "^2.1.2"
 
-level-option-wrap@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/level-option-wrap/-/level-option-wrap-1.1.0.tgz#ad20e68d9f3c22c8897531cc6aa7af596b1ed129"
-  integrity sha512-gQouC22iCqHuBLNl4BHxEZUxLvUKALAtT/Q0c6ziOxZQ8c02G/gyxHWNbLbxUzRNfMrRnbt6TZT3gNe8VBqQeg==
-  dependencies:
-    defined "~0.0.0"
-
 level-packager@^5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/level-packager/-/level-packager-5.1.1.tgz#323ec842d6babe7336f70299c14df2e329c18939"
@@ -14708,7 +14171,7 @@ level@6.0.1:
     level-packager "^5.1.0"
     leveldown "^5.4.0"
 
-leveldown@5.6.0, leveldown@^5.4.0, leveldown@^5.6.0:
+leveldown@5.6.0, leveldown@^5.4.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98"
   integrity sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==
@@ -14717,7 +14180,7 @@ leveldown@5.6.0, leveldown@^5.4.0, leveldown@^5.6.0:
     napi-macros "~2.0.0"
     node-gyp-build "~4.1.0"
 
-levelup@4.4.0, levelup@^4.3.2, levelup@^4.4.0:
+levelup@4.4.0, levelup@^4.3.2:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6"
   integrity sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==
@@ -14906,11 +14369,6 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lock@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/lock/-/lock-1.1.0.tgz#53157499d1653b136ca66451071fca615703fa55"
-  integrity sha512-NZQIJJL5Rb9lMJ0Yl1JoVr9GSdo4HTPsUEWsSFzB8dE8DSoiLCVavWZPi7Rnlv/o73u6I24S/XYc/NmG4l8EKA==
-
 lodash-es@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
@@ -15046,7 +14504,7 @@ lodash.xor@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
   integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ==
 
-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -15412,18 +14870,6 @@ memdown@1.4.1:
     ltgt "~2.2.0"
     safe-buffer "~5.1.1"
 
-memdown@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/memdown/-/memdown-5.1.0.tgz#608e91a9f10f37f5b5fe767667a8674129a833cb"
-  integrity sha512-B3J+UizMRAlEArDjWHTMmadet+UKwHd3UjMgGBkZcKAxAYVPS9o0Yeiha4qvz7iGiL2Sb3igUft6p7nbFWctpw==
-  dependencies:
-    abstract-leveldown "~6.2.1"
-    functional-red-black-tree "~1.0.1"
-    immediate "~3.2.3"
-    inherits "~2.0.1"
-    ltgt "~2.2.0"
-    safe-buffer "~5.2.0"
-
 memory-pager@^1.0.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
@@ -15551,11 +14997,6 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-mimic-response@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
-  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
-
 min-document@^2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
@@ -15845,16 +15286,6 @@ ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-msgpack-lite@^0.1.26:
-  version "0.1.26"
-  resolved "https://registry.yarnpkg.com/msgpack-lite/-/msgpack-lite-0.1.26.tgz#dd3c50b26f059f25e7edee3644418358e2a9ad89"
-  integrity sha512-SZ2IxeqZ1oRFGo0xFGbvBJWMp3yLIY9rlIJyxy8CGrwZn1f0ZK4r6jV/AM1r0FZMDUkWkglOk/eeKIL9g77Nxw==
-  dependencies:
-    event-lite "^0.1.1"
-    ieee754 "^1.1.8"
-    int64-buffer "^0.1.9"
-    isarray "^1.0.0"
-
 msgpackr-extract@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz#e05ec1bb4453ddf020551bcd5daaf0092a2c279d"
@@ -16029,11 +15460,6 @@ neo-async@^2.6.0, neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-neon-env@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/neon-env/-/neon-env-0.1.3.tgz#071e86fde3c698e9314f057d209e0b79ddab16e9"
-  integrity sha512-Zo+L6Nm19gJrjyfhxn/ZDm8eIIDzr75o64ZhijBau4LNuhLzjEAteRg3gchIvgaN8XTo5BxN6iTNP5clZQ0agA==
-
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -16054,11 +15480,6 @@ node-addon-api@^5.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762"
   integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==
 
-node-addon-api@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
-  integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
-
 node-duration@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/node-duration/-/node-duration-1.0.4.tgz#3e94ecc0e473691c89c4560074503362071cecac"
@@ -16093,7 +15514,7 @@ node-gyp-build-optional-packages@5.0.7:
   resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz#5d2632bbde0ab2f6e22f1bbac2199b07244ae0b3"
   integrity sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==
 
-node-gyp-build@<4.0, node-gyp-build@^3.9.0:
+node-gyp-build@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.9.0.tgz#53a350187dd4d5276750da21605d1cb681d09e25"
   integrity sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A==
@@ -16774,23 +16195,6 @@ opentracing@>=0.12.1:
   resolved "https://registry.yarnpkg.com/opentracing/-/opentracing-0.14.7.tgz#25d472bd0296dc0b64d7b94cbc995219031428f5"
   integrity sha512-vz9iS7MJ5+Bp1URw8Khvdyw1H/hGvzHWlKQ7eRrQojSCDL1/SrWfrY9QebLw97n2deyRtzHRC3MkQfVNUCo91Q==
 
-operate-api-client@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/operate-api-client/-/operate-api-client-1.2.3.tgz#c884ab09fe07360ac5ce5b58ae470ba1e91db879"
-  integrity sha512-8FWfDsHVxgYIBe4p4fB6e7SSiYdW/PPTCCLFcGnbqdUxlhcUq9ncYu6ZMMm6E3A3WKxagdInYQbxOhtTeVGhVQ==
-  dependencies:
-    camunda-saas-oauth "^1.2.0"
-    got "^11.8.5"
-
-optimize-api-client@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/optimize-api-client/-/optimize-api-client-1.0.4.tgz#a2e653780fd1e9e54a38912418b0ea27bd0484ef"
-  integrity sha512-2XBW+sv6eENOCHMc5v0XmH2DaaSETAb/qH5BsfpTDD8Pmeu10ZR61W7Pc/rBqauy96vPP/MfgmMphx5CjHb2xg==
-  dependencies:
-    camunda-8-credentials-from-env "^1.1.1"
-    camunda-saas-oauth "^1.2.4"
-    got "^11.8.5"
-
 optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -16864,11 +16268,6 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
-p-cancelable@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
-  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
-
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -17186,7 +16585,7 @@ passport-google-oauth20@2.x.x:
   dependencies:
     passport-oauth2 "1.x.x"
 
-passport-google-oauth@2.0.0, passport-google-oauth@^2.0.0:
+passport-google-oauth@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/passport-google-oauth/-/passport-google-oauth-2.0.0.tgz#f6eb4bc96dd6c16ec0ecfdf4e05ec48ca54d4dae"
   integrity sha512-JKxZpBx6wBQXX1/a1s7VmdBgwOugohH+IxCy84aPTZNq/iIPX6u7Mqov1zY7MKRz3niFPol0KJz8zPLBoHKtYA==
@@ -17201,14 +16600,6 @@ passport-local@1.0.0:
   dependencies:
     passport-strategy "1.x.x"
 
-passport-microsoft@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/passport-microsoft/-/passport-microsoft-1.0.0.tgz#78954cf3201fdce61beeb6587a3b158f8e9db86c"
-  integrity sha512-L1JHeCbSObSZZXiG7jU2KoKie6nzZLwGt38HXz1GasKrsCQdOnf5kH8ltV4BWNUfBL2Pt1csWn1iuBSerprrcg==
-  dependencies:
-    passport-oauth2 "1.6.1"
-    pkginfo "0.4.x"
-
 passport-oauth1@1.x.x:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.3.0.tgz#5d57f1415c8e28e46b461a12ec1b492934f7c354"
@@ -17223,17 +16614,6 @@ passport-oauth2-refresh@^2.1.0:
   resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4"
   integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A==
 
-passport-oauth2@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b"
-  integrity sha512-ZbV43Hq9d/SBSYQ22GOiglFsjsD1YY/qdiptA+8ej+9C1dL1TVB+mBE5kDH/D4AJo50+2i8f4bx0vg4/yDDZCQ==
-  dependencies:
-    base64url "3.x.x"
-    oauth "0.9.x"
-    passport-strategy "1.x.x"
-    uid2 "0.0.x"
-    utils-merge "1.x.x"
-
 passport-oauth2@1.x.x:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.7.0.tgz#5c4766c8531ac45ffe9ec2c09de9809e2c841fc4"
@@ -17610,11 +16990,6 @@ pkg-types@^1.0.3:
     mlly "^1.2.0"
     pathe "^1.1.0"
 
-pkginfo@0.4.x:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
-  integrity sha512-8xCNE/aT/EXKenuMDZ+xTVwkT8gsoHN2z/Q29l80u0ppGEXVvsKRzNMbtKhg8LS8k1tJLAHHylf6p4VFmP6XUQ==
-
 pluralize@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
@@ -17949,7 +17324,7 @@ postgres-interval@^1.1.0:
   dependencies:
     xtend "^4.0.0"
 
-posthog-js@^1.13.4, posthog-js@^1.36.0:
+posthog-js@^1.36.0:
   version "1.96.1"
   resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.96.1.tgz#4f9719a24e4e14037b0e72d430194d7cdb576447"
   integrity sha512-kv1vQqYMt2BV3YHS+wxsbGuP+tz+M3y1AzNhz8TfkpY1HT8W/ONT0i0eQpeRr9Y+d4x/fZ6M4cXG5GMvi9lRCA==
@@ -18188,11 +17563,6 @@ pouchdb@7.3.0:
     uuid "8.3.2"
     vuvuzela "1.0.3"
 
-pprof-format@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/pprof-format/-/pprof-format-2.0.7.tgz#526e4361f8b37d16b2ec4bb0696b5292de5046a4"
-  integrity sha512-1qWaGAzwMpaXJP9opRa23nPnt2Egi7RMNoNBptEE/XwHbcn4fC2b/4U4bKc5arkGkIh2ZabpF2bEb+c5GNHEKA==
-
 precinct@^8.1.0:
   version "8.3.1"
   resolved "https://registry.yarnpkg.com/precinct/-/precinct-8.3.1.tgz#94b99b623df144eed1ce40e0801c86078466f0dc"
@@ -18245,11 +17615,6 @@ prepend-http@^2.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
 
-prepend-http@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-3.0.1.tgz#3e724d58fd5867465b300bb9615009fa2f8ee3b6"
-  integrity sha512-BLxfZh+m6UiAiCPZFJ4+vYoL7NrRs5XgCTRrjseATAggXhdZKKxn+JUNmuVYWY23bDHgaEHodxw8mnmtVEDtHw==
-
 prettier-plugin-svelte@^2.3.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-2.6.0.tgz#0e845b560b55cd1d951d6c50431b4949f8591746"
@@ -18349,14 +17714,6 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
 
-promise-retry@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
-  integrity sha512-StEy2osPr28o17bIW776GtwO6+Q+M9zPiZkYfosciUUMYqjhU/ffwRAH0zN2+uvGyUsn8/YICIHRzLbPacpZGw==
-  dependencies:
-    err-code "^1.0.0"
-    retry "^0.10.0"
-
 promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
@@ -18548,7 +17905,7 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qs@^6.10.3, qs@^6.11.0, qs@^6.4.0:
+qs@^6.11.0, qs@^6.4.0:
   version "6.11.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
   integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
@@ -18604,11 +17961,6 @@ quick-lru@^4.0.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
-quick-lru@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
-  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
-
 quote-unquote@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/quote-unquote/-/quote-unquote-1.0.0.tgz#67a9a77148effeaf81a4d428404a710baaac8a0b"
@@ -18661,11 +18013,6 @@ rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-reachdown@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/reachdown/-/reachdown-1.1.0.tgz#c3b85b459dbd0fe2c79782233a0a38e66a9b5454"
-  integrity sha512-6LsdRe4cZyOjw4NnvbhUd/rGG7WQ9HMopPr+kyL018Uci4kijtxcGR5kVb5Ln13k4PEE+fEFQbjfOvNw7cnXmA==
-
 react-is@^17.0.1:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
@@ -19096,11 +18443,6 @@ requizzle@^0.2.3:
   dependencies:
     lodash "^4.17.21"
 
-resolve-alpn@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
-  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -19165,13 +18507,6 @@ responselike@1.0.2, responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
-responselike@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
-  integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
-  dependencies:
-    lowercase-keys "^2.0.0"
-
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -19193,12 +18528,12 @@ retry-request@^5.0.0:
     debug "^4.1.1"
     extend "^3.0.2"
 
-retry@0.13.1, retry@^0.13.1:
+retry@0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
   integrity "sha1-GFsVh6z2eRnWOzVzSeA1N7JIRlg= sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="
 
-retry@^0.10.0, retry@^0.10.1:
+retry@^0.10.1:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
   integrity sha512-ZXUSQYTHdl3uS7IuCehYfMzKyIDBNoAuUblvy5oGO5UJSUTmStUUVPXbA9Qxd173Bgre53yCQczQuHgRWAdvJQ==
@@ -19666,7 +19001,7 @@ serialize-javascript@^6.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-server-destroy@1.0.1, server-destroy@^1.0.1:
+server-destroy@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
   integrity sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==
@@ -19705,11 +19040,6 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
-
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
@@ -20238,7 +19568,7 @@ stable@^0.1.8:
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
-stack-trace@0.0.10, stack-trace@0.0.x:
+stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==
@@ -20528,14 +19858,6 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-stripe@9.16.0:
-  version "9.16.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-9.16.0.tgz#94c24549c91fced457b9e3259e8a1a1bdb6dbd0e"
-  integrity sha512-Dn8K+jSoQcXjxCobRI4HXUdHjOXsiF/KszK49fJnkbeCFjZ3EZxLG2JiM/CX+Hcq27NBDtv/Sxhvy+HhTmvyaQ==
-  dependencies:
-    "@types/node" ">=8.1.0"
-    qs "^6.10.3"
-
 striptags@^3.1.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
@@ -20609,18 +19931,6 @@ sublevel-pouchdb@7.2.2:
     ltgt "2.2.1"
     readable-stream "1.1.14"
 
-subleveldown@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/subleveldown/-/subleveldown-5.0.1.tgz#aa2b4e4698a48d9a86856b2c4df1b6bce2d2ce53"
-  integrity sha512-cVqd/URpp7si1HWu5YqQ3vqQkjuolAwHypY1B4itPlS71/lsf6TQPZ2Y0ijT22EYVkvH5ove9JFJf4u7VGPuZw==
-  dependencies:
-    abstract-leveldown "^6.3.0"
-    encoding-down "^6.2.0"
-    inherits "^2.0.3"
-    level-option-wrap "^1.1.0"
-    levelup "^4.4.0"
-    reachdown "^1.1.0"
-
 superagent@^8.0.5:
   version "8.1.2"
   resolved "https://registry.yarnpkg.com/superagent/-/superagent-8.1.2.tgz#03cb7da3ec8b32472c9d20f6c2a57c7f3765f30b"
@@ -21502,11 +20812,6 @@ typed-array-length@^1.0.4:
     for-each "^0.3.3"
     is-typed-array "^1.1.9"
 
-typed-duration@^1.0.12:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/typed-duration/-/typed-duration-1.0.13.tgz#a40f9ba563b6e20674cac491e15ecbf6811d85a7"
-  integrity sha512-HLwA+hNq/2eXe03isJSfa7YJt6NikplBGdNKvlhyuR6WL5iZi2uXJIZv1SSOMEIukCZbeQ8QwIcQ801S0/Qulw==
-
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -21738,7 +21043,7 @@ update-browserslist-db@^1.0.10:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-update-dotenv@1.1.1, update-dotenv@^1.1.1:
+update-dotenv@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/update-dotenv/-/update-dotenv-1.1.1.tgz#17146f302f216c3c92419d5a327a45be910050ca"
   integrity sha512-3cIC18In/t0X/yH793c00qqxcKD8jVCgNOPif/fGQkFpYMGecM9YAc+kaAKXuZsM2dE9I9wFI7KvAuNX22SGMQ==
@@ -21787,7 +21092,7 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.4.3, url-parse@^1.5.3:
+url-parse@^1.5.3:
   version "1.5.10"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
   integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
@@ -21862,11 +21167,6 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
-  integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
-
 uuid@^9.0.0, uuid@^9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
@@ -22765,23 +22065,3 @@ z-schema@^5.0.1:
     validator "^13.7.0"
   optionalDependencies:
     commander "^9.4.1"
-
-zeebe-node@^8.2.5:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/zeebe-node/-/zeebe-node-8.3.1.tgz#e100bf3708464e305305b4efa1ffde53f9786c45"
-  integrity sha512-68ascWO3g7g+9WwDzvfa3I9TkLKHku5auEgSINP+k5ktNfsfGW68ELDmEJA+XHZgzvGsdGILZqGRzVd5SC8aaQ==
-  dependencies:
-    "@grpc/grpc-js" "1.9.7"
-    "@grpc/proto-loader" "0.7.10"
-    chalk "^2.4.2"
-    console-stamp "^3.0.2"
-    dayjs "^1.8.15"
-    debug "^4.2.0"
-    fast-xml-parser "^4.1.3"
-    fp-ts "^2.5.1"
-    got "^11.8.5"
-    long "^4.0.0"
-    promise-retry "^1.1.1"
-    stack-trace "0.0.10"
-    typed-duration "^1.0.12"
-    uuid "^7.0.3"

From e7e70349feae3a411a03280b3da1ef3d3033ec87 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 4 Jan 2024 18:02:27 +0000
Subject: [PATCH 29/38] Updating to master.

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index ac87f51b9b..b1c10c2daf 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit ac87f51b9bd9d4427f0dc6473b6e136b436f2ba1
+Subproject commit b1c10c2daf808d103724c324256cbff67f33fb46

From bc0f70d23d705572816dae998733b4aec107f6b0 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 4 Jan 2024 18:07:11 +0000
Subject: [PATCH 30/38] Removing checks for query usage.

---
 .../server/src/api/routes/tests/row.spec.ts   | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 2d47e5f54a..5b39652976 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -132,11 +132,6 @@ describe.each([
     expect(usage).toBe(expected)
   }
 
-  const assertQueryUsage = async (expected: number) => {
-    const usage = await getQueryUsage()
-    expect(usage).toBe(expected)
-  }
-
   const defaultRowFields = isInternal
     ? {
         type: "row",
@@ -181,7 +176,6 @@ describe.each([
       expect(res.body.name).toEqual("Test Contact")
       expect(res.body._rev).toBeDefined()
       await assertRowUsage(rowUsage + 1)
-      await assertQueryUsage(queryUsage + 1)
     })
 
     it("Increment row autoId per create row request", async () => {
@@ -232,7 +226,6 @@ describe.each([
       }
 
       await assertRowUsage(rowUsage + ids.length)
-      await assertQueryUsage(queryUsage + ids.length)
     })
 
     it("updates a row successfully", async () => {
@@ -249,7 +242,6 @@ describe.each([
 
       expect(res.name).toEqual("Updated Name")
       await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage + 1)
     })
 
     it("should load a row", async () => {
@@ -262,7 +254,6 @@ describe.each([
         ...existing,
         ...defaultRowFields,
       })
-      await assertQueryUsage(queryUsage + 1)
     })
 
     it("should list all rows for given tableId", async () => {
@@ -284,7 +275,6 @@ describe.each([
       expect(res.length).toBe(2)
       expect(res.find((r: Row) => r.name === newRow.name)).toBeDefined()
       expect(res.find((r: Row) => r.name === firstRow.name)).toBeDefined()
-      await assertQueryUsage(queryUsage + 1)
     })
 
     it("load should return 404 when row does not exist", async () => {
@@ -294,7 +284,6 @@ describe.each([
       await config.api.row.get(tableId, "1234567", {
         expectStatus: 404,
       })
-      await assertQueryUsage(queryUsage) // no change
     })
 
     isInternal &&
@@ -558,7 +547,6 @@ describe.each([
       expect(savedRow.body.description).toEqual(existing.description)
       expect(savedRow.body.name).toEqual("Updated Name")
       await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage + 2) // account for the second load
     })
 
     it("should throw an error when given improper types", async () => {
@@ -578,7 +566,6 @@ describe.each([
       )
 
       await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage)
     })
 
     it("should not overwrite links if those links are not set", async () => {
@@ -668,7 +655,6 @@ describe.each([
       const res = await config.api.row.delete(table._id!, [createdRow])
       expect(res.body[0]._id).toEqual(createdRow._id)
       await assertRowUsage(rowUsage - 1)
-      await assertQueryUsage(queryUsage + 1)
     })
   })
 
@@ -687,7 +673,6 @@ describe.each([
       expect(res.valid).toBe(true)
       expect(Object.keys(res.errors)).toEqual([])
       await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage)
     })
 
     it("should errors on invalid row", async () => {
@@ -705,7 +690,6 @@ describe.each([
         expect(Object.keys(res.errors)).toEqual([])
       }
       await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage)
     })
   })
 
@@ -726,7 +710,6 @@ describe.each([
       expect(res.body.length).toEqual(2)
       await loadRow(row1._id!, table._id!, 404)
       await assertRowUsage(rowUsage - 2)
-      await assertQueryUsage(queryUsage + 1)
     })
 
     it("should be able to delete a variety of row set types", async () => {
@@ -747,7 +730,6 @@ describe.each([
       expect(res.body.length).toEqual(3)
       await loadRow(row1._id!, table._id!, 404)
       await assertRowUsage(rowUsage - 3)
-      await assertQueryUsage(queryUsage + 1)
     })
 
     it("should accept a valid row object and delete the row", async () => {
@@ -760,7 +742,6 @@ describe.each([
       expect(res.body.id).toEqual(row1._id)
       await loadRow(row1._id!, table._id!, 404)
       await assertRowUsage(rowUsage - 1)
-      await assertQueryUsage(queryUsage + 1)
     })
 
     it("Should ignore malformed/invalid delete requests", async () => {
@@ -787,7 +768,6 @@ describe.each([
       expect(res3.body.message).toEqual("Invalid delete rows request")
 
       await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage)
     })
   })
 
@@ -808,7 +788,6 @@ describe.each([
         expect(res.body.length).toEqual(1)
         expect(res.body[0]._id).toEqual(row._id)
         await assertRowUsage(rowUsage)
-        await assertQueryUsage(queryUsage + 1)
       })
 
       it("should throw an error if view doesn't exist", async () => {
@@ -818,7 +797,6 @@ describe.each([
         await config.api.legacyView.get("derp", { expectStatus: 404 })
 
         await assertRowUsage(rowUsage)
-        await assertQueryUsage(queryUsage)
       })
 
       it("should be able to run on a view", async () => {
@@ -837,7 +815,6 @@ describe.each([
         expect(res.body[0]._id).toEqual(row._id)
 
         await assertRowUsage(rowUsage)
-        await assertQueryUsage(queryUsage + 1)
       })
     })
 
@@ -910,7 +887,6 @@ describe.each([
       expect(resEnriched.body.link[0].name).toBe("Test Contact")
       expect(resEnriched.body.link[0].description).toBe("original description")
       await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage + 2)
     })
   })
 
@@ -1129,7 +1105,6 @@ describe.each([
         await config.api.row.delete(view.id, [createdRow])
 
         await assertRowUsage(rowUsage - 1)
-        await assertQueryUsage(queryUsage + 1)
 
         await config.api.row.get(tableId, createdRow._id!, {
           expectStatus: 404,
@@ -1157,7 +1132,6 @@ describe.each([
         await config.api.row.delete(view.id, [rows[0], rows[2]])
 
         await assertRowUsage(rowUsage - 2)
-        await assertQueryUsage(queryUsage + 1)
 
         await config.api.row.get(tableId, rows[0]._id!, {
           expectStatus: 404,

From 72d16224deaeb54cfecb57ff023352c1e58a5c10 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 5 Jan 2024 10:37:26 +0000
Subject: [PATCH 31/38] Minor fix to stop concating 'undefined' into the
 columns list and generating browser errors

---
 .../settings/controls/GridColumnConfiguration/getColumns.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/getColumns.js b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/getColumns.js
index 72fdbe4108..e7b1727b54 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/getColumns.js
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/getColumns.js
@@ -114,7 +114,7 @@ const getColumns = ({
     primary,
     sortable,
     updateSortable: newDraggableList => {
-      onChange(toGridFormat(newDraggableList.concat(primary)))
+      onChange(toGridFormat(newDraggableList.concat(primary || [])))
     },
     update: newEntry => {
       const newDraggableList = draggableList.map(entry => {

From 69bfd01bf039d422dd86124566a4453da61dadd8 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 5 Jan 2024 11:37:10 +0000
Subject: [PATCH 32/38] Attach authenticated user to DataDog spans.

---
 .../backend-core/src/middleware/authenticated.ts  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts
index 16f658b90a..cfdb7bafed 100644
--- a/packages/backend-core/src/middleware/authenticated.ts
+++ b/packages/backend-core/src/middleware/authenticated.ts
@@ -15,6 +15,7 @@ import * as identity from "../context/identity"
 import env from "../environment"
 import { Ctx, EndpointMatcher, SessionCookie } from "@budibase/types"
 import { InvalidAPIKeyError, ErrorCode } from "../errors"
+import tracer from "dd-trace"
 
 const ONE_MINUTE = env.SESSION_UPDATE_PERIOD
   ? parseInt(env.SESSION_UPDATE_PERIOD)
@@ -166,6 +167,20 @@ export default function (
       if (!authenticated) {
         authenticated = false
       }
+
+      if (user) {
+        tracer.setUser({
+          id: user?.id,
+          email: user?.email,
+          tenantId: user?.tenantId,
+          admin: user?.admin,
+          builder: user?.builder,
+          budibaseAccess: user?.budibaseAccess,
+          status: user?.status,
+          roles: user?.roles,
+        })
+      }
+
       // isAuthenticated is a function, so use a variable to be able to check authed state
       finalise(ctx, { authenticated, user, internal, version, publicEndpoint })
 

From f416f7a54f61ccd1c2ea086e9f85a83e3fa9b072 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 5 Jan 2024 12:24:56 +0000
Subject: [PATCH 33/38] Get rid of a warning when starting up self host stack
 with docker compose V2 - OFFLINE_MODE is fine to be left as a blank string
 and warning might be causing some confusion.

---
 hosting/docker-compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index 34cae92dc7..36b88466fe 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -26,7 +26,7 @@ services:
       BB_ADMIN_USER_EMAIL: ${BB_ADMIN_USER_EMAIL}
       BB_ADMIN_USER_PASSWORD: ${BB_ADMIN_USER_PASSWORD}
       PLUGINS_DIR: ${PLUGINS_DIR}
-      OFFLINE_MODE: ${OFFLINE_MODE}
+      OFFLINE_MODE: ${OFFLINE_MODE:-}
     depends_on:
       - worker-service
       - redis-service
@@ -53,7 +53,7 @@ services:
       INTERNAL_API_KEY: ${INTERNAL_API_KEY}
       REDIS_URL: redis-service:6379
       REDIS_PASSWORD: ${REDIS_PASSWORD}
-      OFFLINE_MODE: ${OFFLINE_MODE}
+      OFFLINE_MODE: ${OFFLINE_MODE:-}
     depends_on:
       - redis-service
       - minio-service

From f2f16cfceec7e8cff0197523995507ea6f91701d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 5 Jan 2024 13:17:10 +0000
Subject: [PATCH 34/38] Adding an option to disable password validation when
 creating an admin user - this means that the environment variables used for
 BB_ADMIN creation can have any length of password (not breaking change).

---
 packages/backend-core/src/environment.ts   |  2 ++
 packages/backend-core/src/security/auth.ts |  6 +++---
 packages/backend-core/src/users/db.ts      | 17 +++++++++++++----
 packages/server/src/startup.ts             |  6 +++++-
 packages/types/src/sdk/user.ts             |  1 +
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 138dbbd9e0..0fec786c31 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -166,6 +166,8 @@ const environment = {
   DISABLE_JWT_WARNING: process.env.DISABLE_JWT_WARNING,
   BLACKLIST_IPS: process.env.BLACKLIST_IPS,
   SERVICE_TYPE: "unknown",
+  PASSWORD_MIN_LENGTH: process.env.PASSWORD_MIN_LENGTH,
+  PASSWORD_MAX_LENGTH: process.env.PASSWORD_MAX_LENGTH,
   /**
    * Enable to allow an admin user to login using a password.
    * This can be useful to prevent lockout when configuring SSO.
diff --git a/packages/backend-core/src/security/auth.ts b/packages/backend-core/src/security/auth.ts
index c90d9df09b..1cce35a0af 100644
--- a/packages/backend-core/src/security/auth.ts
+++ b/packages/backend-core/src/security/auth.ts
@@ -1,7 +1,7 @@
-import { env } from ".."
+import env from "../environment"
 
-export const PASSWORD_MIN_LENGTH = +(process.env.PASSWORD_MIN_LENGTH || 8)
-export const PASSWORD_MAX_LENGTH = +(process.env.PASSWORD_MAX_LENGTH || 512)
+export const PASSWORD_MIN_LENGTH = +(env.PASSWORD_MIN_LENGTH || 8)
+export const PASSWORD_MAX_LENGTH = +(env.PASSWORD_MAX_LENGTH || 512)
 
 export function validatePassword(
   password: string
diff --git a/packages/backend-core/src/users/db.ts b/packages/backend-core/src/users/db.ts
index 3214b3ab63..6d2e476707 100644
--- a/packages/backend-core/src/users/db.ts
+++ b/packages/backend-core/src/users/db.ts
@@ -44,6 +44,12 @@ type GroupFns = {
   getBulk: GroupGetFn
   getGroupBuilderAppIds: GroupBuildersFn
 }
+type CreateAdminUserOpts = {
+  ssoId?: string
+  hashPassword?: boolean
+  requirePassword?: boolean
+  noPasswordValidation?: boolean
+}
 type FeatureFns = { isSSOEnforced: FeatureFn; isAppBuildersEnabled: FeatureFn }
 
 const bulkDeleteProcessing = async (dbUser: User) => {
@@ -112,9 +118,11 @@ export class UserDB {
         throw new HTTPError("Password change is disabled for this user", 400)
       }
 
-      const passwordValidation = validatePassword(password)
-      if (!passwordValidation.valid) {
-        throw new HTTPError(passwordValidation.error, 400)
+      if (!opts.noPasswordValidation) {
+        const passwordValidation = validatePassword(password)
+        if (!passwordValidation.valid) {
+          throw new HTTPError(passwordValidation.error, 400)
+        }
       }
 
       hashedPassword = opts.hashPassword ? await hash(password) : password
@@ -489,7 +497,7 @@ export class UserDB {
     email: string,
     password: string,
     tenantId: string,
-    opts?: { ssoId?: string; hashPassword?: boolean; requirePassword?: boolean }
+    opts?: CreateAdminUserOpts
   ) {
     const user: User = {
       email: email,
@@ -513,6 +521,7 @@ export class UserDB {
     return await UserDB.save(user, {
       hashPassword: opts?.hashPassword,
       requirePassword: opts?.requirePassword,
+      noPasswordValidation: opts?.noPasswordValidation,
     })
   }
 
diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts
index 6860fe5f9b..880bf7a894 100644
--- a/packages/server/src/startup.ts
+++ b/packages/server/src/startup.ts
@@ -138,7 +138,11 @@ export async function startup(app?: Koa, server?: Server) {
             bbAdminEmail,
             bbAdminPassword,
             tenantId,
-            { hashPassword: true, requirePassword: true }
+            {
+              hashPassword: true,
+              requirePassword: true,
+              noPasswordValidation: true,
+            }
           )
           // Need to set up an API key for automated integration tests
           if (env.isTest()) {
diff --git a/packages/types/src/sdk/user.ts b/packages/types/src/sdk/user.ts
index 2b970da1a9..fb2e32c811 100644
--- a/packages/types/src/sdk/user.ts
+++ b/packages/types/src/sdk/user.ts
@@ -2,4 +2,5 @@ export interface SaveUserOpts {
   hashPassword?: boolean
   requirePassword?: boolean
   currentUserId?: string
+  noPasswordValidation?: boolean
 }

From b3cd74e8774fa1c5deb2ed0b97684fdd85b40f44 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 5 Jan 2024 13:49:01 +0000
Subject: [PATCH 35/38] Remove user email from DataDog user info.

---
 packages/backend-core/src/middleware/authenticated.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts
index cfdb7bafed..8885e5c996 100644
--- a/packages/backend-core/src/middleware/authenticated.ts
+++ b/packages/backend-core/src/middleware/authenticated.ts
@@ -171,7 +171,6 @@ export default function (
       if (user) {
         tracer.setUser({
           id: user?.id,
-          email: user?.email,
           tenantId: user?.tenantId,
           admin: user?.admin,
           builder: user?.builder,

From b4b8e16f22fb968cc17fc4cdabaac766a8225d2c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 5 Jan 2024 13:58:31 +0000
Subject: [PATCH 36/38] PR comments.

---
 packages/backend-core/src/users/db.ts | 6 +++---
 packages/server/src/startup.ts        | 2 +-
 packages/types/src/sdk/user.ts        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/backend-core/src/users/db.ts b/packages/backend-core/src/users/db.ts
index 6d2e476707..4d0d216603 100644
--- a/packages/backend-core/src/users/db.ts
+++ b/packages/backend-core/src/users/db.ts
@@ -48,7 +48,7 @@ type CreateAdminUserOpts = {
   ssoId?: string
   hashPassword?: boolean
   requirePassword?: boolean
-  noPasswordValidation?: boolean
+  skipPasswordValidation?: boolean
 }
 type FeatureFns = { isSSOEnforced: FeatureFn; isAppBuildersEnabled: FeatureFn }
 
@@ -118,7 +118,7 @@ export class UserDB {
         throw new HTTPError("Password change is disabled for this user", 400)
       }
 
-      if (!opts.noPasswordValidation) {
+      if (!opts.skipPasswordValidation) {
         const passwordValidation = validatePassword(password)
         if (!passwordValidation.valid) {
           throw new HTTPError(passwordValidation.error, 400)
@@ -521,7 +521,7 @@ export class UserDB {
     return await UserDB.save(user, {
       hashPassword: opts?.hashPassword,
       requirePassword: opts?.requirePassword,
-      noPasswordValidation: opts?.noPasswordValidation,
+      skipPasswordValidation: opts?.skipPasswordValidation,
     })
   }
 
diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts
index 880bf7a894..f9b5974eb2 100644
--- a/packages/server/src/startup.ts
+++ b/packages/server/src/startup.ts
@@ -141,7 +141,7 @@ export async function startup(app?: Koa, server?: Server) {
             {
               hashPassword: true,
               requirePassword: true,
-              noPasswordValidation: true,
+              skipPasswordValidation: true,
             }
           )
           // Need to set up an API key for automated integration tests
diff --git a/packages/types/src/sdk/user.ts b/packages/types/src/sdk/user.ts
index fb2e32c811..3f6f69d2d1 100644
--- a/packages/types/src/sdk/user.ts
+++ b/packages/types/src/sdk/user.ts
@@ -2,5 +2,5 @@ export interface SaveUserOpts {
   hashPassword?: boolean
   requirePassword?: boolean
   currentUserId?: string
-  noPasswordValidation?: boolean
+  skipPasswordValidation?: boolean
 }

From 946a73f1b6b6f1603a92e5198afc183d93c1967f Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 5 Jan 2024 14:40:16 +0000
Subject: [PATCH 37/38] Set user ID correctly.

---
 packages/backend-core/src/middleware/authenticated.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts
index 8885e5c996..e8e16589de 100644
--- a/packages/backend-core/src/middleware/authenticated.ts
+++ b/packages/backend-core/src/middleware/authenticated.ts
@@ -170,7 +170,7 @@ export default function (
 
       if (user) {
         tracer.setUser({
-          id: user?.id,
+          id: user?._id,
           tenantId: user?.tenantId,
           admin: user?.admin,
           builder: user?.builder,

From 850b7dea108a459099e16b89a8fd2859c98b6ef1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 5 Jan 2024 15:02:12 +0000
Subject: [PATCH 38/38] Bump version to 2.14.3

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 71c53cd3fa..d6fa262685 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.14.2",
+  "version": "2.14.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*",