Merge branch 'budi-7754-make-our-helm-chart-work-out-of-the-box' of github.com:budibase/budibase into budi-7754-make-our-helm-chart-work-out-of-the-box

2023-11-22 11:16:43 +00:00 · 2023-11-22 11:16:43 +00:00 · 66f07a7f0f
parent 423fa68f34 8de920d020
commit 66f07a7f0f
216 changed files with 729 additions and 212 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -57,7 +57,10 @@
        "destructuredArrayIgnorePattern": "^_"
      }
    ],
-    "import/no-relative-packages": "error"
+    "import/no-relative-packages": "error",
+    "import/export": "error",
+    "import/no-duplicates": "error",
+    "import/newline-after-import": "error"
  },
  "globals": {
    "GeolocationPositionError": true
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "2.13.12",
+  "version": "2.13.14",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@ -1,5 +1,6 @@
 const _passport = require("koa-passport")
 const LocalStrategy = require("passport-local").Strategy
+
 import { getGlobalDB } from "../context"
 import { Cookie } from "../constants"
 import { getSessionsForUser, invalidateSessions } from "../security/sessions"
@ -26,6 +27,7 @@ import { clearCookie, getCookie } from "../utils"
 import { ssoSaveUserNoOp } from "../middleware/passport/sso/sso"

 const refresh = require("passport-oauth2-refresh")
+
 export {
  auditLog,
  authError,
--- a/packages/backend-core/src/configs/configs.ts
+++ b/packages/backend-core/src/configs/configs.ts
@ -17,7 +17,6 @@ import { DocumentType, SEPARATOR } from "../constants"
 import { CacheKey, TTL, withCache } from "../cache"
 import * as context from "../context"
 import env from "../environment"
-import environment from "../environment"

 // UTILS

@ -181,10 +180,10 @@ export async function getGoogleDatasourceConfig(): Promise<
 }

 export function getDefaultGoogleConfig(): GoogleInnerConfig | undefined {
-  if (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET) {
+  if (env.GOOGLE_CLIENT_ID && env.GOOGLE_CLIENT_SECRET) {
    return {
-      clientID: environment.GOOGLE_CLIENT_ID!,
-      clientSecret: environment.GOOGLE_CLIENT_SECRET!,
+      clientID: env.GOOGLE_CLIENT_ID!,
+      clientSecret: env.GOOGLE_CLIENT_SECRET!,
      activated: true,
    }
  }
--- a/packages/backend-core/src/constants/db.ts
+++ b/packages/backend-core/src/constants/db.ts
@ -1,4 +1,5 @@
 import { prefixed, DocumentType } from "@budibase/types"
+
 export {
  SEPARATOR,
  UNICODE_MAX,
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@ -6,6 +6,7 @@ import { AppState, DeletedApp, getAppMetadata } from "../cache/appMetadata"
 import { isDevApp, isDevAppID, getProdAppID } from "../docIds/conversions"
 import { App, Database } from "@budibase/types"
 import { getStartEndKeyURL } from "../docIds"
+
 export * from "../docIds"

 /**
--- a/packages/backend-core/src/docIds/conversions.ts
+++ b/packages/backend-core/src/docIds/conversions.ts
@ -1,5 +1,6 @@
 import { APP_DEV_PREFIX, APP_PREFIX } from "../constants"
 import { App } from "@budibase/types"
+
 const NO_APP_ERROR = "No app provided"

 export function isDevAppID(appId?: string) {
--- a/packages/backend-core/src/events/processors/posthog/index.ts
+++ b/packages/backend-core/src/events/processors/posthog/index.ts
@ -1,2 +1,3 @@
 import PosthogProcessor from "./PosthogProcessor"
+
 export default PosthogProcessor
--- a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
+++ b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
@ -1,7 +1,9 @@
 import { testEnv } from "../../../../../tests/extra"
 import PosthogProcessor from "../PosthogProcessor"
 import { Event, IdentityType, Hosting } from "@budibase/types"
+
 const tk = require("timekeeper")
+
 import * as cache from "../../../../cache/generic"
 import { CacheKey } from "../../../../cache/generic"
 import * as context from "../../../../context"
--- a/packages/backend-core/src/features/index.ts
+++ b/packages/backend-core/src/features/index.ts
@ -1,5 +1,6 @@
 import env from "../environment"
 import * as context from "../context"
+
 export * from "./installation"

 /**
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@ -38,6 +38,7 @@ export * as docIds from "./docIds"
 // circular dependencies
 import * as context from "./context"
 import * as _tenancy from "./tenancy"
+
 export const tenancy = {
  ..._tenancy,
  ...context,
--- a/packages/backend-core/src/installation.ts
+++ b/packages/backend-core/src/installation.ts
@ -1,7 +1,6 @@
 import { newid } from "./utils"
 import * as events from "./events"
-import { StaticDatabases } from "./db"
-import { doWithDB } from "./db"
+import { StaticDatabases, doWithDB } from "./db"
 import { Installation, IdentityType, Database } from "@budibase/types"
 import * as context from "./context"
 import semver from "semver"
--- a/packages/backend-core/src/logging/correlation/correlation.ts
+++ b/packages/backend-core/src/logging/correlation/correlation.ts
@ -1,4 +1,5 @@
 import { Header } from "../../constants"
+
 const correlator = require("correlation-id")

 export const setHeader = (headers: any) => {
--- a/packages/backend-core/src/logging/correlation/middleware.ts
+++ b/packages/backend-core/src/logging/correlation/middleware.ts
@ -1,5 +1,6 @@
 import { Header } from "../../constants"
 import { v4 as uuid } from "uuid"
+
 const correlator = require("correlation-id")

 const correlation = (ctx: any, next: any) => {
--- a/packages/backend-core/src/logging/pino/middleware.ts
+++ b/packages/backend-core/src/logging/pino/middleware.ts
@ -1,9 +1,12 @@
 import env from "../../environment"
 import { logger } from "./logger"
 import { IncomingMessage } from "http"
+
 const pino = require("koa-pino-logger")
+
 import { Options } from "pino-http"
 import { Ctx } from "@budibase/types"
+
 const correlator = require("correlation-id")

 export function pinoSettings(): Options {
--- a/packages/backend-core/src/middleware/index.ts
+++ b/packages/backend-core/src/middleware/index.ts
@ -2,6 +2,7 @@ export * as local from "./passport/local"
 export * as google from "./passport/sso/google"
 export * as oidc from "./passport/sso/oidc"
 import * as datasourceGoogle from "./passport/datasource/google"
+
 export const datasource = {
  google: datasourceGoogle,
 }
--- a/packages/backend-core/src/middleware/passport/sso/google.ts
+++ b/packages/backend-core/src/middleware/passport/sso/google.ts
@ -8,6 +8,7 @@ import {
  SaveSSOUserFunction,
  GoogleInnerConfig,
 } from "@budibase/types"
+
 const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy

 export function buildVerifyFn(saveUserFn: SaveSSOUserFunction) {
--- a/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
+++ b/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
@ -6,6 +6,7 @@ const mockStrategy = require("passport-google-oauth").OAuth2Strategy

 jest.mock("../sso")
 import * as _sso from "../sso"
+
 const sso = jest.mocked(_sso)

 const mockSaveUserFn = jest.fn()
--- a/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
+++ b/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
@ -11,6 +11,7 @@ const mockSaveUser = jest.fn()

 jest.mock("../../../../users")
 import * as _users from "../../../../users"
+
 const users = jest.mocked(_users)

 const getErrorMessage = () => {
--- a/packages/backend-core/src/middleware/tests/builder.spec.ts
+++ b/packages/backend-core/src/middleware/tests/builder.spec.ts
@ -5,6 +5,7 @@ import { structures } from "../../../tests"
 import { ContextUser, ServiceType } from "@budibase/types"
 import { doInAppContext } from "../../context"
 import env from "../../environment"
+
 env._set("SERVICE_TYPE", ServiceType.APPS)

 const appId = "app_aaa"
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@ -1,4 +1,5 @@
 const sanitize = require("sanitize-s3-objectkey")
+
 import AWS from "aws-sdk"
 import stream, { Readable } from "stream"
 import fetch from "node-fetch"
--- a/packages/backend-core/src/redis/redlockImpl.ts
+++ b/packages/backend-core/src/redis/redlockImpl.ts
@ -3,6 +3,7 @@ import { getLockClient } from "./init"
 import { LockOptions, LockType } from "@budibase/types"
 import * as context from "../context"
 import env from "../environment"
+import { logWarn } from "../logging"

 async function getClient(
  type: LockType,
@ -116,7 +117,7 @@ export async function doWithLock<T>(
    const result = await task()
    return { executed: true, result }
  } catch (e: any) {
-    console.warn("lock error")
+    logWarn(`lock type: ${opts.type} error`, e)
    // lock limit exceeded
    if (e.name === "LockError") {
      if (opts.type === LockType.TRY_ONCE) {
@ -124,11 +125,9 @@ export async function doWithLock<T>(
        // due to retry count (0) exceeded
        return { executed: false }
      } else {
-        console.error(e)
        throw e
      }
    } else {
-      console.error(e)
      throw e
    }
  } finally {
--- a/packages/backend-core/src/security/roles.ts
+++ b/packages/backend-core/src/security/roles.ts
@ -1,7 +1,12 @@
 import { BuiltinPermissionID, PermissionLevel } from "./permissions"
-import { prefixRoleID, getRoleParams, DocumentType, SEPARATOR } from "../db"
+import {
+  prefixRoleID,
+  getRoleParams,
+  DocumentType,
+  SEPARATOR,
+  doWithDB,
+} from "../db"
 import { getAppDB } from "../context"
-import { doWithDB } from "../db"
 import { Screen, Role as RoleDoc } from "@budibase/types"
 import cloneDeep from "lodash/fp/cloneDeep"

--- a/packages/backend-core/src/security/sessions.ts
+++ b/packages/backend-core/src/security/sessions.ts
@ -1,6 +1,7 @@
 const redis = require("../redis/init")
 const { v4: uuidv4 } = require("uuid")
 const { logWarn } = require("../logging")
+
 import env from "../environment"
 import {
  Session,
--- a/packages/backend-core/src/users/db.ts
+++ b/packages/backend-core/src/users/db.ts
@ -1,6 +1,5 @@
 import env from "../environment"
 import * as eventHelpers from "./events"
-import * as accounts from "../accounts"
 import * as accountSdk from "../accounts"
 import * as cache from "../cache"
 import { getGlobalDB, getIdentity, getTenantId } from "../context"
@ -467,7 +466,7 @@ export class UserDB {
    if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
      // root account holder can't be deleted from inside budibase
      const email = dbUser.email
-      const account = await accounts.getAccount(email)
+      const account = await accountSdk.getAccount(email)
      if (account) {
        if (dbUser.userId === getIdentity()!._id) {
          throw new HTTPError('Please visit "Account" to delete this user', 400)
--- a/packages/backend-core/src/utils/hashing.ts
+++ b/packages/backend-core/src/utils/hashing.ts
@ -1,4 +1,5 @@
 import env from "../environment"
+
 export * from "../docIds/newid"
 const bcrypt = env.JS_BCRYPT ? require("bcryptjs") : require("bcrypt")

--- a/packages/backend-core/src/utils/utils.ts
+++ b/packages/backend-core/src/utils/utils.ts
@ -11,6 +11,7 @@ import {
  TenantResolutionStrategy,
 } from "@budibase/types"
 import type { SetOption } from "cookies"
+
 const jwt = require("jsonwebtoken")

 const APP_PREFIX = DocumentType.APP + SEPARATOR
--- a/packages/backend-core/tests/core/utilities/mocks/alerts.ts
+++ b/packages/backend-core/tests/core/utilities/mocks/alerts.ts
@ -1,3 +1,4 @@
 jest.mock("../../../../src/logging/alerts")
 import * as _alerts from "../../../../src/logging/alerts"
+
 export const alerts = jest.mocked(_alerts)
--- a/packages/backend-core/tests/core/utilities/mocks/index.ts
+++ b/packages/backend-core/tests/core/utilities/mocks/index.ts
@ -1,5 +1,6 @@
 jest.mock("../../../../src/accounts")
 import * as _accounts from "../../../../src/accounts"
+
 export const accounts = jest.mocked(_accounts)

 export * as date from "./date"
--- a/packages/backend-core/tests/core/utilities/structures/generator.ts
+++ b/packages/backend-core/tests/core/utilities/structures/generator.ts
@ -1,2 +1,3 @@
 import Chance from "./Chance"
+
 export const generator = new Chance()
--- a/packages/backend-core/tests/jestSetup.ts
+++ b/packages/backend-core/tests/jestSetup.ts
@ -9,6 +9,7 @@ mocks.fetch.enable()
 // mock all dates to 2020-01-01T00:00:00.000Z
 // use tk.reset() to use real dates in individual tests
 import tk from "timekeeper"
+
 tk.freeze(mocks.date.MOCK_DATE)

 if (!process.env.DEBUG) {
--- a/packages/bbui/src/ActionGroup/ActionGroup.svelte
+++ b/packages/bbui/src/ActionGroup/ActionGroup.svelte
@ -1,5 +1,6 @@
 <script>
  import "@spectrum-css/actiongroup/dist/index-vars.css"
+
  export let vertical = false
  export let justified = false
  export let quiet = false
--- a/packages/bbui/src/Avatar/Avatar.svelte
+++ b/packages/bbui/src/Avatar/Avatar.svelte
@ -1,5 +1,6 @@
 <script>
  import "@spectrum-css/avatar/dist/index-vars.css"
+
  let sizes = new Map([
    ["XXS", "--spectrum-alias-avatar-size-50"],
    ["XS", "--spectrum-alias-avatar-size-75"],
--- a/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
+++ b/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
@ -1,5 +1,6 @@
 <script>
  import "@spectrum-css/buttongroup/dist/index-vars.css"
+
  export let vertical = false
  export let gap = ""

--- a/packages/bbui/src/Divider/Divider.svelte
+++ b/packages/bbui/src/Divider/Divider.svelte
@ -1,5 +1,6 @@
 <script>
  import "@spectrum-css/divider/dist/index-vars.css"
+
  export let size = "M"

  export let vertical = false
--- a/packages/bbui/src/Drawer/Drawer.svelte
+++ b/packages/bbui/src/Drawer/Drawer.svelte
@ -3,8 +3,7 @@
  import Button from "../Button/Button.svelte"
  import Body from "../Typography/Body.svelte"
  import Heading from "../Typography/Heading.svelte"
-  import { setContext } from "svelte"
-  import { createEventDispatcher } from "svelte"
+  import { setContext, createEventDispatcher } from "svelte"
  import { generate } from "shortid"

  export let title
--- a/packages/bbui/src/Link/Link.svelte
+++ b/packages/bbui/src/Link/Link.svelte
@ -16,10 +16,9 @@

  const dispatch = createEventDispatcher()

-  const onClick = e => {
+  const onClick = () => {
    if (!disabled) {
      dispatch("click")
-      e.stopPropagation()
    }
  }
 </script>
--- a/packages/bbui/src/Modal/Content.svelte
+++ b/packages/bbui/src/Modal/Content.svelte
@ -1,5 +1,6 @@
 <script>
  import Input from "../Form/Input.svelte"
+
  let value = ""
 </script>

--- a/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
+++ b/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
@ -4,6 +4,7 @@
  import Icon from "../Icon/Icon.svelte"
  import Popover from "../Popover/Popover.svelte"
  import { onMount } from "svelte"
+
  const flipDurationMs = 150

  export let constraints
--- a/packages/bbui/src/Popover/Popover.svelte
+++ b/packages/bbui/src/Popover/Popover.svelte
@ -1,11 +1,10 @@
 <script>
  import "@spectrum-css/popover/dist/index-vars.css"
  import Portal from "svelte-portal"
-  import { createEventDispatcher } from "svelte"
+  import { createEventDispatcher, getContext } from "svelte"
  import positionDropdown from "../Actions/position_dropdown"
  import clickOutside from "../Actions/click_outside"
  import { fly } from "svelte/transition"
-  import { getContext } from "svelte"
  import Context from "../context"

  const dispatch = createEventDispatcher()
--- a/packages/bbui/src/SideNavigation/Item.svelte
+++ b/packages/bbui/src/SideNavigation/Item.svelte
@ -1,7 +1,9 @@
 <script>
  import { getContext } from "svelte"
+
  const multilevel = getContext("sidenav-type")
  import Badge from "../Badge/Badge.svelte"
+
  export let href = ""
  export let external = false
  export let heading = ""
--- a/packages/bbui/src/SideNavigation/Navigation.svelte
+++ b/packages/bbui/src/SideNavigation/Navigation.svelte
@ -1,6 +1,7 @@
 <script>
  import { setContext } from "svelte"
  import "@spectrum-css/sidenav/dist/index-vars.css"
+
  export let multilevel = false
  setContext("sidenav-type", multilevel)
 </script>
--- a/packages/bbui/src/Table/ArrayRenderer.svelte
+++ b/packages/bbui/src/Table/ArrayRenderer.svelte
@ -1,6 +1,7 @@
 <script>
  import "@spectrum-css/label/dist/index-vars.css"
  import Badge from "../Badge/Badge.svelte"
+
  export let value

  const displayLimit = 5
--- a/packages/bbui/src/Tabs/Tab.svelte
+++ b/packages/bbui/src/Tabs/Tab.svelte
@ -1,6 +1,7 @@
 <script>
  import { getContext, onMount, createEventDispatcher } from "svelte"
  import Portal from "svelte-portal"
+
  export let title
  export let icon = ""
  export let id
--- a/packages/bbui/src/helpers.js
+++ b/packages/bbui/src/helpers.js
@ -1,4 +1,5 @@
 import { helpers } from "@budibase/shared-core"
+
 export const deepGet = helpers.deepGet

 /**
--- a/packages/builder/src/builderStore/index.js
+++ b/packages/builder/src/builderStore/index.js
@ -4,11 +4,10 @@ import { getTemporalStore } from "./store/temporal"
 import { getThemeStore } from "./store/theme"
 import { getUserStore } from "./store/users"
 import { getDeploymentStore } from "./store/deployments"
-import { derived, writable } from "svelte/store"
+import { derived, writable, get } from "svelte/store"
 import { findComponent, findComponentPath } from "./componentUtils"
 import { RoleUtils } from "@budibase/frontend-core"
 import { createHistoryStore } from "builderStore/store/history"
-import { get } from "svelte/store"

 export const store = getFrontendStore()
 export const automationStore = getAutomationStore()
--- a/packages/builder/src/builderStore/websocket.js
+++ b/packages/builder/src/builderStore/websocket.js
@ -7,11 +7,9 @@ import {
 } from "builderStore"
 import { datasources, tables } from "stores/backend"
 import { get } from "svelte/store"
-import { auth } from "stores/portal"
-import { SocketEvent, BuilderSocketEvent } from "@budibase/shared-core"
-import { apps } from "stores/portal"
+import { auth, apps } from "stores/portal"
+import { SocketEvent, BuilderSocketEvent, helpers } from "@budibase/shared-core"
 import { notifications } from "@budibase/bbui"
-import { helpers } from "@budibase/shared-core"

 export const createBuilderWebsocket = appId => {
  const socket = createWebsocket("/socket/builder")
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
@ -1,5 +1,9 @@
 <script>
-  import { automationStore, selectedAutomation } from "builderStore"
+  import {
+    automationStore,
+    selectedAutomation,
+    automationHistoryStore,
+  } from "builderStore"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
  import FlowItem from "./FlowItem.svelte"
  import TestDataModal from "./TestDataModal.svelte"
@ -8,7 +12,6 @@
  import { Icon, notifications, Modal } from "@budibase/bbui"
  import { ActionStepID } from "constants/backend/automations"
  import UndoRedoControl from "components/common/UndoRedoControl.svelte"
-  import { automationHistoryStore } from "builderStore"

  export let automation

--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@ -1,7 +1,7 @@
 <script>
  import { automationStore } from "builderStore"
-  import { notifications } from "@budibase/bbui"
  import {
+    notifications,
    Input,
    InlineAlert,
    ModalContent,
--- a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
@ -1,7 +1,12 @@
 <script>
  import { automationStore } from "builderStore"
-  import { notifications } from "@budibase/bbui"
-  import { Icon, Input, ModalContent, Modal } from "@budibase/bbui"
+  import {
+    notifications,
+    Icon,
+    Input,
+    ModalContent,
+    Modal,
+  } from "@budibase/bbui"

  export let automation
  export let onCancel = undefined
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@ -38,12 +38,11 @@
    EditorModes,
  } from "components/common/CodeEditor"
  import FilterDrawer from "components/design/settings/controls/FilterEditor/FilterDrawer.svelte"
-  import { LuceneUtils } from "@budibase/frontend-core"
+  import { LuceneUtils, Utils } from "@budibase/frontend-core"
  import {
    getSchemaForDatasourcePlus,
    getEnvironmentBindings,
  } from "builderStore/dataBinding"
-  import { Utils } from "@budibase/frontend-core"
  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
  import { onMount } from "svelte"
  import { cloneDeep } from "lodash/fp"
--- a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
@ -2,6 +2,7 @@
  import { Button, Select, Input, Label } from "@budibase/bbui"
  import { onMount, createEventDispatcher } from "svelte"
  import { flags } from "stores/backend"
+
  const dispatch = createEventDispatcher()

  export let value
--- a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
+++ b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
@ -1,8 +1,7 @@
 <script>
-  import { Icon, notifications } from "@budibase/bbui"
+  import { Icon, notifications, ModalContent } from "@budibase/bbui"
  import { automationStore, selectedAutomation } from "builderStore"
  import WebhookDisplay from "./WebhookDisplay.svelte"
-  import { ModalContent } from "@budibase/bbui"
  import { onMount, onDestroy } from "svelte"

  const POLL_RATE_MS = 2500
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@ -1,11 +1,15 @@
 <script>
  import { createEventDispatcher } from "svelte"
-  import { tables } from "stores/backend"
-  import { roles } from "stores/backend"
-  import { notifications } from "@budibase/bbui"
+  import { tables, roles } from "stores/backend"
+  import {
+    notifications,
+    keepOpen,
+    ModalContent,
+    Select,
+    Link,
+  } from "@budibase/bbui"
  import RowFieldControl from "../RowFieldControl.svelte"
  import { API } from "api"
-  import { keepOpen, ModalContent, Select, Link } from "@budibase/bbui"
  import ErrorsBox from "components/common/ErrorsBox.svelte"
  import { goto } from "@roxi/routify"

--- a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
@ -1,8 +1,14 @@
 <script>
-  import { keepOpen, ModalContent, Select, Input, Button } from "@budibase/bbui"
+  import {
+    keepOpen,
+    ModalContent,
+    Select,
+    Input,
+    Button,
+    notifications,
+  } from "@budibase/bbui"
  import { onMount } from "svelte"
  import { API } from "api"
-  import { notifications } from "@budibase/bbui"
  import ErrorsBox from "components/common/ErrorsBox.svelte"
  import { roles } from "stores/backend"

--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
@ -1,8 +1,7 @@
 <script>
  import { get } from "svelte/store"
  import { datasources, integrations } from "stores/backend"
-  import { notifications } from "@budibase/bbui"
-  import { Input, ModalContent, Modal } from "@budibase/bbui"
+  import { notifications, Input, ModalContent, Modal } from "@budibase/bbui"
  import { integrationForDatasource } from "stores/selectors"

  let error = ""
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
@ -1,8 +1,7 @@
 <script>
  import { goto } from "@roxi/routify"
  import { datasources } from "stores/backend"
-  import { notifications } from "@budibase/bbui"
-  import { ActionMenu, MenuItem, Icon } from "@budibase/bbui"
+  import { notifications, ActionMenu, MenuItem, Icon } from "@budibase/bbui"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
  import UpdateDatasourceModal from "components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte"
  import { BUDIBASE_DATASOURCE_TYPE } from "constants/backend"
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
@ -1,5 +1,8 @@
 <script>
-  import { RelationshipType } from "constants/backend"
+  import {
+    RelationshipType,
+    PrettyRelationshipDefinitions,
+  } from "constants/backend"
  import {
    keepOpen,
    Button,
@ -8,13 +11,12 @@
    Select,
    Detail,
    Body,
+    Helpers,
  } from "@budibase/bbui"
  import { tables } from "stores/backend"
-  import { Helpers } from "@budibase/bbui"
  import { RelationshipErrorChecker } from "./relationshipErrors"
  import { onMount } from "svelte"
  import RelationshipSelector from "components/common/RelationshipSelector.svelte"
-  import { PrettyRelationshipDefinitions } from "constants/backend"

  export let save
  export let datasource
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@ -1,9 +1,13 @@
 <script>
  import { goto, url } from "@roxi/routify"
-  import { tables } from "stores/backend"
-  import { notifications } from "@budibase/bbui"
-  import { Input, Label, ModalContent, Layout } from "@budibase/bbui"
-  import { datasources } from "stores/backend"
+  import { tables, datasources } from "stores/backend"
+  import {
+    notifications,
+    Input,
+    Label,
+    ModalContent,
+    Layout,
+  } from "@budibase/bbui"
  import TableDataImport from "../TableDataImport.svelte"
  import {
    BUDIBASE_INTERNAL_DB_ID,
--- a/packages/builder/src/components/common/CustomSVG.svelte
+++ b/packages/builder/src/components/common/CustomSVG.svelte
@ -1,5 +1,6 @@
 <script>
  import { Helpers } from "@budibase/bbui"
+
  export let size
  export let svgHtml

--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@ -9,18 +9,18 @@
    Heading,
    Icon,
  } from "@budibase/bbui"
-  import { createEventDispatcher, onMount } from "svelte"
+  import { createEventDispatcher, onMount, getContext } from "svelte"
  import {
    isValid,
    decodeJSBinding,
    encodeJSBinding,
+    convertToJS,
  } from "@budibase/string-templates"
  import {
    readableToRuntimeBinding,
    runtimeToReadableBinding,
  } from "builderStore/dataBinding"

-  import { convertToJS } from "@budibase/string-templates"
  import { admin } from "stores/portal"
  import CodeEditor from "../CodeEditor/CodeEditor.svelte"
  import {
@ -32,7 +32,6 @@
    hbInsert,
    jsInsert,
  } from "../CodeEditor"
-  import { getContext } from "svelte"
  import BindingPicker from "./BindingPicker.svelte"

  const dispatch = createEventDispatcher()
--- a/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
+++ b/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
@ -1,5 +1,6 @@
 <script>
  import { capitalise } from "helpers"
+
  export let value
 </script>

--- a/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte
+++ b/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte
@ -1,5 +1,6 @@
 <script>
  import dayjs from "dayjs"
+
  export let value
 </script>

--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@ -20,7 +20,12 @@
  import analytics, { Events, EventSource } from "analytics"
  import { API } from "api"
  import { apps } from "stores/portal"
-  import { deploymentStore, store, isOnlyUser } from "builderStore"
+  import {
+    deploymentStore,
+    store,
+    isOnlyUser,
+    sortedScreens,
+  } from "builderStore"
  import TourWrap from "components/portal/onboarding/TourWrap.svelte"
  import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
  import { goto } from "@roxi/routify"
@ -48,7 +53,7 @@
    $store.upgradableVersion &&
    $store.version &&
    $store.upgradableVersion !== $store.version
-  $: canPublish = !publishing && loaded
+  $: canPublish = !publishing && loaded && $sortedScreens.length > 0
  $: lastDeployed = getLastDeployedString($deploymentStore)

  const initialiseApp = async () => {
@ -175,7 +180,12 @@

    <div class="app-action-button preview">
      <div class="app-action">
-        <ActionButton quiet icon="PlayCircle" on:click={previewApp}>
+        <ActionButton
+          disabled={$sortedScreens.length === 0}
+          quiet
+          icon="PlayCircle"
+          on:click={previewApp}
+        >
          Preview
        </ActionButton>
      </div>
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
@ -1,7 +1,6 @@
 <script>
-  import { ActionButton, Button, Drawer } from "@budibase/bbui"
+  import { ActionButton, Button, Drawer, notifications } from "@budibase/bbui"
  import { createEventDispatcher } from "svelte"
-  import { notifications } from "@budibase/bbui"
  import ButtonActionDrawer from "./ButtonActionDrawer.svelte"
  import { cloneDeep } from "lodash/fp"

--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
@ -2,6 +2,7 @@
  import { Select, Body } from "@budibase/bbui"
  import { onMount } from "svelte"
  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+
  export let parameters
  export let bindings

--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@ -24,8 +24,9 @@
    queries as queriesStore,
    viewsV2 as viewsV2Store,
    views as viewsStore,
+    datasources,
+    integrations,
  } from "stores/backend"
-  import { datasources, integrations } from "stores/backend"
  import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
  import IntegrationQueryEditor from "components/integration/index.svelte"
  import { makePropSafe as safe } from "@budibase/string-templates"
--- a/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
+++ b/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
@ -1,8 +1,7 @@
 <script>
  import { dndzone } from "svelte-dnd-action"
-  import { createEventDispatcher } from "svelte"
+  import { createEventDispatcher, setContext } from "svelte"
  import { generate } from "shortid"
-  import { setContext } from "svelte"
  import { writable, get } from "svelte/store"
  import DragHandle from "./drag-handle.svelte"

--- a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
+++ b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
@ -2,9 +2,8 @@
  import { Icon, Popover, Layout } from "@budibase/bbui"
  import { store } from "builderStore"
  import { cloneDeep } from "lodash/fp"
-  import { createEventDispatcher } from "svelte"
+  import { createEventDispatcher, getContext } from "svelte"
  import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
-  import { getContext } from "svelte"

  export let anchor
  export let componentInstance
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@ -7,10 +7,9 @@
    getBindableProperties,
    getComponentBindableProperties,
  } from "builderStore/dataBinding"
-  import { currentAsset } from "builderStore"
+  import { currentAsset, store, selectedScreen } from "builderStore"
  import DraggableList from "../DraggableList/DraggableList.svelte"
  import { createEventDispatcher } from "svelte"
-  import { store, selectedScreen } from "builderStore"
  import FieldSetting from "./FieldSetting.svelte"
  import { convertOldFieldFormat, getComponentForField } from "./utils"

--- a/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js
+++ b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js
@ -1,2 +1,3 @@
 import FlatButtonGroup from "./FlatButtonGroup.svelte"
+
 export default FlatButtonGroup
--- a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
@ -1,6 +1,7 @@
 <script>
  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
  import { getUserBindings } from "builderStore/dataBinding"
+
  export let bindable = true
  export let queryBindings = []
  export let hideHeading = false
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@ -404,7 +404,7 @@
    datasource = $datasources.list.find(ds => ds._id === query?.datasourceId)
    const datasourceUrl = datasource?.config.url
    const qs = query?.fields.queryString
-    breakQs = restUtils.breakQueryString(encodeURI(qs))
+    breakQs = restUtils.breakQueryString(encodeURI(qs ?? ""))
    breakQs = runtimeToReadableMap(mergedBindings, breakQs)

    const path = query.fields.path
--- a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
+++ b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
@ -11,6 +11,7 @@
  import { environment } from "stores/portal"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
  import { getContext } from "svelte"
+
  const modalContext = getContext(Context.Modal)

  export let save
--- a/packages/builder/src/components/settings/ThemeModal.svelte
+++ b/packages/builder/src/components/settings/ThemeModal.svelte
@ -1,6 +1,5 @@
 <script>
-  import { ModalContent } from "@budibase/bbui"
-  import { Select } from "@budibase/bbui"
+  import { ModalContent, Select } from "@budibase/bbui"
  import { themeStore } from "builderStore"
  import { Constants } from "@budibase/frontend-core"
 </script>
--- a/packages/builder/src/components/usage/Usage.svelte
+++ b/packages/builder/src/components/usage/Usage.svelte
@ -2,6 +2,7 @@
  import { Body, ProgressBar, Heading, Icon, Link } from "@budibase/bbui"
  import { admin, auth } from "../../stores/portal"
  import { onMount } from "svelte"
+
  export let usage
  export let warnWhenFull = false

--- a/packages/builder/src/pages/builder/admin/index.svelte
+++ b/packages/builder/src/pages/builder/admin/index.svelte
@ -1,10 +1,17 @@
 <script>
-  import { Button, Heading, notifications, Layout, Body } from "@budibase/bbui"
+  import {
+    Button,
+    Heading,
+    notifications,
+    Layout,
+    Body,
+    FancyForm,
+    FancyInput,
+  } from "@budibase/bbui"
  import { goto } from "@roxi/routify"
  import { API } from "api"
  import { admin, auth } from "stores/portal"
  import Logo from "assets/bb-emblem.svg"
-  import { FancyForm, FancyInput } from "@budibase/bbui"
  import { TestimonialPage } from "@budibase/frontend-core/src/components"
  import { passwordsMatch, handleError } from "../auth/_components/utils"

--- a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
@ -1,6 +1,6 @@
 <script>
  import { Heading, Body, Layout, Button, Modal } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "builderStore"
+  import { automationStore, selectedAutomation, store } from "builderStore"
  import AutomationPanel from "components/automation/AutomationPanel/AutomationPanel.svelte"
  import CreateAutomationModal from "components/automation/AutomationPanel/CreateAutomationModal.svelte"
  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
@ -8,7 +8,6 @@
  import { onDestroy, onMount } from "svelte"
  import { syncURLToState } from "helpers/urlStateSync"
  import * as routify from "@roxi/routify"
-  import { store } from "builderStore"

  $: automationId = $selectedAutomation?._id
  $: store.actions.websocket.selectResource(automationId)
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
@ -1,5 +1,5 @@
 <script>
-  import { Modal, keepOpen } from "@budibase/bbui"
+  import { Modal, keepOpen, notifications } from "@budibase/bbui"
  import { goto } from "@roxi/routify"
  import { IntegrationTypes } from "constants/backend"
  import GoogleAuthPrompt from "./GoogleAuthPrompt.svelte"
@ -11,7 +11,6 @@
  import { createOnGoogleAuthStore } from "./stores/onGoogleAuth.js"
  import { createDatasourceCreationStore } from "./stores/datasourceCreation.js"
  import { configFromIntegration } from "stores/selectors"
-  import { notifications } from "@budibase/bbui"

  export let loading = false
  const store = createDatasourceCreationStore()
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
@ -2,6 +2,7 @@
  import { Body } from "@budibase/bbui"
  import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
  import { IntegrationTypes } from "constants/backend"
+
  export let datasource
  const getSubtitle = datasource => {
    if (datasource.source === IntegrationTypes.REST) {
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationBuilder.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationBuilder.svelte
@ -1,8 +1,7 @@
 <script>
-  import { Table, Modal, Layout, ActionButton } from "@budibase/bbui"
+  import { Table, Modal, Layout, ActionButton, Helpers } from "@budibase/bbui"
  import AuthTypeRenderer from "./AuthTypeRenderer.svelte"
  import RestAuthenticationModal from "./RestAuthenticationModal.svelte"
-  import { Helpers } from "@budibase/bbui"
  import { createEventDispatcher } from "svelte"

  export let authConfigs = []
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte
@ -1,5 +1,6 @@
 <script>
  import { redirect } from "@roxi/routify"
+
  $redirect("../../")
 </script>

--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte
@ -1,5 +1,6 @@
 <script>
  import { redirect } from "@roxi/routify"
+
  $redirect("../")
 </script>

--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte
@ -1,6 +1,7 @@
 <script>
  import { DetailSummary } from "@budibase/bbui"
  import InfoDisplay from "./InfoDisplay.svelte"
+
  export let componentDefinition
 </script>

--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
@ -6,13 +6,12 @@
  import DesignSection from "./DesignSection.svelte"
  import CustomStylesSection from "./CustomStylesSection.svelte"
  import ConditionalUISection from "./ConditionalUISection.svelte"
-  import { notifications } from "@budibase/bbui"
+  import { notifications, ActionButton } from "@budibase/bbui"

  import {
    getBindableProperties,
    getComponentBindableProperties,
  } from "builderStore/dataBinding"
-  import { ActionButton } from "@budibase/bbui"
  import { capitalise } from "helpers"

  const onUpdateName = async value => {
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
@ -1,7 +1,7 @@
 <script>
  import { get } from "svelte/store"
-  import { Helpers } from "@budibase/bbui"
  import {
+    Helpers,
    Input,
    Checkbox,
    Banner,
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
@ -1,13 +1,14 @@
 <script>
-  import { store, userSelectedResourceMap } from "builderStore"
-  import ComponentDropdownMenu from "./ComponentDropdownMenu.svelte"
-  import NavItem from "components/common/NavItem.svelte"
-  import { notifications } from "@budibase/bbui"
  import {
+    store,
+    userSelectedResourceMap,
    selectedComponentPath,
    selectedComponent,
    selectedScreen,
  } from "builderStore"
+  import ComponentDropdownMenu from "./ComponentDropdownMenu.svelte"
+  import NavItem from "components/common/NavItem.svelte"
+  import { notifications } from "@budibase/bbui"
  import {
    findComponentPath,
    getComponentText,
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
@ -4,10 +4,9 @@
  import { store, selectedScreen, userSelectedResourceMap } from "builderStore"
  import NavItem from "components/common/NavItem.svelte"
  import ComponentTree from "./ComponentTree.svelte"
-  import { dndStore } from "./dndStore.js"
+  import { dndStore, DropPosition } from "./dndStore.js"
  import ScreenslotDropdownMenu from "./ScreenslotDropdownMenu.svelte"
  import DNDPositionIndicator from "./DNDPositionIndicator.svelte"
-  import { DropPosition } from "./dndStore"
  import ComponentKeyHandler from "./ComponentKeyHandler.svelte"
  import ComponentScrollWrapper from "./ComponentScrollWrapper.svelte"

--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte
@ -1,5 +1,6 @@
 <script>
  import { Icon } from "@budibase/bbui"
+
  export let datasource
  export let selected = false

--- a/packages/builder/src/pages/builder/app/[application]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/index.svelte
@ -1,4 +1,5 @@
 <script>
  import { redirect } from "@roxi/routify"
+
  $redirect("./data")
 </script>
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
@ -1,5 +1,6 @@
 <script>
  import { Badge } from "@budibase/bbui"
+
  export let value

  $: isError = !value || value.toLowerCase() === "error"
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
@ -1,5 +1,6 @@
 <script>
  import { BackupTrigger } from "constants/backend/backups"
+
  export let row

  $: trigger = row?.trigger || "manual"
--- a/packages/builder/src/pages/builder/app/index.svelte
+++ b/packages/builder/src/pages/builder/app/index.svelte
@ -1,4 +1,5 @@
 <script>
  import { redirect } from "@roxi/routify"
+
  $redirect("../portal")
 </script>
--- a/packages/builder/src/pages/builder/auth/forgot.svelte
+++ b/packages/builder/src/pages/builder/auth/forgot.svelte
@ -6,13 +6,14 @@
    Body,
    Heading,
    Icon,
+    FancyForm,
+    FancyInput,
  } from "@budibase/bbui"
  import { organisation, auth } from "stores/portal"
  import Logo from "assets/bb-emblem.svg"
  import { onMount } from "svelte"
  import { goto } from "@roxi/routify"
  import { TestimonialPage } from "@budibase/frontend-core/src/components"
-  import { FancyForm, FancyInput } from "@budibase/bbui"

  let email = ""
  let form
--- a/packages/builder/src/pages/builder/auth/login.svelte
+++ b/packages/builder/src/pages/builder/auth/login.svelte
@ -8,6 +8,8 @@
    Layout,
    notifications,
    Link,
+    FancyForm,
+    FancyInput,
  } from "@budibase/bbui"
  import { goto } from "@roxi/routify"
  import { auth, organisation, oidc, admin } from "stores/portal"
@ -16,7 +18,6 @@
  import { handleError } from "./_components/utils"
  import Logo from "assets/bb-emblem.svg"
  import { TestimonialPage } from "@budibase/frontend-core/src/components"
-  import { FancyForm, FancyInput } from "@budibase/bbui"
  import { onMount } from "svelte"

  let loaded = false
--- a/packages/builder/src/pages/builder/auth/reset.svelte
+++ b/packages/builder/src/pages/builder/auth/reset.svelte
@ -1,10 +1,17 @@
 <script>
-  import { Body, Button, Heading, Layout, notifications } from "@budibase/bbui"
+  import {
+    Body,
+    Button,
+    Heading,
+    Layout,
+    notifications,
+    FancyForm,
+    FancyInput,
+  } from "@budibase/bbui"
  import { goto, params } from "@roxi/routify"
  import { auth, organisation } from "stores/portal"
  import Logo from "assets/bb-emblem.svg"
  import { TestimonialPage } from "@budibase/frontend-core/src/components"
-  import { FancyForm, FancyInput } from "@budibase/bbui"
  import { onMount } from "svelte"
  import { handleError, passwordsMatch } from "./_components/utils"

--- a/packages/builder/src/pages/builder/invite/index.svelte
+++ b/packages/builder/src/pages/builder/invite/index.svelte
@ -1,10 +1,17 @@
 <script>
-  import { Layout, Heading, Body, Button, notifications } from "@budibase/bbui"
+  import {
+    Layout,
+    Heading,
+    Body,
+    Button,
+    notifications,
+    FancyForm,
+    FancyInput,
+  } from "@budibase/bbui"
  import { goto, params } from "@roxi/routify"
  import { users, organisation, auth } from "stores/portal"
  import Logo from "assets/bb-emblem.svg"
  import { TestimonialPage } from "@budibase/frontend-core/src/components"
-  import { FancyForm, FancyInput } from "@budibase/bbui"
  import { onMount } from "svelte"
  import { handleError, passwordsMatch } from "../auth/_components/utils"

--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
@ -1,6 +1,7 @@
 <script>
  import dayjs from "dayjs"
  import relativeTime from "dayjs/plugin/relativeTime"
+
  dayjs.extend(relativeTime)

  export let row
--- a/packages/builder/src/pages/builder/portal/account/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/index.svelte
@ -1,4 +1,5 @@
 <script>
  import { redirect } from "@roxi/routify"
+
  $redirect("./usage")
 </script>
--- a/packages/builder/src/pages/builder/portal/apps/[appId]/ErrorSVG.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/ErrorSVG.svelte
@ -0,0 +1,65 @@
+<xml version="1.0" />
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  enable-background="new 0 0 48 48"
+  height="48px"
+  viewBox="0 0 48 48"
+  width="48px"
+  xml:space="preserve"
+>
+  <g>
+    <g>
+      <path
+        d="M9,42H3c-0.552,0-1-0.449-1-1v-3.5C2,37.224,2.224,37,2.5,37S3,37.224,3,37.5V41h6    c0.276,0,0.5,0.224,0.5,0.5S9.276,42,9,42z"
+      />
+      <path
+        d="M45,42h-6c-0.276,0-0.5-0.224-0.5-0.5S38.724,41,39,41h6V13H3v27c0,0.276-0.224,0.5-0.5,0.5S2,40.276,2,40    V12h44v29C46,41.551,45.552,42,45,42z"
+      />
+      <g>
+        <path
+          d="M45.5,13h-43C2.224,13,2,12.776,2,12.5v-5C2,6.673,2.673,6,3.5,6h41C45.327,6,46,6.673,46,7.5v5     C46,12.776,45.776,13,45.5,13z M3,12h42V7.5C45,7.224,44.775,7,44.5,7h-41C3.225,7,3,7.224,3,7.5V12z"
+        />
+      </g>
+      <g>
+        <g>
+          <path
+            d="M16.5,11c-0.827,0-1.5-0.673-1.5-1.5S15.673,8,16.5,8S18,8.673,18,9.5S17.327,11,16.5,11z M16.5,9      C16.225,9,16,9.224,16,9.5s0.225,0.5,0.5,0.5S17,9.776,17,9.5S16.775,9,16.5,9z"
+          />
+        </g>
+        <g>
+          <path
+            d="M11.5,11c-0.827,0-1.5-0.673-1.5-1.5S10.673,8,11.5,8S13,8.673,13,9.5S12.327,11,11.5,11z M11.5,9      C11.225,9,11,9.224,11,9.5s0.225,0.5,0.5,0.5S12,9.776,12,9.5S11.775,9,11.5,9z"
+          />
+        </g>
+        <g>
+          <path
+            d="M6.5,11C5.673,11,5,10.327,5,9.5S5.673,8,6.5,8S8,8.673,8,9.5S7.327,11,6.5,11z M6.5,9      C6.225,9,6,9.224,6,9.5S6.225,10,6.5,10S7,9.776,7,9.5S6.775,9,6.5,9z"
+          />
+        </g>
+      </g>
+    </g>
+    <g>
+      <g>
+        <path
+          d="M35.696,44H12.304c-0.728,0-1.313-0.284-1.605-0.779c-0.289-0.489-0.259-1.126,0.084-1.749L22.58,19.996     c0.709-1.285,2.132-1.285,2.839,0l11.799,21.477v0c0.343,0.623,0.373,1.26,0.084,1.749C37.01,43.716,36.424,44,35.696,44z M24,20     c-0.176,0-0.379,0.179-0.544,0.478L11.659,41.954c-0.168,0.306-0.205,0.582-0.101,0.758C11.667,42.895,11.938,43,12.304,43     h23.393c0.365,0,0.637-0.105,0.745-0.288c0.104-0.177,0.067-0.453-0.101-0.758v0L24.543,20.478C24.379,20.179,24.176,20,24,20z"
+        />
+      </g>
+      <g>
+        <path
+          d="M24,36L24,36c-0.225,0-0.421-0.15-0.481-0.366C23.456,35.412,22,30.169,22,28c0-1.103,0.897-2,2-2     s2,0.897,2,2c0,2.232-1.457,7.417-1.519,7.636C24.42,35.851,24.224,36,24,36z M24,27c-0.552,0-1,0.449-1,1     c0,1.266,0.569,3.793,1.002,5.531C24.435,31.806,25,29.301,25,28C25,27.449,24.552,27,24,27z"
+        />
+      </g>
+      <g>
+        <path
+          d="M24,41c-1.103,0-2-0.897-2-2s0.897-2,2-2s2,0.897,2,2S25.103,41,24,41z M24,38c-0.552,0-1,0.449-1,1     s0.448,1,1,1s1-0.449,1-1S24.552,38,24,38z"
+        />
+      </g>
+    </g>
+  </g>
+</svg>
+
+<style>
+  svg {
+    fill: var(--ink);
+  }
+</style>
--- a/Show More
+++ b/Show More