Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui

.github/workflows/deploy-cloud.yaml

@@ -1,4 +1,4 @@
-name: Budibase Cloud Deploy
+name: Budibase Deploy Production
 
 on:
  workflow_dispatch:

.github/workflows/deploy-preprod.yml

@@ -1,4 +1,4 @@
-name: Budibase Release Preprod
+name: Budibase Deploy Preprod
 
 on:
  workflow_dispatch:

.github/workflows/deploy-release.yml

@@ -0,0 +1,77 @@
+name: Budibase Deploy Release
+
+on:
+ workflow_dispatch:
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-1
+
+      - name: Fail if branch is not develop
+        if: github.ref != 'refs/heads/develop'
+        run: | 
+          echo "Ref is not develop, you must run this job from develop."
+          exit 1
+
+      - name: Get the latest budibase release version
+        id: version
+        run: | 
+          release_version=$(cat lerna.json | jq -r '.version')
+          echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
+
+      - name: Tag and release Proxy service docker image
+        run: | 
+          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+          yarn build:docker:proxy:release
+          docker tag proxy-service budibase/proxy:$RELEASE_TAG
+          docker push budibase/proxy:$RELEASE_TAG
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
+          RELEASE_TAG: k8s-release
+
+      - name: Pull values.yaml from budibase-infra
+        run: | 
+          curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
+          -H 'Accept: application/vnd.github.v3.raw' \
+          -o values.release.yaml \
+          -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-release/values.yaml
+          wc -l values.release.yaml
+
+      - name: Deploy to Release Environment
+        uses: glopezep/helm@v1.7.1
+        with:
+          release: budibase-release
+          namespace: budibase
+          chart: charts/budibase
+          token: ${{ github.token }}
+          helm: helm3
+          values: |
+            globals: 
+              appVersion: develop
+            ingress:
+              enabled: true
+              nginx: true
+          value-files: >-
+            [
+              "values.release.yaml"
+            ]
+        env:
+          KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
+
+      - name: Discord Webhook Action
+        uses: tsickert/discord-webhook@v4.0.0
+        with:
+          webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
+          content: "Release Env Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Release Env."
+          embed-title: ${{ env.RELEASE_VERSION }}

.github/workflows/release-develop.yml

@@ -4,7 +4,7 @@ concurrency: release-develop
 on: 
  push:
     branches:
-      - release
+      - develop
     paths:
       - '.aws/**'
       - '.github/**'
@@ -28,11 +28,11 @@ jobs:
     runs-on: ubuntu-latest 
 
     steps:
-      # - name: Fail if branch is not develop
+      - name: Fail if branch is not develop
-      #   if: github.ref != 'refs/heads/develop' 
+        if: github.ref != 'refs/heads/develop' 
-      #   run: | 
+        run: | 
-      #     echo "Ref is not develop, you must run this job from develop."
+          echo "Ref is not develop, you must run this job from develop."
-      #     exit 1
+          exit 1
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:

charts/budibase/templates/worker-service-deployment.yaml

@@ -93,6 +93,10 @@ spec:
           value: {{ .Values.globals.selfHosted | quote }}
         - name: SENTRY_DSN
           value: {{ .Values.globals.sentryDSN }}
+        - name: ENABLE_ANALYTICS
+          value: {{ .Values.globals.enableAnalytics | quote }}
+        - name: POSTHOG_TOKEN
+          value: {{ .Values.globals.posthogToken }}
         - name: ACCOUNT_PORTAL_URL
           value: {{ .Values.globals.accountPortalUrl | quote }}
         - name: ACCOUNT_PORTAL_API_KEY

charts/budibase/values.yaml

@@ -89,7 +89,7 @@ affinity: {}
 globals:
   appVersion: "latest"
   budibaseEnv: PRODUCTION
-  enableAnalytics: true
+  enableAnalytics: "1"
   sentryDSN: ""
   posthogToken: "phc_fg5I3nDOf6oJVMHSaycEhpPdlgS8rzXG2r6F2IpxCHS"
   logLevel: info

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -13,6 +13,7 @@
   "license": "GPL-3.0",
   "scripts": {
     "prebuild": "rimraf dist/",
+    "prepack": "cp package.json dist",
     "build": "tsc -p tsconfig.build.json",
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
     "test": "jest",
@@ -56,7 +57,7 @@
     ]
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.200-alpha.3",
+    "@budibase/types": "^1.0.207-alpha.2",
     "@shopify/jest-koa-mocks": "3.1.5",
     "@types/jest": "27.5.1",
     "@types/koa": "2.0.52",

packages/backend-core/src/events/identification.ts

@@ -14,7 +14,6 @@ import {
   CloudAccount,
   UserIdentity,
   InstallationGroup,
-  isSelfHostAccount,
   UserContext,
   Group,
 } from "@budibase/types"
@@ -36,6 +35,7 @@ const pkg = require("../../package.json")
  */
 export const getCurrentIdentity = async (): Promise<Identity> => {
   let identityContext = identityCtx.getIdentity()
+  const environment = getDeploymentEnvironment()
 
   let identityType
 
@@ -47,36 +47,47 @@ export const getCurrentIdentity = async (): Promise<Identity> => {
 
   if (identityType === IdentityType.INSTALLATION) {
     const installationId = await getInstallationId()
+    const hosting = getHostingFromEnv()
     return {
       id: formatDistinctId(installationId, identityType),
+      hosting,
       type: identityType,
       installationId,
+      environment,
     }
   } else if (identityType === IdentityType.TENANT) {
     const installationId = await getInstallationId()
     const tenantId = await getEventTenantId(context.getTenantId())
+    const hosting = getHostingFromEnv()
 
     return {
       id: formatDistinctId(tenantId, identityType),
       type: identityType,
+      hosting,
       installationId,
       tenantId,
+      environment,
     }
   } else if (identityType === IdentityType.USER) {
     const userContext = identityContext as UserContext
     const tenantId = await getEventTenantId(context.getTenantId())
-    let installationId: string | undefined
+    const installationId = await getInstallationId()
 
-    // self host account users won't have installation
+    const account = userContext.account
-    if (!userContext.account || !isSelfHostAccount(userContext.account)) {
+    let hosting
-      installationId = await getInstallationId()
+    if (account) {
+      hosting = account.hosting
+    } else {
+      hosting = getHostingFromEnv()
     }
 
     return {
       id: userContext._id,
       type: identityType,
+      hosting,
       installationId,
       tenantId,
+      environment,
     }
   } else {
     throw new Error("Unknown identity type")
@@ -91,12 +102,14 @@ export const identifyInstallationGroup = async (
   const type = IdentityType.INSTALLATION
   const hosting = getHostingFromEnv()
   const version = pkg.version
+  const environment = getDeploymentEnvironment()
 
   const group: InstallationGroup = {
     id,
     type,
     hosting,
     version,
+    environment,
   }
 
   await identifyGroup(group, timestamp)
@@ -112,6 +125,8 @@ export const identifyTenantGroup = async (
 ): Promise<void> => {
   const id = await getEventTenantId(tenantId)
   const type = IdentityType.TENANT
+  const installationId = await getInstallationId()
+  const environment = getDeploymentEnvironment()
 
   let hosting: Hosting
   let profession: string | undefined
@@ -129,6 +144,8 @@ export const identifyTenantGroup = async (
     id,
     type,
     hosting,
+    environment,
+    installationId,
     profession,
     companySize,
   }
@@ -154,10 +171,13 @@ export const identifyUser = async (
   const verified =
     account && account?.budibaseUserId === user._id ? account.verified : false
   const installationId = await getInstallationId()
+  const hosting = account ? account.hosting : getHostingFromEnv()
+  const environment = getDeploymentEnvironment()
 
   const identity: UserIdentity = {
     id,
     type,
+    hosting,
     installationId,
     tenantId,
     verified,
@@ -165,6 +185,7 @@ export const identifyUser = async (
     providerType,
     builder,
     admin,
+    environment,
   }
 
   await identify(identity, timestamp)
@@ -177,6 +198,9 @@ export const identifyAccount = async (account: Account) => {
   let providerType = isSSOAccount(account) ? account.providerType : undefined
   const verified = account.verified
   const accountHolder = true
+  const hosting = account.hosting
+  const installationId = await getInstallationId()
+  const environment = getDeploymentEnvironment()
 
   if (isCloudAccount(account)) {
     if (account.budibaseUserId) {
@@ -188,10 +212,13 @@ export const identifyAccount = async (account: Account) => {
   const identity: UserIdentity = {
     id,
     type,
+    hosting,
+    installationId,
     tenantId,
     providerType,
     verified,
     accountHolder,
+    environment,
   }
 
   await identify(identity)
@@ -211,6 +238,14 @@ export const identifyGroup = async (
   await processors.identifyGroup(group, timestamp)
 }
 
+const getDeploymentEnvironment = () => {
+  if (env.isDev()) {
+    return "development"
+  } else {
+    return env.DEPLOYMENT_ENVIRONMENT
+  }
+}
+
 const getHostingFromEnv = () => {
   return env.SELF_HOSTED ? Hosting.SELF : Hosting.CLOUD
 }

packages/backend-core/src/events/processors/AnalyticsProcessor.ts

@@ -7,14 +7,17 @@ import PosthogProcessor from "./PosthogProcessor"
 /**
  * Events that are always captured.
  */
-const EVENT_WHITELIST = [Event.VERSION_UPGRADED, Event.VERSION_DOWNGRADED]
+const EVENT_WHITELIST = [
+  Event.INSTALLATION_VERSION_UPGRADED,
+  Event.INSTALLATION_VERSION_DOWNGRADED,
+]
 const IDENTITY_WHITELIST = [IdentityType.INSTALLATION, IdentityType.TENANT]
 
 export default class AnalyticsProcessor implements EventProcessor {
   posthog: PosthogProcessor | undefined
 
   constructor() {
-    if (env.POSTHOG_TOKEN) {
+    if (env.POSTHOG_TOKEN && !env.isTest()) {
       this.posthog = new PosthogProcessor(env.POSTHOG_TOKEN)
     }
   }

packages/backend-core/src/events/processors/PosthogProcessor.ts

@@ -23,7 +23,8 @@ export default class PosthogProcessor implements EventProcessor {
   ): Promise<void> {
     properties.version = pkg.version
     properties.service = env.SERVICE
-    properties.environment = env.DEPLOYMENT_ENVIRONMENT
+    properties.environment = identity.environment
+    properties.hosting = identity.hosting
 
     const appId = context.getAppId()
     if (appId) {

packages/backend-core/src/events/publishers/index.ts

@@ -15,5 +15,5 @@ export * as table from "./table"
 export * as serve from "./serve"
 export * as user from "./user"
 export * as view from "./view"
-export * as version from "./version"
+export * as installation from "./installation"
 export * as backfill from "./backfill"

packages/backend-core/src/events/publishers/installation.ts

@@ -1,11 +1,11 @@
 import { publishEvent } from "../events"
 import { Event, VersionCheckedEvent, VersionChangeEvent } from "@budibase/types"
 
-export async function checked(version: string) {
+export async function versionChecked(version: string) {
   const properties: VersionCheckedEvent = {
     currentVersion: version,
   }
-  await publishEvent(Event.VERSION_CHECKED, properties)
+  await publishEvent(Event.INSTALLATION_VERSION_CHECKED, properties)
 }
 
 export async function upgraded(from: string, to: string) {
@@ -14,7 +14,7 @@ export async function upgraded(from: string, to: string) {
     to,
   }
 
-  await publishEvent(Event.VERSION_UPGRADED, properties)
+  await publishEvent(Event.INSTALLATION_VERSION_UPGRADED, properties)
 }
 
 export async function downgraded(from: string, to: string) {
@@ -22,5 +22,10 @@ export async function downgraded(from: string, to: string) {
     from,
     to,
   }
-  await publishEvent(Event.VERSION_DOWNGRADED, properties)
+  await publishEvent(Event.INSTALLATION_VERSION_DOWNGRADED, properties)
+}
+
+export async function firstStartup() {
+  const properties = {}
+  await publishEvent(Event.INSTALLATION_FIRST_STARTUP, properties)
 }

packages/backend-core/src/installation.ts

@@ -84,9 +84,9 @@ export const checkInstallVersion = async (): Promise<void> => {
         },
         async () => {
           if (isUpgrade) {
-            await events.version.upgraded(currentVersion, newVersion)
+            await events.installation.upgraded(currentVersion, newVersion)
           } else if (isDowngrade) {
-            await events.version.downgraded(currentVersion, newVersion)
+            await events.installation.downgraded(currentVersion, newVersion)
           }
         }
       )

packages/backend-core/tests/utilities/mocks/events.js

@@ -55,7 +55,7 @@ jest.spyOn(events.org, "logoUpdated")
 jest.spyOn(events.org, "platformURLUpdated")
 jest.spyOn(events.org, "analyticsOptOut")
 
-jest.spyOn(events.version, "checked")
+jest.spyOn(events.installation, "versionChecked")
 
 jest.spyOn(events.query, "created")
 jest.spyOn(events.query, "updated")

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.200-alpha.3",
+    "@budibase/string-templates": "^1.0.207-alpha.2",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",

packages/bbui/src/Button/Button.svelte

@@ -14,6 +14,7 @@
   export let active = false
   export let tooltip = undefined
   export let dataCy
+  export let newStyles = false
 
   let showTooltip = false
 </script>
@@ -25,6 +26,7 @@
   class:spectrum-Button--warning={warning}
   class:spectrum-Button--overBackground={overBackground}
   class:spectrum-Button--quiet={quiet}
+  class:new-styles={newStyles}
   class:active
   class="spectrum-Button spectrum-Button--size{size.toUpperCase()}"
   {disabled}
@@ -93,4 +95,20 @@
     padding-left: var(--spacing-m);
     line-height: 0;
   }
+  .spectrum-Button--primary.new-styles {
+    background: var(--spectrum-global-color-gray-800);
+    border-color: transparent;
+    color: var(--spectrum-global-color-gray-50);
+  }
+  .spectrum-Button--primary.new-styles:hover {
+    background: var(--spectrum-global-color-gray-900);
+  }
+  .spectrum-Button--secondary.new-styles {
+    background: var(--spectrum-global-color-gray-200);
+    border-color: transparent;
+    color: var(--spectrum-global-color-gray-900);
+  }
+  .spectrum-Button--secondary.new-styles:hover {
+    background: var(--spectrum-global-color-gray-300);
+  }
 </style>

packages/bbui/src/Form/Core/TextField.svelte

@@ -112,4 +112,8 @@
   .spectrum-Textfield {
     width: 100%;
   }
+  input:disabled {
+    color: var(--spectrum-global-color-gray-600) !important;
+    -webkit-text-fill-color: var(--spectrum-global-color-gray-600) !important;
+  }
 </style>

packages/builder/cypress/integration/appOverview.spec.js

@@ -1,7 +1,7 @@
 import filterTests from "../support/filterTests"
 import clientPackage from "@budibase/client/package.json"
 
-filterTests(['all'], () => {
+filterTests(["all"], () => {
   context("Application Overview screen", () => {
     before(() => {
       cy.login()
@@ -10,31 +10,19 @@ filterTests(['all'], () => {
 
     it("Should be accessible from the applications list", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      
+      cy.get(".appTable .title")
-      cy.get(".appTable .title").eq(0)
+        .eq(0)
-      .invoke('attr', 'data-cy')
+        .invoke("attr", "data-cy")
-      .then(($dataCy) => {
+        .then($dataCy => {
-        const dataCy = $dataCy;
+          const dataCy = $dataCy
-        cy.get(".appTable .name").eq(0).click()
+          cy.get(".appTable .app-row-actions button")
+            .contains("Manage")
+            .click({ force: true })
 
-        cy.location().should((loc) => {
+          cy.location().should(loc => {
-          expect(loc.pathname).to.eq('/builder/portal/overview/' + dataCy)
+            expect(loc.pathname).to.eq("/builder/portal/overview/" + dataCy)
+          })
         })
-      })
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-
-      cy.get(".appTable .title").eq(0)
-      .invoke('attr', 'data-cy')
-      .then(($dataCy) => {
-        const dataCy = $dataCy;
-        cy.get(".appTable .app-row-actions button").contains("View").click({force: true})
-
-        cy.location().should((loc) => {
-          expect(loc.pathname).to.eq('/builder/portal/overview/' + dataCy)
-        })
-      })
-
     })
 
     // Find a more suitable place for this.
@@ -43,24 +31,28 @@ filterTests(['all'], () => {
 
       cy.get(".appTable .lock-status").eq(0).contains("Locked by you").click()
 
-      cy.unlockApp({ owned : true })
+      cy.unlockApp({ owned: true })
 
       cy.get(".appTable").should("exist")
-      cy.get(".lock-status").should('not.be.visible')
+      cy.get(".lock-status").should("not.be.visible")
     })
-    
+
     it("Should allow unlocking in the app overview screen", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
 
-      cy.get(".appTable .app-row-actions button").contains("Edit").eq(0).click({force: true})
+      cy.get(".appTable .app-row-actions button")
+        .contains("Edit")
+        .eq(0)
+        .click({ force: true })
       cy.wait(1000)
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      
+      cy.get(".appTable .app-row-actions button")
-      cy.get(".appTable .name").eq(0).click()
+        .contains("Manage")
-
+        .eq(0)
+        .click({ force: true })
       cy.get(".lock-status").eq(0).contains("Locked by you").click()
 
-      cy.unlockApp({ owned : true })
+      cy.unlockApp({ owned: true })
 
       cy.get(".lock-status").should("not.be.visible")
     })
@@ -68,107 +60,149 @@ filterTests(['all'], () => {
     it("Should reflect the deploy state of an app that hasn't been published.", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
 
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
-      
+        .contains("Manage")
-      cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should("be.disabled")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should(
+        "be.disabled"
+      )
 
       cy.get(".spectrum-Tabs-item.is-selected").contains("Overview")
       cy.get(".overview-tab").should("be.visible")
 
       cy.get(".overview-tab [data-cy='app-status']").within(() => {
         cy.get(".status-display").contains("Unpublished")
-        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should("exist")
+        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should(
+          "exist"
+        )
         cy.get(".status-text").contains("-")
       })
     })
 
     it("Should reflect the app deployment state", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button").contains("Edit").eq(0).click({force: true})
+      cy.get(".appTable .app-row-actions button")
-      
+        .contains("Edit")
-      cy.get(".toprightnav button.spectrum-Button").contains("Publish").click({ force : true })
+        .eq(0)
-      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']").should("be.visible")
+        .click({ force: true })
-      .within(() => {
+
-        cy.get(".spectrum-Button").contains("Publish").click({ force : true })
+      cy.get(".toprightnav button.spectrum-Button")
-        cy.wait(1000)
+        .contains("Publish")
-      });
+        .click({ force: true })
+      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']")
+        .should("be.visible")
+        .within(() => {
+          cy.get(".spectrum-Button").contains("Publish").click({ force: true })
+          cy.wait(1000)
+        })
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
-
+        .contains("Manage")
-      cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should("not.be.disabled")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should(
+        "not.be.disabled"
+      )
 
       cy.get(".overview-tab [data-cy='app-status']").within(() => {
         cy.get(".status-display").contains("Published")
-        cy.get(".status-display .icon svg[aria-label='GlobeCheck']").should("exist")
+        cy.get(".status-display .icon svg[aria-label='GlobeCheck']").should(
+          "exist"
+        )
         cy.get(".status-text").contains("Last published a few seconds ago")
       })
     })
 
-    it("Should reflect an application that has been unpublished", () => { 
+    it("Should reflect an application that has been unpublished", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button").contains("Edit").eq(0).click({force: true})
+      cy.get(".appTable .app-row-actions button")
+        .contains("Edit")
+        .eq(0)
+        .click({ force: true })
 
-      cy.get(".deployment-top-nav svg[aria-label='Globe']")
+      cy.get(".deployment-top-nav svg[aria-label='Globe']").click({
-      .click({ force: true })
+        force: true,
+      })
 
       cy.get("[data-cy='publish-popover-menu']").should("be.visible")
-      cy.get("[data-cy='publish-popover-menu'] [data-cy='publish-popover-action']")
+      cy.get(
-      .click({ force : true })
+        "[data-cy='publish-popover-menu'] [data-cy='publish-popover-action']"
-      
+      ).click({ force: true })
-      cy.get("[data-cy='unpublish-modal']").should("be.visible")
+
-      .within(() => {
+      cy.get("[data-cy='unpublish-modal']")
-        cy.get(".confirm-wrap button").click({ force: true }
+        .should("be.visible")
-      )})
+        .within(() => {
+          cy.get(".confirm-wrap button").click({ force: true })
+        })
       cy.wait(1000)
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
-
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".overview-tab [data-cy='app-status']").within(() => {
         cy.get(".status-display").contains("Unpublished")
-        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should("exist")
+        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should(
+          "exist"
+        )
         cy.get(".status-text").contains("Last published a few seconds ago")
       })
     })
 
-    it("Should allow the editing of the application icon and colour", () => { 
+    it("Should allow the editing of the application icon and colour", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable", { timeout: 2000})
+      cy.get(".appTable .app-row-actions button")
-        .within(() => {
+        .contains("Manage")
-          cy.get(".app-row-actions-icon").eq(0).click()
+        .eq(0)
-        })
+        .click({ force: true })
+      cy.wait(1000)
+      cy.get(".app-overview-actions-icon").within(() => {
+        cy.get(".spectrum-Icon").click({ force: true })
+      })
       cy.get(".spectrum-Menu").contains("Edit icon").click()
       // Select random icon
       cy.get(".grid").within(() => {
-          cy.get(".icon-item").eq(Math.floor(Math.random() * 23) + 1).click()
+        cy.get(".icon-item")
+          .eq(Math.floor(Math.random() * 23) + 1)
+          .click()
       })
       // Select random colour
       cy.get(".fill").click()
       cy.get(".colors").within(() => {
-          cy.get(".color").eq(Math.floor(Math.random() * 33) + 1).click()
+        cy.get(".color")
+          .eq(Math.floor(Math.random() * 33) + 1)
+          .click()
       })
-      cy.intercept('**/applications/**').as('iconChange')
+      cy.intercept("**/applications/**").as("iconChange")
       cy.get(".spectrum-Button").contains("Save").click({ force: true })
       cy.wait("@iconChange")
-      cy.get("@iconChange").its('response.statusCode')
+      cy.get("@iconChange").its("response.statusCode").should("eq", 200)
-      .should('eq', 200)
       // Confirm icon has changed from default
       // Confirm colour has been applied
-      cy.get(".appTable", { timeout: 2000})
+      cy.get(".appTable", { timeout: 2000 }).within(() => {
-        .within(() => {
+        cy.get("[aria-label]")
-          cy.get('[aria-label]').eq(0).children()
+          .eq(0)
-          .should('have.attr', 'xlink:href').and('not.contain', '#spectrum-icon-18-Apps')
+          .children()
-          cy.get(".title").children().children()
+          .should("have.attr", "xlink:href")
-          .should('have.attr', 'style').and('contains', 'color')
+          .and("not.contain", "#spectrum-icon-18-Apps")
-        })
+        cy.get(".title")
+          .children()
+          .children()
+          .should("have.attr", "style")
+          .and("contains", "color")
+      })
     })
 
     it("Should reflect the last time the application was edited", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
-
+        .contains("Manage")
-      cy.get(".header-right button").contains("Edit").click({ force: true });
+        .eq(0)
+        .click({ force: true })
+      cy.get(".header-right button").contains("Edit").click({ force: true })
 
       cy.navigateToFrontend()
 
@@ -177,41 +211,51 @@ filterTests(['all'], () => {
       })
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
-
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".overview-tab [data-cy='edited-by']").within(() => {
         cy.get(".editor-name").contains("You")
         cy.get(".last-edit-text").contains("Last edited a few seconds ago")
       })
-    });
+    })
 
     it("Should reflect application version is up-to-date", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
-
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".overview-tab [data-cy='app-version']").within(() => {
         cy.get(".version-status").contains("You're running the latest!")
       })
-    });
+    })
 
     it("Should navigate to the settings tab when clicking the App Version card header", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
-
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".spectrum-Tabs-item.is-selected").contains("Overview")
       cy.get(".overview-tab").should("be.visible")
 
-      cy.get(".overview-tab [data-cy='app-version'] .dash-card-header").click({ force : true })
+      cy.get(".overview-tab [data-cy='app-version'] .dash-card-header").click({
+        force: true,
+      })
 
       cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
       cy.get(".settings-tab").should("be.visible")
       cy.get(".overview-tab").should("not.exist")
-
+    })
-    });
 
     it("Should allow the upgrading of an application, if available.", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.wait(500)
 
       cy.location().then(loc => {
@@ -219,8 +263,7 @@ filterTests(['all'], () => {
         const appId = params[params.length - 1]
         cy.log(appId)
         //Downgrade the app for the test
-        cy.alterAppVersion(appId, "0.0.1-alpha.0")
+        cy.alterAppVersion(appId, "0.0.1-alpha.0").then(() => {
-        .then(()=>{
           cy.reload()
           cy.wait(1000)
           cy.log("Current deployment version: " + clientPackage.version)
@@ -228,115 +271,163 @@ filterTests(['all'], () => {
           cy.get(".version-status a").contains("Update").click()
           cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
 
-          cy.get(".version-section .page-action button").contains("Update").click({ force: true })
+          cy.get(".version-section .page-action button")
-          
+            .contains("Update")
-          cy.intercept('POST', '**/applications/**/client/update').as('updateVersion')
+            .click({ force: true })
-          cy.get(".spectrum-Modal.is-open button").contains("Update").click({ force: true })
+
+          cy.intercept("POST", "**/applications/**/client/update").as(
+            "updateVersion"
+          )
+          cy.get(".spectrum-Modal.is-open button")
+            .contains("Update")
+            .click({ force: true })
 
           cy.wait("@updateVersion")
-          .its('response.statusCode').should('eq', 200)
+            .its("response.statusCode")
-          .then(() => {
+            .should("eq", 200)
-            cy.visit(`${Cypress.config().baseUrl}/builder`)
+            .then(() => {
-            cy.get(".appTable .name").eq(0).click()
+              cy.visit(`${Cypress.config().baseUrl}/builder`)
-
+              cy.get(".appTable .app-row-actions button")
-            cy.get(".spectrum-Tabs-item").contains("Overview").click({ force: true })
+                .contains("Manage")
-            cy.get(".overview-tab [data-cy='app-version']").within(() => {
+                .eq(0)
-              cy.get(".spectrum-Heading").contains(clientPackage.version)
+                .click({ force: true })
-              cy.get(".version-status").contains("You're running the latest!")
+              cy.get(".spectrum-Tabs-item")
+                .contains("Overview")
+                .click({ force: true })
+              cy.get(".overview-tab [data-cy='app-version']").within(() => {
+                cy.get(".spectrum-Heading").contains(clientPackage.version)
+                cy.get(".version-status").contains("You're running the latest!")
+              })
             })
-          })
         })
-      });
+      })
-      
     })
 
     it("Should allow editing of the app details.", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
-
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".spectrum-Tabs-item").contains("Settings").click()
       cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
       cy.get(".settings-tab").should("be.visible")
 
-      cy.get(".details-section .page-action button").contains("Edit").click({ force: true })
+      cy.get(".details-section .page-action button")
+        .contains("Edit")
+        .click({ force: true })
       cy.updateAppName("sample name")
 
       //publish and check its disabled
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button").contains("Edit").eq(0).click({force: true})
+      cy.get(".appTable .app-row-actions button")
+        .contains("Edit")
+        .eq(0)
+        .click({ force: true })
 
-      cy.get(".toprightnav button.spectrum-Button").contains("Publish").click({ force : true })
+      cy.get(".toprightnav button.spectrum-Button")
-      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']").should("be.visible")
+        .contains("Publish")
-      .within(() => {
+        .click({ force: true })
-        cy.get(".spectrum-Button").contains("Publish").click({ force : true })
+      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']")
-        cy.wait(1000)
+        .should("be.visible")
-      });
+        .within(() => {
+          cy.get(".spectrum-Button").contains("Publish").click({ force: true })
+          cy.wait(1000)
+        })
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(1000)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".spectrum-Tabs-item").contains("Settings").click()
       cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
 
       cy.get(".details-section .page-action .spectrum-Button").scrollIntoView()
       cy.wait(1000)
-      cy.get(".details-section .page-action .spectrum-Button").should("be.disabled")
+      cy.get(".details-section .page-action .spectrum-Button").should(
-
+        "be.disabled"
+      )
     })
 
     xit("Should allow copying of the published application Id", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions").eq(0)
+      cy.get(".appTable .app-row-actions")
-      .within(() => {
+        .eq(0)
-        cy.get(".spectrum-Button").contains("Edit").click({ force: true })
+        .within(() => {
-      })
+          cy.get(".spectrum-Button").contains("Edit").click({ force: true })
+        })
 
       cy.publishApp("sample-name")
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".app-overview-actions-icon > .icon").click({ force: true })
 
-      cy.get(".app-overview-actions-icon > .icon").click({ force : true })
+      cy.get("[data-cy='app-overview-menu-popover']")
+        .eq(0)
+        .within(() => {
+          cy.get(".spectrum-Menu-item")
+            .contains("Copy App ID")
+            .click({ force: true })
+        })
 
-      cy.get("[data-cy='app-overview-menu-popover']").eq(0).within(() => {
+      cy.get(".spectrum-Toast-content")
-        cy.get(".spectrum-Menu-item").contains("Copy App ID").click({ force: true })
+        .contains("App ID copied to clipboard.")
-      })
+        .should("be.visible")
-
-      cy.get(".spectrum-Toast-content").contains("App ID copied to clipboard.").should("be.visible")
     })
 
     it("Should allow unpublishing of the application", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".app-overview-actions-icon > .icon").click({ force: true })
 
-      cy.get(".app-overview-actions-icon > .icon").click({ force : true })
+      cy.get("[data-cy='app-overview-menu-popover']")
+        .eq(0)
+        .within(() => {
+          cy.get(".spectrum-Menu-item")
+            .contains("Unpublish")
+            .click({ force: true })
+          cy.wait(500)
+        })
 
-      cy.get("[data-cy='app-overview-menu-popover']").eq(0).within(() => {
+      cy.get("[data-cy='unpublish-modal']")
-        cy.get(".spectrum-Menu-item").contains("Unpublish").click({ force: true })
+        .should("be.visible")
-        cy.wait(500)
+        .within(() => {
-      })
+          cy.get(".confirm-wrap button").click({ force: true })
-
+        })
-      cy.get("[data-cy='unpublish-modal']").should("be.visible")
-      .within(() => {
-        cy.get(".confirm-wrap button").click({ force: true }
-      )})
 
       cy.get(".overview-tab [data-cy='app-status']").within(() => {
         cy.get(".status-display").contains("Unpublished")
-        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should("exist")
+        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should(
+          "exist"
+        )
       })
     })
 
     it("Should allow deleting of the application", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".app-overview-actions-icon > .icon").click({ force: true })
 
-      cy.get(".app-overview-actions-icon > .icon").click({ force : true })
+      cy.get("[data-cy='app-overview-menu-popover']")
-
+        .eq(0)
-      cy.get("[data-cy='app-overview-menu-popover']").eq(0).within(() => {
+        .within(() => {
-        cy.get(".spectrum-Menu-item").contains("Delete").click({ force: true })
+          cy.get(".spectrum-Menu-item")
-        cy.wait(500)
+            .contains("Delete")
-      })  
+            .click({ force: true })
+          cy.wait(500)
+        })
 
       //The test application was renamed earlier in the spec
       cy.get(".spectrum-Dialog-grid").within(() => {
@@ -344,18 +435,17 @@ filterTests(['all'], () => {
         cy.get(".spectrum-Button--warning").click()
       })
 
-      cy.location().should((loc) => {
+      cy.location().should(loc => {
-        expect(loc.pathname).to.eq('/builder/portal/apps')
+        expect(loc.pathname).to.eq("/builder/portal/apps")
       })
 
       cy.get(".appTable").should("not.exist")
-      
+
       cy.get(".welcome .container h1").contains("Let's create your first app!")
     })
 
     after(() => {
       cy.deleteAllApps()
     })
-
   })
 })

packages/builder/cypress/integration/createComponents.spec.js

@@ -1,7 +1,7 @@
 import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
+const interact = require("../support/interact")
 
-filterTests(['all'], () => {
+filterTests(["all"], () => {
   context("Create Components", () => {
     let headlineId
 
@@ -19,17 +19,15 @@ filterTests(['all'], () => {
 
     //Use the tree to delete a selected component
     const deleteSelectedComponent = () => {
-      cy.get(".nav-items-container .nav-item.selected .actions > div > .icon").click({
+      cy.get(
+        ".nav-items-container .nav-item.selected .actions > div > .icon"
+      ).click({
+        force: true,
+      })
+      cy.get(".spectrum-Popover.is-open li").contains("Delete").click()
+      cy.get(".spectrum-Modal button").contains("Delete Component").click({
         force: true,
       })
-      cy.get(".spectrum-Popover.is-open li")
-        .contains("Delete")
-        .click()
-      cy.get(".spectrum-Modal button")
-        .contains("Delete Component")
-        .click({
-          force: true,
-        })
     }
 
     it("should add a container", () => {
@@ -47,18 +45,18 @@ filterTests(['all'], () => {
 
     it("should change the text of the headline", () => {
       const text = "Lorem ipsum dolor sit amet."
-      cy.get("[data-cy=setting-text] input")
+      cy.get("[data-cy=setting-text] input").type(text).blur()
-        .type(text)
-        .blur()
       cy.getComponent(headlineId).should("have.text", text)
     })
 
     it("should change the size of the headline", () => {
       cy.get("[data-cy=setting-size]").scrollIntoView().click()
       cy.get("[data-cy=setting-size]").within(() => {
-        cy.get(".spectrum-Form-item li.spectrum-Menu-item").contains("3XL").click()
+        cy.get(".spectrum-Form-item li.spectrum-Menu-item")
+          .contains("3XL")
+          .click()
       })
-      
+
       cy.getComponent(headlineId).within(() => {
         cy.get(".spectrum-Heading").should("have.css", "font-size", "60px")
       })
@@ -66,13 +64,9 @@ filterTests(['all'], () => {
 
     it("should create a form and reset to match schema", () => {
       cy.addComponent("Form", "Form").then(() => {
-        cy.get("[data-cy=setting-dataSource]")
+        cy.get("[data-cy=setting-dataSource]").contains("Custom").click()
-          .contains("Custom")
+        cy.get(interact.DROPDOWN).contains("dog").click()
-          .click()
+        cy.wait(500)
-        cy.get(interact.DROPDOWN)
-          .contains("dog")
-          .click()
-          cy.wait(500)
         cy.addComponent("Form", "Field Group").then(fieldGroupId => {
           cy.contains("Update form fields").click()
           cy.get(".spectrum-Modal")
@@ -83,11 +77,9 @@ filterTests(['all'], () => {
             cy.contains("name").should("exist")
             cy.contains("age").should("exist")
             cy.contains("breed").should("exist")
-           // cy.contains("image").should("exist")
+            // cy.contains("image").should("exist")
           })
-          cy.getComponent(fieldGroupId)
+          cy.getComponent(fieldGroupId).find("input").should("have.length", 2)
-            .find("input")
-            .should("have.length", 2)
           cy.getComponent(fieldGroupId)
             .find(interact.SPECTRUM_PICKER)
             .should("have.length", 1)
@@ -97,191 +89,102 @@ filterTests(['all'], () => {
 
     it("deletes a component", () => {
       cy.addComponent("Elements", "Paragraph").then(componentId => {
-        cy.get("[data-cy=setting-_instanceName] input")
+        cy.get("[data-cy=setting-_instanceName] input").type(componentId).blur()
-          .type(componentId)
+        cy.get(
-          .blur()
+          ".nav-items-container .nav-item.selected .actions > div > .icon"
-        cy.get(".nav-items-container .nav-item.selected .actions > div > .icon").click({
+        ).click({
+          force: true,
+        })
+        cy.get(".spectrum-Popover.is-open li").contains("Delete").click()
+        cy.get(".spectrum-Modal button").contains("Delete Component").click({
           force: true,
         })
-        cy.get(".spectrum-Popover.is-open li")
-          .contains("Delete")
-          .click()
-        cy.get(".spectrum-Modal button")
-          .contains("Delete Component")
-          .click({
-            force: true,
-          })
         cy.getComponent(componentId).should("not.exist")
       })
     })
 
-    it("should set focus to the field setting when fields are added to a form", () => {
-      cy.addComponent("Form", "Form").then((formId) => {
-        
-        //For deletion
-        cy.get("[data-cy=setting-_instanceName] input")
-          .clear()
-          .type(formId)
-          .blur()
-
-        const componentTypeLabels = ["Text Field", "Number Field", "Password Field", 
-          "Options Picker", "Checkbox", "Long Form Field", "Date Picker", "Attachment", 
-          "JSON Field", "Multi-select Picker", "Relationship Picker"]
-
-        const refocusTest = (componentId) => {
-          cy.getComponent(componentId)
-          .find(".showMe").should("exist").click({ force: true })
-          
-          cy.get("[data-cy=setting-field] .spectrum-InputGroup")
-          .should("have.class", "is-focused")
-        }
-
-        const testFieldFocusOnCreate = (componentLabel) => {
-          cy.log("Adding: " + componentLabel)
-          return cy.addComponent("Form", componentLabel).then((componentId) => {
-           
-            refocusTest(componentId)
-
-            cy.get("[data-cy=setting-field] .spectrum-InputGroup")
-            .should("have.class", "is-focused")
-          })
-        }
-        
-        cy.wait(1000)
-        cy.wrap(componentTypeLabels).each((label) => {
-          return testFieldFocusOnCreate(label)
-        }).then(()=>{
-          cy.get(".nav-items-container .nav-item").contains(formId).click({ force: true })
-          deleteSelectedComponent()
-        })
-      })
-    })
-
     it("should clear the iframe place holder when a form field has been set", () => {
-      cy.addComponent("Form", "Form").then((formId) => {
+      cy.addComponent("Form", "Form").then(formId => {
-        
         //For deletion
         cy.get("[data-cy=setting-_instanceName] input")
           .clear()
           .type(formId)
           .blur()
-
+        cy.get("[data-cy=setting-dataSource]").contains("Custom").click()
-        cy.get("[data-cy=setting-dataSource]")
+        cy.get(".dropdown").contains("dog").click()
-          .contains("Custom")
-          .click()
-        cy.get(".dropdown")
-          .contains("dog")
-          .click()
 
         const fieldTypeToColumnName = {
-          "Text Field" : "name", 
+          "Text Field": "name",
-          "Number Field": "age", 
+          "Number Field": "age",
-          "Options Picker": "breed"
+          "Options Picker": "breed",
         }
 
         const componentTypeLabels = Object.keys(fieldTypeToColumnName)
 
-        const testFieldFocusOnCreate = (componentLabel) => {
+        const testFieldFocusOnCreate = componentLabel => {
           cy.log("Adding: " + componentLabel)
-          return cy.addComponent("Form", componentLabel).then((componentId) => {
+          return cy.addComponent("Form", componentLabel).then(componentId => {
-           
             cy.getComponent(componentId)
-              .find(".placeholder_wrap").should("exist")
+              .find(".component-placeholder")
-
+              .should("exist")
-            cy.get("[data-cy=setting-field] .spectrum-InputGroup")
-              .should("have.class", "is-focused")
-
             cy.get("[data-cy=setting-field] button.spectrum-Picker").click()
 
             //Click the first appropriate field. They are filtered by type
-            cy.get("[data-cy=setting-field] .spectrum-Popover.is-open li.spectrum-Menu-item")
+            cy.get(
-              .contains(fieldTypeToColumnName[componentLabel]).click()
+              "[data-cy=setting-field] .spectrum-Popover.is-open li.spectrum-Menu-item"
+            )
+              .contains(fieldTypeToColumnName[componentLabel])
+              .click()
             cy.wait(500)
             cy.getComponent(componentId)
-              .find(".placeholder_wrap").should("not.exist")
+              .find(".component-placeholder")
+              .should("not.exist")
           })
         }
-        
+
         cy.wait(500)
-        cy.wrap(componentTypeLabels).each((label) => {
+        cy.wrap(componentTypeLabels)
-          return testFieldFocusOnCreate(label)
+          .each(label => {
-        }).then(()=>{
+            return testFieldFocusOnCreate(label)
-          cy.get(".nav-items-container .nav-item").contains(formId).click({ force: true })
+          })
-          deleteSelectedComponent()
+          .then(() => {
-        })
+            cy.get(".nav-items-container .nav-item")
-      })
+              .contains(formId)
-    })
+              .click({ force: true })
-
+            deleteSelectedComponent()
-    it("should focus a charts settings on data provider if not nested in provider ", () => {
-      cy.addComponent("Layout", "Container").then((containerId) => {
-
-        //For deletion
-        cy.get("[data-cy=setting-_instanceName] input")
-          .clear()
-          .type(containerId)
-          .blur()
-
-        const chartTypeLabels = ["Bar Chart", "Line Chart", "Area Chart", "Pie Chart", 
-          "Donut Chart", "Candlestick Chart"]
-
-        const refocusTest = (componentId) => {
-          cy.getComponent(componentId)
-          .find(".showMe").should("exist").click({ force: true })
-          
-          cy.get("[data-cy=dataProvider-prop-control] .spectrum-Picker")
-          .should("have.class", "is-focused")
-        }
-
-        const testFocusOnCreate = (chartLabel) => {
-          cy.log("Adding: " + chartLabel)
-          cy.addComponent("Chart", chartLabel).then((componentId) => {
-            refocusTest(componentId)
-
-            cy.get("[data-cy=dataProvider-prop-control] .spectrum-Picker")
-            .should("have.class", "is-focused")
           })
-        }
-
-        cy.wait(1000)
-        cy.wrap(chartTypeLabels).each((label) => {
-          return testFocusOnCreate(label)
-        })
-        .then(()=>{
-          cy.get(".nav-items-container .nav-item").contains(containerId).click({ force: true })
-          deleteSelectedComponent()
-        })
-
       })
-
     })
 
     it("should populate the provider for charts with a data provider in its path", () => {
-      cy.addComponent("Data", "Data Provider").then((providerId) => {
+      cy.addComponent("Data", "Data Provider").then(providerId => {
-
         //For deletion
         cy.get("[data-cy=setting-_instanceName] input")
           .clear()
           .type(providerId)
           .blur()
-
-          
         cy.get("[data-cy=setting-dataSource]")
           .contains("Choose an option")
           .click()
-
         cy.get(`[data-cy=dataSource-popover-${providerId}] ul li`)
           .contains("dog")
           .click()
 
-        const chartTypeLabels = ["Bar Chart", "Line Chart", "Area Chart", "Pie Chart", 
+        const chartTypeLabels = [
-          "Donut Chart", "Candlestick Chart"]
+          "Bar Chart",
+          "Line Chart",
+          "Area Chart",
+          "Pie Chart",
+          "Donut Chart",
+          "Candlestick Chart",
+        ]
 
-        const testFocusOnCreate = (chartLabel) => {
+        const testFocusOnCreate = chartLabel => {
           cy.log("Adding: " + chartLabel)
-          cy.addComponent("Chart", chartLabel).then((componentId) => {
+          cy.addComponent("Chart", chartLabel).then(componentId => {
-
+            cy.get(
-            cy.get("[data-cy=dataProvider-prop-control] .spectrum-Picker")
+              "[data-cy=dataProvider-prop-control] .spectrum-Picker"
-              .should("not.have.class", "is-focused")
+            ).should("not.have.class", "is-focused")
 
             // Pre populated.
             cy.get("[data-cy=dataProvider-prop-control] .spectrum-Picker-label")
@@ -289,114 +192,86 @@ filterTests(['all'], () => {
               .should("exist")
           })
         }
-
         cy.wait(1000)
-        cy.wrap(chartTypeLabels).each((label) => {
+        cy.wrap(chartTypeLabels)
-          return testFocusOnCreate(label)
+          .each(label => {
-        })
+            return testFocusOnCreate(label)
-        .then(()=>{
+          })
-          cy.get(".nav-items-container .nav-item").contains(providerId).click({ force: true })
+          .then(() => {
-          deleteSelectedComponent()
+            cy.get(".nav-items-container .nav-item")
-        })
+              .contains(providerId)
+              .click({ force: true })
+            deleteSelectedComponent()
+          })
       })
-
     })
 
     it("should replace the placeholder when a url is set on an image", () => {
-      cy.addComponent("Elements", "Image").then((imageId) => {
+      cy.addComponent("Elements", "Image").then(imageId => {
-        
-        cy.get("[data-cy=url-prop-control] .spectrum-InputGroup")
-          .should("have.class", "is-focused")
-
         cy.get("[data-cy=setting-_instanceName] input")
           .clear()
           .type(imageId)
           .blur()
-        
         //return $("New Data Provider.Rows")[0]["Attachment"][0]["url"]
         //No minio, so just enter something local that will not reslove
         cy.get("[data-cy=url-prop-control] input[type=text]")
           .type("cypress/fixtures/ghost.png")
           .blur()
-
         cy.getComponent(imageId)
-          .find(".placeholder_wrap").should("not.exist")
+          .find(".component-placeholder")
-
+          .should("not.exist")
-        cy.getComponent(imageId)
+        cy.getComponent(imageId).find(`img[alt=${imageId}]`).should("exist")
-          .find(`img[alt=${imageId}]`).should("exist")
-        
         cy.get(".nav-items-container .nav-item")
           .contains(imageId)
           .click({ force: true })
-
         deleteSelectedComponent()
       })
     })
 
     it("should add a markdown component.", () => {
-      cy.addComponent("Elements", "Markdown Viewer").then((markdownId) => {
+      cy.addComponent("Elements", "Markdown Viewer").then(markdownId => {
-        
-        cy.get("[data-cy=value-prop-control] .spectrum-InputGroup")
-          .should("have.class", "is-focused")
-        
         cy.get("[data-cy=setting-_instanceName] input")
           .clear()
           .type(markdownId)
           .blur()
-
+        cy.get(
-        cy.get("[data-cy=value-prop-control] input[type=text].spectrum-Textfield-input")
+          "[data-cy=value-prop-control] input[type=text].spectrum-Textfield-input"
-          .type("# Hi").blur()
+        )
-
+          .type("# Hi")
+          .blur()
         cy.getComponent(markdownId)
-          .find(".placeholder_wrap").should("not.exist")
+          .find(".component-placeholder")
-        
+          .should("not.exist")
         cy.getComponent(markdownId)
-          .find(".editor-preview-full h1").contains("Hi")
+          .find(".editor-preview-full h1")
-
+          .contains("Hi")
         cy.get(".nav-items-container .nav-item")
           .contains(markdownId)
           .click({ force: true })
-
         deleteSelectedComponent()
       })
     })
 
     it("should direct the user when adding an Icon component.", () => {
-      cy.addComponent("Elements", "Icon").then((iconId) => {
+      cy.addComponent("Elements", "Icon").then(iconId => {
-        
+        cy.getComponent(iconId).find(".component-placeholder").should("exist")
-        cy.get("[data-cy=icon-prop-control] .spectrum-ActionButton")
-          .should("have.class", "is-focused")
-
-        cy.getComponent(iconId)
-          .find(".placeholder_wrap").should("exist")
-        
         cy.get("[data-cy=setting-_instanceName] input")
           .clear()
           .type(iconId)
           .blur()
-
         cy.get("[data-cy=icon-prop-control] .spectrum-ActionButton").click()
-
         cy.get("[data-cy=icon-popover].spectrum-Popover.is-open").within(() => {
-          cy.get(".search-input input")
+          cy.get(".search-input input").type("save").blur()
-          .type("save")
-          .blur()
-
           cy.get(".search-input button").click({ force: true })
-
           cy.get(".icon-area .icon-container").eq(0).click({ force: true })
         })
-
         cy.getComponent(iconId)
-          .find(".placeholder_wrap").should("not.exist")
+          .find(".component-placeholder")
-
+          .should("not.exist")
-        cy.getComponent(iconId)
+        cy.getComponent(iconId).find("i.ri-save-fill").should("exist")
-          .find("i.ri-save-fill").should("exist")
-
         cy.get(".nav-items-container .nav-item")
           .contains(iconId)
           .click({ force: true })
-
         deleteSelectedComponent()
       })
     })

packages/builder/cypress/integration/renameAnApplication.spec.js

@@ -1,7 +1,7 @@
 import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
+const interact = require("../support/interact")
 
-filterTests(['all'], () => {
+filterTests(["all"], () => {
   context("Rename an App", () => {
     beforeEach(() => {
       cy.login()
@@ -32,12 +32,15 @@ filterTests(['all'], () => {
       const appRename = "Cypress Renamed"
       // Publish the app
       cy.get(interact.TOP_RIGHT_NAV)
-      cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true })
+      cy.get(interact.SPECTRUM_BUTTON)
-      cy.get(interact.SPECTRUM_DIALOG_GRID)
+        .contains("Publish")
-        .within(() => {
+        .click({ force: true })
-          // Click publish again within the modal
+      cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
-          cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true })
+        // Click publish again within the modal
-        })
+        cy.get(interact.SPECTRUM_BUTTON)
+          .contains("Publish")
+          .click({ force: true })
+      })
       // Rename app, Search for app, Confirm name was changed
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(500)
@@ -64,14 +67,20 @@ filterTests(['all'], () => {
       const appName = "Cypress Tests"
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(500)
-      cy.get(interact.SPECTRUM_BUTTON).contains("Create app").click({ force: true })
+      cy.get(interact.SPECTRUM_BUTTON)
+        .contains("Create app")
+        .click({ force: true })
       cy.contains(/Start from scratch/).click()
-      cy.get(interact.SPECTRUM_MODAL)
+      cy.get(interact.SPECTRUM_MODAL).within(() => {
-        .within(() => {
+        cy.get("input").eq(0).type(appName)
-          cy.get("input").eq(0).type(appName)
+        cy.get(interact.SPECTRUM_BUTTON_GROUP)
-          cy.get(interact.SPECTRUM_BUTTON_GROUP).contains("Create app").click({ force: true })
+          .contains("Create app")
-          cy.get(interact.ERROR).should("have.text", "Another app with the same name already exists")
+          .click({ force: true })
-        })
+        cy.get(interact.ERROR).should(
+          "have.text",
+          "Another app with the same name already exists"
+        )
+      })
     })
 
     it("should validate application names", () => {
@@ -89,7 +98,10 @@ filterTests(['all'], () => {
       cy.reload()
       cy.wait(1000)
       renameApp(numberName, specialCharName)
-      cy.get(interact.ERROR).should("have.text", "App name must be letters, numbers and spaces only")
+      cy.get(interact.ERROR).should(
+        "have.text",
+        "App name must be letters, numbers and spaces only"
+      )
       // Set app name back to Cypress Tests
       cy.reload()
       cy.wait(1000)
@@ -98,24 +110,19 @@ filterTests(['all'], () => {
 
     const renameApp = (originalName, changedName, published, noName) => {
       cy.searchForApplication(originalName)
-      cy.get(interact.APP_TABLE)
+      cy.get(interact.APP_TABLE).within(() => {
-        .within(() => {
+        cy.get(".app-row-actions button")
-          cy.get(interact.AREA_LABEL_MORE).eq(0).click()
+          .contains("Manage")
-        })
+          .eq(0)
-      // Check for when an app is published
+          .click({ force: true })
-      if (published == true) {
-        // Should not have Edit as option, will unpublish app
-        cy.should("not.have.value", "Edit")
-        cy.get(interact.SPECTRUM_MENU).contains("Unpublish").click()
-        cy.get(interact.SPECTRUM_DIALOG_GRID).contains("Unpublish app").click()
-        cy.get(".appTable > :nth-child(5) > :nth-child(2) > .spectrum-Icon").click()
-      }
-      cy.get(interact.APP_ROW_ACTION_MENU_POPOVER).eq(0).within(() => {
-        cy.get(interact.SPECTRUM_MENU_ITEMM).contains("Edit").click({ force: true })
       })
-
+      cy.get(".spectrum-Tabs-item").contains("Settings").click()
+      cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
+      cy.get(".settings-tab").should("be.visible")
+      cy.get(".details-section .page-action button")
+        .contains("Edit")
+        .click({ force: true })
       cy.updateAppName(changedName, noName)
-
     }
   })
 })

packages/builder/cypress/support/commands.js

@@ -144,20 +144,27 @@ Cypress.Commands.add("deleteApp", name => {
             return
           }
 
+          // Go to app overview
           const appIdParsed = appId.split("_").pop()
           const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
           cy.get(actionEleId).within(() => {
-            cy.get(".spectrum-Icon").eq(0).click({ force: true })
+            cy.contains("Manage").click({ force: true })
           })
-          cy.get(".spectrum-Menu").then($menu => {
+          cy.wait(1000)
-            if ($menu.text().includes("Unpublish")) {
+
-              cy.get(".spectrum-Menu").contains("Unpublish").click()
+          // Unpublish first if needed
-              cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
+          cy.get(`[data-cy="app-status"]`).then($status => {
+            if ($status.text().includes("Last published")) {
+              cy.contains("Unpublish").click()
+              cy.get(".spectrum-Modal").within(() => {
+                cy.contains("Unpublish app").click()
+              })
             }
           })
 
-          cy.get(actionEleId).within(() => {
+          // Delete app
-            cy.get(".spectrum-Icon").eq(0).click({ force: true })
+          cy.get(".app-overview-actions-icon").within(() => {
+            cy.get(".spectrum-Icon").click({ force: true })
           })
           cy.get(".spectrum-Menu").contains("Delete").click()
           cy.get(".spectrum-Dialog-grid").within(() => {
@@ -180,17 +187,7 @@ Cypress.Commands.add("deleteAllApps", () => {
     .its("body")
     .then(val => {
       for (let i = 0; i < val.length; i++) {
-        const appIdParsed = val[i].appId.split("_").pop()
+        cy.deleteApp(val[i].name)
-        const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
-        cy.get(actionEleId).within(() => {
-          cy.get(".spectrum-Icon").eq(0).click({ force: true })
-        })
-
-        cy.get(".spectrum-Menu").contains("Delete").click()
-        cy.get(".spectrum-Dialog-grid").within(() => {
-          cy.get("input").type(val[i].name)
-          cy.get(".spectrum-Button--warning").click()
-        })
         cy.reload()
       }
     })

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.200-alpha.3",
+    "@budibase/bbui": "^1.0.207-alpha.2",
-    "@budibase/client": "^1.0.200-alpha.3",
+    "@budibase/client": "^1.0.207-alpha.2",
-    "@budibase/frontend-core": "^1.0.200-alpha.3",
+    "@budibase/frontend-core": "^1.0.207-alpha.2",
-    "@budibase/string-templates": "^1.0.200-alpha.3",
+    "@budibase/string-templates": "^1.0.207-alpha.2",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/components/common/AppLockModal.svelte

@@ -87,7 +87,7 @@
     {#if lockedByYou && getExpiryDuration(app) > 0}
       <span class="lock-expiry-body">
         {processStringSync(
-          "This lock will expire in {{ duration time 'millisecond' }} from now",
+          "This lock will expire in {{ duration time 'millisecond' }} from now.",
           {
             time: getExpiryDuration(app),
           }
@@ -141,4 +141,8 @@
     gap: var(--spacing-s);
     max-width: 175px;
   }
+  .lock-status-text {
+    font-weight: 400;
+    color: var(--spectrum-global-color-gray-800);
+  }
 </style>

packages/builder/src/components/start/AppRow.svelte

@@ -1,18 +1,11 @@
 <script>
-  import { Heading, Button, Icon, ActionMenu, MenuItem } from "@budibase/bbui"
+  import { Heading, Button, Icon } from "@budibase/bbui"
   import AppLockModal from "../common/AppLockModal.svelte"
   import { processStringSync } from "@budibase/string-templates"
 
   export let app
-  export let exportApp
   export let editApp
-  export let updateApp
-  export let deleteApp
-  export let unpublishApp
   export let appOverview
-  export let releaseLock
-  export let editIcon
-  export let copyAppId
 </script>
 
 <div class="title" data-cy={`${app.devId}`}>
@@ -20,7 +13,7 @@
     <div class="app-icon" style="color: {app.icon?.color || ''}">
       <Icon size="XL" name={app.icon?.name || "Apps"} />
     </div>
-    <div class="name" data-cy="app-name-link" on:click={() => appOverview(app)}>
+    <div class="name" data-cy="app-name-link" on:click={() => editApp(app)}>
       <Heading size="XS">
         {app.name}
       </Heading>
@@ -37,7 +30,7 @@
   {/if}
 </div>
 <div class="desktop">
-  <AppLockModal {app} buttonSize="S" />
+  <AppLockModal {app} buttonSize="M" />
 </div>
 <div class="desktop">
   <div class="app-status">
@@ -52,47 +45,27 @@
 </div>
 <div data-cy={`row_actions_${app.appId}`}>
   <div class="app-row-actions">
+    <Button size="S" secondary newStyles on:click={() => appOverview(app)}>
+      Manage
+    </Button>
     <Button
       size="S"
-      secondary
+      primary
-      quiet
+      newStyles
       disabled={app.lockedOther}
       on:click={() => editApp(app)}
-      >Edit
+    >
+      Edit
     </Button>
-    <Button size="S" cta on:click={() => appOverview(app)}>View</Button>
   </div>
-  <ActionMenu align="right" dataCy="app-row-actions-menu-popover">
-    <span slot="control" class="app-row-actions-icon">
-      <Icon hoverable name="More" />
-    </span>
-    {#if app.lockedYou}
-      <MenuItem on:click={() => releaseLock(app)} icon="LockOpen">
-        Release lock
-      </MenuItem>
-    {/if}
-    <MenuItem on:click={() => exportApp(app)} icon="Download">Export</MenuItem>
-    {#if app.deployed}
-      <MenuItem on:click={() => unpublishApp(app)} icon="GlobeRemove">
-        Unpublish
-      </MenuItem>
-      <MenuItem on:click={() => copyAppId(app)} icon="Copy">
-        Copy App ID
-      </MenuItem>
-    {/if}
-    {#if !app.deployed}
-      <MenuItem on:click={() => updateApp(app)} icon="Edit">Edit</MenuItem>
-      <MenuItem on:click={() => deleteApp(app)} icon="Delete">Delete</MenuItem>
-    {/if}
-    <MenuItem on:click={() => editIcon(app)} icon="Brush">Edit icon</MenuItem>
-  </ActionMenu>
 </div>
 
 <style>
   .app-row-actions {
     grid-gap: var(--spacing-s);
-    display: grid;
+    display: flex;
-    grid-template-columns: 75px 75px;
+    flex-direction: row;
+    justify-content: flex-end;
   }
   .app-status {
     display: grid;

packages/builder/src/pages/builder/portal/apps/index.svelte

@@ -3,20 +3,17 @@
     Heading,
     Layout,
     Button,
-    Input,
     Select,
     Modal,
     Page,
     notifications,
     Body,
     Search,
-    Helpers,
   } from "@budibase/bbui"
   import TemplateDisplay from "components/common/TemplateDisplay.svelte"
   import Spinner from "components/common/Spinner.svelte"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
   import UpdateAppModal from "components/start/UpdateAppModal.svelte"
-  import ChooseIconModal from "components/start/ChooseIconModal.svelte"
   import ExportAppModal from "components/start/ExportAppModal.svelte"
 
   import { store, automationStore } from "builderStore"
@@ -25,10 +22,8 @@
   import { apps, auth, admin, templates } from "stores/portal"
   import download from "downloadjs"
   import { goto } from "@roxi/routify"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import AppRow from "components/start/AppRow.svelte"
   import { AppStatus } from "constants"
-  import analytics, { Events, EventSource } from "analytics"
   import Logo from "assets/bb-space-man.svg"
 
   let sortBy = "name"
@@ -36,15 +31,11 @@
   let selectedApp
   let creationModal
   let updatingModal
-  let deletionModal
-  let unpublishModal
   let exportModal
-  let iconModal
   let creatingApp = false
   let loaded = $apps?.length || $templates?.length
   let searchTerm = ""
   let cloud = $admin.cloud
-  let appName = ""
   let creatingFromTemplate = false
 
   const resolveWelcomeMessage = (auth, apps) => {
@@ -164,18 +155,6 @@
     creatingApp = false
   }
 
-  const viewApp = app => {
-    analytics.captureEvent(Events.APP_VIEW_PUBLISHED, {
-      appId: app.appId,
-      eventSource: EventSource.PORTAL,
-    })
-    if (app.url) {
-      window.open(`/app${app.url}`)
-    } else {
-      window.open(`/${app.prodId}`)
-    }
-  }
-
   const appOverview = app => {
     $goto(`../overview/${app.devId}`)
   }
@@ -190,76 +169,6 @@
     $goto(`../../app/${app.devId}`)
   }
 
-  const editIcon = app => {
-    selectedApp = app
-    iconModal.show()
-  }
-
-  const exportApp = app => {
-    exportModal.show()
-    selectedApp = app
-  }
-
-  const unpublishApp = app => {
-    selectedApp = app
-    unpublishModal.show()
-  }
-
-  const confirmUnpublishApp = async () => {
-    if (!selectedApp) {
-      return
-    }
-    try {
-      await API.unpublishApp(selectedApp.prodId)
-      await apps.load()
-      notifications.success("App unpublished successfully")
-    } catch (err) {
-      notifications.error("Error unpublishing app")
-    }
-  }
-
-  const deleteApp = app => {
-    selectedApp = app
-    deletionModal.show()
-  }
-
-  const confirmDeleteApp = async () => {
-    if (!selectedApp) {
-      return
-    }
-    try {
-      await API.deleteApp(selectedApp?.devId)
-      await apps.load()
-      // Get checklist, just in case that was the last app
-      await admin.init()
-      notifications.success("App deleted successfully")
-    } catch (err) {
-      notifications.error("Error deleting app")
-    }
-    selectedApp = null
-    appName = null
-  }
-
-  const updateApp = async app => {
-    selectedApp = app
-    updatingModal.show()
-  }
-
-  const releaseLock = async app => {
-    try {
-      await API.releaseAppLock(app.devId)
-      await apps.load()
-      notifications.success("Lock released successfully")
-    } catch (err) {
-      notifications.error("Error releasing lock")
-    }
-  }
-
-  const copyAppId = async app => {
-    await Helpers.copyToClipboard(app.prodId)
-    notifications.success("App ID copied to clipboard.")
-  }
-
   function createAppFromTemplateUrl(templateKey) {
     // validate the template key just to make sure
     const templateParts = templateKey.split("/")
@@ -407,19 +316,7 @@
 
           <div class="appTable" class:unlocked>
             {#each filteredApps as app (app.appId)}
-              <AppRow
+              <AppRow {app} {editApp} {appOverview} />
-                {copyAppId}
-                {releaseLock}
-                {editIcon}
-                {app}
-                {unpublishApp}
-                {viewApp}
-                {editApp}
-                {exportApp}
-                {deleteApp}
-                {updateApp}
-                {appOverview}
-              />
             {/each}
           </div>
         </Layout>
@@ -453,35 +350,6 @@
   <ExportAppModal app={selectedApp} />
 </Modal>
 
-<ConfirmDialog
-  bind:this={deletionModal}
-  title="Confirm deletion"
-  okText="Delete app"
-  onOk={confirmDeleteApp}
-  onCancel={() => (appName = null)}
-  disabled={appName !== selectedApp?.name}
->
-  Are you sure you want to delete the app <b>{selectedApp?.name}</b>?
-
-  <p>Please enter the app name below to confirm.</p>
-  <Input
-    bind:value={appName}
-    data-cy="delete-app-confirmation"
-    placeholder={selectedApp?.name}
-  />
-</ConfirmDialog>
-<ConfirmDialog
-  bind:this={unpublishModal}
-  title="Confirm unpublish"
-  okText="Unpublish app"
-  onOk={confirmUnpublishApp}
-  dataCy={"unpublish-modal"}
->
-  Are you sure you want to unpublish the app <b>{selectedApp?.name}</b>?
-</ConfirmDialog>
-
-<ChooseIconModal app={selectedApp} bind:this={iconModal} />
-
 <style>
   .appTable {
     border-top: var(--border-light);
@@ -538,12 +406,9 @@
     height: 70px;
     display: grid;
     align-items: center;
-    grid-gap: var(--spacing-xl);
-    grid-template-columns: auto 1fr;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    padding: 0 var(--spacing-s);
   }
   .appTable :global(> div) {
     border-bottom: var(--border-light);

packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte

@@ -51,7 +51,7 @@
     bind:value={$email}
     error={$touched && $error}
   />
-  <Input disabled label="Password" value={password} />
+  <Input readonly label="Password" value={password} />
   <div>
     <div class="toggle">
       <Label size="L">Development access</Label>

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.200-alpha.3",
+    "@budibase/bbui": "^1.0.207-alpha.2",
-    "@budibase/frontend-core": "^1.0.200-alpha.3",
+    "@budibase/frontend-core": "^1.0.207-alpha.2",
-    "@budibase/string-templates": "^1.0.200-alpha.3",
+    "@budibase/string-templates": "^1.0.207-alpha.2",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",

packages/frontend-core/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.200-alpha.3",
+    "@budibase/bbui": "^1.0.207-alpha.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,10 +77,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.200-alpha.3",
+    "@budibase/backend-core": "^1.0.207-alpha.2",
-    "@budibase/client": "^1.0.200-alpha.3",
+    "@budibase/client": "^1.0.207-alpha.2",
-    "@budibase/pro": "1.0.200-alpha.3",
+    "@budibase/pro": "1.0.207-alpha.2",
-    "@budibase/string-templates": "^1.0.200-alpha.3",
+    "@budibase/string-templates": "^1.0.207-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -151,7 +151,7 @@
     "@babel/core": "7.17.4",
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/types": "^1.0.200-alpha.3",
+    "@budibase/types": "^1.0.207-alpha.2",
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",

packages/server/src/api/controllers/dev.js

@@ -131,5 +131,5 @@ exports.getBudibaseVersion = async ctx => {
   ctx.body = {
     version,
   }
-  await events.version.checked(version)
+  await events.installation.versionChecked(version)
 }

packages/server/src/api/controllers/row/external.js

@@ -155,27 +155,22 @@ exports.validate = async () => {
 }
 
 exports.exportRows = async ctx => {
-  const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId)
+  const { datasourceId } = breakExternalTableId(ctx.params.tableId)
   const db = getAppDB()
   let format = ctx.query.format
   const datasource = await db.get(datasourceId)
   if (!datasource || !datasource.entities) {
     ctx.throw(400, "Datasource has not been configured for plus API.")
   }
-  const tables = datasource.entities
-  const table = tables[tableName]
   ctx.request.body = {
     query: {
       oneOf: {
-        [table.primaryDisplay]: ctx.request.body.rows.map(
+        _id: ctx.request.body.rows.map(row => JSON.parse(decodeURI(row))[0]),
-          id => breakRowIdField(id)[0]
-        ),
       },
     },
   }
 
   let result = await exports.search(ctx)
-
   let headers = Object.keys(result.rows[0])
   const exporter = exporters[format]
   const filename = `export.${format}`

packages/server/src/api/controllers/static/index.js

@@ -17,7 +17,6 @@ const { attachmentsRelativeURL } = require("../../../utilities")
 const { DocumentTypes, isDevAppID } = require("../../../db/utils")
 const { getAppDB, getAppId } = require("@budibase/backend-core/context")
 const AWS = require("aws-sdk")
-const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1"
 const { events } = require("@budibase/backend-core")
 
 async function prepareUpload({ s3Key, bucket, metadata, file }) {
@@ -42,7 +41,9 @@ async function prepareUpload({ s3Key, bucket, metadata, file }) {
 exports.serveBuilder = async function (ctx) {
   let builderPath = resolve(TOP_LEVEL_PATH, "builder")
   await send(ctx, ctx.file, { root: builderPath })
-  await events.serve.servedBuilder()
+  if (!ctx.file.includes("assets/")) {
+    await events.serve.servedBuilder()
+  }
 }
 
 exports.uploadFile = async function (ctx) {
@@ -128,6 +129,7 @@ exports.getSignedUploadURL = async function (ctx) {
   // Determine type of datasource and generate signed URL
   let signedUrl
   let publicUrl
+  const awsRegion = datasource?.config?.region || "eu-west-1"
   if (datasource.source === "S3") {
     const { bucket, key } = ctx.request.body || {}
     if (!bucket || !key) {
@@ -136,7 +138,7 @@ exports.getSignedUploadURL = async function (ctx) {
     }
     try {
       const s3 = new AWS.S3({
-        region: AWS_REGION,
+        region: awsRegion,
         accessKeyId: datasource?.config?.accessKeyId,
         secretAccessKey: datasource?.config?.secretAccessKey,
         apiVersion: "2006-03-01",
@@ -144,7 +146,7 @@ exports.getSignedUploadURL = async function (ctx) {
       })
       const params = { Bucket: bucket, Key: key }
       signedUrl = s3.getSignedUrl("putObject", params)
-      publicUrl = `https://${bucket}.s3.${AWS_REGION}.amazonaws.com/${key}`
+      publicUrl = `https://${bucket}.s3.${awsRegion}.amazonaws.com/${key}`
     } catch (error) {
       ctx.throw(400, error)
     }

packages/server/src/api/routes/tests/dev.spec.js

@@ -33,8 +33,8 @@ describe("/dev", () => {
         .expect(200)
 
       expect(res.body.version).toBe(version)
-      expect(events.version.checked).toBeCalledTimes(1)
+      expect(events.installation.versionChecked).toBeCalledTimes(1)
-      expect(events.version.checked).toBeCalledWith(version)
+      expect(events.installation.versionChecked).toBeCalledWith(version)
     })
   })
 })

packages/server/src/automations/steps/executeQuery.js

@@ -72,7 +72,7 @@ exports.run = async function ({ inputs, appId, emitter }) {
   })
 
   try {
-    await queryController.executeV1(ctx)
+    await queryController.executeV2(ctx)
     const { data, ...rest } = ctx.body
     return {
       response: data,

packages/server/src/automations/triggers.js

@@ -97,7 +97,7 @@ exports.externalTrigger = async function (
     // values are likely to be submitted as strings, so we shall convert to correct type
     const coercedFields = {}
     const fields = automation.definition.trigger.inputs.fields
-    for (let key of Object.keys(fields)) {
+    for (let key of Object.keys(fields || {})) {
       coercedFields[key] = coerce(params.fields[key], fields[key])
     }
     params.fields = coercedFields

packages/server/src/integrations/firebase.ts

@@ -66,7 +66,6 @@ module Firebase {
             "==",
             "<",
             "<=",
-            "==",
             "!=",
             ">=",
             ">",

packages/server/src/migrations/functions/backfill/app.ts

@@ -20,6 +20,7 @@ const handleError = (e: any, errors?: any) => {
     }
     return
   }
+  console.trace(e)
   throw e
 }
 

packages/server/src/migrations/functions/backfill/app/queries.ts

@@ -22,10 +22,23 @@ export const backfill = async (appDb: any, timestamp: string | number) => {
   const queries: Query[] = await getQueries(appDb)
 
   for (const query of queries) {
-    const datasource: Datasource = await getDatasource(
+    let datasource: Datasource
-      appDb,
+
-      query.datasourceId
+    try {
-    )
+      datasource = await getDatasource(appDb, query.datasourceId)
+    } catch (e: any) {
+      // handle known bug where a datasource has been deleted
+      // and the query has not
+      if (e.status === 404) {
+        datasource = {
+          _id: query.datasourceId,
+          source: "unknown",
+        }
+      } else {
+        throw e
+      }
+    }
+
     await events.query.created(datasource, query, timestamp)
   }
 

packages/server/src/migrations/functions/backfill/global.ts

@@ -14,6 +14,7 @@ import {
   App,
   TenantBackfillSucceededEvent,
   Event,
+  User,
 } from "@budibase/types"
 import env from "../../../environment"
 import { DEFAULT_TIMESTAMP } from "."
@@ -94,8 +95,24 @@ export const run = async (db: any) => {
     const totals: any = {}
     const errors: any = []
 
+    let allUsers: User[] = []
     try {
-      const installTimestamp = await getInstallTimestamp(db)
+      allUsers = await users.getUsers(db)
+    } catch (e: any) {
+      handleError(e, errors)
+    }
+
+    if (!allUsers || allUsers.length === 0) {
+      // first time startup - we don't need to backfill anything
+      // tenant will be identified when admin user is created
+      if (env.SELF_HOSTED) {
+        await events.installation.firstStartup()
+      }
+      return
+    }
+
+    try {
+      const installTimestamp = await getInstallTimestamp(db, allUsers)
       if (installTimestamp) {
         timestamp = installTimestamp
       }
@@ -175,20 +192,25 @@ export const isComplete = async (): Promise<boolean> => {
 }
 
 export const getInstallTimestamp = async (
-  globalDb: any
+  globalDb: any,
+  allUsers?: User[]
 ): Promise<number | undefined> => {
-  const allUsers = await users.getUsers(globalDb)
+  if (!allUsers) {
+    allUsers = await users.getUsers(globalDb)
+  }
 
   // get the oldest user timestamp
-  const timestamps = allUsers
+  if (allUsers) {
-    .map(user => user.createdAt)
+    const timestamps = allUsers
-    .filter(timestamp => !!timestamp)
+      .map(user => user.createdAt)
-    .sort(
+      .filter(timestamp => !!timestamp)
-      (a, b) =>
+      .sort(
-        new Date(a as number).getTime() - new Date(b as number).getTime()
+        (a, b) =>
-    )
+          new Date(a as number).getTime() - new Date(b as number).getTime()
+      )
 
-  if (timestamps.length) {
+    if (timestamps.length) {
-    return timestamps[0]
+      return timestamps[0]
+    }
   }
 }

packages/server/src/migrations/index.ts

@@ -104,7 +104,6 @@ export const migrate = async (options?: MigrationOptions) => {
 
 const migrateWithLock = async (options?: MigrationOptions) => {
   // get a new lock client
-
   const redlock = await redis.clients.getMigrationsRedlock()
   // lock for 15 minutes
   const ttl = 1000 * 60 * 15

packages/server/src/migrations/tests/index.spec.ts

@@ -23,6 +23,8 @@ const clearMigrations = async () => {
   }
 }
 
+jest.setTimeout(10000)
+
 describe("migrations", () => {
   const config = new TestConfig()
 

packages/server/yarn.lock

@@ -181,6 +181,11 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab"
   integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==
 
+"@babel/compat-data@^7.16.8":
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.5.tgz#acac0c839e317038c73137fbb6ef71a1d6238471"
+  integrity sha512-BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg==
+
 "@babel/core@7.17.4":
   version "7.17.4"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.4.tgz#a22f1ae8999122873b3d18865e98c7a3936b8c8b"
@@ -223,7 +228,7 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.18.2", "@babel/generator@^7.4.0", "@babel/generator@^7.7.2":
+"@babel/generator@^7.17.3", "@babel/generator@^7.18.2", "@babel/generator@^7.4.0", "@babel/generator@^7.7.2":
   version "7.18.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
   integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==
@@ -333,7 +338,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-module-transforms@^7.18.0":
+"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.18.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd"
   integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
@@ -368,7 +373,7 @@
     "@babel/helper-wrap-function" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helper-replace-supers@^7.16.7":
+"@babel/helper-replace-supers@^7.16.7", "@babel/helper-replace-supers@^7.18.2":
   version "7.18.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz#41fdfcc9abaf900e18ba6e5931816d9062a7b2e0"
   integrity sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==
@@ -420,7 +425,7 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.18.2":
+"@babel/helpers@^7.17.2", "@babel/helpers@^7.18.2":
   version "7.18.2"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384"
   integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==
@@ -443,14 +448,19 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef"
   integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12":
+"@babel/parser@^7.17.3", "@babel/parser@^7.18.5":
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.5.tgz#337062363436a893a2d22faa60be5bb37091c83c"
+  integrity sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e"
   integrity sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.17.12":
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz#0d498ec8f0374b1e2eb54b9cb2c4c78714c77753"
   integrity sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==
@@ -459,7 +469,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-proposal-optional-chaining" "^7.17.12"
 
-"@babel/plugin-proposal-async-generator-functions@^7.17.12":
+"@babel/plugin-proposal-async-generator-functions@^7.16.8":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz#094a417e31ce7e692d84bab06c8e2a607cbeef03"
   integrity sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==
@@ -468,7 +478,7 @@
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.17.12":
+"@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz#84f65c0cc247d46f40a6da99aadd6438315d80a4"
   integrity sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==
@@ -476,7 +486,7 @@
     "@babel/helper-create-class-features-plugin" "^7.17.12"
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-proposal-class-static-block@^7.18.0":
+"@babel/plugin-proposal-class-static-block@^7.16.7":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz#7d02253156e3c3793bdb9f2faac3a1c05f0ba710"
   integrity sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==
@@ -493,7 +503,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.17.12":
+"@babel/plugin-proposal-export-namespace-from@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378"
   integrity sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==
@@ -501,7 +511,7 @@
     "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.17.12":
+"@babel/plugin-proposal-json-strings@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz#f4642951792437233216d8c1af370bb0fbff4664"
   integrity sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==
@@ -509,7 +519,7 @@
     "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.17.12":
+"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23"
   integrity sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==
@@ -517,7 +527,7 @@
     "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.17.12":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be"
   integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==
@@ -533,7 +543,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.18.0":
+"@babel/plugin-proposal-object-rest-spread@^7.16.7":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz#79f2390c892ba2a68ec112eb0d895cfbd11155e8"
   integrity sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==
@@ -552,7 +562,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.17.12":
+"@babel/plugin-proposal-optional-chaining@^7.16.7", "@babel/plugin-proposal-optional-chaining@^7.17.12":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz#f96949e9bacace3a9066323a5cf90cfb9de67174"
   integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==
@@ -561,7 +571,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.17.12":
+"@babel/plugin-proposal-private-methods@^7.16.11":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz#c2ca3a80beb7539289938da005ad525a038a819c"
   integrity sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==
@@ -569,7 +579,7 @@
     "@babel/helper-create-class-features-plugin" "^7.17.12"
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-proposal-private-property-in-object@^7.17.12":
+"@babel/plugin-proposal-private-property-in-object@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d"
   integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==
@@ -579,7 +589,7 @@
     "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.17.12", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz#3dbd7a67bd7f94c8238b394da112d86aaf32ad4d"
   integrity sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==
@@ -629,13 +639,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz#58096a92b11b2e4e54b24c6a0cc0e5e607abcedd"
-  integrity sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
@@ -713,14 +716,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-arrow-functions@^7.17.12":
+"@babel/plugin-transform-arrow-functions@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz#dddd783b473b1b1537ef46423e3944ff24898c45"
   integrity sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-async-to-generator@^7.17.12":
+"@babel/plugin-transform-async-to-generator@^7.16.8":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz#dbe5511e6b01eee1496c944e35cdfe3f58050832"
   integrity sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==
@@ -736,35 +739,35 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-block-scoping@^7.17.12":
+"@babel/plugin-transform-block-scoping@^7.16.7":
-  version "7.17.12"
+  version "7.18.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.17.12.tgz#68fc3c4b3bb7dfd809d97b7ed19a584052a2725c"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz#7988627b3e9186a13e4d7735dc9c34a056613fb9"
-  integrity sha512-jw8XW/B1i7Lqwqj2CbrViPcZijSxfguBWZP2aN59NHgxUyO/OcO1mfdCxH13QhN5LbWhPkX+f+brKGhZTiqtZQ==
+  integrity sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-classes@^7.17.12":
+"@babel/plugin-transform-classes@^7.16.7":
-  version "7.17.12"
+  version "7.18.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.17.12.tgz#da889e89a4d38375eeb24985218edeab93af4f29"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz#51310b812a090b846c784e47087fa6457baef814"
-  integrity sha512-cvO7lc7pZat6BsvH6l/EGaI8zpl8paICaoGk+7x7guvtfak/TbIf66nYmJOH13EuG0H+Xx3M+9LQDtSvZFKXKw==
+  integrity sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.18.2"
     "@babel/helper-function-name" "^7.17.9"
     "@babel/helper-optimise-call-expression" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.18.2"
     "@babel/helper-split-export-declaration" "^7.16.7"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.17.12":
+"@babel/plugin-transform-computed-properties@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz#bca616a83679698f3258e892ed422546e531387f"
   integrity sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-destructuring@^7.18.0":
+"@babel/plugin-transform-destructuring@^7.16.7":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz#dc4f92587e291b4daa78aa20cc2d7a63aa11e858"
   integrity sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==
@@ -779,7 +782,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-duplicate-keys@^7.17.12":
+"@babel/plugin-transform-duplicate-keys@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz#a09aa709a3310013f8e48e0e23bc7ace0f21477c"
   integrity sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==
@@ -794,7 +797,7 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-for-of@^7.18.1":
+"@babel/plugin-transform-for-of@^7.16.7":
   version "7.18.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz#ed14b657e162b72afbbb2b4cdad277bf2bb32036"
   integrity sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==
@@ -810,7 +813,7 @@
     "@babel/helper-function-name" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-literals@^7.17.12":
+"@babel/plugin-transform-literals@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz#97131fbc6bbb261487105b4b3edbf9ebf9c830ae"
   integrity sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==
@@ -824,7 +827,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-amd@^7.18.0":
+"@babel/plugin-transform-modules-amd@^7.16.7":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz#7ef1002e67e36da3155edc8bf1ac9398064c02ed"
   integrity sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==
@@ -833,7 +836,7 @@
     "@babel/helper-plugin-utils" "^7.17.12"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.18.2":
+"@babel/plugin-transform-modules-commonjs@^7.16.8":
   version "7.18.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e"
   integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==
@@ -843,10 +846,10 @@
     "@babel/helper-simple-access" "^7.18.2"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.18.0":
+"@babel/plugin-transform-modules-systemjs@^7.16.7":
-  version "7.18.0"
+  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.0.tgz#50ecdb43de97c8483824402f7125edb94cddb09a"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.5.tgz#87f11c44fbfd3657be000d4897e192d9cb535996"
-  integrity sha512-vwKpxdHnlM5tIrRt/eA0bzfbi7gUBLN08vLu38np1nZevlPySRe6yvuATJB5F/WPJ+ur4OXwpVYq9+BsxqAQuQ==
+  integrity sha512-SEewrhPpcqMF1V7DhnEbhVJLrC+nnYfe1E0piZMZXBpxi9WvZqWGwpsk7JYP7wPWeqaBh4gyKlBhHJu3uz5g4Q==
   dependencies:
     "@babel/helper-hoist-variables" "^7.16.7"
     "@babel/helper-module-transforms" "^7.18.0"
@@ -854,7 +857,7 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.18.0":
+"@babel/plugin-transform-modules-umd@^7.16.7":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz#56aac64a2c2a1922341129a4597d1fd5c3ff020f"
   integrity sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==
@@ -862,7 +865,7 @@
     "@babel/helper-module-transforms" "^7.18.0"
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.17.12":
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz#9c4a5a5966e0434d515f2675c227fd8cc8606931"
   integrity sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==
@@ -870,10 +873,10 @@
     "@babel/helper-create-regexp-features-plugin" "^7.17.12"
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-new-target@^7.17.12":
+"@babel/plugin-transform-new-target@^7.16.7":
-  version "7.17.12"
+  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz#10842cd605a620944e81ea6060e9e65c265742e3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.5.tgz#8c228c4a07501dd12c95c5f23d1622131cc23931"
-  integrity sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==
+  integrity sha512-TuRL5uGW4KXU6OsRj+mLp9BM7pO8e7SGNTEokQRRxHFkXYMFiy2jlKSZPFtI/mKORDzciH+hneskcSOp0gU8hg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.17.12"
 
@@ -885,7 +888,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-replace-supers" "^7.16.7"
 
-"@babel/plugin-transform-parameters@^7.17.12":
+"@babel/plugin-transform-parameters@^7.16.7", "@babel/plugin-transform-parameters@^7.17.12":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz#eb467cd9586ff5ff115a9880d6fdbd4a846b7766"
   integrity sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==
@@ -899,7 +902,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-regenerator@^7.18.0":
+"@babel/plugin-transform-regenerator@^7.16.7":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz#44274d655eb3f1af3f3a574ba819d3f48caf99d5"
   integrity sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==
@@ -907,7 +910,7 @@
     "@babel/helper-plugin-utils" "^7.17.12"
     regenerator-transform "^0.15.0"
 
-"@babel/plugin-transform-reserved-words@^7.17.12":
+"@babel/plugin-transform-reserved-words@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz#7dbd349f3cdffba751e817cf40ca1386732f652f"
   integrity sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==
@@ -921,7 +924,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-spread@^7.17.12":
+"@babel/plugin-transform-spread@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz#c112cad3064299f03ea32afed1d659223935d1f5"
   integrity sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==
@@ -936,14 +939,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-template-literals@^7.18.2":
+"@babel/plugin-transform-template-literals@^7.16.7":
   version "7.18.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz#31ed6915721864847c48b656281d0098ea1add28"
   integrity sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-typeof-symbol@^7.17.12":
+"@babel/plugin-transform-typeof-symbol@^7.16.7":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz#0f12f57ac35e98b35b4ed34829948d42bd0e6889"
   integrity sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==
@@ -1088,7 +1091,23 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.18.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4":
+"@babel/traverse@^7.17.3":
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.5.tgz#94a8195ad9642801837988ab77f36e992d9a20cd"
+  integrity sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-function-name" "^7.17.9"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.18.5"
+    "@babel/types" "^7.18.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.18.2", "@babel/types@^7.18.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4":
   version "7.18.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354"
   integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==
@@ -1101,10 +1120,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.200-alpha.3":
+"@budibase/backend-core@1.0.207-alpha.2":
-  version "1.0.200-alpha.3"
+  version "1.0.207-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.200-alpha.3.tgz#b21ba2bdb4f1de3e5f14161b8203a1a98f693e4d"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.2.tgz#c80884397b0bf1e972648014734b3a8b2cafc7a3"
-  integrity sha512-zVy6bfg4yrtjva0MoBMqIbFrNwA+v76XvRgI3GesaSuJKspWCk4lKtV6I4cr6q9Rr2U+kUzK/4ho/0F/oZcfsg==
+  integrity sha512-2724M05X3TayOWjRz2+n9Zqf/VaqqCWGzoJlbsCkQNUzzyv5lVZ5KLL5fPLfUtjuerYikGZLh/v5a/hRSc5yZw==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1182,12 +1201,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.200-alpha.3":
+"@budibase/pro@1.0.207-alpha.2":
-  version "1.0.200-alpha.3"
+  version "1.0.207-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.200-alpha.3.tgz#c6bc4c6b335fb8eae973939efc16958022a45a99"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.2.tgz#52d57ce4a7502aa8eb1aeb4a63ffdcc5d298e44d"
-  integrity sha512-YUUlfVJA2xhtjL3jXem7WtuqdshDWF8qm4xbEXgvlpgOxHtGrjSxf9WR4kir/F2UDDTgVNmttAS1oWVDMSGzug==
+  integrity sha512-TI0hbxIuad8gFqswV/93pURKJPWUe85Q9U5pCxuEs/oHlA0ULwRK8oK3cm/AgdKEjmf5GafSlphPXC4wHnvwDA==
   dependencies:
-    "@budibase/backend-core" "1.0.200-alpha.3"
+    "@budibase/backend-core" "1.0.207-alpha.2"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
@@ -1208,13 +1227,6 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@bull-board/api@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.11.0.tgz#680a9a488dc503e5aec74df6c17486f009d3bb07"
-  integrity sha512-0fB3aD3NTU3e5WApJbEJWFwDI0RKqw9P9hHVjs7yx6/8C7IXmAH0HjS5vwXUDDyEvs0sKJZuCbWcfwJIk1nGOA==
-  dependencies:
-    redis-info "^3.0.8"
-
 "@bull-board/api@3.7.0":
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af"
@@ -1222,6 +1234,13 @@
   dependencies:
     redis-info "^3.0.8"
 
+"@bull-board/api@3.9.4":
+  version "3.9.4"
+  resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.9.4.tgz#984f25e6d5501d97152d81184968ff135757b57a"
+  integrity sha512-1X1YCqPEID2kKwq+g4aEspZm2j+vUgEYDlqINCLztThBXWbzJhI1vqwktVGJF9DAe98Jl6R84vb7cO/AgjaKMA==
+  dependencies:
+    redis-info "^3.0.8"
+
 "@bull-board/koa@3.9.4":
   version "3.9.4"
   resolved "https://registry.yarnpkg.com/@bull-board/koa/-/koa-3.9.4.tgz#c741500cf42f01e339e1b0c05c80a42b310b31dd"
@@ -1236,12 +1255,12 @@
     koa-static "^5.0.0"
     koa-views "^7.0.1"
 
-"@bull-board/ui@3.11.0":
+"@bull-board/ui@3.9.4":
-  version "3.11.0"
+  version "3.9.4"
-  resolved "https://registry.yarnpkg.com/@bull-board/ui/-/ui-3.11.0.tgz#4cd7825adc76c87596326504f6f74a153c272464"
+  resolved "https://registry.yarnpkg.com/@bull-board/ui/-/ui-3.9.4.tgz#3a58c2903c91048c9f200f2d7525847a6a84a78c"
-  integrity sha512-dUOwnH4mJO154FDKiA4j7nkyYCfCq0Bghos5de5orFxjGRBwSAhRQXoSTtl2ZHAOGCZNinXHGTEXFry3G8OWgw==
+  integrity sha512-FjKmoEWerJmqh3mSx9wltVZvjNuBpux17CPQpI/nWJCtWzCQp0icxbJ8VBb6LP97xl8puDZ+na3zm89TdOPM9g==
   dependencies:
-    "@bull-board/api" "3.11.0"
+    "@bull-board/api" "3.9.4"
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
@@ -1256,12 +1275,17 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
-"@cspotcode/source-map-support@^0.8.0":
+"@cspotcode/source-map-consumer@0.8.0":
-  version "0.8.1"
+  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+  integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
+
+"@cspotcode/source-map-support@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5"
+  integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==
   dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
+    "@cspotcode/source-map-consumer" "0.8.0"
 
 "@curlconverter/yargs-parser@^0.0.1":
   version "0.0.1"
@@ -1982,14 +2006,6 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
   integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
 
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.13"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
@@ -4117,7 +4133,7 @@ browser-resolve@^1.11.3:
   dependencies:
     resolve "1.1.7"
 
-browserslist@^4.14.5, browserslist@^4.20.2, browserslist@^4.20.3:
+browserslist@^4.14.5, browserslist@^4.20.2, browserslist@^4.20.3, browserslist@^4.20.4:
   version "4.20.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.4.tgz#98096c9042af689ee1e0271333dbc564b8ce4477"
   integrity sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==
@@ -4187,6 +4203,11 @@ buffer-fill@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
   integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
 
+buffer-from@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
 buffer-from@1.1.2, buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
@@ -4764,6 +4785,14 @@ copyfiles@2.4.1:
     untildify "^4.0.0"
     yargs "^16.1.0"
 
+core-js-compat@^3.20.2:
+  version "3.23.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.1.tgz#23d44d9f209086e60dabf9130cea7719af6e199b"
+  integrity sha512-KeYrEc8t6FJsKYB2qnDwRHWaC0cJNaqlHfCpMe5q3j/W1nje3moib/txNklddLPCtGb+etcBIyJ8zuMa/LN5/A==
+  dependencies:
+    browserslist "^4.20.4"
+    semver "7.0.0"
+
 core-js-compat@^3.21.0:
   version "3.22.8"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.8.tgz#46fa34ce1ddf742acd7f95f575f66bbb21e05d62"
@@ -4772,14 +4801,6 @@ core-js-compat@^3.21.0:
     browserslist "^4.20.3"
     semver "7.0.0"
 
-core-js-compat@^3.22.1:
-  version "3.22.7"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.7.tgz#8359eb66ecbf726dd0cfced8e48d5e73f3224239"
-  integrity sha512-uI9DAQKKiiE/mclIC5g4AjRpio27g+VMRhe6rQoz+q4Wm4L6A/fJhiLtBw+sfOpDG9wZ3O0pxIw7GbfOlBgjOA==
-  dependencies:
-    browserslist "^4.20.3"
-    semver "7.0.0"
-
 core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -5349,7 +5370,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-ejs@^3.1.7:
+ejs@^3.1.6:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
   integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
@@ -6157,6 +6178,13 @@ fengari@^0.1.4:
     sprintf-js "^1.1.1"
     tmp "^0.0.33"
 
+fetch-cookie@0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.10.1.tgz#5ea88f3d36950543c87997c27ae2aeafb4b5c4d4"
+  integrity sha512-beB+VEd4cNeVG1PY+ee74+PkuCQnik78pgLi5Ah/7qdUfov8IctU0vLUbBT8/10Ma5GMBeI4wtxhGrEfKNYs2g==
+  dependencies:
+    tough-cookie "^2.3.3 || ^3.0.1 || ^4.0.0"
+
 fetch-cookie@0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.11.0.tgz#e046d2abadd0ded5804ce7e2cae06d4331c15407"
@@ -10054,6 +10082,11 @@ node-addon-api@^3.1.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
+node-fetch@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
+  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+
 node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -10984,38 +11017,38 @@ pouch-stream@^0.4.0:
     inherits "^2.0.1"
     readable-stream "^1.0.27-1"
 
-pouchdb-abstract-mapreduce@7.3.0:
+pouchdb-abstract-mapreduce@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.3.0.tgz#cc178cb5d07f73b7c3f0f47a7f963defd4872b1c"
+  resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.2.2.tgz#dd1b10a83f8d24361dce9aaaab054614b39f766f"
-  integrity sha512-+2fVt3SDh7D776lIGbYZOsKX5js1aUyUw7iJaTGitxSdQ2ObWSTrr3SUrj5Qo1CkgPXwRM3Tdoq/53JYAa2qCA==
+  integrity sha512-7HWN/2yV2JkwMnGnlp84lGvFtnm0Q55NiBUdbBcaT810+clCGKvhssBCrXnmwShD1SXTwT83aszsgiSfW+SnBA==
   dependencies:
-    pouchdb-binary-utils "7.3.0"
+    pouchdb-binary-utils "7.2.2"
-    pouchdb-collate "7.3.0"
+    pouchdb-collate "7.2.2"
-    pouchdb-collections "7.3.0"
+    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.3.0"
+    pouchdb-errors "7.2.2"
-    pouchdb-fetch "7.3.0"
+    pouchdb-fetch "7.2.2"
-    pouchdb-mapreduce-utils "7.3.0"
+    pouchdb-mapreduce-utils "7.2.2"
-    pouchdb-md5 "7.3.0"
+    pouchdb-md5 "7.2.2"
-    pouchdb-utils "7.3.0"
+    pouchdb-utils "7.2.2"
 
-pouchdb-adapter-leveldb-core@7.3.0:
+pouchdb-adapter-leveldb-core@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-adapter-leveldb-core/-/pouchdb-adapter-leveldb-core-7.3.0.tgz#91fa1fbc35e744252ae73f9e88911883c1841c9a"
+  resolved "https://registry.yarnpkg.com/pouchdb-adapter-leveldb-core/-/pouchdb-adapter-leveldb-core-7.2.2.tgz#e0aa6a476e2607d7ae89f4a803c9fba6e6d05a8a"
-  integrity sha512-OyUsEae1JlqR2jSGMohP03gj6VANh9fDR/3nPIa1vYyoQWlwQzOS7knKqDaJm7Nui3JC5q/lWos7/FGZBFuF5Q==
+  integrity sha512-K9UGf1Ivwe87mjrMqN+1D07tO/DfU7ariVDrGffuOjvl+3BcvUF25IWrxsBObd4iPOYCH7NVQWRpojhBgxULtQ==
   dependencies:
     argsarray "0.0.1"
-    buffer-from "1.1.2"
+    buffer-from "1.1.1"
     double-ended-queue "2.1.0-0"
     levelup "4.4.0"
-    pouchdb-adapter-utils "7.3.0"
+    pouchdb-adapter-utils "7.2.2"
-    pouchdb-binary-utils "7.3.0"
+    pouchdb-binary-utils "7.2.2"
-    pouchdb-collections "7.3.0"
+    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.3.0"
+    pouchdb-errors "7.2.2"
-    pouchdb-json "7.3.0"
+    pouchdb-json "7.2.2"
-    pouchdb-md5 "7.3.0"
+    pouchdb-md5 "7.2.2"
-    pouchdb-merge "7.3.0"
+    pouchdb-merge "7.2.2"
-    pouchdb-utils "7.3.0"
+    pouchdb-utils "7.2.2"
-    sublevel-pouchdb "7.3.0"
+    sublevel-pouchdb "7.2.2"
     through2 "3.0.2"
 
 pouchdb-adapter-memory@7.2.2:
@@ -11027,17 +11060,17 @@ pouchdb-adapter-memory@7.2.2:
     pouchdb-adapter-leveldb-core "7.2.2"
     pouchdb-utils "7.2.2"
 
-pouchdb-adapter-utils@7.3.0:
+pouchdb-adapter-utils@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.3.0.tgz#1747e4ea0b519a9d817c6eda0e2f0ebc3dc18c41"
+  resolved "https://registry.yarnpkg.com/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.2.2.tgz#c64426447d9044ba31517a18500d6d2d28abd47d"
-  integrity sha512-mU1+smcagWSpInVx/VQk7VVjjnJlyagKtusUS3OdCMFZY35L6RbXC8eIhoNVDbkBfEv3cIwqQ3t7fdvkaa1odQ==
+  integrity sha512-2CzZkTyTyHZkr3ePiWFMTiD5+56lnembMjaTl8ohwegM0+hYhRyJux0biAZafVxgIL4gnCUC4w2xf6WVztzKdg==
   dependencies:
-    pouchdb-binary-utils "7.3.0"
+    pouchdb-binary-utils "7.2.2"
-    pouchdb-collections "7.3.0"
+    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.3.0"
+    pouchdb-errors "7.2.2"
-    pouchdb-md5 "7.3.0"
+    pouchdb-md5 "7.2.2"
-    pouchdb-merge "7.3.0"
+    pouchdb-merge "7.2.2"
-    pouchdb-utils "7.3.0"
+    pouchdb-utils "7.2.2"
 
 pouchdb-all-dbs@1.0.2:
   version "1.0.2"
@@ -11050,38 +11083,38 @@ pouchdb-all-dbs@1.0.2:
     pouchdb-promise "5.4.3"
     tiny-queue "^0.2.0"
 
-pouchdb-binary-utils@7.3.0:
+pouchdb-binary-utils@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-7.3.0.tgz#ecc235d28e7f226c168affcf53959675f78d5aaf"
+  resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz#0690b348052c543b1e67f032f47092ca82bcb10e"
-  integrity sha512-xvBH/XGHGcou2vkEzszJxkCc7YElfRUrkLUg51Jbdmh1mogLDUO0bU3Tj6TOIIJfRkQrU/HV+dDkMAhsil0amQ==
+  integrity sha512-shacxlmyHbUrNfE6FGYpfyAJx7Q0m91lDdEAaPoKZM3SzAmbtB1i+OaDNtYFztXjJl16yeudkDb3xOeokVL3Qw==
   dependencies:
-    buffer-from "1.1.2"
+    buffer-from "1.1.1"
 
-pouchdb-collate@7.3.0:
+pouchdb-collate@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.3.0.tgz#9276de7459a21a6aded71e3090d9b5d5488be19f"
+  resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.2.2.tgz#fc261f5ef837c437e3445fb0abc3f125d982c37c"
-  integrity sha512-ys7rXKtEr6cfghgUjknwFJiOkITebV6JmeTybJKCzMV0r2luXu0OoPQsKVpE/wbM/3F5LxfpbFKGFpPcfGMvTA==
+  integrity sha512-/SMY9GGasslknivWlCVwXMRMnQ8myKHs4WryQ5535nq1Wj/ehpqWloMwxEQGvZE1Sda3LOm7/5HwLTcB8Our+w==
 
-pouchdb-collections@7.3.0:
+pouchdb-collections@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.3.0.tgz#3197dfbee8d69c3760229705fc5a73d0c8a896f1"
+  resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz#aeed77f33322429e3f59d59ea233b48ff0e68572"
-  integrity sha512-Xr54m2+fErShXn+qAT4xwqJ+8NwddNPeTMJT4z4k1sZsrwfHmZsWbsKAyGPMF04eQaaU+7DDRMciu2VzaBUXyg==
+  integrity sha512-6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew==
 
-pouchdb-errors@7.3.0:
+pouchdb-errors@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.3.0.tgz#23bc328108778be0bfe22d69c0df67eab94aeca5"
+  resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz#80d811d65c766c9d20b755c6e6cc123f8c3c4792"
-  integrity sha512-dTBbIC1BbCy6J9W/Csg5xROgb3wJN3HpbgAJHHSEtAkb8oA45KZmU3ZwEpNhf0AfPuQm4XgW1936PvlDlGgJiw==
+  integrity sha512-6GQsiWc+7uPfgEHeavG+7wuzH3JZW29Dnrvz8eVbDFE50kVFxNDVm3EkYHskvo5isG7/IkOx7PV7RPTA3keG3g==
   dependencies:
     inherits "2.0.4"
 
-pouchdb-fetch@7.3.0:
+pouchdb-fetch@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-7.3.0.tgz#92b5d3b067d79ecbb9a61cbd52dce36e94dbbf28"
+  resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-7.2.2.tgz#492791236d60c899d7e9973f9aca0d7b9cc02230"
-  integrity sha512-8/lcg8iMDG+GVs1dHNXA4ktJSEpH71dHU3xesMJ25tNQOqfAaaWrkfz9j71ZYDDkveLYE6UjUzl/sDacu2hSjw==
+  integrity sha512-lUHmaG6U3zjdMkh8Vob9GvEiRGwJfXKE02aZfjiVQgew+9SLkuOxNw3y2q4d1B6mBd273y1k2Lm0IAziRNxQnA==
   dependencies:
     abort-controller "3.0.0"
-    fetch-cookie "0.11.0"
+    fetch-cookie "0.10.1"
-    node-fetch "2.6.7"
+    node-fetch "2.6.0"
 
 pouchdb-find@7.2.2:
   version "7.2.2"
@@ -11096,35 +11129,35 @@ pouchdb-find@7.2.2:
     pouchdb-selector-core "7.2.2"
     pouchdb-utils "7.2.2"
 
-pouchdb-json@7.3.0:
+pouchdb-json@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-json/-/pouchdb-json-7.3.0.tgz#94c2d876202c6879cb525db05e7633b926346e5d"
+  resolved "https://registry.yarnpkg.com/pouchdb-json/-/pouchdb-json-7.2.2.tgz#b939be24b91a7322e9a24b8880a6e21514ec5e1f"
-  integrity sha512-D4wyi20ltyiFpuziQeMk3CbXs/Q58VoGTYTJQY8MWBw37OidtHGQAt1Kh5yJ435wJqDzJZyxMA5RxGZxEOBDVg==
+  integrity sha512-3b2S2ynN+aoB7aCNyDZc/4c0IAdx/ir3nsHB+/RrKE9cM3QkQYbnnE3r/RvOD1Xvr6ji/KOCBie+Pz/6sxoaug==
   dependencies:
     vuvuzela "1.0.3"
 
-pouchdb-mapreduce-utils@7.3.0:
+pouchdb-mapreduce-utils@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.3.0.tgz#21d42ea9a376b0fa2e61c8c1ac53f886ffdf3409"
+  resolved "https://registry.yarnpkg.com/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.2.2.tgz#13a46a3cc2a3f3b8e24861da26966904f2963146"
-  integrity sha512-KDVSd+H2r+XWTrQfKWV71SknDDYRjYXoeWs0ZQl3xITHCcTl+fIgqyagg/XN+Zy/U9LeLPGMe2JdgPx9H8lJgw==
+  integrity sha512-rAllb73hIkU8rU2LJNbzlcj91KuulpwQu804/F6xF3fhZKC/4JQMClahk+N/+VATkpmLxp1zWmvmgdlwVU4HtQ==
   dependencies:
     argsarray "0.0.1"
     inherits "2.0.4"
-    pouchdb-collections "7.3.0"
+    pouchdb-collections "7.2.2"
-    pouchdb-utils "7.3.0"
+    pouchdb-utils "7.2.2"
 
-pouchdb-md5@7.3.0:
+pouchdb-md5@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-md5/-/pouchdb-md5-7.3.0.tgz#3a094e45ccce87271530ad3f37d7e82c53562bb0"
+  resolved "https://registry.yarnpkg.com/pouchdb-md5/-/pouchdb-md5-7.2.2.tgz#415401acc5a844112d765bd1fb4e5d9f38fb0838"
-  integrity sha512-wL04QgoKyd/L/TV5gxgcvlEyCJiZoXCOEFJklTzkdza/kBQNJGPH7i0ZhKa7Sb+AvZYoWZHddf1Zgv7rBScHkA==
+  integrity sha512-c/RvLp2oSh8PLAWU5vFBnp6ejJABIdKqboZwRRUrWcfGDf+oyX8RgmJFlYlzMMOh4XQLUT1IoaDV8cwlsuryZw==
   dependencies:
-    pouchdb-binary-utils "7.3.0"
+    pouchdb-binary-utils "7.2.2"
-    spark-md5 "3.0.2"
+    spark-md5 "3.0.1"
 
-pouchdb-merge@7.3.0:
+pouchdb-merge@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.3.0.tgz#dfde5b54aa6dd203ac62d768fe33e7bdbd56e38e"
+  resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.2.2.tgz#940d85a2b532d6a93a6cab4b250f5648511bcc16"
-  integrity sha512-E7LmchMzwYFm6V8OBxejzARLisanpksOju2LEfuiYnotGfNDeW7MByP0qBH0/zF8BfUyyjA1cl7ByaEpsapkeQ==
+  integrity sha512-6yzKJfjIchBaS7Tusuk8280WJdESzFfQ0sb4jeMUNnrqs4Cx3b0DIEOYTRRD9EJDM+je7D3AZZ4AT0tFw8gb4A==
 
 pouchdb-promise@5.4.3:
   version "5.4.3"
@@ -11153,27 +11186,27 @@ pouchdb-replication-stream@1.2.9:
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-pouchdb-selector-core@7.3.0:
+pouchdb-selector-core@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.3.0.tgz#1860afeec069ba4d5b79583b4b520dd2b643e3a3"
+  resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz#264d7436a8c8ac3801f39960e79875ef7f3879a0"
-  integrity sha512-sK/cCrIGeL9ImcMhKGcwa54+bzX7Wv4hhVV+oUW3T1Nasaoxh+Muem1GuA+x1+SbTCE8y37rUg8i6DIOhX51ew==
+  integrity sha512-XYKCNv9oiNmSXV5+CgR9pkEkTFqxQGWplnVhO3W9P154H08lU0ZoNH02+uf+NjZ2kjse7Q1fxV4r401LEcGMMg==
   dependencies:
-    pouchdb-collate "7.3.0"
+    pouchdb-collate "7.2.2"
-    pouchdb-utils "7.3.0"
+    pouchdb-utils "7.2.2"
 
-pouchdb-utils@7.3.0:
+pouchdb-utils@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-utils/-/pouchdb-utils-7.3.0.tgz#782df5ab3309edd5dc8c0f8ae4663bf0e67962e2"
+  resolved "https://registry.yarnpkg.com/pouchdb-utils/-/pouchdb-utils-7.2.2.tgz#c17c4788f1d052b0daf4ef8797bbc4aaa3945aa4"
-  integrity sha512-HH+5IXXWn/ZgVCSnrlydBMYn6MabT7RS7SNoo9w8qVH9efpZSp3eLchw6yMQNLw8LQefWmbbskiHV9VgJmSVWQ==
+  integrity sha512-XmeM5ioB4KCfyB2MGZXu1Bb2xkElNwF1qG+zVFbQsKQij0zvepdOUfGuWvLRHxTOmt4muIuSOmWZObZa3NOgzQ==
   dependencies:
     argsarray "0.0.1"
     clone-buffer "1.0.0"
     immediate "3.3.0"
     inherits "2.0.4"
-    pouchdb-collections "7.3.0"
+    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.3.0"
+    pouchdb-errors "7.2.2"
-    pouchdb-md5 "7.3.0"
+    pouchdb-md5 "7.2.2"
-    uuid "8.3.2"
+    uuid "8.1.0"
 
 pouchdb@7.3.0:
   version "7.3.0"
@@ -11216,10 +11249,10 @@ prettier@2.5.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
   integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
 
-prettier@^2.6.2:
+prettier@^2.5.1:
-  version "2.6.2"
+  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
-  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
+  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
 
 pretty-format@^24.9.0:
   version "24.9.0"
@@ -12415,6 +12448,11 @@ source-map@^0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
   integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
+spark-md5@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.1.tgz#83a0e255734f2ab4e5c466e5a2cfc9ba2aa2124d"
+  integrity sha512-0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig==
+
 spark-md5@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"
@@ -12739,10 +12777,10 @@ style-loader@^3.3.1:
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
   integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==
 
-sublevel-pouchdb@7.3.0:
+sublevel-pouchdb@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.3.0.tgz#d27138c34d98c3d5c8c3ee85c1662add3ad04525"
+  resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.2.2.tgz#49e46cd37883bf7ff5006d7c5b9bcc7bcc1f422f"
-  integrity sha512-zp7u4jmv2N/s+dXZkWTtL4BjREs3SZ1nGBNNJ8RWX4yqN59oHgKmti4CfVOqfsAW9RMasmTqQAEPxL9hX8+CIA==
+  integrity sha512-y5uYgwKDgXVyPZceTDGWsSFAhpSddY29l9PJbXqMJLfREdPmQTY8InpatohlEfCXX7s1LGcrfYAhxPFZaJOLnQ==
   dependencies:
     inherits "2.0.4"
     level-codec "9.0.2"
@@ -13494,10 +13532,10 @@ undefsafe@^2.0.5:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee"
   integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ==
 
-undici@^5.0.0:
+undici@^4.14.1:
-  version "5.3.0"
+  version "4.16.0"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.3.0.tgz#869d47bafa7f72ccaf8738258f0283bf3dd179ca"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-4.16.0.tgz#469bb87b3b918818d3d7843d91a1d08da357d5ff"
-  integrity sha512-8LxC/xmR2GCE4q1heE1sJxVnnf5S6yQ2dObvMFBBWkB8aQlaqNuWovgRFWRMB7KUdLPGZfOTTmUeeLEJYX56iQ==
+  integrity sha512-tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
@@ -13689,6 +13727,11 @@ uuid@8.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
   integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
 
+uuid@8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
+  integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==
+
 uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -13699,7 +13742,7 @@ uuid@^3.1.0, uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-v8-compile-cache-lib@^3.0.1:
+v8-compile-cache-lib@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
@@ -14224,7 +14267,7 @@ yargs-parser@^13.1.0, yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^21.0.1:
+yargs-parser@^21.0.0:
   version "21.0.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
   integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
@@ -14318,4 +14361,4 @@ z-schema@^5.0.1:
 zlib@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0"
-  integrity sha1-bnyXL8NxxkWmr7A6sUdp3vEU/MA=
+  integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w==

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/types/src/sdk/events/event.ts

@@ -1,3 +1,5 @@
+import { Hosting } from "../hosting"
+
 export enum Event {
   // USER
   USER_CREATED = "user:created",
@@ -37,10 +39,11 @@ export enum Event {
   ORG_LOGO_UPDATED = "org:info:logo:updated",
   ORG_PLATFORM_URL_UPDATED = "org:platformurl:updated",
 
-  // VERSIONS
+  // INSTALLATION
-  VERSION_CHECKED = "version:checked",
+  INSTALLATION_VERSION_CHECKED = "installation:version:checked",
-  VERSION_UPGRADED = "version:upgraded",
+  INSTALLATION_VERSION_UPGRADED = "installation:version:upgraded",
-  VERSION_DOWNGRADED = "version:downgraded",
+  INSTALLATION_VERSION_DOWNGRADED = "installation:version:downgraded",
+  INSTALLATION_FIRST_STARTUP = "installation:firstStartup",
 
   // ORG / ANALYTICS
   ANALYTICS_OPT_OUT = "analytics:opt:out",
@@ -157,6 +160,7 @@ export interface BaseEvent {
   appId?: string
   installationId?: string
   tenantId?: string
+  hosting?: Hosting
 }
 
 export type RowImportFormat = "csv"

packages/types/src/sdk/events/identification.ts

@@ -10,6 +10,8 @@ export enum GroupType {
 export interface Group {
   id: string
   type: IdentityType
+  environment: string
+  hosting: Hosting
 }
 
 export interface TenantGroup extends Group {
@@ -17,12 +19,11 @@ export interface TenantGroup extends Group {
   // as we don't have this at the user level
   profession?: string // only available in cloud
   companySize?: string // only available in cloud
-  hosting: Hosting // need hosting at the tenant level for cloud self host accounts
+  installationId: string
 }
 
 export interface InstallationGroup extends Group {
   version: string
-  hosting: Hosting
 }
 
 // IDENTITIES
@@ -36,6 +37,8 @@ export enum IdentityType {
 export interface Identity {
   id: string
   type: IdentityType
+  hosting: Hosting
+  environment: string
   installationId?: string
   tenantId?: string
 }

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.200-alpha.3",
+  "version": "1.0.207-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,9 +34,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.200-alpha.3",
+    "@budibase/backend-core": "^1.0.207-alpha.2",
-    "@budibase/pro": "1.0.200-alpha.3",
+    "@budibase/pro": "1.0.207-alpha.2",
-    "@budibase/string-templates": "^1.0.200-alpha.3",
+    "@budibase/string-templates": "^1.0.207-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -66,7 +66,7 @@
     "server-destroy": "1.0.1"
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.200-alpha.3",
+    "@budibase/types": "^1.0.207-alpha.2",
     "@types/jest": "26.0.23",
     "@types/koa": "2.13.4",
     "@types/koa-router": "7.4.4",

packages/worker/yarn.lock

@@ -291,10 +291,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.200-alpha.3":
+"@budibase/backend-core@1.0.207-alpha.2":
-  version "1.0.200-alpha.3"
+  version "1.0.207-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.200-alpha.3.tgz#b21ba2bdb4f1de3e5f14161b8203a1a98f693e4d"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.2.tgz#c80884397b0bf1e972648014734b3a8b2cafc7a3"
-  integrity sha512-zVy6bfg4yrtjva0MoBMqIbFrNwA+v76XvRgI3GesaSuJKspWCk4lKtV6I4cr6q9Rr2U+kUzK/4ho/0F/oZcfsg==
+  integrity sha512-2724M05X3TayOWjRz2+n9Zqf/VaqqCWGzoJlbsCkQNUzzyv5lVZ5KLL5fPLfUtjuerYikGZLh/v5a/hRSc5yZw==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -322,20 +322,25 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.0.200-alpha.3":
+"@budibase/pro@1.0.207-alpha.2":
-  version "1.0.200-alpha.3"
+  version "1.0.207-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.200-alpha.3.tgz#c6bc4c6b335fb8eae973939efc16958022a45a99"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.2.tgz#52d57ce4a7502aa8eb1aeb4a63ffdcc5d298e44d"
-  integrity sha512-YUUlfVJA2xhtjL3jXem7WtuqdshDWF8qm4xbEXgvlpgOxHtGrjSxf9WR4kir/F2UDDTgVNmttAS1oWVDMSGzug==
+  integrity sha512-TI0hbxIuad8gFqswV/93pURKJPWUe85Q9U5pCxuEs/oHlA0ULwRK8oK3cm/AgdKEjmf5GafSlphPXC4wHnvwDA==
   dependencies:
-    "@budibase/backend-core" "1.0.200-alpha.3"
+    "@budibase/backend-core" "1.0.207-alpha.2"
     node-fetch "^2.6.1"
 
-"@cspotcode/source-map-support@^0.8.0":
+"@cspotcode/source-map-consumer@0.8.0":
-  version "0.8.1"
+  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+  integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
+
+"@cspotcode/source-map-support@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5"
+  integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==
   dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
+    "@cspotcode/source-map-consumer" "0.8.0"
 
 "@hapi/bourne@^2.0.0":
   version "2.1.0"
@@ -382,7 +387,7 @@
     jest-util "^27.5.1"
     slash "^3.0.0"
 
-"@jest/core@^27.5.1":
+"@jest/core@^27.4.7", "@jest/core@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626"
   integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==
@@ -582,14 +587,6 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
   integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
 
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.13"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
@@ -3602,7 +3599,7 @@ jest-circus@^27.5.1:
     stack-utils "^2.0.3"
     throat "^6.0.1"
 
-jest-cli@^27.5.1:
+jest-cli@^27.4.7:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145"
   integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==
@@ -4616,16 +4613,16 @@ mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.19, mime-types@~2.1.24,
   dependencies:
     mime-db "1.52.0"
 
+mime@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
+  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
+
 mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
-  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -5229,24 +5226,24 @@ pouchdb-abstract-mapreduce@7.2.2:
     pouchdb-md5 "7.2.2"
     pouchdb-utils "7.2.2"
 
-pouchdb-adapter-leveldb-core@7.3.0:
+pouchdb-adapter-leveldb-core@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-adapter-leveldb-core/-/pouchdb-adapter-leveldb-core-7.3.0.tgz#91fa1fbc35e744252ae73f9e88911883c1841c9a"
+  resolved "https://registry.yarnpkg.com/pouchdb-adapter-leveldb-core/-/pouchdb-adapter-leveldb-core-7.2.2.tgz#e0aa6a476e2607d7ae89f4a803c9fba6e6d05a8a"
-  integrity sha512-OyUsEae1JlqR2jSGMohP03gj6VANh9fDR/3nPIa1vYyoQWlwQzOS7knKqDaJm7Nui3JC5q/lWos7/FGZBFuF5Q==
+  integrity sha512-K9UGf1Ivwe87mjrMqN+1D07tO/DfU7ariVDrGffuOjvl+3BcvUF25IWrxsBObd4iPOYCH7NVQWRpojhBgxULtQ==
   dependencies:
     argsarray "0.0.1"
-    buffer-from "1.1.2"
+    buffer-from "1.1.1"
     double-ended-queue "2.1.0-0"
     levelup "4.4.0"
-    pouchdb-adapter-utils "7.3.0"
+    pouchdb-adapter-utils "7.2.2"
-    pouchdb-binary-utils "7.3.0"
+    pouchdb-binary-utils "7.2.2"
-    pouchdb-collections "7.3.0"
+    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.3.0"
+    pouchdb-errors "7.2.2"
-    pouchdb-json "7.3.0"
+    pouchdb-json "7.2.2"
-    pouchdb-md5 "7.3.0"
+    pouchdb-md5 "7.2.2"
-    pouchdb-merge "7.3.0"
+    pouchdb-merge "7.2.2"
-    pouchdb-utils "7.3.0"
+    pouchdb-utils "7.2.2"
-    sublevel-pouchdb "7.3.0"
+    sublevel-pouchdb "7.2.2"
     through2 "3.0.2"
 
 pouchdb-adapter-memory@7.2.2:
@@ -5258,17 +5255,17 @@ pouchdb-adapter-memory@7.2.2:
     pouchdb-adapter-leveldb-core "7.2.2"
     pouchdb-utils "7.2.2"
 
-pouchdb-adapter-utils@7.3.0:
+pouchdb-adapter-utils@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.3.0.tgz#1747e4ea0b519a9d817c6eda0e2f0ebc3dc18c41"
+  resolved "https://registry.yarnpkg.com/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.2.2.tgz#c64426447d9044ba31517a18500d6d2d28abd47d"
-  integrity sha512-mU1+smcagWSpInVx/VQk7VVjjnJlyagKtusUS3OdCMFZY35L6RbXC8eIhoNVDbkBfEv3cIwqQ3t7fdvkaa1odQ==
+  integrity sha512-2CzZkTyTyHZkr3ePiWFMTiD5+56lnembMjaTl8ohwegM0+hYhRyJux0biAZafVxgIL4gnCUC4w2xf6WVztzKdg==
   dependencies:
-    pouchdb-binary-utils "7.3.0"
+    pouchdb-binary-utils "7.2.2"
-    pouchdb-collections "7.3.0"
+    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.3.0"
+    pouchdb-errors "7.2.2"
-    pouchdb-md5 "7.3.0"
+    pouchdb-md5 "7.2.2"
-    pouchdb-merge "7.3.0"
+    pouchdb-merge "7.2.2"
-    pouchdb-utils "7.3.0"
+    pouchdb-utils "7.2.2"
 
 pouchdb-all-dbs@1.1.1:
   version "1.1.1"
@@ -5288,13 +5285,6 @@ pouchdb-binary-utils@7.2.2:
   dependencies:
     buffer-from "1.1.1"
 
-pouchdb-binary-utils@7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-7.3.0.tgz#ecc235d28e7f226c168affcf53959675f78d5aaf"
-  integrity sha512-xvBH/XGHGcou2vkEzszJxkCc7YElfRUrkLUg51Jbdmh1mogLDUO0bU3Tj6TOIIJfRkQrU/HV+dDkMAhsil0amQ==
-  dependencies:
-    buffer-from "1.1.2"
-
 pouchdb-collate@7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.2.2.tgz#fc261f5ef837c437e3445fb0abc3f125d982c37c"
@@ -5305,11 +5295,6 @@ pouchdb-collections@7.2.2:
   resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz#aeed77f33322429e3f59d59ea233b48ff0e68572"
   integrity sha512-6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew==
 
-pouchdb-collections@7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.3.0.tgz#3197dfbee8d69c3760229705fc5a73d0c8a896f1"
-  integrity sha512-Xr54m2+fErShXn+qAT4xwqJ+8NwddNPeTMJT4z4k1sZsrwfHmZsWbsKAyGPMF04eQaaU+7DDRMciu2VzaBUXyg==
-
 pouchdb-errors@7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz#80d811d65c766c9d20b755c6e6cc123f8c3c4792"
@@ -5317,13 +5302,6 @@ pouchdb-errors@7.2.2:
   dependencies:
     inherits "2.0.4"
 
-pouchdb-errors@7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.3.0.tgz#23bc328108778be0bfe22d69c0df67eab94aeca5"
-  integrity sha512-dTBbIC1BbCy6J9W/Csg5xROgb3wJN3HpbgAJHHSEtAkb8oA45KZmU3ZwEpNhf0AfPuQm4XgW1936PvlDlGgJiw==
-  dependencies:
-    inherits "2.0.4"
-
 pouchdb-fetch@7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-7.2.2.tgz#492791236d60c899d7e9973f9aca0d7b9cc02230"
@@ -5346,10 +5324,10 @@ pouchdb-find@7.2.2:
     pouchdb-selector-core "7.2.2"
     pouchdb-utils "7.2.2"
 
-pouchdb-json@7.3.0:
+pouchdb-json@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-json/-/pouchdb-json-7.3.0.tgz#94c2d876202c6879cb525db05e7633b926346e5d"
+  resolved "https://registry.yarnpkg.com/pouchdb-json/-/pouchdb-json-7.2.2.tgz#b939be24b91a7322e9a24b8880a6e21514ec5e1f"
-  integrity sha512-D4wyi20ltyiFpuziQeMk3CbXs/Q58VoGTYTJQY8MWBw37OidtHGQAt1Kh5yJ435wJqDzJZyxMA5RxGZxEOBDVg==
+  integrity sha512-3b2S2ynN+aoB7aCNyDZc/4c0IAdx/ir3nsHB+/RrKE9cM3QkQYbnnE3r/RvOD1Xvr6ji/KOCBie+Pz/6sxoaug==
   dependencies:
     vuvuzela "1.0.3"
 
@@ -5371,18 +5349,10 @@ pouchdb-md5@7.2.2:
     pouchdb-binary-utils "7.2.2"
     spark-md5 "3.0.1"
 
-pouchdb-md5@7.3.0:
+pouchdb-merge@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-md5/-/pouchdb-md5-7.3.0.tgz#3a094e45ccce87271530ad3f37d7e82c53562bb0"
+  resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.2.2.tgz#940d85a2b532d6a93a6cab4b250f5648511bcc16"
-  integrity sha512-wL04QgoKyd/L/TV5gxgcvlEyCJiZoXCOEFJklTzkdza/kBQNJGPH7i0ZhKa7Sb+AvZYoWZHddf1Zgv7rBScHkA==
+  integrity sha512-6yzKJfjIchBaS7Tusuk8280WJdESzFfQ0sb4jeMUNnrqs4Cx3b0DIEOYTRRD9EJDM+je7D3AZZ4AT0tFw8gb4A==
-  dependencies:
-    pouchdb-binary-utils "7.3.0"
-    spark-md5 "3.0.2"
-
-pouchdb-merge@7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.3.0.tgz#dfde5b54aa6dd203ac62d768fe33e7bdbd56e38e"
-  integrity sha512-E7LmchMzwYFm6V8OBxejzARLisanpksOju2LEfuiYnotGfNDeW7MByP0qBH0/zF8BfUyyjA1cl7ByaEpsapkeQ==
 
 pouchdb-promise@6.4.3, pouchdb-promise@^6.0.4:
   version "6.4.3"
@@ -5426,20 +5396,6 @@ pouchdb-utils@7.2.2:
     pouchdb-md5 "7.2.2"
     uuid "8.1.0"
 
-pouchdb-utils@7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/pouchdb-utils/-/pouchdb-utils-7.3.0.tgz#782df5ab3309edd5dc8c0f8ae4663bf0e67962e2"
-  integrity sha512-HH+5IXXWn/ZgVCSnrlydBMYn6MabT7RS7SNoo9w8qVH9efpZSp3eLchw6yMQNLw8LQefWmbbskiHV9VgJmSVWQ==
-  dependencies:
-    argsarray "0.0.1"
-    clone-buffer "1.0.0"
-    immediate "3.3.0"
-    inherits "2.0.4"
-    pouchdb-collections "7.3.0"
-    pouchdb-errors "7.3.0"
-    pouchdb-md5 "7.3.0"
-    uuid "8.3.2"
-
 pouchdb@7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-7.3.0.tgz#440fbef12dfd8f9002320802528665e883a3b7f8"
@@ -6267,20 +6223,20 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
-sublevel-pouchdb@7.3.0:
+sublevel-pouchdb@7.2.2:
-  version "7.3.0"
+  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.3.0.tgz#d27138c34d98c3d5c8c3ee85c1662add3ad04525"
+  resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.2.2.tgz#49e46cd37883bf7ff5006d7c5b9bcc7bcc1f422f"
-  integrity sha512-zp7u4jmv2N/s+dXZkWTtL4BjREs3SZ1nGBNNJ8RWX4yqN59oHgKmti4CfVOqfsAW9RMasmTqQAEPxL9hX8+CIA==
+  integrity sha512-y5uYgwKDgXVyPZceTDGWsSFAhpSddY29l9PJbXqMJLfREdPmQTY8InpatohlEfCXX7s1LGcrfYAhxPFZaJOLnQ==
   dependencies:
     inherits "2.0.4"
     level-codec "9.0.2"
     ltgt "2.2.1"
     readable-stream "1.1.14"
 
-superagent@^7.1.3:
+superagent@^7.1.0:
-  version "7.1.3"
+  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.3.tgz#783ff8330e7c2dad6ad8f0095edc772999273b6b"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.6.tgz#64f303ed4e4aba1e9da319f134107a54cacdc9c6"
-  integrity sha512-WA6et4nAvgBCS73lJvv1D0ssI5uk5Gh+TGN/kNe+B608EtcVs/yzfl+OLXTzDs7tOBDIpvgh/WUs1K2OK1zTeQ==
+  integrity sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g==
   dependencies:
     component-emitter "^1.3.0"
     cookiejar "^2.1.3"
@@ -6289,7 +6245,7 @@ superagent@^7.1.3:
     form-data "^4.0.0"
     formidable "^2.0.1"
     methods "^1.1.2"
-    mime "^2.5.0"
+    mime "2.6.0"
     qs "^6.10.3"
     readable-stream "^3.6.0"
     semver "^7.3.7"
@@ -6748,11 +6704,6 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"