Merge branch 'develop' into feature/user-column-type

2023-09-25 19:03:25 +02:00 · 2023-09-25 19:03:25 +02:00 · 79e693c89d
parent 1f2a66fc77 b7eb5847fd
commit 79e693c89d
43 changed files with 344 additions and 190 deletions
--- a/.github/workflows/deploy-featurebranch.yml
+++ b/.github/workflows/deploy-featurebranch.yml
@ -12,7 +12,8 @@ jobs:
      - uses: actions/checkout@v3
      - uses: passeidireto/trigger-external-workflow-action@main
        env:
-            BRANCH: ${{ github.head_ref }}
+          PAYLOAD_BRANCH: ${{ github.head_ref }}
+          PAYLOAD_PR_NUMBER: ${{ github.ref }}
        with:
          repository: budibase/budibase-deploys
          event: featurebranch-qa-deploy
--- a/hosting/proxy/nginx.prod.conf
+++ b/hosting/proxy/nginx.prod.conf
@ -55,7 +55,7 @@ http {
    set $csp_style "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://fonts.googleapis.com https://rsms.me https://maxcdn.bootstrapcdn.com";
    set $csp_object "object-src 'none'";
    set $csp_base_uri "base-uri 'self'";
-    set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.amazonaws.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com https://api.github.com";    
+    set $csp_connect "connect-src 'self' https://*.budibase.app https://*.budibase.qa https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.amazonaws.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com https://api.github.com";    
    set $csp_font "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com  https://js.intercomcdn.com  https://fonts.intercomcdn.com";
    set $csp_frame "frame-src 'self' https:";
    set $csp_img "img-src http: https: data: blob:";
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "2.10.9-alpha.5",
+  "version": "2.10.12-alpha.10",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/package.json
+++ b/package.json
@ -5,7 +5,7 @@
    "@esbuild-plugins/tsconfig-paths": "^0.1.2",
    "@nx/js": "16.4.3",
    "@rollup/plugin-json": "^4.0.2",
-    "@typescript-eslint/parser": "5.45.0",
+    "@typescript-eslint/parser": "6.7.2",
    "esbuild": "^0.18.17",
    "esbuild-node-externals": "^1.8.0",
    "eslint": "^8.44.0",
@ -22,7 +22,7 @@
    "rimraf": "^3.0.2",
    "rollup-plugin-replace": "^2.2.0",
    "svelte": "^3.38.2",
-    "typescript": "4.7.3",
+    "typescript": "5.2.2",
    "@babel/core": "^7.22.5",
    "@babel/eslint-parser": "^7.22.5",
    "@babel/preset-env": "^7.22.5",
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@ -87,7 +87,7 @@
    "timekeeper": "2.2.0",
    "ts-node": "10.8.1",
    "tsconfig-paths": "4.0.0",
-    "typescript": "4.7.3"
+    "typescript": "5.2.2"
  },
  "nx": {
    "targets": {
--- a/packages/backend-core/tests/core/utilities/structures/users.ts
+++ b/packages/backend-core/tests/core/utilities/structures/users.ts
@ -10,14 +10,13 @@ import { authDetails } from "./sso"
 import { uuid } from "./common"
 import { generator } from "./generator"
 import { tenant } from "."
-import { generateGlobalUserID } from "../../../../src/docIds"

 export const newEmail = () => {
  return `${uuid()}@test.com`
 }

 export const user = (userProps?: Partial<Omit<User, "userId">>): User => {
-  const userId = userProps?._id || generateGlobalUserID()
+  const userId = userProps?._id
  return {
    _id: userId,
    userId,
@ -53,7 +52,7 @@ export const adminOnlyUser = (userProps?: any): AdminOnlyUser => {
  }
 }

-export const builderUser = (userProps?: any): BuilderUser => {
+export const builderUser = (userProps?: Partial<User>): BuilderUser => {
  return {
    ...user(userProps),
    builder: {
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -108,7 +108,7 @@
    "svelte-jester": "^1.3.2",
    "ts-node": "10.8.1",
    "tsconfig-paths": "4.0.0",
-    "typescript": "4.7.3",
+    "typescript": "5.2.2",
    "vite": "^3.0.8",
    "vite-plugin-static-copy": "^0.16.0",
    "vitest": "^0.29.2"
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@ -83,8 +83,7 @@
      if (Array.isArray(value)) {
        return value
      }
-
-      return [value]
+      return value.split(",").map(x => x.trim())
    }

    if (type === "json") {
@ -146,7 +145,7 @@
                placeholder={placeholders[schema.type]}
                panel={AutomationBindingPanel}
                value={Array.isArray(value[field])
-                  ? value[field].join(" ")
+                  ? value[field].join(",")
                  : value[field]}
                on:change={e => onChange(e, field, schema.type)}
                label={field}
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@ -55,9 +55,14 @@
    bind:value={value[field]}
    label={field}
    options={schema.constraints.inclusion}
+    on:change={e => onChange(e, field)}
  />
 {:else if schema.type === "longform"}
-  <TextArea label={field} bind:value={value[field]} />
+  <TextArea
+    label={field}
+    bind:value={value[field]}
+    on:change={e => onChange(e, field)}
+  />
 {:else if schema.type === "json"}
  <span>
    <Label>{field}</Label>
@ -73,7 +78,11 @@
    />
  </span>
 {:else if schema.type === "link"}
-  <LinkedRowSelector bind:linkedRows={value[field]} {schema} />
+  <LinkedRowSelector
+    bind:linkedRows={value[field]}
+    {schema}
+    on:change={e => onChange(e, field)}
+  />
 {:else if schema.type === "string" || schema.type === "number"}
  <svelte:component
    this={isTestModal ? ModalBindableInput : DrawerBindableInput}
--- a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
+++ b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
@ -235,7 +235,7 @@
    const baseExtensions = buildBaseExtensions()

    editor = new EditorView({
-      doc: value,
+      doc: value?.toString(),
      extensions: buildExtensions(baseExtensions),
      parent: textarea,
    })
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@ -3,10 +3,13 @@
  import { API } from "api"
  import { Select, Label, Multiselect } from "@budibase/bbui"
  import { capitalise } from "../../helpers"
+  import { createEventDispatcher } from "svelte"

  export let schema
  export let linkedRows = []

+  const dispatch = createEventDispatcher()
+
  let rows = []
  let linkedIds = (Array.isArray(linkedRows) ? linkedRows : [])?.map(
    row => row?._id || row
@ -44,7 +47,10 @@
    options={rows}
    getOptionLabel={getPrettyName}
    getOptionValue={row => row._id}
-    on:change={e => (linkedIds = e.detail ? [e.detail] : [])}
+    on:change={e => {
+      linkedIds = e.detail ? [e.detail] : []
+      dispatch("change", linkedIds)
+    }}
    {label}
    sort
  />
@ -56,5 +62,6 @@
    getOptionLabel={getPrettyName}
    getOptionValue={row => row._id}
    sort
+    on:change={() => dispatch("change", linkedIds)}
  />
 {/if}
--- a/packages/builder/src/components/common/UndoRedoControl.svelte
+++ b/packages/builder/src/components/common/UndoRedoControl.svelte
@ -38,14 +38,12 @@
    hoverable
    on:click={store.undo}
    disabled={!$store.canUndo}
-    tooltip="Undo latest change"
  />
  <Icon
    name="Redo"
    hoverable
    on:click={store.redo}
    disabled={!$store.canRedo}
-    tooltip="Redo latest undo"
  />
 </div>

--- a/packages/builder/src/components/common/VerificationPromptBanner.svelte
+++ b/packages/builder/src/components/common/VerificationPromptBanner.svelte
@ -0,0 +1,102 @@
+<script>
+  import { notifications, Button, Icon, Body } from "@budibase/bbui"
+  import { admin, auth } from "stores/portal"
+
+  $: user = $auth.user
+  let loading = false
+  let complete = false
+
+  const resetPassword = async () => {
+    if (loading || complete) return
+    loading = true
+
+    try {
+      await fetch(`${$admin.accountPortalUrl}/api/auth/reset`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ email: user.email }),
+      })
+
+      complete = true
+    } catch (e) {
+      notifications.error("There was an issue sending your validation email.")
+    } finally {
+      loading = false
+    }
+  }
+</script>
+
+{#if user?.account?.verified === false}
+  <section class="banner">
+    <div class="icon">
+      <Icon name="Info" />
+    </div>
+    <div class="copy">
+      <Body size="S">
+        Please verify your account. We've sent the verification link to <span
+          class="email">{user.email}</span
+        ></Body
+      >
+    </div>
+    <div class="button" class:disabled={loading || complete}>
+      <Button on:click={resetPassword}
+        >{complete ? "Email sent" : "Resend email"}</Button
+      >
+    </div>
+  </section>
+{/if}
+
+<style>
+  .banner {
+    flex-shrink: 0;
+    display: flex;
+    background-color: var(--grey-2);
+    height: 48px;
+    align-items: center;
+    padding: 0 15px;
+  }
+
+  .icon {
+    margin-right: 15px;
+    color: var(--ink);
+    display: flex;
+  }
+
+  .copy {
+    flex-grow: 1;
+    overflow: hidden;
+  }
+
+  .copy :global(p) {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .email {
+    font-weight: 600;
+  }
+
+  .button {
+    margin-left: 15px;
+  }
+
+  .button :global(button) {
+    color: var(--ink);
+    background-color: var(--grey-3);
+    border: none;
+  }
+
+  .button :global(button):hover {
+    background-color: var(--grey-4);
+  }
+
+  .disabled :global(button) {
+    pointer-events: none;
+    color: var(--ink);
+    background-color: var(--grey-4);
+    border: none;
+  }
+</style>
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@ -224,10 +224,10 @@
              <span
                class="app-link"
                on:click={() => {
+                  appActionPopover.hide()
                  if (isPublished) {
                    viewApp()
                  } else {
-                    appActionPopover.hide()
                    updateAppModal.show()
                  }
                }}
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
@ -3,7 +3,6 @@
  import { createEventDispatcher } from "svelte"
  import { notifications } from "@budibase/bbui"
  import ButtonActionDrawer from "./ButtonActionDrawer.svelte"
-  import { automationStore } from "builderStore"
  import { cloneDeep } from "lodash/fp"

  const dispatch = createEventDispatcher()
@ -24,47 +23,11 @@
  }

  const saveEventData = async () => {
-    // any automations that need created from event triggers
-    const automationsToCreate = tmpValue.filter(
-      action => action["##eventHandlerType"] === "Trigger Automation"
-    )
-    for (let action of automationsToCreate) {
-      await createAutomation(action.parameters)
-    }
-
    dispatch("change", tmpValue)
    notifications.success("Component actions saved.")
    drawer.hide()
  }

-  // called by the parent modal when actions are saved
-  const createAutomation = async parameters => {
-    if (parameters.automationId || !parameters.newAutomationName) {
-      return
-    }
-    try {
-      let trigger = automationStore.actions.constructBlock(
-        "TRIGGER",
-        "APP",
-        $automationStore.blockDefinitions.TRIGGER.APP
-      )
-      trigger.inputs = {
-        fields: Object.keys(parameters.fields ?? {}).reduce((fields, key) => {
-          fields[key] = "string"
-          return fields
-        }, {}),
-      }
-      const automation = await automationStore.actions.create(
-        parameters.newAutomationName,
-        trigger
-      )
-      parameters.automationId = automation._id
-      delete parameters.newAutomationName
-    } catch (error) {
-      notifications.error("Error creating automation")
-    }
-  }
-
  $: actionCount = value?.length
  $: actionText = `${actionCount || "No"} action${
    actionCount !== 1 ? "s" : ""
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
@ -1,6 +1,5 @@
 <script>
  import { currentAsset, store } from "builderStore"
-  import { onMount } from "svelte"
  import { Label, Combobox, Select } from "@budibase/bbui"
  import {
    getActionProviderComponents,
@ -10,12 +9,6 @@

  export let parameters

-  onMount(() => {
-    if (!parameters.type) {
-      parameters.type = "top"
-    }
-  })
-
  $: formComponent = findComponent($currentAsset.props, parameters.componentId)
  $: formSchema = buildFormSchema(formComponent)
  $: fieldOptions = Object.keys(formSchema || {})
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@ -3,7 +3,6 @@
  import { admin, auth, licensing } from "stores/portal"
  import { onMount } from "svelte"
  import { CookieUtils, Constants } from "@budibase/frontend-core"
-  import { banner, BANNER_TYPES } from "@budibase/bbui"
  import { API } from "api"
  import Branding from "./Branding.svelte"

@ -17,32 +16,6 @@
  $: user = $auth.user

  $: useAccountPortal = cloud && !$admin.disableAccountPortal
-  let showVerificationPrompt = false
-
-  const checkVerification = user => {
-    if (!showVerificationPrompt && user?.account?.verified === false) {
-      showVerificationPrompt = true
-      banner.queue([
-        {
-          message: `Please verify your account. We've sent the verification link to ${user.email}`,
-          type: BANNER_TYPES.NEUTRAL,
-          showCloseButton: false,
-          extraButtonAction: () => {
-            fetch(`${$admin.accountPortalUrl}/api/auth/reset`, {
-              method: "POST",
-              headers: {
-                "Content-Type": "application/json",
-              },
-              body: JSON.stringify({ email: user.email }),
-            })
-          },
-          extraButtonText: "Resend email",
-        },
-      ])
-    }
-  }
-
-  $: checkVerification(user)

  const validateTenantId = async () => {
    const host = window.location.host
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@ -22,6 +22,7 @@
  import { isActive, goto, layout, redirect } from "@roxi/routify"
  import { capitalise } from "helpers"
  import { onMount, onDestroy } from "svelte"
+  import VerificationPromptBanner from "components/common/VerificationPromptBanner.svelte"
  import CommandPalette from "components/commandPalette/CommandPalette.svelte"
  import TourWrap from "components/portal/onboarding/TourWrap.svelte"
  import TourPopover from "components/portal/onboarding/TourPopover.svelte"
@ -136,6 +137,7 @@
 {/if}

 <div class="root" class:blur={$store.showPreview}>
+  <VerificationPromptBanner />
  <div class="top-nav">
    {#if $store.initialised}
      <div class="topleftnav">
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
@ -61,10 +61,12 @@
    key: "_css",
    type: "text",
  })
-  $: settingOptions = settings.map(setting => ({
-    label: makeLabel(setting),
-    value: setting.key,
-  }))
+  $: settingOptions = settings
+    .filter(setting => setting.supportsConditions !== false)
+    .map(setting => ({
+      label: makeLabel(setting),
+      value: setting.key,
+    }))
  $: conditions.forEach(link => {
    if (!link.id) {
      link.id = generate()
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
@ -36,10 +36,7 @@
 </script>

 <DetailSummary name={"Conditions"} collapsible={false}>
-  <div class="conditionCount">{conditionText}</div>
-  <div>
-    <ActionButton on:click={openDrawer}>Configure conditions</ActionButton>
-  </div>
+  <ActionButton on:click={openDrawer}>{conditionText}</ActionButton>
 </DetailSummary>
 <Drawer bind:this={drawer} title="Conditions">
  <svelte:fragment slot="description">
@ -48,10 +45,3 @@
  <Button cta slot="buttons" on:click={() => save()}>Save</Button>
  <ConditionalUIDrawer slot="body" bind:conditions={tempValue} {bindings} />
 </Drawer>
-
-<style>
-  .conditionCount {
-    font-weight: 600;
-    margin-top: -5px;
-  }
-</style>
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@ -8,6 +8,7 @@
  import Logo from "./_components/Logo.svelte"
  import UserDropdown from "./_components/UserDropdown.svelte"
  import HelpMenu from "components/common/HelpMenu.svelte"
+  import VerificationPromptBanner from "components/common/VerificationPromptBanner.svelte"
  import { sdk } from "@budibase/shared-core"

  let loaded = false
@ -55,6 +56,7 @@
  {:else}
    <HelpMenu />
    <div class="container">
+      <VerificationPromptBanner />
      <div class="nav">
        <div class="branding">
          <Logo />
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -62,6 +62,6 @@
    "eslint": "^7.20.0",
    "renamer": "^4.0.0",
    "ts-node": "^10.9.1",
-    "typescript": "4.7.3"
+    "typescript": "5.2.2"
  }
 }
--- a/packages/cli/src/plugins/index.ts
+++ b/packages/cli/src/plugins/index.ts
@ -49,8 +49,8 @@ async function askAboutTopLevel(name: string) {
  }
 }

-async function init(opts: PluginOpts) {
-  const type = opts["init"] || (opts as PluginType)
+async function init(opts: PluginOpts | PluginType) {
+  const type = (opts as PluginOpts).init || (opts as PluginType)
  if (!type || !PLUGIN_TYPE_ARR.includes(type)) {
    console.log(
      error(
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@ -2539,7 +2539,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "event",
@ -2629,7 +2630,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "event",
@ -2685,7 +2687,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "event",
@ -2736,7 +2739,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "event",
@ -2841,7 +2845,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "boolean",
@ -2960,7 +2965,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "event",
@ -3143,7 +3149,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "event",
@ -3200,7 +3207,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "event",
@ -3301,7 +3309,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "event",
@ -3355,7 +3364,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "boolean",
@ -3622,7 +3632,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "event",
@ -3689,7 +3700,8 @@
      {
        "type": "text",
        "label": "Default value",
-        "key": "defaultValue"
+        "key": "defaultValue",
+        "supportsConditions": false
      },
      {
        "type": "event",
--- a/packages/client/src/components/app/forms/InnerForm.svelte
+++ b/packages/client/src/components/app/forms/InnerForm.svelte
@ -230,10 +230,16 @@
      // We want to validate every field (even if validation fails early) to
      // ensure that all fields are populated with errors if invalid
      let valid = true
+      let hasScrolled = false
      stepFields.forEach(field => {
        const fieldValid = get(field).fieldApi.validate()
        valid = valid && fieldValid
+        if (!valid && !hasScrolled) {
+          handleScrollToField({ field: get(field) })
+          hasScrolled = true
+        }
      })
+
      return valid
    },
    reset: () => {
@ -409,10 +415,15 @@
  }

  const handleScrollToField = ({ field }) => {
-    const fieldId = get(getField(field)).fieldState.fieldId
+    if (!field.fieldState) {
+      field = get(getField(field))
+    }
+    const fieldId = field.fieldState.fieldId
+    const fieldElement = document.getElementById(fieldId)
+    fieldElement.focus({ preventScroll: true })
    const label = document.querySelector(`label[for="${fieldId}"]`)
-    document.getElementById(fieldId).focus({ preventScroll: true })
-    label.scrollIntoView({ behavior: "smooth" })
+    label.style.scrollMargin = "100px"
+    label.scrollIntoView({ behavior: "smooth", block: "nearest" })
  }

  // Action context to pass to children
--- a/packages/client/src/components/app/forms/S3Upload.svelte
+++ b/packages/client/src/components/app/forms/S3Upload.svelte
@ -17,6 +17,13 @@
  let fieldApi
  let localFiles = []

+  $: {
+    // If the field state is reset, clear the local files
+    if (!fieldState?.value?.length) {
+      localFiles = []
+    }
+  }
+
  const { API, notificationStore, uploadStore } = getContext("sdk")
  const component = getContext("component")

--- a/packages/pro
+++ b/packages/pro
@ -1 +1 @@
-Subproject commit 4638ae916e55ce89166095578cbd01745d0ee9ee
+Subproject commit 3c51e0938e2226038f4456bb8c96d857310b8d0c
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -153,7 +153,6 @@
    "@types/server-destroy": "1.0.1",
    "@types/supertest": "2.0.12",
    "@types/tar": "6.1.5",
-    "@typescript-eslint/parser": "5.45.0",
    "apidoc": "0.50.4",
    "babel-jest": "29.6.2",
    "copyfiles": "2.4.1",
@ -174,7 +173,7 @@
    "timekeeper": "2.2.0",
    "ts-node": "10.8.1",
    "tsconfig-paths": "4.0.0",
-    "typescript": "4.7.3",
+    "typescript": "5.2.2",
    "update-dotenv": "1.1.1"
  },
  "optionalDependencies": {
--- a/packages/server/src/api/controllers/row/external.ts
+++ b/packages/server/src/api/controllers/row/external.ts
@ -28,7 +28,7 @@ export async function handleRequest(
 ) {
  // make sure the filters are cleaned up, no empty strings for equals, fuzzy or string
  if (opts && opts.filters) {
-    opts.filters = utils.removeEmptyFilters(opts.filters)
+    opts.filters = sdk.rows.removeEmptyFilters(opts.filters)
  }
  if (
    !dataFilters.hasFilters(opts?.filters) &&
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@ -72,6 +72,11 @@ export const save = async (ctx: UserCtx<Row, Row>) => {
  const tableId = utils.getTableId(ctx)
  const body = ctx.request.body

+  // user metadata doesn't exist yet - don't allow creation
+  if (utils.isUserMetadataTable(tableId) && !body._rev) {
+    ctx.throw(400, "Cannot create new user entry.")
+  }
+
  // if it has an ID already then its a patch
  if (body && body._id) {
    return patch(ctx as UserCtx<PatchRowRequest, PatchRowResponse>)
--- a/packages/server/src/api/controllers/row/utils.ts
+++ b/packages/server/src/api/controllers/row/utils.ts
@ -175,3 +175,7 @@ export function removeEmptyFilters(filters: SearchFilters) {
  }
  return filters
 }
+
+export function isUserMetadataTable(tableId: string) {
+  return tableId === InternalTables.USER_METADATA
+}
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@ -3,7 +3,7 @@ import { databaseTestProviders } from "../../../integrations/tests/utils"
 import tk from "timekeeper"
 import { outputProcessing } from "../../../utilities/rowProcessor"
 import * as setup from "./utilities"
-import { context, roles, tenancy } from "@budibase/backend-core"
+import { context, InternalTable, roles, tenancy } from "@budibase/backend-core"
 import { quotas } from "@budibase/pro"
 import {
  FieldType,
@ -1415,6 +1415,23 @@ describe.each([
        })
      })

+      isInternal &&
+        it("doesn't allow creating in user table", async () => {
+          const userTableId = InternalTable.USER_METADATA
+          const response = await config.api.row.save(
+            userTableId,
+            {
+              tableId: userTableId,
+              firstName: "Joe",
+              lastName: "Joe",
+              email: "joe@joe.com",
+              roles: {},
+            },
+            { expectStatus: 400 }
+          )
+          expect(response.message).toBe("Cannot create new user entry.")
+        })
+
      describe("permissions", () => {
        let viewId: string
        let tableId: string
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@ -1,4 +1,8 @@
 import { Knex, knex } from "knex"
+import { db as dbCore } from "@budibase/backend-core"
+import { QueryOptions } from "../../definitions/datasource"
+import { isIsoDateString, SqlClient } from "../utils"
+import SqlTableQueryBuilder from "./sqlTable"
 import {
  Operation,
  QueryJson,
@ -6,11 +10,8 @@ import {
  SearchFilters,
  SortDirection,
 } from "@budibase/types"
-import { db as dbCore } from "@budibase/backend-core"
-import { QueryOptions } from "../../definitions/datasource"
-import { isIsoDateString, SqlClient } from "../utils"
-import SqlTableQueryBuilder from "./sqlTable"
 import environment from "../../environment"
+import { isValidFilter } from "../utils"

 const envLimit = environment.SQL_MAX_ROWS
  ? parseInt(environment.SQL_MAX_ROWS)
@ -261,15 +262,17 @@ class InternalBuilder {
        if (isEmptyObject(value.high)) {
          value.high = ""
        }
-        if (value.low && value.high) {
+        const lowValid = isValidFilter(value.low),
+          highValid = isValidFilter(value.high)
+        if (lowValid && highValid) {
          // Use a between operator if we have 2 valid range values
          const fnc = allOr ? "orWhereBetween" : "whereBetween"
          query = query[fnc](key, [value.low, value.high])
-        } else if (value.low) {
+        } else if (lowValid) {
          // Use just a single greater than operator if we only have a low
          const fnc = allOr ? "orWhere" : "where"
          query = query[fnc](key, ">", value.low)
-        } else if (value.high) {
+        } else if (highValid) {
          // Use just a single less than operator if we only have a high
          const fnc = allOr ? "orWhere" : "where"
          query = query[fnc](key, "<", value.high)
--- a/packages/server/src/integrations/utils.ts
+++ b/packages/server/src/integrations/utils.ts
@ -1,6 +1,11 @@
-import { SourceName, SqlQuery, Datasource, Table } from "@budibase/types"
+import { SqlQuery, Table, SearchFilters } from "@budibase/types"
 import { DocumentType, SEPARATOR } from "../db/utils"
-import { FieldTypes, BuildSchemaErrors, InvalidColumns } from "../constants"
+import {
+  FieldTypes,
+  BuildSchemaErrors,
+  InvalidColumns,
+  NoEmptyFilterStrings,
+} from "../constants"
 import { helpers } from "@budibase/shared-core"

 const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`
@ -343,3 +348,36 @@ export function getPrimaryDisplay(testValue: unknown): string | undefined {
  }
  return testValue as string
 }
+
+export function isValidFilter(value: any) {
+  return value != null && value !== ""
+}
+
+// don't do a pure falsy check, as 0 is included
+// https://github.com/Budibase/budibase/issues/10118
+export function removeEmptyFilters(filters: SearchFilters) {
+  for (let filterField of NoEmptyFilterStrings) {
+    if (!filters[filterField]) {
+      continue
+    }
+
+    for (let filterType of Object.keys(filters)) {
+      if (filterType !== filterField) {
+        continue
+      }
+      // don't know which one we're checking, type could be anything
+      const value = filters[filterType] as unknown
+      if (typeof value === "object") {
+        for (let [key, value] of Object.entries(
+          filters[filterType] as object
+        )) {
+          if (value == null || value === "") {
+            // @ts-ignore
+            delete filters[filterField][key]
+          }
+        }
+      }
+    }
+  }
+  return filters
+}
--- a/packages/server/src/sdk/app/applications/applications.ts
+++ b/packages/server/src/sdk/app/applications/applications.ts
@ -1,13 +1,14 @@
 import { AppStatus } from "../../../db/utils"
-import { App, ContextUser } from "@budibase/types"
+import { App, ContextUser, User } from "@budibase/types"
 import { getLocksById } from "../../../utilities/redis"
 import { enrichApps } from "../../users/sessions"
 import { checkAppMetadata } from "../../../automations/logging"
 import { db as dbCore, users } from "@budibase/backend-core"
+import { groups } from "@budibase/pro"

-export function filterAppList(user: ContextUser, apps: App[]) {
+export function filterAppList(user: User, apps: App[]) {
  let appList: string[] = []
-  const roleApps = Object.keys(user.roles || {})
+  const roleApps = Object.keys(user.roles)
  if (users.hasAppBuilderPermissions(user)) {
    appList = user.builder?.apps || []
    appList = appList.concat(roleApps)
@ -23,7 +24,12 @@ export async function fetch(status: AppStatus, user: ContextUser) {
  const dev = status === AppStatus.DEV
  const all = status === AppStatus.ALL
  let apps = (await dbCore.getAllApps({ dev, all })) as App[]
-  apps = filterAppList(user, apps)
+
+  const enrichedUser = await groups.enrichUserRolesFromGroups({
+    ...user,
+    roles: user.roles || {},
+  })
+  apps = filterAppList(enrichedUser, apps)

  const appIds = apps
    .filter((app: any) => app.status === "development")
--- a/packages/server/src/sdk/app/rows/search.ts
+++ b/packages/server/src/sdk/app/rows/search.ts
@ -3,6 +3,7 @@ import { isExternalTable } from "../../../integrations/utils"
 import * as internal from "./search/internal"
 import * as external from "./search/external"
 import { Format } from "../../../api/controllers/view/exporters"
+export { isValidFilter, removeEmptyFilters } from "../../../integrations/utils"

 export interface ViewParams {
  calculation: string
--- a/packages/server/src/api/controllers/row/tests/utils.spec.ts
+++ b/packages/server/src/api/controllers/row/tests/utils.spec.ts
@ -1,8 +1,8 @@
-import * as utils from "../utils"
+import * as search from "../../app/rows/search"

 describe("removeEmptyFilters", () => {
  it("0 should not be removed", () => {
-    const filters = utils.removeEmptyFilters({
+    const filters = search.removeEmptyFilters({
      equal: {
        column: 0,
      },
@ -11,7 +11,7 @@ describe("removeEmptyFilters", () => {
  })

  it("empty string should be removed", () => {
-    const filters = utils.removeEmptyFilters({
+    const filters = search.removeEmptyFilters({
      equal: {
        column: "",
      },
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@ -19,7 +19,7 @@
  "devDependencies": {
    "concurrently": "^7.6.0",
    "rimraf": "3.0.2",
-    "typescript": "4.7.3"
+    "typescript": "5.2.2"
  },
  "nx": {
    "targets": {
@ -43,7 +43,6 @@
          }
        ]
      }
-
    }
  }
 }
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -45,6 +45,6 @@
    "rollup-plugin-node-globals": "^1.4.0",
    "rollup-plugin-node-resolve": "^5.2.0",
    "rollup-plugin-terser": "^7.0.2",
-    "typescript": "4.7.3"
+    "typescript": "5.2.2"
  }
 }
--- a/packages/types/package.json
+++ b/packages/types/package.json
@ -24,7 +24,7 @@
    "concurrently": "^7.6.0",
    "koa-body": "4.2.0",
    "rimraf": "3.0.2",
-    "typescript": "4.7.3"
+    "typescript": "5.2.2"
  },
  "dependencies": {
    "scim-patch": "^0.7.0"
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -88,7 +88,6 @@
    "@types/server-destroy": "1.0.1",
    "@types/supertest": "2.0.12",
    "@types/uuid": "8.3.4",
-    "@typescript-eslint/parser": "5.45.0",
    "copyfiles": "2.4.1",
    "eslint": "6.8.0",
    "jest": "29.6.2",
@ -100,7 +99,7 @@
    "timekeeper": "2.2.0",
    "ts-node": "10.8.1",
    "tsconfig-paths": "4.0.0",
-    "typescript": "4.7.3",
+    "typescript": "5.2.2",
    "update-dotenv": "1.1.1"
  },
  "nx": {
--- a/qa-core/package.json
+++ b/qa-core/package.json
@ -38,7 +38,7 @@
    "ts-jest": "29.1.1",
    "ts-node": "10.8.1",
    "tsconfig-paths": "4.0.0",
-    "typescript": "4.7.3"
+    "typescript": "5.2.2"
  },
  "dependencies": {
    "@budibase/backend-core": "^2.3.17",
--- a/yarn.lock
+++ b/yarn.lock
@ -6696,51 +6696,52 @@
  dependencies:
    "@types/yargs-parser" "*"

-"@typescript-eslint/parser@5.45.0":
-  version "5.45.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.45.0.tgz#b18a5f6b3cf1c2b3e399e9d2df4be40d6b0ddd0e"
-  integrity sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ==
+"@typescript-eslint/parser@6.7.2":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.2.tgz#e0ae93771441b9518e67d0660c79e3a105497af4"
+  integrity sha512-KA3E4ox0ws+SPyxQf9iSI25R6b4Ne78ORhNHeVKrPQnoYsb9UhieoiRoJgrzgEeKGOXhcY1i8YtOeCHHTDa6Fw==
  dependencies:
-    "@typescript-eslint/scope-manager" "5.45.0"
-    "@typescript-eslint/types" "5.45.0"
-    "@typescript-eslint/typescript-estree" "5.45.0"
+    "@typescript-eslint/scope-manager" "6.7.2"
+    "@typescript-eslint/types" "6.7.2"
+    "@typescript-eslint/typescript-estree" "6.7.2"
+    "@typescript-eslint/visitor-keys" "6.7.2"
    debug "^4.3.4"

-"@typescript-eslint/scope-manager@5.45.0":
-  version "5.45.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.45.0.tgz#7a4ac1bfa9544bff3f620ab85947945938319a96"
-  integrity sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw==
+"@typescript-eslint/scope-manager@6.7.2":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.2.tgz#cf59a2095d2f894770c94be489648ad1c78dc689"
+  integrity sha512-bgi6plgyZjEqapr7u2mhxGR6E8WCzKNUFWNh6fkpVe9+yzRZeYtDTbsIBzKbcxI+r1qVWt6VIoMSNZ4r2A+6Yw==
  dependencies:
-    "@typescript-eslint/types" "5.45.0"
-    "@typescript-eslint/visitor-keys" "5.45.0"
+    "@typescript-eslint/types" "6.7.2"
+    "@typescript-eslint/visitor-keys" "6.7.2"

 "@typescript-eslint/types@4.33.0":
  version "4.33.0"
  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
  integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==

-"@typescript-eslint/types@5.45.0":
-  version "5.45.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.0.tgz#794760b9037ee4154c09549ef5a96599621109c5"
-  integrity sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==
-
 "@typescript-eslint/types@5.53.0":
  version "5.53.0"
  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.53.0.tgz#f79eca62b97e518ee124086a21a24f3be267026f"
  integrity sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A==

-"@typescript-eslint/typescript-estree@5.45.0":
-  version "5.45.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz#f70a0d646d7f38c0dfd6936a5e171a77f1e5291d"
-  integrity sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==
+"@typescript-eslint/types@6.7.2":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.2.tgz#75a615a6dbeca09cafd102fe7f465da1d8a3c066"
+  integrity sha512-flJYwMYgnUNDAN9/GAI3l8+wTmvTYdv64fcH8aoJK76Y+1FCZ08RtI5zDerM/FYT5DMkAc+19E4aLmd5KqdFyg==
+
+"@typescript-eslint/typescript-estree@6.7.2":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.2.tgz#ce5883c23b581a5caf878af641e49dd0349238c7"
+  integrity sha512-kiJKVMLkoSciGyFU0TOY0fRxnp9qq1AzVOHNeN1+B9erKFCJ4Z8WdjAkKQPP+b1pWStGFqezMLltxO+308dJTQ==
  dependencies:
-    "@typescript-eslint/types" "5.45.0"
-    "@typescript-eslint/visitor-keys" "5.45.0"
+    "@typescript-eslint/types" "6.7.2"
+    "@typescript-eslint/visitor-keys" "6.7.2"
    debug "^4.3.4"
    globby "^11.1.0"
    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"

 "@typescript-eslint/typescript-estree@^4.33.0":
  version "4.33.0"
@ -6776,14 +6777,6 @@
    "@typescript-eslint/types" "4.33.0"
    eslint-visitor-keys "^2.0.0"

-"@typescript-eslint/visitor-keys@5.45.0":
-  version "5.45.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz#e0d160e9e7fdb7f8da697a5b78e7a14a22a70528"
-  integrity sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==
-  dependencies:
-    "@typescript-eslint/types" "5.45.0"
-    eslint-visitor-keys "^3.3.0"
-
 "@typescript-eslint/visitor-keys@5.53.0":
  version "5.53.0"
  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz#8a5126623937cdd909c30d8fa72f79fa56cc1a9f"
@ -6792,6 +6785,14 @@
    "@typescript-eslint/types" "5.53.0"
    eslint-visitor-keys "^3.3.0"

+"@typescript-eslint/visitor-keys@6.7.2":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.2.tgz#4cb2bd786f1f459731b0ad1584c9f73e1c7a4d5c"
+  integrity sha512-uVw9VIMFBUTz8rIeaUT3fFe8xIUx8r4ywAdlQv1ifH+6acn/XF8Y6rwJ7XNmkNMDrTW+7+vxFFPIF40nJCVsMQ==
+  dependencies:
+    "@typescript-eslint/types" "6.7.2"
+    eslint-visitor-keys "^3.4.1"
+
 "@vitest/expect@0.29.8":
  version "0.29.8"
  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.29.8.tgz#6ecdd031b4ea8414717d10b65ccd800908384612"
@ -21927,6 +21928,13 @@ semver@^7.3.2, semver@^7.3.7, semver@^7.3.8:
  dependencies:
    lru-cache "^6.0.0"

+semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@~2.3.1:
  version "2.3.2"
  resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52"
@ -23882,6 +23890,11 @@ triple-beam@^1.3.0:
  resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
  integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==

+ts-api-utils@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
+  integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
+
 ts-graphviz@^1.5.0:
  version "1.5.4"
  resolved "https://registry.yarnpkg.com/ts-graphviz/-/ts-graphviz-1.5.4.tgz#61a3059afeac4f6d4be3c6729a4d88546ca9e095"
@ -24120,10 +24133,10 @@ typeof@^1.0.0:
  resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440"
  integrity sha512-Pze0mIxYXhaJdpw1ayMzOA7rtGr1OmsTY/Z+FWtRKIqXFz6aoDLjqdbWE/tcIBSC8nhnVXiRrEXujodR/xiFAA==

-typescript@4.7.3:
-  version "4.7.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
-  integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
+typescript@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
+  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==

 "typescript@>=3 < 6":
  version "5.0.4"