Merge remote-tracking branch 'origin/develop' into feature/table-row-selection

.eslintignore

@@ -4,4 +4,6 @@ dist
 packages/server/builder
 packages/server/coverage
 packages/server/client
-packages/builder/.routify
+packages/builder/.routify
+packages/builder/cypress/support/queryLevelTransformerFunction.js
+packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js

.github/workflows/budibase_ci.yml

@@ -43,4 +43,8 @@ jobs:
         verbose: true 
 
     # TODO: parallelise this
-    - run: yarn test:e2e:ci
+    - name: Cypress run
+      uses: cypress-io/github-action@v2
+      with:
+        install: false
+        command: yarn test:e2e:ci

.gitignore

@@ -65,6 +65,7 @@ typings/
 .env
 !hosting/.env
 hosting/.generated-nginx.dev.conf
+hosting/proxy/.generated-nginx.prod.conf
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache
@@ -95,3 +96,4 @@ hosting/.generated-nginx.dev.conf
 *.sublime-workspace
 
 bin/
+packages/builder/cypress.env.json

.prettierignore

@@ -6,4 +6,6 @@ packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
 packages/server/builder
 packages/server/coverage
 packages/server/client
-packages/builder/.routify
+packages/builder/.routify
+packages/builder/cypress/support/queryLevelTransformerFunction.js
+packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js

charts/budibase/Chart.yaml

@@ -11,7 +11,7 @@ sources:
   - https://github.com/Budibase/budibase
   - https://budibase.com
 type: application
-version: 0.2.6
+version: 0.2.8
 appVersion: 1.0.48
 dependencies:
   - name: couchdb

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

@@ -25,7 +25,7 @@ spec:
         app.kubernetes.io/name: budibase-proxy
     spec:
       containers:
-      - image: budibase/proxy:k8s
+      - image: budibase/proxy:{{ .Values.services.proxy.tag | default "k8s" }}
         imagePullPolicy: Always
         name: proxy-service
         ports:

charts/budibase/values.yaml

@@ -100,6 +100,9 @@ globals:
   cookieDomain: ""
   platformUrl: ""
   httpMigrations: "0"
+  google:
+    clientId: "" 
+    secret: ""
 
   createSecrets: true # creates an internal API key, JWT secrets and redis password for you
 
@@ -124,7 +127,7 @@ services:
     logLevel: info
 
   worker:
-    port: 4001
+    port: 4003
     replicaCount: 1
 
   couchdb:

hosting/docker-compose.yaml

@@ -7,8 +7,6 @@ services:
     restart: always
     image: budibase.docker.scarf.sh/budibase/apps
     container_name: bbapps
-    ports:
-      - "${APP_PORT}:4002"
     environment:
       SELF_HOSTED: 1
       COUCH_DB_URL: http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:5984
@@ -25,8 +23,6 @@ services:
       ENABLE_ANALYTICS: "true"
       REDIS_URL: redis-service:6379
       REDIS_PASSWORD: ${REDIS_PASSWORD}
-    volumes:
-      - ./logs:/logs
     depends_on:
       - worker-service
       - redis-service
@@ -35,8 +31,6 @@ services:
     restart: always
     image: budibase.docker.scarf.sh/budibase/worker
     container_name: bbworker
-    ports:
-      - "${WORKER_PORT}:4003"
     environment:
       SELF_HOSTED: 1
       PORT: 4003
@@ -53,8 +47,6 @@ services:
       INTERNAL_API_KEY: ${INTERNAL_API_KEY}
       REDIS_URL: redis-service:6379
       REDIS_PASSWORD: ${REDIS_PASSWORD}
-    volumes:
-      - ./logs:/logs
     depends_on:
       - redis-service
       - minio-service
@@ -65,8 +57,6 @@ services:
     image: minio/minio
     volumes:
       - minio_data:/data
-    ports:
-      - "${MINIO_PORT}:9000"
     environment:
       MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
       MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
@@ -80,10 +70,10 @@ services:
 
   proxy-service:
     restart: always
-    container_name: bbproxy
-    image: budibase/proxy
     ports:
       - "${MAIN_PORT}:10000"
+    container_name: bbproxy
+    image: budibase/proxy
     depends_on:
       - minio-service
       - worker-service
@@ -96,8 +86,6 @@ services:
     environment:
       - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD}
       - COUCHDB_USER=${COUCH_DB_USER}
-    ports:
-      - "${COUCH_DB_PORT}:5984"
     volumes:
       - couchdb3_data:/opt/couchdb/data
 
@@ -113,15 +101,11 @@ services:
     restart: always
     image: redis
     command: redis-server --requirepass ${REDIS_PASSWORD}
-    ports:
-      - "${REDIS_PORT}:6379"
     volumes:
       - redis_data:/data
 
   watchtower-service:
     image: containrrr/watchtower
-    ports:
-      - "${WATCHTOWER_PORT}:8080"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     command: --debug --http-api-update bbapps bbworker bbproxy

hosting/hosting.properties

@@ -0,0 +1,21 @@
+# Use the main port in the builder for your self hosting URL, e.g. localhost:10000
+MAIN_PORT=10000
+
+# This section contains all secrets pertaining to the system
+# These should be updated
+JWT_SECRET=testsecret
+MINIO_ACCESS_KEY=budibase
+MINIO_SECRET_KEY=budibase
+COUCH_DB_PASSWORD=budibase
+COUCH_DB_USER=budibase
+REDIS_PASSWORD=budibase
+INTERNAL_API_KEY=budibase
+
+# This section contains variables that do not need to be altered under normal circumstances
+APP_PORT=4002
+WORKER_PORT=4003
+MINIO_PORT=4004
+COUCH_DB_PORT=4005
+REDIS_PORT=6379
+WATCHTOWER_PORT=6161
+BUDIBASE_ENVIRONMENT=PRODUCTION

hosting/kubernetes/nginx/Dockerfile

@@ -1,2 +0,0 @@
-FROM nginx:latest
-COPY nginx.conf /etc/nginx/nginx.conf

hosting/nginx.dev.conf.hbs

@@ -11,6 +11,7 @@ events {
 http {
   include       /etc/nginx/mime.types;
   default_type  application/octet-stream;
+  proxy_set_header Host $host;
 
   log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                     '$status $body_bytes_sent "$http_referer" '
@@ -43,6 +44,10 @@ http {
       proxy_pass      http://{{ address }}:4001;
     }
 
+    location = / {
+      proxy_pass      http://{{ address }}:4001;
+    }
+
     location /app_ {
       proxy_pass      http://{{ address }}:4001;
     }
@@ -63,7 +68,6 @@ http {
       proxy_http_version  1.1;
       proxy_set_header    Connection          $connection_upgrade;
       proxy_set_header    Upgrade             $http_upgrade;
-      proxy_set_header    Host                $host;
       proxy_set_header    X-Real-IP           $remote_addr;
       proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
     }
@@ -72,7 +76,6 @@ http {
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header Host $http_host;
 
       proxy_connect_timeout 300;
       proxy_http_version 1.1;

hosting/nginx.prod.conf.hbs

@@ -9,15 +9,23 @@ events {
 }
 
 http {
-  limit_req_zone $binary_remote_addr zone=ratelimit:10m rate=10r/s;
+  limit_req_zone $binary_remote_addr zone=ratelimit:10m rate=20r/s;
   include       /etc/nginx/mime.types;
   default_type  application/octet-stream;
+  proxy_set_header Host $host;
   charset utf-8;
   sendfile on;
   tcp_nopush on;
   tcp_nodelay on;
   server_tokens off;
   types_hash_max_size 2048;
+  {{#if compose}}
+  resolver 127.0.0.11 ipv6=off;
+  {{/if}}
+  {{#if k8s}}
+  resolver kube-dns.kube-system.svc.cluster.local valid=10s;
+  {{/if}}
+
 
   # buffering
   client_body_buffer_size 1K;
@@ -34,83 +42,82 @@ http {
     default     "upgrade";
   }
 
-  server { 
+  server {
     listen       10000 default_server;
     listen  [::]:10000 default_server;
     server_name  _;
-    port_in_redirect off;
+    client_max_body_size 1000m;
+    ignore_invalid_headers off;
+    proxy_buffering off;
+    # port_in_redirect off;
 
     # Security Headers
     add_header X-Frame-Options SAMEORIGIN always;
     add_header X-Content-Type-Options nosniff always;
     add_header X-XSS-Protection "1; mode=block" always;
-    add_header Content-Security-Policy  "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdn.budi.live https://js.intercomcdn.com https://widget.intercom.io; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://fonts.googleapis.com https://rsms.me; object-src 'none'; base-uri 'self'; connect-src 'self' https://api-iam.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io; font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me; frame-src 'self'; img-src http: https: data:; manifest-src 'self'; media-src 'self'; worker-src 'none';" always;
+    add_header Content-Security-Policy  "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdn.budi.live https://js.intercomcdn.com https://widget.intercom.io; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://fonts.googleapis.com https://rsms.me https://maxcdn.bootstrapcdn.com; object-src 'none'; base-uri 'self'; connect-src 'self' https://api-iam.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io; font-src 'self' data https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com; frame-src 'self'; img-src http: https: data; manifest-src 'self'; media-src 'self'; worker-src 'none';" always;
+
+    # upstreams
+    set $apps {{ apps }};
+    set $worker {{ worker }};
+    set $minio {{ minio }};
+    set $couchdb {{ couchdb }};
+    {{#if watchtower}}
+    set $watchtower {{ watchtower }};
+    {{/if}}
 
     location /app {
-      proxy_pass      http://app-service.budibase.svc.cluster.local:4002;
+      proxy_pass      http://$apps:4002;
       rewrite ^/app/(.*)$ /$1 break;
     }
 
     location = / {
-      proxy_http_version  1.1;
+      proxy_pass      http://$apps:4002;
-      proxy_set_header    Connection          $connection_upgrade;
-      proxy_set_header    Upgrade             $http_upgrade;
-      proxy_set_header    Host                $host;
-      proxy_set_header    X-Real-IP           $remote_addr;
-      proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-      proxy_pass      http://app-service.budibase.svc.cluster.local:4002;
     }
 
-    location /builder/ {
+    {{#if watchtower}}
-      proxy_http_version  1.1;
+    location = /v1/update {
-      proxy_set_header    Connection          $connection_upgrade;
+      proxy_pass      http://$watchtower:8080;
-      proxy_set_header    Upgrade             $http_upgrade;
-      proxy_set_header    Host                $host;
-      proxy_set_header    X-Real-IP           $remote_addr;
-      proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-      proxy_pass      http://app-service.budibase.svc.cluster.local:4002;
     }
-
+    {{/if}}
     location ~ ^/(builder|app_) {
       proxy_http_version  1.1;
       proxy_set_header    Connection          $connection_upgrade;
       proxy_set_header    Upgrade             $http_upgrade;
-      proxy_set_header    Host                $host;
       proxy_set_header    X-Real-IP           $remote_addr;
       proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-      proxy_pass      http://app-service.budibase.svc.cluster.local:4002;
+      proxy_pass      http://$apps:4002;
     }
 
     location ~ ^/api/(system|admin|global)/ {
-      proxy_pass      http://worker-service.budibase.svc.cluster.local:4001;
+      proxy_pass      http://$worker:4003;
     }
 
     location /worker/ {
-      proxy_pass      http://worker-service.budibase.svc.cluster.local:4001;
+      proxy_pass      http://$worker:4003;
       rewrite ^/worker/(.*)$ /$1 break;
     }
 
     location /api/ {
       # calls to the API are rate limited with bursting
-      limit_req zone=ratelimit burst=10 nodelay;
+      limit_req zone=ratelimit burst=20 nodelay;
 
       # 120s timeout on API requests
       proxy_read_timeout 120s;
       proxy_connect_timeout 120s;
-      proxy_send_timeout 120s; 
+      proxy_send_timeout 120s;
 
       proxy_http_version  1.1;
       proxy_set_header    Connection          $connection_upgrade;
       proxy_set_header    Upgrade             $http_upgrade;
-      proxy_set_header    Host                $host;
       proxy_set_header    X-Real-IP           $remote_addr;
       proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
 
-      proxy_pass      http://app-service.budibase.svc.cluster.local:4002;
+      proxy_pass      http://$apps:4002;
     }
 
     location /db/ {
-      proxy_pass      http://budibase-prod-svc-couchdb:5984;
+      proxy_pass      http://$couchdb:5984;
       rewrite ^/db/(.*)$ /$1 break;
     }
 
@@ -118,13 +125,12 @@ http {
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header Host $http_host;
-      proxy_set_header Connection "";
-      proxy_http_version 1.1;
-      chunked_transfer_encoding off;
 
       proxy_connect_timeout 300;
-      proxy_pass      http://minio-service.budibase.svc.cluster.local:9000;
+      proxy_http_version 1.1;
+      proxy_set_header Connection "";
+      chunked_transfer_encoding off;
+      proxy_pass      http://$minio:9000;
     }
 
     client_header_timeout 60;
@@ -138,4 +144,4 @@ http {
     gzip_comp_level 6;
     gzip_types text/plain text/css text/xml application/json application/javascript application/rss+xml application/atom+xml image/svg+xml;
   }
-}
+}

hosting/proxy/Dockerfile

@@ -1,2 +1,2 @@
 FROM nginx:latest
-COPY nginx.conf /etc/nginx/nginx.conf
+COPY .generated-nginx.prod.conf /etc/nginx/nginx.conf

hosting/proxy/nginx.conf

@@ -9,7 +9,7 @@ events {
 }
 
 http {
-  limit_req_zone $binary_remote_addr zone=ratelimit:10m rate=10r/s;
+  limit_req_zone $binary_remote_addr zone=ratelimit:10m rate=20r/s;
   include       /etc/nginx/mime.types;
   default_type  application/octet-stream;
   charset utf-8;
@@ -96,7 +96,7 @@ http {
 
     location /api/ {
       # calls to the API are rate limited with bursting
-      limit_req zone=ratelimit burst=10 nodelay;
+      limit_req zone=ratelimit burst=20 nodelay;
 
       # 120s timeout on API requests
       proxy_read_timeout 120s;

hosting/scripts/airgapped/airgappedDockerBuild.js

@@ -15,7 +15,7 @@ const IMAGES = {
 
 const FILES = {
 	COMPOSE: "docker-compose.yaml",
-	NGINX: "nginx.conf"
+	ENV: ".env"
 }
 
 const OUTPUT_DIR = path.join(__dirname, "../", "bb-airgapped")
@@ -40,8 +40,7 @@ for (let image in IMAGES) {
 
 // copy config files
 copyFile(FILES.COMPOSE)
-copyFile(FILES.ENVOY)
+copyFile(FILES.ENV)
-copyFile(FILES.PROPERTIES)
 
 // compress
 execSync(`tar -czf bb-airgapped.tar.gz hosting/scripts/bb-airgapped`)

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.66-alpha.0",
+  "version": "1.0.74-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

package.json

@@ -44,10 +44,13 @@
     "lint:fix": "yarn run lint:fix:ts && yarn run lint:fix:prettier && yarn run lint:fix:eslint",
     "test:e2e": "lerna run cy:test",
     "test:e2e:ci": "lerna run cy:ci",
-    "build:docker": "lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -",
+    "build:docker": "lerna run build:docker && npm run build:docker:proxy:compose && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -",
     "build:docker:proxy": "docker build hosting/proxy -t proxy-service",
+    "build:docker:proxy:compose": "lerna run generate:proxy:compose && npm run build:docker:proxy",
+    "build:docker:proxy:preprod": "lerna run generate:proxy:preprod && npm run build:docker:proxy",
+    "build:docker:proxy:prod": "lerna run generate:proxy:prod && npm run build:docker:proxy",
     "build:docker:selfhost": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh latest && cd -",
-    "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
+    "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && npm run build:docker:proxy:compose && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
     "build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild",
     "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -",
     "build:docs": "lerna run build:docs",

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.66-alpha.0",
+  "version": "1.0.74-alpha.1",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",

packages/backend-core/src/cloud/accounts.js

@@ -17,7 +17,7 @@ exports.getAccount = async email => {
   const json = await response.json()
 
   if (response.status !== 200) {
-    throw Error(`Error getting account by email ${email}`, json)
+    throw new Error(`Error getting account by email ${email}`, json)
   }
 
   return json[0]

packages/backend-core/src/context/deprovision.js

@@ -1,5 +1,5 @@
 const { getGlobalUserParams, getAllApps } = require("../db/utils")
-const { getDB, getCouch } = require("../db")
+const { getDB } = require("../db")
 const { getGlobalDB } = require("../tenancy")
 const { StaticDatabases } = require("../db/constants")
 
@@ -79,7 +79,7 @@ const removeGlobalDB = async tenantId => {
 
 const removeTenantApps = async tenantId => {
   try {
-    const apps = await getAllApps(getCouch(), { all: true })
+    const apps = await getAllApps({ all: true })
     const destroyPromises = apps.map(app => getDB(app.appId).destroy())
     await Promise.allSettled(destroyPromises)
   } catch (err) {

packages/backend-core/src/context/index.js

@@ -121,7 +121,7 @@ exports.getTenantId = () => {
   }
   const tenantId = cls.getFromContext(ContextKeys.TENANT_ID)
   if (!tenantId) {
-    throw Error("Tenant id not found")
+    throw new Error("Tenant id not found")
   }
   return tenantId
 }

packages/backend-core/src/db/utils.js

@@ -179,8 +179,11 @@ exports.getStartEndKeyURL = (base, baseKey, tenantId = null) => {
 /**
  * if in production this will use the CouchDB _all_dbs call to retrieve a list of databases. If testing
  * when using Pouch it will use the pouchdb-all-dbs package.
+ * opts.efficient can be provided to make sure this call is always quick in a multi-tenant environment,
+ * but it may not be 100% accurate in full efficiency mode (some tenantless apps may be missed).
  */
-exports.getAllDbs = async () => {
+exports.getAllDbs = async (opts = { efficient: false }) => {
+  const efficient = opts && opts.efficient
   // specifically for testing we use the pouch package for this
   if (env.isTest()) {
     return getCouch().allDbs()
@@ -197,7 +200,7 @@ exports.getAllDbs = async () => {
   }
   let couchUrl = `${exports.getCouchUrl()}/_all_dbs`
   let tenantId = getTenantId()
-  if (!env.MULTI_TENANCY || tenantId === DEFAULT_TENANT_ID) {
+  if (!env.MULTI_TENANCY || (!efficient && tenantId === DEFAULT_TENANT_ID)) {
     // just get all DBs when:
     // - single tenancy
     // - default tenant
@@ -225,13 +228,13 @@ exports.getAllDbs = async () => {
  *
  * @return {Promise<object[]>} returns the app information document stored in each app database.
  */
-exports.getAllApps = async ({ dev, all, idsOnly } = {}) => {
+exports.getAllApps = async ({ dev, all, idsOnly, efficient } = {}) => {
   const CouchDB = getCouch()
   let tenantId = getTenantId()
   if (!env.MULTI_TENANCY && !tenantId) {
     tenantId = DEFAULT_TENANT_ID
   }
-  let dbs = await exports.getAllDbs()
+  let dbs = await exports.getAllDbs({ efficient })
   const appDbNames = dbs.filter(dbName => {
     const split = dbName.split(SEPARATOR)
     // it is an app, check the tenantId

packages/backend-core/src/migrations/index.js

@@ -22,6 +22,7 @@ exports.getMigrationsDoc = async db => {
     if (err.status && err.status === 404) {
       return { _id: DocumentTypes.MIGRATIONS }
     }
+    console.error(err)
   }
 }
 
@@ -94,6 +95,8 @@ exports.runMigrations = async (CouchDB, migrations, options = {}) => {
     if (!options.tenantIds || !options.tenantIds.length) {
       // run for all tenants
       tenantIds = await getTenantIds()
+    } else {
+      tenantIds = options.tenantIds
     }
   } else {
     // single tenancy

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.66-alpha.0",
+  "version": "1.0.74-alpha.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/bbui/src/Button/Button.svelte

@@ -29,6 +29,7 @@
   {disabled}
   on:click|preventDefault
   on:mouseover={() => (showTooltip = true)}
+  on:focus={() => (showTooltip = true)}
   on:mouseleave={() => (showTooltip = false)}
 >
   {#if icon}

packages/builder/cypress.json

@@ -1,9 +1,10 @@
 {
-  "baseUrl": "http://localhost:10001/builder/",
+  "baseUrl": "http://localhost:10001",
   "video": true,
   "projectId": "bmbemn",
   "env": {
     "PORT": "10001",
-    "JWT_SECRET": "test"
+    "JWT_SECRET": "test",
+    "HOST_IP": ""
   }
 }

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

@@ -1,14 +1,17 @@
-context("Add Multi-Option Datatype", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-  })
 
-  it("should create a new table, with data", () => {
+filterTests(['all'], () => {
-    cy.createTable("Multi Data")
+  context("Add Multi-Option Datatype", () => {
-    cy.addColumn("Multi Data", "Test Data", "Multi-select", "1\n2\n3\n4\n5")
+    before(() => {
-    cy.addRowMultiValue(["1", "2", "3", "4", "5"])
+      cy.login()
-  })
+      cy.createTestApp()
+    })
+
+    it("should create a new table, with data", () => {
+      cy.createTable("Multi Data")
+      cy.addColumn("Multi Data", "Test Data", "Multi-select", "1\n2\n3\n4\n5")
+      cy.addRowMultiValue(["1", "2", "3", "4", "5"])
+    })
 
   it("should add form with multi select picker, containing 5 options", () => {
     cy.navigateToFrontend()
@@ -39,6 +42,7 @@ context("Add Multi-Option Datatype", () => {
       cy.getComponent(componentId)
         .find(".spectrum-Picker-label")
         .contains("(5)")
+      })
     })
   })
 })

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

@@ -1,35 +1,39 @@
-context("Add Radio Buttons", () => {
+import filterTests from "../support/filterTests"
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-    })
 
-it("should add Radio Buttons options picker on form, add data, and confirm", () => {
+filterTests(['all'], () => {
-    cy.navigateToFrontend()
+    context("Add Radio Buttons", () => {
-    cy.addComponent("Form", "Form")
+        before(() => {
-    cy.addComponent("Form", "Options Picker").then((componentId) => {
+        cy.login()
-        // Provide field setting
+        cy.createTestApp()
-    cy.get(`[data-cy="field-prop-control"]`).type("1")
-    // Open dropdown and select Radio buttons
-    cy.get(`[data-cy="optionsType-prop-control"]`).click().then(() => {
-        cy.get('.spectrum-Popover').contains('Radio buttons')
-        .wait(500)
-        .click()
         })
-    const radioButtonsTotal = 3
+
-    // Add values and confirm total
+    it("should add Radio Buttons options picker on form, add data, and confirm", () => {
-    addRadioButtonData(radioButtonsTotal)
+        cy.navigateToFrontend()
-    cy.getComponent(componentId).find('[type="radio"]')
+        cy.addComponent("Form", "Form")
-    .should('have.length', radioButtonsTotal)
+        cy.addComponent("Form", "Options Picker").then((componentId) => {
-        })
+            // Provide field setting
-    })
+        cy.get(`[data-cy="field-prop-control"]`).type("1")
-    
+        // Open dropdown and select Radio buttons
-    const addRadioButtonData = (totalRadioButtons) => {
+        cy.get(`[data-cy="optionsType-prop-control"]`).click().then(() => {
-        cy.get(`[data-cy="optionsSource-prop-control"]`).click().then(() => {
+            cy.get('.spectrum-Popover').contains('Radio buttons')
-            cy.get('.spectrum-Popover').contains('Custom')
             .wait(500)
             .click()
+            })
+        const radioButtonsTotal = 3
+        // Add values and confirm total
+        addRadioButtonData(radioButtonsTotal)
+        cy.getComponent(componentId).find('[type="radio"]')
+        .should('have.length', radioButtonsTotal)
+            })
         })
-        cy.addCustomSourceOptions(totalRadioButtons)
+        
-    }
+        const addRadioButtonData = (totalRadioButtons) => {
+            cy.get(`[data-cy="optionsSource-prop-control"]`).click().then(() => {
+                cy.get('.spectrum-Popover').contains('Custom')
+                .wait(500)
+                .click()
+            })
+            cy.addCustomSourceOptions(totalRadioButtons)
+        }
+    })
 })

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

@@ -0,0 +1,51 @@
+import filterTests from "../support/filterTests"
+
+filterTests(['smoke', 'all'], () => {
+    context("Auto Screens UI", () => {
+        before(() => {
+        cy.login()
+        cy.createTestApp()
+        })
+        
+        it("should generate internal table screens", () => {
+            // Create autogenerated screens from the internal table
+            cy.createAutogeneratedScreens(["Cypress Tests"])
+            // Confirm screens have been auto generated
+            cy.get(".nav-items-container").contains("cypress-tests").click({ force: true })
+            cy.get(".nav-items-container").should('contain', 'cypress-tests/:id')
+            .and('contain', 'cypress-tests/new/row')
+        })
+        
+        it("should generate multiple internal table screens at once", () => {
+            // Create a second internal table
+            const initialTable = "Cypress Tests"
+            const secondTable = "Table Two"
+            cy.createTable(secondTable)
+            // Create autogenerated screens from the internal tables
+            cy.createAutogeneratedScreens([initialTable, secondTable])
+            // Confirm screens have been auto generated
+            cy.get(".nav-items-container").contains("cypress-tests").click({ force: true })
+            // Previously generated tables are suffixed with numbers - as expected
+            cy.get(".nav-items-container").should('contain', 'cypress-tests-2/:id')
+            .and('contain', 'cypress-tests-2/new/row')
+            cy.get(".nav-items-container").contains("table-two").click()
+            cy.get(".nav-items-container").should('contain', 'table-two/:id')
+            .and('contain', 'table-two/new/row')
+        })
+        
+        if (Cypress.env("TEST_ENV")) {
+            it("should generate data source screens", () => {
+                // Using MySQL data source for testing this
+                const datasource = "MySQL"
+                // Select & configure MySQL data source
+                cy.selectExternalDatasource(datasource)
+                cy.addDatasourceConfig(datasource)
+                // Create autogenerated screens from a MySQL table - MySQL contains books table
+                cy.createAutogeneratedScreens(["books"])
+                cy.get(".nav-items-container").contains("books").click()
+                cy.get(".nav-items-container").should('contain', 'books/:id')
+                .and('contain', 'books/new/row')
+            })
+        }
+    })
+})

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

@@ -0,0 +1,43 @@
+import filterTests from "../support/filterTests"
+
+filterTests(['all'], () => {
+  context("Change Application Icon and Colour", () => {
+      before(() => {
+        cy.login()
+      })
+      
+      it("should change the icon and colour for an application", () => {
+          // Search for test application
+          cy.searchForApplication("Cypress Tests")
+          cy.get(".appTable")
+            .within(() => {
+              cy.get(".spectrum-Icon").eq(1).click()
+            })
+          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()
+          })
+          // Select random colour
+          cy.get(".fill").click()
+          cy.get(".colors").within(() => {
+              cy.get(".color").eq(Math.floor(Math.random() * 33) + 1).click()
+          })
+          cy.intercept('**/applications/**').as('iconChange')
+          cy.get(".spectrum-Button").contains("Save").click({ force: true })
+          cy.wait("@iconChange")
+          cy.get("@iconChange").its('response.statusCode')
+          .should('eq', 200)
+          cy.wait(1000)
+          // Confirm icon has changed from default
+          // Confirm colour has been applied - There is no default colour
+          cy.get(".appTable")
+            .within(() => {
+              cy.get('[aria-label]').eq(0).children()
+              .should('have.attr', 'xlink:href').and('not.contain', '#spectrum-icon-18-Apps')
+              cy.get(".title").children().children()
+              .should('have.attr', 'style').and('contains', 'color')
+            })
+      })
+  })
+})

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

@@ -1,8 +1,12 @@
-context("Create an Application", () => {
+import filterTests from '../support/filterTests'
-  it("should create a new application", () => {
+
-    cy.login()
+filterTests(['smoke', 'all'], () => {
-    cy.createTestApp()
+  context("Create an Application", () => {
-    cy.visit(`localhost:${Cypress.env("PORT")}/builder`)
+    it("should create a new application", () => {
-    cy.contains("Cypress Tests").should("exist")
+      cy.login()
-  })
+      cy.createTestApp()
+      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.contains("Cypress Tests").should("exist")
+    })
+  })  
 })

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

@@ -1,66 +1,69 @@
-context("Create a automation", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-  })
 
-  // https://on.cypress.io/interacting-with-elements
+filterTests(['smoke', 'all'], () => {
-  it("should create a automation", () => {
+  context("Create a automation", () => {
-    cy.createTestTableWithData()
+    before(() => {
-    cy.wait(2000)
+      cy.login()
-    cy.contains("Automate").click()
+      cy.createTestApp()
-    cy.get("[data-cy='new-screen'] > .spectrum-Icon").click()
+    })
-    cy.get(".modal-inner-wrapper").within(() => {
+
-      cy.get("input").type("Add Row")
+    it("should create a automation", () => {
-      cy.contains("Row Created").click({ force: true })
+      cy.createTestTableWithData()
+      cy.wait(2000)
+      cy.contains("Automate").click()
+      cy.get("[data-cy='new-screen'] > .spectrum-Icon").click()
+      cy.get(".modal-inner-wrapper").within(() => {
+        cy.get("input").type("Add Row")
+        cy.contains("Row Created").click({ force: true })
+        cy.wait(500)
+        cy.get(".spectrum-Button--cta").click()
+      })
+
+      // Setup trigger
+      cy.contains("Setup").click()
+      cy.get(".spectrum-Picker-label").click()
       cy.wait(500)
-      cy.get(".spectrum-Button--cta").click()
+      cy.contains("dog").click()
-    })
+      cy.wait(2000)
-
+      // Create action
-    // Setup trigger
+      cy.get('[aria-label="AddCircle"]').eq(1).click()
-    cy.contains("Setup").click()
+      cy.get(".modal-inner-wrapper").within(() => {
-    cy.get(".spectrum-Picker-label").click()
+        cy.wait(1000)
-    cy.wait(500)
+        cy.contains("Create Row").trigger('mouseover').click().click()
-    cy.contains("dog").click()
+        cy.get(".spectrum-Button--cta").click()
-    cy.wait(2000)
+      })
-    // Create action
+      cy.contains("Setup").click()
-    cy.get(".block > .spectrum-Icon").click()
-    cy.get(".modal-inner-wrapper").within(() => {
-      cy.wait(1000)
-      cy.contains("Create Row").trigger('mouseover').click().click()
-      cy.get(".spectrum-Button--cta").click()
-    })
-    cy.contains("Setup").click()
-    cy.get(".spectrum-Picker-label").click()
-    cy.contains("dog").click()
-    cy.get(".spectrum-Textfield-input")
-    .first()
-    .type("{{ trigger.row.name }}", { parseSpecialCharSequences: false })
-    cy.get(".spectrum-Textfield-input")
-      .eq(1)
-      .type("11")
-    cy.contains("Finish and test automation").click()
-
-    cy.get(".modal-inner-wrapper").within(() => {
-      cy.wait(1000)
       cy.get(".spectrum-Picker-label").click()
       cy.contains("dog").click()
-      cy.wait(1000)
       cy.get(".spectrum-Textfield-input")
-        .first()
+      .first()
-        .type("automationGoodboy")
+      .type("{{ trigger.row.name }}", { parseSpecialCharSequences: false })
       cy.get(".spectrum-Textfield-input")
         .eq(1)
         .type("11")
-      cy.get(".spectrum-Textfield-input")
+      cy.contains("Finish and test automation").click()
-        .eq(2)
+
-        .type("123456")
+      cy.get(".modal-inner-wrapper").within(() => {
-      cy.get(".spectrum-Textfield-input")
+        cy.wait(1000)
-        .eq(3)
+        cy.get(".spectrum-Picker-label").click()
-        .type("123456")
+        cy.contains("dog").click()
-      cy.contains("Test").click()
+        cy.wait(1000)
+        cy.get(".spectrum-Textfield-input")
+          .first()
+          .type("automationGoodboy")
+        cy.get(".spectrum-Textfield-input")
+          .eq(1)
+          .type("11")
+        cy.get(".spectrum-Textfield-input")
+          .eq(2)
+          .type("123456")
+        cy.get(".spectrum-Textfield-input")
+          .eq(3)
+          .type("123456")
+        cy.contains("Test").click()
+      })
+      cy.contains("Data").click()
+      cy.contains("automationGoodboy")
     })
-    cy.contains("Data").click()
-    cy.contains("automationGoodboy")
   })
 })

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

@@ -1,58 +1,62 @@
-context("Create Bindings", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-    cy.navigateToFrontend()
-  })
 
-  it("should add a current user binding", () => {
+filterTests(['smoke', 'all'], () => {
-    cy.addComponent("Elements", "Paragraph").then(() => {
+  context("Create Bindings", () => {
-      addSettingBinding("text", "Current User._id")
+    before(() => {
+      cy.login()
+      cy.createTestApp()
+      cy.navigateToFrontend()
+    })
+
+    it("should add a current user binding", () => {
+      cy.addComponent("Elements", "Paragraph").then(() => {
+        addSettingBinding("text", "Current User._id")
+      })
+    })
+
+    it("should handle an invalid binding", () => {
+      cy.addComponent("Elements", "Paragraph").then(componentId => {
+        // Cypress needs to escape curly brackets
+        cy.get("[data-cy=setting-text] input")
+          .type("{{}{{}{{} Current User._id {}}{}}")
+          .blur()
+        cy.getComponent(componentId).should("have.text", "{{{ [user].[_id] }}")
+      })
+    })
+
+    it("should add a URL param binding", () => {
+      const paramName = "foo"
+      cy.createScreen("Test Param", `/test/:${paramName}`)
+      cy.addComponent("Elements", "Paragraph").then(componentId => {
+        addSettingBinding("text", `URL.${paramName}`)
+        // The builder preview pages don't have a real URL, so all we can do
+        // is check that we were able to bind to the property, and that the
+        // component exists on the page
+        cy.getComponent(componentId).should("have.text", "New Paragraph")
+      })
+    })
+
+    it("should add a binding with a handlebars helper", () => {
+      cy.addComponent("Elements", "Paragraph").then(componentId => {
+        // Cypress needs to escape curly brackets
+        cy.get("[data-cy=setting-text] input")
+          .type("{{}{{} add 1 2 {}}{}}")
+          .blur()
+        cy.getComponent(componentId).should("have.text", "3")
+      })
     })
   })
 
-  it("should handle an invalid binding", () => {
+  const addSettingBinding = (setting, bindingText, clickOption = true) => {
-    cy.addComponent("Elements", "Paragraph").then(componentId => {
+    cy.get(`[data-cy="setting-${setting}"] [data-cy=text-binding-button]`).click()
-      // Cypress needs to escape curly brackets
+    cy.get(".drawer").within(() => {
-      cy.get("[data-cy=setting-text] input")
+      if (clickOption) {
-        .type("{{}{{}{{} Current User._id {}}{}}")
+        cy.contains(bindingText).click()
-        .blur()
+        cy.get("textarea").should("have.value", `{{ ${bindingText} }}`)
-      cy.getComponent(componentId).should("have.text", "{{{ [user].[_id] }}")
+      } else {
+        cy.get("textarea").type(bindingText)
+      }
+      cy.contains("Save").click()
     })
-  })
+  }
-
-  it("should add a URL param binding", () => {
-    const paramName = "foo"
-    cy.createScreen("Test Param", `/test/:${paramName}`)
-    cy.addComponent("Elements", "Paragraph").then(componentId => {
-      addSettingBinding("text", `URL.${paramName}`)
-      // The builder preview pages don't have a real URL, so all we can do
-      // is check that we were able to bind to the property, and that the
-      // component exists on the page
-      cy.getComponent(componentId).should("have.text", "New Paragraph")
-    })
-  })
-
-  it("should add a binding with a handlebars helper", () => {
-    cy.addComponent("Elements", "Paragraph").then(componentId => {
-      // Cypress needs to escape curly brackets
-      cy.get("[data-cy=setting-text] input")
-        .type("{{}{{} add 1 2 {}}{}}")
-        .blur()
-      cy.getComponent(componentId).should("have.text", "3")
-    })
-  })
 })
-
-const addSettingBinding = (setting, bindingText, clickOption = true) => {
-  cy.get(`[data-cy="setting-${setting}"] [data-cy=text-binding-button]`).click()
-  cy.get(".drawer").within(() => {
-    if (clickOption) {
-      cy.contains(bindingText).click()
-      cy.get("textarea").should("have.value", `{{ ${bindingText} }}`)
-    } else {
-      cy.get("textarea").type(bindingText)
-    }
-    cy.contains("Save").click()
-  })
-}

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

@@ -1,92 +1,97 @@
 // TODO for now components are skipped, might not be good to keep doing this
-xcontext("Create Components", () => {
-  let headlineId
 
-  before(() => {
+import filterTests from "../support/filterTests"
-    cy.login()
-    cy.createTestApp()
-    cy.createTable("dog")
-    cy.addColumn("dog", "name", "Text")
-    cy.addColumn("dog", "age", "Number")
-    cy.addColumn("dog", "type", "Options")
-    cy.navigateToFrontend()
-  })
 
-  it("should add a container", () => {
+filterTests(['all'], () => {
-    cy.addComponent(null, "Container").then(componentId => {
+  xcontext("Create Components", () => {
-      cy.getComponent(componentId).should("exist")
+    let headlineId
+
+    before(() => {
+      cy.login()
+      cy.createTestApp()
+      cy.createTable("dog")
+      cy.addColumn("dog", "name", "Text")
+      cy.addColumn("dog", "age", "Number")
+      cy.addColumn("dog", "type", "Options")
+      cy.navigateToFrontend()
     })
-  })
 
-  it("should add a headline", () => {
+    it("should add a container", () => {
-    cy.addComponent("Elements", "Headline").then(componentId => {
+      cy.addComponent(null, "Container").then(componentId => {
-      headlineId = componentId
+        cy.getComponent(componentId).should("exist")
-      cy.getComponent(headlineId).should("exist")
+      })
     })
-  })
 
-  it("should change the text of the headline", () => {
+    it("should add a headline", () => {
-    const text = "Lorem ipsum dolor sit amet."
+      cy.addComponent("Elements", "Headline").then(componentId => {
-    cy.get("[data-cy=Settings]").click()
+        headlineId = componentId
-    cy.get("[data-cy=setting-text] input")
+        cy.getComponent(headlineId).should("exist")
-      .type(text)
+      })
-      .blur()
+    })
-    cy.getComponent(headlineId).should("have.text", text)
-  })
 
-  it("should change the size of the headline", () => {
+    it("should change the text of the headline", () => {
-    cy.get("[data-cy=Design]").click()
+      const text = "Lorem ipsum dolor sit amet."
-    cy.contains("Typography").click()
-    cy.get("[data-cy=font-size-prop-control]").click()
-    cy.contains("60px").click()
-    cy.getComponent(headlineId).should("have.css", "font-size", "60px")
-  })
-
-  it("should create a form and reset to match schema", () => {
-    cy.addComponent("Form", "Form").then(() => {
       cy.get("[data-cy=Settings]").click()
-      cy.get("[data-cy=setting-dataSource]")
+      cy.get("[data-cy=setting-text] input")
-        .contains("Choose option")
+        .type(text)
-        .click()
+        .blur()
-      cy.get(".dropdown")
+      cy.getComponent(headlineId).should("have.text", text)
-        .contains("dog")
+    })
-        .click()
+
-      cy.addComponent("Form", "Field Group").then(fieldGroupId => {
+    it("should change the size of the headline", () => {
+      cy.get("[data-cy=Design]").click()
+      cy.contains("Typography").click()
+      cy.get("[data-cy=font-size-prop-control]").click()
+      cy.contains("60px").click()
+      cy.getComponent(headlineId).should("have.css", "font-size", "60px")
+    })
+
+    it("should create a form and reset to match schema", () => {
+      cy.addComponent("Form", "Form").then(() => {
         cy.get("[data-cy=Settings]").click()
-        cy.contains("Update Form Fields").click()
+        cy.get("[data-cy=setting-dataSource]")
-        cy.get(".modal")
+          .contains("Choose option")
-          .get("button.primary")
           .click()
-        cy.getComponent(fieldGroupId).within(() => {
+        cy.get(".dropdown")
-          cy.contains("name").should("exist")
+          .contains("dog")
-          cy.contains("age").should("exist")
+          .click()
-          cy.contains("type").should("exist")
+        cy.addComponent("Form", "Field Group").then(fieldGroupId => {
+          cy.get("[data-cy=Settings]").click()
+          cy.contains("Update Form Fields").click()
+          cy.get(".modal")
+            .get("button.primary")
+            .click()
+          cy.getComponent(fieldGroupId).within(() => {
+            cy.contains("name").should("exist")
+            cy.contains("age").should("exist")
+            cy.contains("type").should("exist")
+          })
+          cy.getComponent(fieldGroupId)
+            .find("input")
+            .should("have.length", 2)
+          cy.getComponent(fieldGroupId)
+            .find(".spectrum-Picker")
+            .should("have.length", 1)
         })
-        cy.getComponent(fieldGroupId)
-          .find("input")
-          .should("have.length", 2)
-        cy.getComponent(fieldGroupId)
-          .find(".spectrum-Picker")
-          .should("have.length", 1)
       })
     })
-  })
 
-  it("deletes a component", () => {
+    it("deletes a component", () => {
-    cy.addComponent("Elements", "Paragraph").then(componentId => {
+      cy.addComponent("Elements", "Paragraph").then(componentId => {
-      cy.get("[data-cy=setting-_instanceName] input")
+        cy.get("[data-cy=setting-_instanceName] input")
-        .type(componentId)
+          .type(componentId)
-        .blur()
+          .blur()
-      cy.get(".ui-nav ul .nav-item.selected .ri-more-line").click({
+        cy.get(".ui-nav ul .nav-item.selected .ri-more-line").click({
-        force: true,
+          force: true,
+        })
+        cy.get(".dropdown-container")
+          .contains("Delete")
+          .click()
+        cy.get(".modal")
+          .contains("Delete Component")
+          .click()
+        cy.getComponent(componentId).should("not.exist")
       })
-      cy.get(".dropdown-container")
-        .contains("Delete")
-        .click()
-      cy.get(".modal")
-        .contains("Delete Component")
-        .click()
-      cy.getComponent(componentId).should("not.exist")
     })
   })
 })

packages/builder/cypress/integration/createScreen.js

@@ -1,21 +1,25 @@
-context("Screen Tests", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-    cy.navigateToFrontend()
-  })
 
-  it("Should successfully create a screen", () => {
+filterTests(["smoke", "all"], () => {
-    cy.createScreen("Test Screen", "/test")
+  context("Screen Tests", () => {
-    cy.get(".nav-items-container").within(() => {
+    before(() => {
-      cy.contains("/test").should("exist")
+      cy.login()
+      cy.createTestApp()
+      cy.navigateToFrontend()
     })
-  })
 
-  it("Should update the url", () => {
+    it("Should successfully create a screen", () => {
-    cy.createScreen("Test Screen", "test with spaces")
+      cy.createScreen("Test Screen", "/test")
-    cy.get(".nav-items-container").within(() => {
+      cy.get(".nav-items-container").within(() => {
-      cy.contains("/test-with-spaces").should("exist")
+        cy.contains("/test").should("exist")
+      })
+    })
+
+    it("Should update the url", () => {
+      cy.createScreen("Test Screen", "test with spaces")
+      cy.get(".nav-items-container").within(() => {
+        cy.contains("/test-with-spaces").should("exist")
+      })
     })
   })
 })

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

@@ -1,74 +1,110 @@
-context("Create a Table", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-  })
 
-  it("should create a new Table", () => {
+filterTests(['smoke', 'all'], () => {
-    cy.createTable("dog")
+  context("Create a Table", () => {
-    cy.wait(1000)
+    before(() => {
-    // Check if Table exists
+      cy.login()
-    cy.get(".table-title h1").should("have.text", "dog")
+      cy.createTestApp()
-  })
+    })
 
-  it("adds a new column to the table", () => {
+    it("should create a new Table", () => {
-    cy.addColumn("dog", "name", "Text")
+      cy.createTable("dog")
-    cy.contains("name").should("be.visible")
+      cy.wait(1000)
-  })
+      // Check if Table exists
+      cy.get(".table-title h1").should("have.text", "dog")
+    })
 
-  it("creates a row in the table", () => {
+    it("adds a new column to the table", () => {
-    cy.addRow(["Rover"])
+      cy.addColumn("dog", "name", "Text")
-    cy.contains("Rover").should("be.visible")
+      cy.contains("name").should("be.visible")
-  })
+    })
 
-  it("updates a column on the table", () => {
+    it("creates a row in the table", () => {
-    cy.get(".title").click()
+      cy.addRow(["Rover"])
-    cy.get(".spectrum-Table-editIcon > use").click()
+      cy.contains("Rover").should("be.visible")
-    cy.get("input").eq(1).type("updated", { force: true })
+    })
-    // Unset table display column
-    cy.get(".spectrum-Switch-input").eq(1).click()
-    cy.contains("Save Column").click()
-    cy.contains("nameupdated ").should("contain", "nameupdated")
-  })
 
-  
+    it("updates a column on the table", () => {
-  it("edits a row", () => {
+      cy.get(".title").click()
-    cy.contains("button", "Edit").click({ force: true })
+      cy.get(".spectrum-Table-editIcon > use").click()
-    cy.wait(1000)
+      cy.get("input").eq(1).type("updated", { force: true })
-    cy.get(".spectrum-Modal input").clear()
+      // Unset table display column
-    cy.get(".spectrum-Modal input").type("Updated")
+      cy.get(".spectrum-Switch-input").eq(1).click()
-    cy.contains("Save").click()
+      cy.contains("Save Column").click()
-    cy.contains("Updated").should("have.text", "Updated")
+      cy.contains("nameupdated ").should("contain", "nameupdated")
-  })
+    })
-  
+    
-  it("deletes a row", () => {
+    it("edits a row", () => {
-    cy.get(".spectrum-Checkbox-input").check({ force: true })
+      cy.contains("button", "Edit").click({ force: true })
-    cy.contains("Delete 1 row(s)").click()
+      cy.wait(1000)
-    cy.get(".spectrum-Modal").contains("Delete").click()
+      cy.get(".spectrum-Modal input").clear()
-    cy.contains("RoverUpdated").should("not.exist")
+      cy.get(".spectrum-Modal input").type("Updated")
-  })
+      cy.contains("Save").click()
-
+      cy.contains("Updated").should("have.text", "Updated")
-  it("deletes a column", () => {
+    })
-    cy.get(".title").click()
+    
-    cy.get(".spectrum-Table-editIcon > use").click()
+    it("deletes a row", () => {
-    cy.contains("Delete").click()
+      cy.get(".spectrum-Checkbox-input").check({ force: true })
-    cy.wait(50)
+      cy.contains("Delete 1 row(s)").click()
-    cy.get(`[data-cy="delete-column-confirm"]`).type("nameupdated")
+      cy.get(".spectrum-Modal").contains("Delete").click()
-    cy.contains("Delete Column").click()
+      cy.contains("RoverUpdated").should("not.exist")
-    cy.contains("nameupdated").should("not.exist")
+    })
-  })
+    
-
+    if (Cypress.env("TEST_ENV")) {
-  it("deletes a table", () => {
+      // No Pagination in CI - Test env only for the next two tests
-    cy.get(".nav-item")
+      it("Adds 15 rows and checks pagination", () => {
-      .contains("dog")
+        // 10 rows per page, 15 rows should create 2 pages within table
-      .parents(".nav-item")
+        const totalRows = 16
-      .first()
+        for (let i = 1; i < totalRows; i++){
-      .within(() => {
+          cy.addRow([i])
-        cy.get(".actions .spectrum-Icon").click({ force: true })
+        }
+        cy.wait(1000)
+        cy.get(".spectrum-Pagination").within(() => {
+          cy.get(".spectrum-ActionButton").eq(1).click()
+        })
+        cy.get(".spectrum-Pagination").within(() => {
+          cy.get(".spectrum-Body--secondary").contains("Page 2")
+        })
       })
-    cy.get(".spectrum-Menu > :nth-child(2)").click()
+      
-    cy.get(`[data-cy="delete-table-confirm"]`).type("dog")
+      it("Deletes rows and checks pagination", () => {
-    cy.contains("Delete Table").click()
+        // Delete rows, removing second page of rows from table
-    cy.contains("dog").should("not.exist")
+        const deleteRows = 5
+        cy.get(".spectrum-Checkbox-input").check({ force: true })
+        cy.get(".spectrum-Table-body")
+        cy.contains("Delete 5 row(s)").click()
+        cy.get(".spectrum-Modal").contains("Delete").click()
+        cy.wait(1000)
+        
+        // Confirm table only has one page
+        cy.get(".spectrum-Pagination").within(() => {
+          cy.get(".spectrum-ActionButton").eq(1).should('not.be.enabled')
+        })
+      })
+    }
+
+    it("deletes a column", () => {
+      const columnName = "nameupdated"
+      cy.get(".title").click()
+      cy.get(".spectrum-Table-editIcon > use").click()
+      cy.contains("Delete").click()
+      cy.get('[data-cy="delete-column-confirm"]').type(columnName)
+      cy.contains("Delete Column").click()
+      cy.contains("nameupdated").should("not.exist")
+    })
+
+    it("deletes a table", () => {
+      cy.get(".nav-item")
+        .contains("dog")
+        .parents(".nav-item")
+        .first()
+        .within(() => {
+          cy.get(".actions .spectrum-Icon").click({ force: true })
+        })
+      cy.get(".spectrum-Menu > :nth-child(2)").click()
+      cy.get('[data-cy="delete-table-confirm"]').type("dog")
+      cy.contains("Delete Table").click()
+      cy.contains("dog").should("not.exist")
+    })
   })
 })

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

@@ -1,10 +0,0 @@
-context("Create a User", () => {
-  before(() => {
-    cy.login()
-  })
-
-  it("should create a user", () => {
-    cy.createUser("bbuser@test.com")
-    cy.contains("bbuser").should("be.visible")
-  })
-})

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

@@ -0,0 +1,132 @@
+import filterTests from "../support/filterTests"
+
+
+filterTests(['smoke', 'all'], () => {
+  context("Create a User and Assign Roles", () => {
+    before(() => {
+      cy.login()
+    })
+
+    it("should create a user", () => {
+      cy.createUser("bbuser@test.com")
+      cy.get(".spectrum-Table-body").should('contain', 'bbuser')
+    })
+    
+    it("should confirm there is No Access for a New User", () => {
+      // Click into the user
+      cy.contains("bbuser").click()
+      cy.wait(500)
+      // Get No Access table - Confirm it has apps in it
+      cy.get(".spectrum-Table").eq(1).should('not.contain', 'No rows found')
+      // Get Configure Roles table - Confirm it has no apps
+      cy.get(".spectrum-Table").eq(0).contains('No rows found')
+    })
+    
+    it("should assign role types", () => {
+      // 3 apps minimum required - to assign an app to each role type
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length < 3) {
+          for (let i = 1; i < 3; i++) {
+            const uuid = () => Cypress._.random(0, 1e6)
+            const name = uuid()
+            cy.createApp(name)
+          }
+        }
+      })
+      // Navigate back to the user
+      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.wait(500)
+      cy.get(".spectrum-SideNav").contains("Users").click()
+      cy.wait(500)
+      cy.get(".spectrum-Table").contains("bbuser").click()
+      cy.wait(1000)
+      for (let i = 0; i < 3; i++) {
+        cy.get(".spectrum-Table-body").eq(1).find('tr').eq(0).click()
+        cy.wait(500)
+        cy.get(".spectrum-Dialog-grid").contains("Choose an option").click().then(() => {
+          cy.wait(500)
+          if (i == 0) {
+            cy.get(".spectrum-Popover").contains("Admin").click()
+          }
+          if (i == 1) {
+            cy.get(".spectrum-Popover").contains("Power").click()
+          }
+          if (i == 2) {
+            cy.get(".spectrum-Popover").contains("Basic").click()
+          }
+          cy.wait(500)
+          cy.get(".spectrum-Button").contains("Update role").click({ force: true })
+          })
+        }
+        // Confirm roles exist within Configure roles table
+        cy.wait(500)
+        cy.get(".spectrum-Table-body").eq(0).within((assginedRoles) => {
+          expect(assginedRoles).to.contain("Admin")
+          expect(assginedRoles).to.contain("Power")
+          expect(assginedRoles).to.contain("Basic")
+        })
+      })
+      
+    it("should unassign role types", () => {
+      // Set each app within Configure roles table to 'No Access'
+      cy.get(".spectrum-Table-body").eq(0).find('tr').its('length').then((len) => {
+        for (let i = 0; i < len; i ++){
+          cy.get(".spectrum-Table-body").eq(0).find('tr').eq(0).click().then(() => {
+              cy.get(".spectrum-Picker").eq(1).click({ force: true })
+              cy.wait(500)
+              cy.get(".spectrum-Popover").contains("No Access").click()
+            })
+            cy.get(".spectrum-Button").contains("Update role").click({ force: true })
+            cy.wait(1000)
+        }
+      })
+      // Confirm Configure roles table no longer has any apps in it
+      cy.get(".spectrum-Table-body").eq(0).contains('No rows found')
+    })
+      
+    it("should enable Developer access", () => {
+      // Enable Developer access
+      cy.get(".field").eq(4).within(() => {
+        cy.get(".spectrum-Switch-input").click({ force: true })
+      })
+      // No Access table should now be empty
+      cy.get(".container").contains("No Access").parent().within(() => {
+        cy.get(".spectrum-Table").contains("No rows found")
+      })
+      
+      // Each app within Configure roles should have Admin access
+      cy.get(".spectrum-Table-body").eq(0).find('tr').its('length').then((len) => {
+        for (let i = 0; i < len; i++) {
+          cy.get(".spectrum-Table-body").eq(0).find('tr').eq(i).contains("Admin")
+          cy.wait(500)
+        }
+      })
+    })
+      
+    it("should disable Developer access", () => {
+      // Disable Developer access
+      cy.get(".field").eq(4).within(() => {
+        cy.get(".spectrum-Switch-input").click({ force: true })
+      })
+      // Configure roles table should now be empty
+      cy.get(".container").contains("Configure roles").parent().within(() => {
+        cy.get(".spectrum-Table").contains("No rows found")
+      })
+    })
+    
+    it("should delete a user", () => {
+      // Click Delete user button
+      cy.get(".spectrum-Button").contains("Delete user").click({force: true}).then(() => {
+        // Confirm deletion within modal
+        cy.wait(500)
+        cy.get(".spectrum-Dialog-grid").within(() => {
+          cy.get(".spectrum-Button").contains("Delete user").click({force: true})
+          cy.wait(4000)
+        })
+      })
+      cy.get(".spectrum-Table-body").should("not.have.text", "bbuser")
+    })
+  })
+})

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

@@ -1,152 +1,156 @@
-context("Create a View", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-    cy.createTable("data")
-    cy.addColumn("data", "group", "Text")
-    cy.addColumn("data", "age", "Number")
-    cy.addColumn("data", "rating", "Number")
 
-    // 6 Rows
+filterTests(['smoke', 'all'], () => {
-    cy.addRow(["Students", 25, 1])
+  context("Create a View", () => {
-    cy.addRow(["Students", 20, 3])
+    before(() => {
-    cy.addRow(["Students", 18, 6])
+      cy.login()
-    cy.addRow(["Students", 25, 2])
+      cy.createTestApp()
-    cy.addRow(["Teachers", 49, 5])
+      cy.createTable("data")
-    cy.addRow(["Teachers", 36, 3])
+      cy.addColumn("data", "group", "Text")
-  })
+      cy.addColumn("data", "age", "Number")
+      cy.addColumn("data", "rating", "Number")
 
-  it("creates a view", () => {
+      // 6 Rows
-    cy.contains("Create view").click()
+      cy.addRow(["Students", 25, 1])
-    cy.get(".modal-inner-wrapper").within(() => {
+      cy.addRow(["Students", 20, 3])
-      cy.get("input").type("Test View")
+      cy.addRow(["Students", 18, 6])
-      cy.get("button").contains("Create View").click({ force: true })
+      cy.addRow(["Students", 25, 2])
+      cy.addRow(["Teachers", 49, 5])
+      cy.addRow(["Teachers", 36, 3])
     })
-    cy.get(".table-title h1").contains("Test View")
+
-    cy.get(".title").then($headers => {
+    it("creates a view", () => {
-      expect($headers).to.have.length(3)
+      cy.contains("Create view").click()
-      const headers = Array.from($headers).map(header =>
+      cy.get(".modal-inner-wrapper").within(() => {
-        header.textContent.trim()
+        cy.get("input").type("Test View")
-      )
+        cy.get("button").contains("Create View").click({ force: true })
-      expect(removeSpacing(headers)).to.deep.eq(["group", "age", "rating"])
+      })
+      cy.get(".table-title h1").contains("Test View")
+      cy.get(".title").then($headers => {
+        expect($headers).to.have.length(3)
+        const headers = Array.from($headers).map(header =>
+          header.textContent.trim()
+        )
+        expect(removeSpacing(headers)).to.deep.eq(["group", "age", "rating"])
+      })
+    })
+
+    it("filters the view by age over 10", () => {
+      cy.contains("Filter").click()
+      cy.contains("Add Filter").click()
+
+      cy.get(".modal-inner-wrapper").within(() => {
+        cy.get(".spectrum-Picker-label").eq(0).click()
+        cy.contains("age").click({ force: true })
+
+        cy.get(".spectrum-Picker-label").eq(1).click()
+        cy.contains("More Than").click({ force: true })
+
+        cy.get("input").type(18)
+        cy.contains("Save").click()
+      })
+
+      cy.get(".spectrum-Table-row").get($values => {
+        expect($values).to.have.length(5)
+      })
+    })
+
+    it("creates a stats calculation view based on age", () => {
+      cy.wait(1000)
+      cy.contains("Calculate").click()
+      cy.get(".modal-inner-wrapper").within(() => {
+        cy.get(".spectrum-Picker-label").eq(0).click()
+        cy.contains("Statistics").click()
+
+        cy.get(".spectrum-Picker-label").eq(1).click()
+        cy.contains("age").click({ force: true })
+
+        cy.get(".spectrum-Button").contains("Save").click({ force: true })
+      })
+      cy.wait(1000)
+
+      cy.get(".title").then($headers => {
+        expect($headers).to.have.length(7)
+        const headers = Array.from($headers).map(header =>
+          header.textContent.trim()
+        )
+        expect(removeSpacing(headers)).to.deep.eq([
+          "field",
+          "sum",
+          "min",
+          "max",
+          "count",
+          "sumsqr",
+          "avg",
+        ])
+      })
+      cy.get(".spectrum-Table-cell").then($values => {
+        let values = Array.from($values).map(header => header.textContent.trim())
+        expect(values).to.deep.eq(["age", "155", "20", "49", "5", "5347", "31"])
+      })
+    })
+
+    it("groups the view by group", () => {
+      cy.contains("Group by").click()
+      cy.get(".modal-inner-wrapper").within(() => {
+        cy.get(".spectrum-Picker-label").eq(0).click()
+        cy.contains("group").click()
+        cy.contains("Save").click()
+      })
+      cy.wait(1000)
+      cy.contains("Students").should("be.visible")
+      cy.contains("Teachers").should("be.visible")
+
+      cy.get(".spectrum-Table-cell").then($values => {
+        let values = Array.from($values).map(header => header.textContent.trim())
+        expect(values).to.deep.eq([
+          "Students",
+          "70",
+          "20",
+          "25",
+          "3",
+          "1650",
+          "23.333333333333332",
+          "Teachers",
+          "85",
+          "36",
+          "49",
+          "2",
+          "3697",
+          "42.5",
+        ])
+      })
+    })
+
+    it("renames a view", () => {
+      cy.contains(".nav-item", "Test View")
+        .find(".actions .icon")
+        .click({ force: true })
+      cy.get(".spectrum-Menu-itemLabel").contains("Edit").click()
+      cy.get(".modal-inner-wrapper").within(() => {
+        cy.get("input").type(" Updated")
+        cy.contains("Save").click()
+      })
+      cy.wait(1000)
+      cy.contains("Test View Updated").should("be.visible")
+    })
+
+    it("deletes a view", () => {
+      cy.contains(".nav-item", "Test View Updated")
+        .find(".actions .icon")
+        .click({ force: true })
+      cy.contains("Delete").click()
+      cy.contains("Delete View").click()
+      cy.wait(500)
+      cy.contains("TestView Updated").should("not.exist")
     })
   })
 
-  it("filters the view by age over 10", () => {
+  function removeSpacing(headers) {
-    cy.contains("Filter").click()
+    let newHeaders = []
-    cy.contains("Add Filter").click()
+    for (let header of headers) {
-
+      newHeaders.push(header.replace(/\s\s+/g, " "))
-    cy.get(".modal-inner-wrapper").within(() => {
+    }
-      cy.get(".spectrum-Picker-label").eq(0).click()
+    return newHeaders
-      cy.contains("age").click({ force: true })
-
-      cy.get(".spectrum-Picker-label").eq(1).click()
-      cy.contains("More Than").click({ force: true })
-
-      cy.get("input").type(18)
-      cy.contains("Save").click()
-    })
-
-    cy.get(".spectrum-Table-row").get($values => {
-      expect($values).to.have.length(5)
-    })
-  })
-
-  it("creates a stats calculation view based on age", () => {
-    cy.wait(1000)
-    cy.contains("Calculate").click()
-    cy.get(".modal-inner-wrapper").within(() => {
-      cy.get(".spectrum-Picker-label").eq(0).click()
-      cy.contains("Statistics").click()
-
-      cy.get(".spectrum-Picker-label").eq(1).click()
-      cy.contains("age").click({ force: true })
-
-      cy.get(".spectrum-Button").contains("Save").click({ force: true })
-    })
-    cy.wait(1000)
-
-    cy.get(".title").then($headers => {
-      expect($headers).to.have.length(7)
-      const headers = Array.from($headers).map(header =>
-        header.textContent.trim()
-      )
-      expect(removeSpacing(headers)).to.deep.eq([
-        "field",
-        "sum",
-        "min",
-        "max",
-        "count",
-        "sumsqr",
-        "avg",
-      ])
-    })
-    cy.get(".spectrum-Table-cell").then($values => {
-      let values = Array.from($values).map(header => header.textContent.trim())
-      expect(values).to.deep.eq(["age", "155", "20", "49", "5", "5347", "31"])
-    })
-  })
-
-  it("groups the view by group", () => {
-    cy.contains("Group by").click()
-    cy.get(".modal-inner-wrapper").within(() => {
-      cy.get(".spectrum-Picker-label").eq(0).click()
-      cy.contains("group").click()
-      cy.contains("Save").click()
-    })
-    cy.wait(1000)
-    cy.contains("Students").should("be.visible")
-    cy.contains("Teachers").should("be.visible")
-
-    cy.get(".spectrum-Table-cell").then($values => {
-      let values = Array.from($values).map(header => header.textContent.trim())
-      expect(values).to.deep.eq([
-        "Students",
-        "70",
-        "20",
-        "25",
-        "3",
-        "1650",
-        "23.333333333333332",
-        "Teachers",
-        "85",
-        "36",
-        "49",
-        "2",
-        "3697",
-        "42.5",
-      ])
-    })
-  })
-
-  it("renames a view", () => {
-    cy.contains(".nav-item", "Test View")
-      .find(".actions .icon")
-      .click({ force: true })
-    cy.get(".spectrum-Menu-itemLabel").contains("Edit").click()
-    cy.get(".modal-inner-wrapper").within(() => {
-      cy.get("input").type(" Updated")
-      cy.contains("Save").click()
-    })
-    cy.wait(1000)
-    cy.contains("Test View Updated").should("be.visible")
-  })
-
-  it("deletes a view", () => {
-    cy.contains(".nav-item", "Test View Updated")
-      .find(".actions .icon")
-      .click({ force: true })
-    cy.contains("Delete").click()
-    cy.contains("Delete View").click()
-    cy.wait(500)
-    cy.contains("TestView Updated").should("not.exist")
-  })
-})
-
-function removeSpacing(headers) {
-  let newHeaders = []
-  for (let header of headers) {
-    newHeaders.push(header.replace(/\s\s+/g, " "))
   }
-  return newHeaders
+})
-}

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

@@ -1,84 +1,87 @@
-xcontext("Custom Theming Properties", () => {
+import filterTests from "../support/filterTests"
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-      cy.navigateToFrontend()
-    })
 
-    /* Default Values:
+filterTests(['all'], () => {
-    Button roundness = Large
+  xcontext("Custom Theming Properties", () => {
-    Accent colour = Blue 600
+      before(() => {
-    Accent colour (hover) = Blue 500
+        cy.login()
-    Navigation bar background colour = Gray 100
+        cy.createTestApp()
-    Navigation bar text colour = Gray 800 */
+        cy.navigateToFrontend()
-    it("should reset the color property values", () => {
+      })
-      // Open Theme modal and change colours  
+
-      cy.get(".spectrum-ActionButton-label").contains("Theme").click()
+      /* Default Values:
-        cy.get(".spectrum-Picker").contains("Large").click()
+      Button roundness = Large
-        .parents()
+      Accent colour = Blue 600
-        .get(".spectrum-Menu-itemLabel").contains("None").click()
+      Accent colour (hover) = Blue 500
-        changeThemeColors()
+      Navigation bar background colour = Gray 100
-        // Reset colours
+      Navigation bar text colour = Gray 800 */
-        cy.get(".spectrum-Button-label").contains("Reset").click({force: true})
+      it("should reset the color property values", () => {
-        // Check values have reset
+        // Open Theme modal and change colours  
-        checkThemeColorDefaults()
+        cy.get(".spectrum-ActionButton-label").contains("Theme").click()
-    })
+          cy.get(".spectrum-Picker").contains("Large").click()
-    
+          .parents()
-    /* Button Roundness Values:
+          .get(".spectrum-Menu-itemLabel").contains("None").click()
-    None = 0
+          changeThemeColors()
-    Small = 4px
+          // Reset colours
-    Medium = 8px
+          cy.get(".spectrum-Button-label").contains("Reset").click({force: true})
-    Large = 16px */
+          // Check values have reset
-    it("should test button roundness", () => {
+          checkThemeColorDefaults()
-      const buttonRoundnessValues = ["0", "4px", "8px", "16px"]
+      })
-      cy.wait(1000)
+      
-      // Add button, change roundness and confirm value
+      /* Button Roundness Values:
-      cy.addComponent("Button", null).then((componentId) => {
+      None = 0
-        buttonRoundnessValues.forEach(function (item, index){
+      Small = 4px
-          cy.get(".spectrum-ActionButton-label").contains("Theme").click()
+      Medium = 8px
-          cy.get(".setting").contains("Button roundness").parent()
+      Large = 16px */
-          .get(".select-wrapper").click()
+      it("should test button roundness", () => {
-          cy.get(".spectrum-Popover").find('li').eq(index).click()
+        const buttonRoundnessValues = ["0", "4px", "8px", "16px"]
-          cy.get(".spectrum-Button").contains("View changes").click({force: true})
+        cy.wait(1000)
-          cy.reload()
+        // Add button, change roundness and confirm value
-          cy.getComponent(componentId)
+        cy.addComponent("Button", null).then((componentId) => {
-        .parents(".svelte-xiqd1c").eq(0).should('have.attr', 'style').and('contains', `--buttonBorderRadius:${item}`)
+          buttonRoundnessValues.forEach(function (item, index){
+            cy.get(".spectrum-ActionButton-label").contains("Theme").click()
+            cy.get(".setting").contains("Button roundness").parent()
+            .get(".select-wrapper").click()
+            cy.get(".spectrum-Popover").find('li').eq(index).click()
+            cy.get(".spectrum-Button").contains("View changes").click({force: true})
+            cy.reload()
+            cy.getComponent(componentId)
+          .parents(".svelte-xiqd1c").eq(0).should('have.attr', 'style').and('contains', `--buttonBorderRadius:${item}`)
+        })
       })
     })
+      
+      const changeThemeColors = () => {
+        // Changes the theme colours
+        cy.get(".spectrum-FieldLabel").contains("Accent color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .find('[title="Red 400"]').click()
+          cy.get(".spectrum-FieldLabel").contains("Accent color (hover)")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .find('[title="Orange 400"]').click()
+          cy.get(".spectrum-FieldLabel").contains("Navigation bar background color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .find('[title="Yellow 400"]').click()
+          cy.get(".spectrum-FieldLabel").contains("Navigation bar text color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .find('[title="Green 400"]').click()
+      }
+      
+      const checkThemeColorDefaults = () => {
+        cy.get(".spectrum-FieldLabel").contains("Accent color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .get('[title="Blue 600"]').children().find('[aria-label="Checkmark"]')
+          cy.get(".spectrum-Dialog-grid").click()
+          cy.get(".spectrum-FieldLabel").contains("Accent color (hover)")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .get('[title="Blue 500"]').children().find('[aria-label="Checkmark"]')
+          cy.get(".spectrum-Dialog-grid").click()
+          cy.get(".spectrum-FieldLabel").contains("Navigation bar background color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .get('[title="Gray 100"]').children().find('[aria-label="Checkmark"]')
+          cy.get(".spectrum-Dialog-grid").click()
+          cy.get(".spectrum-FieldLabel").contains("Navigation bar text color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .get('[title="Gray 800"]').children().find('[aria-label="Checkmark"]')
+      }
   })
-    
-    const changeThemeColors = () => {
-      // Changes the theme colours
-      cy.get(".spectrum-FieldLabel").contains("Accent color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .find('[title="Red 400"]').click()
-        cy.get(".spectrum-FieldLabel").contains("Accent color (hover)")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .find('[title="Orange 400"]').click()
-        cy.get(".spectrum-FieldLabel").contains("Navigation bar background color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .find('[title="Yellow 400"]').click()
-        cy.get(".spectrum-FieldLabel").contains("Navigation bar text color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .find('[title="Green 400"]').click()
-    }
-    
-    const checkThemeColorDefaults = () => {
-      cy.get(".spectrum-FieldLabel").contains("Accent color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .get('[title="Blue 600"]').children().find('[aria-label="Checkmark"]')
-        cy.get(".spectrum-Dialog-grid").click()
-        cy.get(".spectrum-FieldLabel").contains("Accent color (hover)")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .get('[title="Blue 500"]').children().find('[aria-label="Checkmark"]')
-        cy.get(".spectrum-Dialog-grid").click()
-        cy.get(".spectrum-FieldLabel").contains("Navigation bar background color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .get('[title="Gray 100"]').children().find('[aria-label="Checkmark"]')
-        cy.get(".spectrum-Dialog-grid").click()
-        cy.get(".spectrum-FieldLabel").contains("Navigation bar text color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .get('[title="Gray 800"]').children().find('[aria-label="Checkmark"]')
-    }
-
 })

packages/builder/cypress/integration/datasources/datasourceWizard.spec.js

@@ -0,0 +1,43 @@
+import filterTests from "../../support/filterTests"
+
+filterTests(['all'], () => {
+  context("Datasource Wizard", () => {
+    if (Cypress.env("TEST_ENV")) {
+      before(() => {
+        cy.login()
+        cy.createTestApp()
+      })
+
+    it("should navigate in and out of a datasource via wizard", () => {
+      // Select PostgreSQL and add config (without fetch)
+      const datasource = "Oracle"
+      cy.selectExternalDatasource(datasource)
+      cy.addDatasourceConfig(datasource, true)
+      
+      // Navigate back within datasource wizard
+      cy.get(".spectrum-Dialog-grid").within(() => {
+        cy.get(".spectrum-Button").contains("Back").click({ force: true })
+        cy.wait(1000)
+      })
+    
+      // Select PostgreSQL datasource again
+      cy.get(".item-list").contains(datasource).click()
+      cy.get(".spectrum-Dialog-grid").within(() => {
+        cy.get(".spectrum-Button").contains("Continue").click({ force: true })
+      })
+      
+      // Fetch tables after selection
+      // Previously entered config should not have been saved
+      // Config is back to default values
+      // Modal will close and provide 500 error
+      cy.intercept('**/datasources').as('datasourceConnection')
+      cy.get(".spectrum-Dialog-grid").within(() => {
+        cy.get(".spectrum-Button").contains("Save and fetch tables").click({ force: true })
+      })
+      cy.wait("@datasourceConnection")
+      cy.get("@datasourceConnection").its('response.body')
+          .should('have.property', 'status', 500)
+      })
+    }
+  })
+})

packages/builder/cypress/integration/datasources/mySql.spec.js

@@ -0,0 +1,191 @@
+import filterTests from "../../support/filterTests"
+
+filterTests(['all'], () => {
+    context("MySQL Datasource Testing", () => {
+        if (Cypress.env("TEST_ENV")) {
+        
+            before(() => {
+            cy.login()
+            cy.createTestApp()
+            })
+            const datasource = "MySQL"
+            const queryName = "Cypress Test Query"
+            const queryRename = "CT Query Rename"
+            
+            it("Should add MySQL data source without configuration", () => {
+                // Select MySQL data source
+                cy.selectExternalDatasource(datasource)
+                // Attempt to fetch tables without applying configuration
+                cy.intercept('**/datasources').as('datasource')
+                cy.get(".spectrum-Button")
+                .contains("Save and fetch tables")
+                .click({ force: true })
+                // Intercept Request after button click & apply assertions
+                cy.wait("@datasource")
+                cy.get("@datasource").its('response.body')
+                .should('have.property', 'message', 'connect ECONNREFUSED 127.0.0.1:3306')
+                cy.get("@datasource").its('response.body')
+                .should('have.property', 'status', 500)
+            })
+            
+            it("should add MySQL data source and fetch tables", () => {
+                // Add & configure MySQL data source
+                cy.selectExternalDatasource(datasource)
+                cy.intercept('**/datasources').as('datasource')
+                cy.addDatasourceConfig(datasource)
+                // Check response from datasource after adding configuration
+                cy.wait("@datasource")
+                cy.get("@datasource").its('response.statusCode')
+                .should('eq', 200)
+                // Confirm fetch tables was successful
+                cy.get(".spectrum-Table-body").eq(0)
+                .find('tr')
+                .its('length')
+                .should('be.gt', 0)
+            })
+            
+            it("should check table fetching error", () => {
+                // MySQL test data source contains tables without primary keys
+                cy.get(".spectrum-InLineAlert")
+                .should('contain', 'Error fetching tables')
+                .and('contain', 'No primary key constraint found')
+            })
+            
+            it("should define a One relationship type", () => {
+                // Select relationship type & configure
+                cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Picker").eq(0).click()
+                    cy.get(".spectrum-Popover").contains("One").click()
+                    cy.get(".spectrum-Picker").eq(1).click()
+                    cy.get(".spectrum-Popover").contains("REGIONS").click()
+                    cy.get(".spectrum-Picker").eq(2).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    cy.get(".spectrum-Picker").eq(3).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                    cy.get(".spectrum-Picker").eq(4).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    // Save relationship & reload page
+                    cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                    cy.reload()
+                })
+                // Confirm table length & column name
+                cy.get(".spectrum-Table-body").eq(1)
+                .find('tr')
+                .its('length')
+                .should('eq', 1)
+                cy.get(".spectrum-Table-cell").should('contain', "COUNTRIES to REGIONS")
+            })
+            
+            it("should define a Many relationship type", () => {
+                // Select relationship type & configure
+                cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Picker").eq(0).click()
+                    cy.get(".spectrum-Popover").contains("Many").click()
+                    cy.get(".spectrum-Picker").eq(1).click()
+                    cy.get(".spectrum-Popover").contains("LOCATIONS").click()
+                    cy.get(".spectrum-Picker").eq(2).click()
+                    cy.get(".spectrum-Popover").contains("REGIONS").click()
+                    cy.get(".spectrum-Picker").eq(3).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                    cy.get(".spectrum-Picker").eq(4).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
+                    cy.get(".spectrum-Picker").eq(5).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    // Save relationship & reload page
+                    cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                    cy.reload()
+                    cy.wait(1000)
+                })
+                // Confirm table length & relationship name
+                cy.get(".spectrum-Table-body").eq(1)
+                .find('tr')
+                .its('length')
+                .should('eq', 2)
+                cy.get(".spectrum-Table-cell")
+                .should('contain', "LOCATIONS through COUNTRIES → REGIONS")
+            })
+            
+            it("should delete relationships", () => {
+                // Delete both relationships
+                cy.get(".spectrum-Table-body")
+                .eq(1).find('tr').its('length')
+                .then((len) => {
+                    for (let i = 0; i < len; i++) {
+                        cy.get(".spectrum-Table-body").eq(1).within(() => {
+                            cy.get(".spectrum-Table-row").eq(0).click()
+                            cy.wait(500)
+                        })
+                        cy.get(".spectrum-Dialog-grid").within(() => {
+                            cy.get(".spectrum-Button").contains("Delete").click({ force: true })
+                        })
+                        cy.reload()
+                    }
+                    // Confirm relationships no longer exist
+                    cy.get(".spectrum-Body").should('contain', 'No relationships configured')
+                })
+            })
+            
+            it("should add a query", () => {
+                // Add query
+                cy.get(".spectrum-Button").contains("Add query").click({ force: true })
+                cy.get(".spectrum-Form-item").eq(0).within(() => {
+                    cy.get("input").type(queryName)
+                })
+                // Insert Query within Fields section
+                cy.get(".CodeMirror textarea").eq(0)
+                .type("SELECT * FROM books", { force: true })
+                // Intercept query execution
+                cy.intercept('**/queries/preview').as('query')
+                cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
+                cy.wait(500)
+                cy.wait("@query")
+                // Assert against Status Code & Body
+                cy.get("@query").its('response.statusCode')
+                .should('eq', 200)
+                cy.get("@query").its('response.body')
+                .should('not.be.empty')
+                // Save query
+                cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+                cy.get(".nav-item").should('contain', queryName)
+            })
+            
+            it("should duplicate a query", () => {
+                // Get last nav item - The query
+                cy.get(".nav-item").last().within(() => {
+                        cy.get(".icon").eq(1).click({ force: true })
+                    })
+                // Select and confirm duplication
+                cy.get(".spectrum-Menu").contains("Duplicate").click()
+                cy.get(".nav-item").should('contain', queryName + ' (1)')
+            })
+            
+            it("should edit a query name", () => {
+                // Rename query
+                cy.get(".spectrum-Form-item").eq(0).within(() => {
+                    cy.get("input").clear().type(queryRename)
+                })
+                // Save query
+                cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+                cy.get(".nav-item").should('contain', queryRename)
+            })
+            
+            it("should delete a query", () => {
+                // Get last nav item - The query
+                for (let i = 0; i < 2; i++) {
+                    cy.get(".nav-item").last().within(() => {
+                        cy.get(".icon").eq(1).click({ force: true })
+                    })
+                    // Select Delete
+                    cy.get(".spectrum-Menu").contains("Delete").click()
+                    cy.get(".spectrum-Button").contains("Delete Query").click({ force: true })
+                    cy.wait(1000)
+                }
+                // Confirm deletion
+                cy.get(".nav-item").should('not.contain', queryName)
+                cy.get(".nav-item").should('not.contain', queryRename)
+            })
+        }
+    })
+})

packages/builder/cypress/integration/datasources/oracle.spec.js

@@ -0,0 +1,196 @@
+import filterTests from "../../support/filterTests"
+
+filterTests(['all'], () => {
+    context("Oracle Datasource Testing", () => {
+        if (Cypress.env("TEST_ENV")) {
+
+            before(() => {
+            cy.login()
+            cy.createTestApp()
+            })
+            const datasource = "Oracle"
+            const queryName = "Cypress Test Query"
+            const queryRename = "CT Query Rename"
+            
+            it("Should add Oracle data source and skip table fetch", () => {
+                // Select Oracle data source
+                cy.selectExternalDatasource(datasource)
+                // Skip table fetch - no config added
+                cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true })
+                cy.wait(500)
+                // Confirm config contains localhost
+                cy.get(".spectrum-Textfield-input").eq(1).should('have.value', 'localhost')
+                // Add another Oracle data source, configure & skip table fetch
+                cy.selectExternalDatasource(datasource)
+                cy.addDatasourceConfig(datasource, true)
+                // Confirm config and no tables
+                cy.get(".spectrum-Textfield-input").eq(1).should('have.value', Cypress.env("oracle").HOST)
+                cy.get(".spectrum-Body").eq(2).should('contain', 'No tables found.')
+            })
+            
+            it("Should add Oracle data source and fetch tables without configuration", () => {
+                // Select Oracle data source
+                cy.selectExternalDatasource(datasource)
+                // Attempt to fetch tables without applying configuration
+                cy.intercept('**/datasources').as('datasource')
+                cy.get(".spectrum-Button")
+                .contains("Save and fetch tables")
+                .click({ force: true })
+                // Intercept Request after button click & apply assertions
+                cy.wait("@datasource")
+                cy.get("@datasource").its('response.body')
+                .should('have.property', 'status', 500)
+            })
+            
+            it("should add Oracle data source and fetch tables", () => {
+                // Add & configure Oracle data source
+                cy.selectExternalDatasource(datasource)
+                cy.intercept('**/datasources').as('datasource')
+                cy.addDatasourceConfig(datasource)
+                // Check response from datasource after adding configuration
+                cy.wait("@datasource")
+                cy.get("@datasource").its('response.statusCode')
+                .should('eq', 200)
+                // Confirm fetch tables was successful
+                cy.get(".spectrum-Table-body").eq(0)
+                .find('tr')
+                .its('length')
+                .should('be.gt', 0)
+            })
+            
+            it("should define a One relationship type", () => {
+                // Select relationship type & configure
+                cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Picker").eq(0).click()
+                    cy.get(".spectrum-Popover").contains("One").click()
+                    cy.get(".spectrum-Picker").eq(1).click()
+                    cy.get(".spectrum-Popover").contains("REGIONS").click()
+                    cy.get(".spectrum-Picker").eq(2).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    cy.get(".spectrum-Picker").eq(3).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                    cy.get(".spectrum-Picker").eq(4).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    // Save relationship & reload page
+                    cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                    cy.reload()
+                })
+                // Confirm table length & column name
+                cy.get(".spectrum-Table-body").eq(1)
+                .find('tr')
+                .its('length')
+                .should('eq', 1)
+                cy.get(".spectrum-Table-cell").should('contain', "COUNTRIES to REGIONS")
+            })
+            
+            it("should define a Many relationship type", () => {
+                // Select relationship type & configure
+                cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Picker").eq(0).click()
+                    cy.get(".spectrum-Popover").contains("Many").click()
+                    cy.get(".spectrum-Picker").eq(1).click()
+                    cy.get(".spectrum-Popover").contains("LOCATIONS").click()
+                    cy.get(".spectrum-Picker").eq(2).click()
+                    cy.get(".spectrum-Popover").contains("REGIONS").click()
+                    cy.get(".spectrum-Picker").eq(3).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                    cy.get(".spectrum-Picker").eq(4).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
+                    cy.get(".spectrum-Picker").eq(5).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    // Save relationship & reload page
+                    cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                    cy.reload()
+                })
+                // Confirm table length & relationship name
+                cy.get(".spectrum-Table-body").eq(1)
+                .find('tr')
+                .its('length')
+                .should('eq', 2)
+                cy.get(".spectrum-Table-cell")
+                .should('contain', "LOCATIONS through COUNTRIES → REGIONS")
+            })
+            
+            it("should delete relationships", () => {
+                // Delete both relationships
+                cy.get(".spectrum-Table-body")
+                .eq(1).find('tr').its('length')
+                .then((len) => {
+                    for (let i = 0; i < len; i++) {
+                        cy.get(".spectrum-Table-body").eq(1).within(() => {
+                            cy.get(".spectrum-Table-row").eq(0).click()
+                            cy.wait(500)
+                        })
+                        cy.get(".spectrum-Dialog-grid").within(() => {
+                            cy.get(".spectrum-Button").contains("Delete").click({ force: true })
+                        })
+                        cy.reload()
+                    }
+                    // Confirm relationships no longer exist
+                    cy.get(".spectrum-Body").should('contain', 'No relationships configured')
+                })
+            })
+            
+            it("should add a query", () => {
+                // Add query
+                cy.get(".spectrum-Button").contains("Add query").click({ force: true })
+                cy.get(".spectrum-Form-item").eq(0).within(() => {
+                    cy.get("input").type(queryName)
+                })
+                // Insert Query within Fields section
+                cy.get(".CodeMirror textarea").eq(0)
+                .type("SELECT * FROM JOBS", { force: true })
+                // Intercept query execution
+                cy.intercept('**/queries/preview').as('query')
+                cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
+                cy.wait(500)
+                cy.wait("@query")
+                // Assert against Status Code & Body
+                cy.get("@query").its('response.statusCode')
+                .should('eq', 200)
+                cy.get("@query").its('response.body')
+                .should('not.be.empty')
+                // Save query
+                cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+                cy.get(".nav-item").should('contain', queryName)
+            })
+            
+            it("should duplicate a query", () => {
+                // Get query nav item
+                cy.get(".nav-item").contains(queryName).parent().within(() => {
+                    cy.get(".spectrum-Icon").eq(1).click({ force: true })  
+                })
+                // Select and confirm duplication
+                cy.get(".spectrum-Menu").contains("Duplicate").click()
+                cy.get(".nav-item").should('contain', queryName + ' (1)')
+            })
+            
+            it("should edit a query name", () => {
+                // Rename query
+                cy.get(".spectrum-Form-item").eq(0).within(() => {
+                    cy.get("input").clear().type(queryRename)
+                })
+                // Save query
+                cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+                cy.get(".nav-item").should('contain', queryRename)
+            })
+            
+            it("should delete a query", () => {
+                // Get query nav item - QueryName
+                cy.get(".nav-item").contains(queryName).parent().within(() => {
+                    cy.get(".spectrum-Icon").eq(1).click({ force: true })  
+                })
+                
+                // Select Delete
+                cy.get(".spectrum-Menu").contains("Delete").click()
+                cy.get(".spectrum-Button").contains("Delete Query").click({ force: true })
+                cy.wait(1000)
+                
+                // Confirm deletion
+                cy.get(".nav-item").should('not.contain', queryName)
+            })
+        }
+    })
+})

packages/builder/cypress/integration/datasources/postgreSql.spec.js

@@ -0,0 +1,241 @@
+import filterTests from "../../support/filterTests"
+
+filterTests(['all'], () => {
+    context("PostgreSQL Datasource Testing", () => {
+        if (Cypress.env("TEST_ENV")) {
+        
+            before(() => {
+            cy.login()
+            cy.createTestApp()
+            })
+            const datasource = "PostgreSQL"
+            const queryName = "Cypress Test Query"
+            const queryRename = "CT Query Rename"
+            
+            it("Should add PostgreSQL data source without configuration", () => {
+                // Select PostgreSQL data source
+                cy.selectExternalDatasource(datasource)
+                // Attempt to fetch tables without applying configuration
+                cy.intercept('**/datasources').as('datasource')
+                cy.get(".spectrum-Button")
+                .contains("Save and fetch tables")
+                .click({ force: true })
+                // Intercept Request after button click & apply assertions
+                cy.wait("@datasource")
+                cy.get("@datasource").its('response.body')
+                .should('have.property', 'message', 'connect ECONNREFUSED 127.0.0.1:5432')
+                cy.get("@datasource").its('response.body')
+                .should('have.property', 'status', 500)
+            })
+            
+            it("should add PostgreSQL data source and fetch tables", () => {
+                // Add & configure PostgreSQL data source
+                cy.selectExternalDatasource(datasource)
+                cy.intercept('**/datasources').as('datasource')
+                cy.addDatasourceConfig(datasource)
+                // Check response from datasource after adding configuration
+                cy.wait("@datasource")
+                cy.get("@datasource").its('response.statusCode')
+                .should('eq', 200)
+                // Confirm fetch tables was successful
+                cy.get(".spectrum-Table-body").eq(0)
+                .find('tr')
+                .its('length')
+                .should('be.gt', 0)
+            })
+            
+            it("should define a One relationship type", () => {
+                // Select relationship type & configure
+                cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Picker").eq(0).click()
+                    cy.get(".spectrum-Popover").contains("One").click()
+                    cy.get(".spectrum-Picker").eq(1).click()
+                    cy.get(".spectrum-Popover").contains("REGIONS").click()
+                    cy.get(".spectrum-Picker").eq(2).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    cy.get(".spectrum-Picker").eq(3).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                    cy.get(".spectrum-Picker").eq(4).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    // Save relationship & reload page
+                    cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                    cy.reload()
+                })
+                // Confirm table length & column name
+                cy.get(".spectrum-Table-body").eq(1)
+                .find('tr')
+                .its('length')
+                .should('eq', 1)
+                cy.get(".spectrum-Table-cell").should('contain', "COUNTRIES to REGIONS")
+            })
+            
+            it("should define a Many relationship type", () => {
+                // Select relationship type & configure
+                cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Picker").eq(0).click()
+                    cy.get(".spectrum-Popover").contains("Many").click()
+                    cy.get(".spectrum-Picker").eq(1).click()
+                    cy.get(".spectrum-Popover").contains("LOCATIONS").click()
+                    cy.get(".spectrum-Picker").eq(2).click()
+                    cy.get(".spectrum-Popover").contains("REGIONS").click()
+                    cy.get(".spectrum-Picker").eq(3).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                    cy.get(".spectrum-Picker").eq(4).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
+                    cy.get(".spectrum-Picker").eq(5).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    // Save relationship & reload page
+                    cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                    cy.reload()
+                })
+                // Confirm table length & relationship name
+                cy.get(".spectrum-Table-body").eq(1)
+                .find('tr')
+                .its('length')
+                .should('eq', 2)
+                cy.get(".spectrum-Table-cell")
+                .should('contain', "LOCATIONS through COUNTRIES → REGIONS")
+            })
+            
+            it("should delete a relationship", () => {
+                cy.get(".hierarchy-items-container").contains(datasource).click()
+                cy.reload()
+                // Delete one relationship
+                cy.get(".spectrum-Table-body").eq(1).within(() => {
+                    cy.get(".spectrum-Table-row").eq(0).click()
+                    cy.wait(500)
+                    })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Button").contains("Delete").click({ force: true })
+                    })
+                cy.reload()
+                // Confirm relationship was deleted
+                cy.get(".spectrum-Table-body")
+                .eq(1).find('tr').its('length').should('eq', 1)
+            })
+            
+            it("should add a query", () => {
+                // Add query
+                cy.get(".spectrum-Button").contains("Add query").click({ force: true })
+                cy.get(".spectrum-Form-item").eq(0).within(() => {
+                    cy.get("input").type(queryName)
+                })
+                // Insert Query within Fields section
+                cy.get(".CodeMirror textarea").eq(0)
+                .type("SELECT * FROM books", { force: true })
+                // Intercept query execution
+                cy.intercept('**/queries/preview').as('query')
+                cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
+                cy.wait(500)
+                cy.wait("@query")
+                // Assert against Status Code & Body
+                cy.get("@query").its('response.statusCode')
+                .should('eq', 200)
+                cy.get("@query").its('response.body')
+                .should('not.be.empty')
+                // Save query
+                cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+                cy.get(".hierarchy-items-container").should('contain', queryName)
+            })
+            
+            it("should switch to schema with no tables", () => {
+                // Switch Schema - To one without any tables
+                cy.get(".hierarchy-items-container").contains(datasource).click()
+                switchSchema("randomText")
+                
+                // No tables displayed
+                cy.get(".spectrum-Body").eq(2).should('contain', 'No tables found')
+                
+                // Previously created query should be visible
+                cy.get(".spectrum-Table-body").should('contain', queryName)
+            })
+            
+            it("should switch schemas", () => {
+                // Switch schema - To one with tables
+                switchSchema("1")
+                
+                // Confirm tables exist - Check for specific one
+                cy.get(".spectrum-Table-body").eq(0).should('contain', 'test')
+                cy.get(".spectrum-Table-body").eq(0).find('tr').its('length').should('eq', 1)
+                
+                // Confirm specific table visible within left nav bar
+                cy.get(".hierarchy-items-container").should('contain', 'test')
+                
+                // Switch back to public schema
+                switchSchema("public")
+                
+                // Confirm tables exist - again
+                cy.get(".spectrum-Table-body").eq(0).should('contain', 'REGIONS')
+                cy.get(".spectrum-Table-body").eq(0)
+                .find('tr').its('length').should('be.gt', 1)
+                
+                // Confirm specific table visible within left nav bar
+                cy.get(".hierarchy-items-container").should('contain', 'REGIONS')
+                
+                // No relationships and one query
+                cy.get(".spectrum-Body").eq(3).should('contain', 'No relationships configured.')
+                cy.get(".spectrum-Table-body").eq(1).should('contain', queryName)
+            })
+            
+            it("should duplicate a query", () => {
+                // Get last nav item - The query
+                cy.get(".nav-item").last().within(() => {
+                        cy.get(".icon").eq(1).click({ force: true })
+                    })
+                // Select and confirm duplication
+                cy.get(".spectrum-Menu").contains("Duplicate").click()
+                cy.get(".nav-item").should('contain', queryName + ' (1)')
+            })
+            
+            it("should edit a query name", () => {
+                // Access query
+                cy.get(".hierarchy-items-container").contains(queryName + ' (1)').click()
+                
+                // Rename query
+                cy.get(".spectrum-Form-item").eq(0).within(() => {
+                    cy.get("input").clear().type(queryRename)
+                })
+                
+                // Run and Save query
+                cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
+                cy.wait(500)
+                cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+                cy.get(".nav-item").should('contain', queryRename)
+            })
+            
+            it("should delete a query", () => {
+                // Get last nav item - The query
+                for (let i = 0; i < 2; i++) {
+                    cy.get(".nav-item").last().within(() => {
+                        cy.get(".icon").eq(1).click({ force: true })
+                    })
+                    // Select Delete
+                    cy.get(".spectrum-Menu").contains("Delete").click()
+                    cy.get(".spectrum-Button").contains("Delete Query").click({ force: true })
+                    cy.wait(1000)
+                }
+                // Confirm deletion
+                cy.get(".nav-item").should('not.contain', queryName)
+                cy.get(".nav-item").should('not.contain', queryRename)
+            })
+            
+            const switchSchema = (schema) => {
+                // Edit configuration - Change Schema
+                cy.get(".spectrum-Textfield").eq(6).within(() => {
+                    cy.get('input').clear().type(schema)
+                })
+                // Save configuration & fetch
+                cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                cy.get(".spectrum-Button").contains("Fetch tables").click({ force: true })
+                // Click fetch tables again within modal
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Button").contains("Fetch tables").click({ force: true })
+                })
+                cy.reload()
+                cy.wait(5000)
+            }
+        }
+    })
+})

packages/builder/cypress/integration/datasources/rest.spec.js

@@ -0,0 +1,43 @@
+import filterTests from "../../support/filterTests"
+
+filterTests(['smoke', 'all'], () => {
+    context("REST Datasource Testing", () => {
+        before(() => {
+          cy.login()
+          cy.createTestApp()
+        })
+        
+        const datasource = "REST"
+        const restUrl = "https://api.openbrewerydb.org/breweries"
+        
+        it("Should add REST data source with incorrect API", () => {
+            // Select REST data source
+            cy.selectExternalDatasource(datasource)
+            // Enter incorrect api & attempt to send query
+            cy.wait(500)
+            cy.get(".spectrum-Button").contains("Add query").click({ force: true })
+            cy.intercept('**/preview').as('queryError')
+            cy.get("input").clear().type("random text")
+            cy.get(".spectrum-Button").contains("Send").click({ force: true })
+            // Intercept Request after button click & apply assertions
+            cy.wait("@queryError")
+            cy.get("@queryError").its('response.body')
+            .should('have.property', 'message', 'Invalid URL: http://random text?')
+            cy.get("@queryError").its('response.body')
+            .should('have.property', 'status', 400)
+        })
+        
+        it("should add and configure a REST datasource", () => {
+            // Select REST datasource and create query
+            cy.selectExternalDatasource(datasource)
+            cy.wait(500)
+            // createRestQuery confirms query creation
+            cy.createRestQuery("GET", restUrl)
+            // Confirm status code response within REST datasource
+            cy.get(".spectrum-FieldLabel")
+            .contains("Status")
+            .children()
+            .should('contain', 200)
+        })
+    })
+})

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

@@ -0,0 +1,116 @@
+import filterTests from "../support/filterTests"
+
+filterTests(['smoke', 'all'], () => {
+  context("Query Level Transformers", () => {
+    before(() => {
+      cy.login()
+      cy.deleteApp("Cypress Tests")
+      cy.createApp("Cypress Tests")
+    })
+      
+    it("should write a transformer function", () => {
+        // Add REST datasource - contains API for breweries
+        const datasource = "REST"
+        const restUrl = "https://api.openbrewerydb.org/breweries"
+        cy.selectExternalDatasource(datasource)
+        cy.createRestQuery("GET", restUrl)
+        cy.get(".spectrum-Tabs-itemLabel").contains("Transformer").click()
+        // Get Transformer Function from file
+        cy.readFile("cypress/support/queryLevelTransformerFunction.js").then((transformerFunction) => {
+          cy.get(".CodeMirror textarea")
+          // Highlight current text and overwrite with file contents
+          .type(Cypress.platform === 'darwin' ? '{cmd}a' : '{ctrl}a', { force: true })
+          .type(transformerFunction, { parseSpecialCharSequences: false })
+        })
+        // Send Query
+        cy.intercept('**/queries/preview').as('query')
+        cy.get(".spectrum-Button").contains("Send").click({ force: true })
+        cy.wait("@query")
+        // Assert against Status Code, body, & body rows
+        cy.get("@query").its('response.statusCode')
+        .should('eq', 200)
+        cy.get("@query").its('response.body').should('not.be.empty')
+        cy.get("@query").its('response.body.rows').should('not.be.empty')
+      })
+        
+    it("should add data to the previous query", () => {
+      // Add REST datasource - contains API for breweries
+      const datasource = "REST"
+      const restUrl = "https://api.openbrewerydb.org/breweries"
+      cy.selectExternalDatasource(datasource)
+      cy.createRestQuery("GET", restUrl)
+      cy.get(".spectrum-Tabs-itemLabel").contains("Transformer").click()
+      // Get Transformer Function with Data from file
+      cy.readFile("cypress/support/queryLevelTransformerFunctionWithData.js").then((transformerFunction) => {
+        //console.log(transformerFunction[1])
+        cy.get(".CodeMirror textarea")
+        // Highlight current text and overwrite with file contents
+        .type(Cypress.platform === 'darwin' ? '{cmd}a' : '{ctrl}a', { force: true })
+        .type(transformerFunction, { parseSpecialCharSequences: false })
+      })
+      // Send Query
+      cy.intercept('**/queries/preview').as('query')
+      cy.get(".spectrum-Button").contains("Send").click({ force: true })
+      cy.wait("@query")
+      // Assert against Status Code, body, & body rows
+      cy.get("@query").its('response.statusCode')
+      .should('eq', 200)
+      cy.get("@query").its('response.body').should('not.be.empty')
+      cy.get("@query").its('response.body.rows').should('not.be.empty')
+    })
+    
+    it("should run an invalid query within the transformer section", () => {
+      // Add REST datasource - contains API for breweries
+      const datasource = "REST"
+      const restUrl = "https://api.openbrewerydb.org/breweries"
+      cy.selectExternalDatasource(datasource)
+      cy.createRestQuery("GET", restUrl)
+      cy.get(".spectrum-Tabs-itemLabel").contains("Transformer").click()
+      // Clear the code box and add "test"
+      cy.get(".CodeMirror textarea")
+      .type(Cypress.platform === 'darwin' ? '{cmd}a' : '{ctrl}a', { force: true })
+      .type("test")
+      // Run Query and intercept
+      cy.intercept('**/preview').as('queryError')
+      cy.get(".spectrum-Button").contains("Send").click({ force: true })
+      cy.wait("@queryError")
+      cy.wait(500)
+      // Assert against message and status for the query error
+      cy.get("@queryError").its('response.body').should('have.property', 'message', "test is not defined")
+      cy.get("@queryError").its('response.body').should('have.property', 'status', 400)
+    })
+    
+    xit("should run an invalid query via POST request", () => {
+      // POST request with transformer as null
+      cy.request({method: 'POST',
+      url: `${Cypress.config().baseUrl}/api/queries/`,
+      body: {fields : {"headers":{},"queryString":null,"path":null},
+      parameters : [],
+      schema : {},
+      name : "test",
+      queryVerb : "read",
+      transformer : null,
+      datasourceId: "test"},
+      // Expected 400 error - Transformer must be a string
+      failOnStatusCode: false}).then((response) => {
+        expect(response.status).to.equal(400)
+        expect(response.body.message).to.include('Invalid body - "transformer" must be a string')
+      })
+    })
+    
+    xit("should run an empty query", () => {
+      // POST request with Transformer as an empty string
+      cy.request({method: 'POST',
+      url: `${Cypress.config().baseUrl}/api/queries/preview`,
+      body: {fields : {"headers":{},"queryString":null,"path":null},
+      queryVerb : "read",
+      transformer : "",
+      datasourceId: "test"},
+      // Expected 400 error - Transformer is not allowed to be empty
+      failOnStatusCode: false}).then((response) => {
+        expect(response.status).to.equal(400)
+        expect(response.body.message).to.include('Invalid body - "transformer" is not allowed to be empty')
+      })
+    })
+  })
+})

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

@@ -1,103 +1,133 @@
-context("Rename an App", () => {
+import filterTests from "../support/filterTests"
-    beforeEach(() => {
-      cy.login()
-      cy.createTestApp()
-    })
 
-it("should rename an unpublished application", () => {
+filterTests(['all'], () => {
-    const appRename = "Cypress Renamed"
+    context("Rename an App", () => {
-    // Rename app, Search for app, Confirm name was changed
+        beforeEach(() => {
-    cy.get(".home-logo").click()
+        cy.login()
-    renameApp(appRename)
+        cy.createTestApp()
-    cy.searchForApplication(appRename)
-    cy.get(".appTable").find(".title").should("have.length", 1)
-    cy.deleteApp(appRename)
-})
-    
-xit("Should rename a published application", () => {
-    // It is not possible to rename a published application
-    const appRename = "Cypress Renamed"
-    // Publish the app
-    cy.get(".toprightnav")
-    cy.get(".spectrum-Button").contains("Publish").click({force: true})
-    cy.get(".spectrum-Dialog-grid")
-        .within(() => {
-            // Click publish again within the modal
-            cy.get(".spectrum-Button").contains("Publish").click({force: true})
         })
-    // Rename app, Search for app, Confirm name was changed
-    cy.get(".home-logo").click()
-    renameApp(appRename, true)
-    cy.searchForApplication(appRename)
-    cy.get(".appTable").find(".title").should("have.length", 1)
-})
 
-it("Should try to rename an application to have no name", () => {
+    it("should rename an unpublished application", () => {
-    cy.get(".home-logo").click()
+        const appName = "Cypress Tests"
-    renameApp(" ", false, true)
+        const appRename = "Cypress Renamed"
-    // Close modal and confirm name has not been changed
+        // Rename app, Search for app, Confirm name was changed
-    cy.get(".spectrum-Dialog-grid").contains("Cancel").click()
+        cy.get(".home-logo").click()
-    cy.searchForApplication("Cypress Tests")
+        renameApp(appName, appRename)
-    cy.get(".appTable").find(".title").should("have.length", 1)
+        cy.reload()
-})
+        cy.wait(1000)
-
+        cy.searchForApplication(appRename)
-xit("Should create two applications with the same name", () => {
+        cy.get(".appTable").find(".title").should("have.length", 1)
-    // It is not possible to have applications with the same name
+        // Set app name back to Cypress Tests
-    const appName = "Cypress Tests"
+        cy.reload()
-    cy.visit(`localhost:${Cypress.env("PORT")}/builder`)
+        cy.wait(1000)
-    cy.wait(500)
+        renameApp(appRename, appName)
-    cy.get(".spectrum-Button").contains("Create app").click({force: true})
-    cy.contains(/Start from scratch/).click()
-    cy.get(".spectrum-Modal")
-    .within(() => {
-      cy.get("input").eq(0).type(appName)
-      cy.get(".spectrum-ButtonGroup").contains("Create app").click({force: true})
-      cy.get(".error").should("have.text", "Another app with the same name already exists")      
     })
-})
+        
-
+    xit("Should rename a published application", () => {
-it("should validate application names", () => {
+        // It is not possible to rename a published application
-    // App name must be letters, numbers and spaces only
+        const appName = "Cypress Tests"
-    // This test checks numbers and special characters specifically
+        const appRename = "Cypress Renamed"
-    const numberName = 12345
+        // Publish the app
-    const specialCharName = "£$%^"
+        cy.get(".toprightnav")
-    cy.get(".home-logo").click()
+        cy.get(".spectrum-Button").contains("Publish").click({force: true})
-    renameApp(numberName)
+        cy.get(".spectrum-Dialog-grid")
-    cy.searchForApplication(numberName)
-    cy.get(".appTable").find(".title").should("have.length", 1)
-    renameApp(specialCharName)
-    cy.get(".error").should("have.text", "App name must be letters, numbers and spaces only")
-})
-    
-    const renameApp = (appName, published, noName) => {
-    cy.request(`localhost:${Cypress.env("PORT")}/api/applications?status=all`)
-    .its("body")
-    .then(val => {
-        if (val.length > 0) {
-            cy.get(".appTable > :nth-child(5) > :nth-child(2) > .spectrum-Icon").click()
-            // Check for when an app is published
-            if (published == true){
-                // Should not have Edit as option, will unpublish app
-                cy.should("not.have.value", "Edit")
-                cy.get(".spectrum-Menu").contains("Unpublish").click()
-                cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
-                cy.get(".appTable > :nth-child(5) > :nth-child(2) > .spectrum-Icon").click()
-            }
-            cy.contains("Edit").click()
-            cy.get(".spectrum-Modal")
             .within(() => {
-                if (noName == true){
+                // Click publish again within the modal
-                    cy.get("input").clear()
+                cy.get(".spectrum-Button").contains("Publish").click({force: true})
-                    cy.get(".spectrum-Dialog-grid").click()
+            })
-                    .contains("App name must be letters, numbers and spaces only")
+        // Rename app, Search for app, Confirm name was changed
-                    return cy
+        cy.get(".home-logo").click()
+        renameApp(appName, appRename, true)
+        cy.searchForApplication(appRename)
+        cy.get(".appTable").find(".wrapper").should("have.length", 1)
+    })
+
+    it("Should try to rename an application to have no name", () => {
+        const appName = "Cypress Tests"
+        cy.get(".home-logo").click()
+        renameApp(appName, " ", false, true)
+        cy.wait(500)
+        // Close modal and confirm name has not been changed
+        cy.get(".spectrum-Dialog-grid").contains("Cancel").click()
+        cy.reload() 
+        cy.wait(1000)
+        cy.searchForApplication(appName)
+        cy.get(".appTable").find(".title").should("have.length", 1)
+
+    })
+
+    xit("Should create two applications with the same name", () => {
+        // It is not possible to have applications with the same name
+        const appName = "Cypress Tests"
+        cy.visit(`${Cypress.config().baseUrl}/builder`)
+        cy.wait(500)
+        cy.get(".spectrum-Button").contains("Create app").click({force: true})
+        cy.contains(/Start from scratch/).click()
+        cy.get(".spectrum-Modal")
+        .within(() => {
+        cy.get("input").eq(0).type(appName)
+        cy.get(".spectrum-ButtonGroup").contains("Create app").click({force: true})
+        cy.get(".error").should("have.text", "Another app with the same name already exists")      
+        })
+    })
+
+    it("should validate application names", () => {
+        // App name must be letters, numbers and spaces only
+        // This test checks numbers and special characters specifically
+        const appName = "Cypress Tests"
+        const numberName = 12345
+        const specialCharName = "£$%^"
+        cy.get(".home-logo").click()
+        renameApp(appName, numberName)
+        cy.reload()
+        cy.wait(1000)
+        cy.searchForApplication(numberName)
+        cy.get(".appTable").find(".title").should("have.length", 1)
+        cy.reload()
+        cy.wait(1000)
+        renameApp(numberName, specialCharName)
+        cy.get(".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)
+        renameApp(numberName, appName)
+    })
+        
+        const renameApp = (originalName, changedName, published, noName) => {
+            cy.searchForApplication(originalName)
+            cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+        .its("body")
+        .then(val => {
+            if (val.length > 0) {
+                cy.get(".appTable")
+                .within(() => {
+                    cy.get(".spectrum-Icon").eq(1).click()
+                    })
+                // Check for when an app is published
+                if (published == true){
+                    // Should not have Edit as option, will unpublish app
+                    cy.should("not.have.value", "Edit")
+                    cy.get(".spectrum-Menu").contains("Unpublish").click()
+                    cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
+                    cy.get(".appTable > :nth-child(5) > :nth-child(2) > .spectrum-Icon").click()
                 }
-                cy.get("input").clear()
+                cy.contains("Edit").click()
-                cy.get("input").eq(0).type(appName).should("have.value", appName).blur()
+                cy.get(".spectrum-Modal")
-                cy.get(".spectrum-ButtonGroup").contains("Save").click({force: true})
+                .within(() => {
-                cy.wait(500)
+                    if (noName == true){
-      })
+                        cy.get("input").clear()
+                        cy.get(".spectrum-Dialog-grid").click()
+                        .contains("App name must be letters, numbers and spaces only")
+                        return cy
+                    }
+                    cy.get("input").clear()
+                    cy.get("input").eq(0).type(changedName).should("have.value", changedName).blur()
+                    cy.get(".spectrum-ButtonGroup").contains("Save").click({force: true})
+                    cy.wait(500)
+        })
+        }
+        })
+
     }
     })
-}
 })

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

@@ -0,0 +1,67 @@
+import filterTests from "../support/filterTests"
+
+filterTests(['smoke', 'all'], () => {
+    context("Revert apps", () => {
+        before(() => {
+        cy.login()
+        cy.createTestApp()
+        })
+        
+        it("should try to revert an unpublished app", () => {
+            // Click revert icon
+            cy.get(".toprightnav").within(() => {
+                cy.get(".spectrum-Icon").eq(1).click()
+            })
+            cy.get(".spectrum-Dialog-grid").within(() => {
+                // Enter app name before revert
+                cy.get("input").type("Cypress Tests")
+                cy.intercept('**/revert').as('revertApp')
+                // Click Revert
+                cy.get(".spectrum-Button").contains("Revert").click({ force: true })
+                // Intercept Request after button click & apply assertions
+                cy.wait("@revertApp")
+                cy.get("@revertApp").its('response.body').should('have.property', 'message', "App has not yet been deployed")
+                cy.get("@revertApp").its('response.body').should('have.property', 'status', 400)
+            })
+        })
+        
+        it("should revert a published app", () => {
+            // Add initial component - Paragraph
+            cy.addComponent("Elements", "Paragraph")
+            // Publish app
+            cy.get(".spectrum-Button").contains("Publish").click({ force: true })
+            cy.get(".spectrum-ButtonGroup").within(() => {
+                cy.get(".spectrum-Button").contains("Publish").click({ force: true })
+            })
+            // Add second component - Button
+            cy.addComponent("Elements", "Button")
+            // Click Revert
+            cy.get(".toprightnav").within(() => {
+                cy.get(".spectrum-Icon").eq(1).click()
+            })
+            cy.get(".spectrum-Dialog-grid").within(() => {
+                // Click Revert
+                cy.get(".spectrum-Button").contains("Revert").click({ force: true })
+                cy.wait(1000)
+            })
+            // Confirm Paragraph component is still visible
+            cy.get(".root").contains("New Paragraph")
+            // Confirm Button component is not visible
+            cy.get(".root").should("not.have.text", "New Button")
+            cy.wait(500)
+        })
+        
+        it("should enter incorrect app name when reverting", () => {
+            // Click Revert
+            cy.get(".toprightnav").within(() => {
+                cy.get(".spectrum-Icon").eq(1).click({ force: true })
+            })
+            // Enter incorrect app name
+            cy.get(".spectrum-Dialog-grid").within(() => {
+                cy.get("input").type("Cypress Tests")
+                // Revert button within modal should be disabled
+                cy.get(".spectrum-Button").eq(1).should('be.disabled')
+            })
+        })
+    })
+})

packages/builder/cypress/support/commands.js

@@ -10,7 +10,7 @@ Cypress.on("uncaught:exception", () => {
 })
 
 Cypress.Commands.add("login", () => {
-  cy.visit(`localhost:${Cypress.env("PORT")}/builder`)
+  cy.visit(`${Cypress.config().baseUrl}/builder`)
   cy.wait(2000)
   cy.url().then(url => {
     if (url.includes("builder/admin")) {
@@ -33,37 +33,69 @@ Cypress.Commands.add("login", () => {
 })
 
 Cypress.Commands.add("createApp", name => {
-  cy.visit(`localhost:${Cypress.env("PORT")}/builder`)
+  cy.visit(`${Cypress.config().baseUrl}/builder`)
   cy.wait(500)
-  cy.request(`${Cypress.config().baseUrl}api/applications?status=all`)
+  cy.get(".spectrum-Button").contains("Create app").click({ force: true })
-    .its("body")
-    .then(body => {
-      if (body.length > 0) {
-        cy.get(".spectrum-Button").contains("Create app").click({ force: true })
-      }
-    })
   cy.get(".spectrum-Modal").within(() => {
     cy.get("input").eq(0).type(name).should("have.value", name).blur()
     cy.get(".spectrum-ButtonGroup").contains("Create app").click()
-    cy.wait(7000)
+    cy.wait(5000)
   })
+  cy.createTable("Cypress Tests", true)
 })
 
-Cypress.Commands.add("deleteApp", appName => {
+Cypress.Commands.add("deleteApp", name => {
-  cy.visit(`localhost:${Cypress.env("PORT")}/builder`)
+  cy.visit(`${Cypress.config().baseUrl}/builder`)
-  cy.wait(1000)
+  cy.wait(2000)
-  cy.request(`localhost:${Cypress.env("PORT")}/api/applications?status=all`)
+  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
     .its("body")
     .then(val => {
       if (val.length > 0) {
-        cy.get(
+        cy.searchForApplication(name)
-          ".appTable > :nth-child(5) > :nth-child(2) > .spectrum-Icon"
+        cy.get(".appTable").within(() => {
-        ).click()
+          cy.get(".spectrum-Icon").eq(1).click()
-        cy.contains("Delete").click()
-        cy.get(".spectrum-Modal").within(() => {
-          cy.get("input").type(appName)
-          cy.get(".spectrum-Button--warning").click()
         })
+        cy.get(".spectrum-Menu").then($menu => {
+          if ($menu.text().includes("Unpublish")) {
+            cy.get(".spectrum-Menu").contains("Unpublish").click()
+            cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
+          } else {
+            cy.get(".spectrum-Menu").contains("Delete").click()
+            cy.get(".spectrum-Dialog-grid").within(() => {
+              cy.get("input").type(name)
+            })
+            cy.get(".spectrum-Button--warning").click()
+          }
+        })
+      } else {
+        return
+      }
+    })
+})
+
+Cypress.Commands.add("deleteAllApps", () => {
+  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.wait(500)
+  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+    .its("body")
+    .then(val => {
+      for (let i = 0; i < val.length; i++) {
+        cy.get(".spectrum-Heading")
+          .eq(1)
+          .then(app => {
+            const name = app.text()
+            cy.get(".title")
+              .children()
+              .within(() => {
+                cy.get(".spectrum-Icon").eq(0).click()
+              })
+            cy.get(".spectrum-Menu").contains("Delete").click()
+            cy.get(".spectrum-Dialog-grid").within(() => {
+              cy.get("input").type(name)
+              cy.get(".spectrum-Button--warning").click()
+            })
+            cy.reload()
+          })
       }
     })
 })
@@ -72,6 +104,7 @@ Cypress.Commands.add("createTestApp", () => {
   const appName = "Cypress Tests"
   cy.deleteApp(appName)
   cy.createApp(appName, "This app is used for Cypress testing.")
+  cy.createScreen("home", "home")
 })
 
 Cypress.Commands.add("createTestTableWithData", () => {
@@ -80,10 +113,18 @@ Cypress.Commands.add("createTestTableWithData", () => {
   cy.addColumn("dog", "age", "Number")
 })
 
-Cypress.Commands.add("createTable", tableName => {
+Cypress.Commands.add("createTable", (tableName, initialTable) => {
-  cy.contains("Budibase DB").click()
+  if (!initialTable) {
-  cy.contains("Create new table").click()
+    cy.navigateToDataSection()
-
+    cy.get(".add-button").click()
+  }
+  cy.wait(7000)
+  cy.get(".spectrum-Modal")
+    .contains("Budibase DB")
+    .click({ force: true })
+    .then(() => {
+      cy.get(".spectrum-Button").contains("Continue").click({ force: true })
+    })
   cy.get(".spectrum-Modal").within(() => {
     cy.wait(1000)
     cy.get("input").first().type(tableName).blur()
@@ -190,22 +231,49 @@ Cypress.Commands.add("navigateToFrontend", () => {
   cy.wait(1000)
   cy.contains("Design").click()
   cy.get(".spectrum-Search").type("/")
-  cy.createScreen("home", "home")
-  cy.addComponent("Elements", "Headline")
   cy.get(".nav-item").contains("home").click()
 })
 
+Cypress.Commands.add("navigateToDataSection", () => {
+  // Clicks on the Data tab
+  cy.wait(500)
+  cy.contains("Data").click()
+})
+
 Cypress.Commands.add("createScreen", (screenName, route) => {
+  cy.contains("Design").click()
   cy.get("[aria-label=AddCircle]").click()
   cy.get(".spectrum-Modal").within(() => {
-    cy.get(".item").first().click()
+    cy.get(".item").contains("Blank").click()
-    cy.get(".spectrum-Button--cta").click()
+    cy.get(".spectrum-Button").contains("Add Screens").click({ force: true })
+    cy.wait(500)
   })
+  cy.get(".spectrum-Dialog-grid").within(() => {
+    cy.get(".spectrum-Form-itemField").eq(0).type(screenName)
+    cy.get(".spectrum-Form-itemField").eq(1).type(route)
+    cy.get(".spectrum-Button").contains("Continue").click({ force: true })
+    cy.wait(1000)
+  })
+})
+
+Cypress.Commands.add("createAutogeneratedScreens", screenNames => {
+  // Screen name must already exist within data source
+  cy.contains("Design").click()
+  cy.get("[aria-label=AddCircle]").click()
+  for (let i = 0; i < screenNames.length; i++) {
+    cy.get(".item").contains(screenNames[i]).click()
+  }
+  cy.get(".spectrum-Button").contains("Add Screens").click({ force: true })
+  cy.wait(4000)
+})
+
+Cypress.Commands.add("addRow", values => {
+  cy.contains("Create row").click()
   cy.get(".spectrum-Modal").within(() => {
-    cy.get("input").first().clear().type(screenName)
+    for (let i = 0; i < values.length; i++) {
-    cy.get("input").eq(1).clear().type(route)
+      cy.get("input").eq(i).type(values[i]).blur()
-    cy.get(".spectrum-Button--cta").click()
+    }
-    cy.wait(2000)
+    cy.get(".spectrum-ButtonGroup").contains("Create").click()
   })
 })
 
@@ -243,7 +311,144 @@ Cypress.Commands.add("addCustomSourceOptions", totalOptions => {
 })
 
 Cypress.Commands.add("searchForApplication", appName => {
-  cy.get(".spectrum-Textfield").within(() => {
+  cy.wait(1000)
-    cy.get("input").eq(0).type(appName)
+  // Searches for the app
+  cy.get(".filter").then(() => {
+    cy.get(".spectrum-Textfield").within(() => {
+      cy.get("input").eq(0).type(appName)
+    })
+  })
+  // Confirms app exists after search
+  cy.get(".appTable").contains(appName)
+})
+
+Cypress.Commands.add("selectExternalDatasource", datasourceName => {
+  // Navigates to Data Section
+  cy.navigateToDataSection()
+  // Open Data Source modal
+  cy.get(".nav").within(() => {
+    cy.get(".add-button").click()
+  })
+  // Clicks specified datasource & continue
+  cy.get(".item-list").contains(datasourceName).click()
+  cy.get(".spectrum-Dialog-grid").within(() => {
+    cy.get(".spectrum-Button").contains("Continue").click({ force: true })
   })
 })
+
+Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => {
+  // selectExternalDatasource should be called prior to this
+  // Adds the config for specified datasource & fetches tables
+  // Currently supports MySQL, PostgreSQL, Oracle
+  // Host IP Address
+  cy.wait(500)
+  cy.get(".spectrum-Dialog-grid").within(() => {
+    cy.get(".form-row")
+      .eq(0)
+      .within(() => {
+        cy.get(".spectrum-Textfield").within(() => {
+          if (datasource == "Oracle") {
+            cy.get("input").clear().type(Cypress.env("oracle").HOST)
+          } else {
+            cy.get("input").clear().type(Cypress.env("HOST_IP"))
+          }
+        })
+      })
+  })
+  // Database Name
+  cy.get(".spectrum-Dialog-grid").within(() => {
+    if (datasource == "MySQL") {
+      cy.get(".form-row")
+        .eq(4)
+        .within(() => {
+          cy.get("input").clear().type(Cypress.env("mysql").DATABASE)
+        })
+    } else {
+      cy.get(".form-row")
+        .eq(2)
+        .within(() => {
+          if (datasource == "PostgreSQL") {
+            cy.get("input").clear().type(Cypress.env("postgresql").DATABASE)
+          }
+          if (datasource == "Oracle") {
+            cy.get("input").clear().type(Cypress.env("oracle").DATABASE)
+          }
+        })
+    }
+  })
+  // User
+  cy.get(".spectrum-Dialog-grid").within(() => {
+    if (datasource == "MySQL") {
+      cy.get(".form-row")
+        .eq(2)
+        .within(() => {
+          cy.get("input").clear().type(Cypress.env("mysql").USER)
+        })
+    } else {
+      cy.get(".form-row")
+        .eq(3)
+        .within(() => {
+          if (datasource == "PostgreSQL") {
+            cy.get("input").clear().type(Cypress.env("postgresql").USER)
+          }
+          if (datasource == "Oracle") {
+            cy.get("input").clear().type(Cypress.env("oracle").USER)
+          }
+        })
+    }
+  })
+  // Password
+  cy.get(".spectrum-Dialog-grid").within(() => {
+    if (datasource == "MySQL") {
+      cy.get(".form-row")
+        .eq(3)
+        .within(() => {
+          cy.get("input").clear().type(Cypress.env("mysql").PASSWORD)
+        })
+    } else {
+      cy.get(".form-row")
+        .eq(4)
+        .within(() => {
+          if (datasource == "PostgreSQL") {
+            cy.get("input").clear().type(Cypress.env("postgresql").PASSWORD)
+          }
+          if (datasource == "Oracle") {
+            cy.get("input").clear().type(Cypress.env("oracle").PASSWORD)
+          }
+        })
+    }
+  })
+  // Click to fetch tables
+  if (skipFetch) {
+    cy.get(".spectrum-Dialog-grid").within(() => {
+      cy.get(".spectrum-Button")
+        .contains("Skip table fetch")
+        .click({ force: true })
+    })
+  } else {
+    cy.get(".spectrum-Dialog-grid").within(() => {
+      cy.get(".spectrum-Button")
+        .contains("Save and fetch tables")
+        .click({ force: true })
+      cy.wait(1000)
+    })
+  }
+})
+
+Cypress.Commands.add("createRestQuery", (method, restUrl) => {
+  // addExternalDatasource should be called prior to this
+  // Configures REST datasource & sends query
+  cy.wait(1000)
+  cy.get(".spectrum-Button").contains("Add query").click({ force: true })
+  // Select Method & add Rest URL
+  cy.get(".spectrum-Picker-label").eq(1).click()
+  cy.get(".spectrum-Menu").contains(method).click()
+  cy.get("input").clear().type(restUrl)
+  // Send query
+  cy.get(".spectrum-Button").contains("Send").click({ force: true })
+  cy.wait(500)
+  cy.get(".spectrum-Button").contains("Save").click({ force: true })
+  cy.get(".hierarchy-items-container")
+    .should("contain", method)
+    .and("contain", restUrl)
+})

packages/builder/cypress/support/filterTests.js

@@ -0,0 +1,16 @@
+const filterTests = (testTags, runTest) => {
+  // testTags is an array of tags
+  // runTest is all tests
+  if (Cypress.env("TEST_TAGS")) {
+    const tags = Cypress.env("TEST_TAGS").split("/")
+    const found = testTags.some($testTags => tags.includes($testTags))
+
+    if (found) {
+      runTest()
+    }
+  } else {
+    runTest()
+  }
+}
+
+export default filterTests

packages/builder/cypress/support/queryLevelTransformerFunction.js

@@ -0,0 +1,14 @@
+/* eslint-disable */
+const breweries = data
+const totals = {}
+
+for (let brewery of breweries) 
+  {const state = brewery.state
+  if (totals[state] == null) 
+    {totals[state] = 1
+  } else 
+    {totals[state]++
+  }
+}
+const entries = Object.entries(totals)
+return entries.map(([state, count]) => ({ state, count }))

packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js

@@ -0,0 +1,31 @@
+/* eslint-disable */
+const breweries = data
+const totals = {}
+for (let brewery of breweries) 
+  {const state = brewery.state
+  if (totals[state] == null) 
+    {totals[state] = 1
+  } else 
+    {totals[state]++
+  }
+}
+const stateCodes = 
+  {texas: "tx",
+  colorado: "co",
+  florida: "fl",
+  iwoa: "ia",
+  louisiana: "la",
+  california: "ca",
+  pennsylvania: "pa",
+  georgia: "ga",
+  "new hampshire": "nh",
+  virginia: "va",
+  michigan: "mi",
+  maryland: "md",
+  ohio: "oh",
+}
+const entries = Object.entries(totals)
+return entries.map(([state, count]) => 
+  {stateCodes[state.toLowerCase()]
+  return { state, count, flag: "http://flags.ox3.in/svg/us/${stateCode}.svg" }
+})

packages/builder/nuxt.config.js

@@ -0,0 +1,4 @@
+export default {
+  ssr: false,
+  target: "static",
+}

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.66-alpha.0",
+  "version": "1.0.74-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -11,7 +11,7 @@
     "rollup": "rollup -c -w",
     "cy:setup": "ts-node ./cypress/ts/setup.ts",
     "cy:setup:ci": "node ./cypress/setup.js",
-    "cy:run": "cypress run",
+    "cy:run": "xvfb-run cypress run --headed --browser chrome",
     "cy:open": "cypress open",
     "cy:run:ci": "cypress run --record",
     "cy:test": "start-server-and-test cy:setup http://localhost:10001/builder cy:run",
@@ -64,10 +64,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.66-alpha.0",
+    "@budibase/bbui": "^1.0.74-alpha.1",
-    "@budibase/client": "^1.0.66-alpha.0",
+    "@budibase/client": "^1.0.74-alpha.1",
-    "@budibase/frontend-core": "^1.0.66-alpha.0",
+    "@budibase/frontend-core": "^1.0.74-alpha.1",
-    "@budibase/string-templates": "^1.0.66-alpha.0",
+    "@budibase/string-templates": "^1.0.74-alpha.1",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
@@ -94,7 +94,7 @@
     "@testing-library/jest-dom": "^5.11.10",
     "@testing-library/svelte": "^3.0.0",
     "babel-jest": "^26.6.3",
-    "cypress": "^5.1.0",
+    "cypress": "^9.3.1",
     "cypress-terminal-report": "^1.4.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^26.6.3",

packages/builder/src/builderStore/dataBinding.js

@@ -556,11 +556,13 @@ export const getSchemaForDatasource = (asset, datasource, options) => {
     }
 
     // Add schema properties if required
-    if (addId) {
+    if (schema) {
-      schema["_id"] = { type: "string" }
+      if (addId) {
-    }
+        schema["_id"] = { type: "string" }
-    if (addRev) {
+      }
-      schema["_rev"] = { type: "string" }
+      if (addRev) {
+        schema["_rev"] = { type: "string" }
+      }
     }
 
     // Ensure there are "name" properties for all fields and that field schema

packages/builder/src/components/common/bindings/BindingPanel.svelte

@@ -58,7 +58,7 @@
   const updateValue = val => {
     valid = isValid(readableToRuntimeBinding(bindings, val))
     if (valid) {
-      dispatch("change", value)
+      dispatch("change", val)
     }
   }
 
@@ -146,7 +146,7 @@
                   <div class="helper__description">
                     {@html helper.description}
                   </div>
-                  <pre class="helper__example">{helper.example || ''}</pre>
+                  <pre class="helper__example">{helper.example || ""}</pre>
                 </div>
               </li>
             {/each}

packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte

@@ -74,6 +74,7 @@
       }
 
       draftScreen.routing.route = route
+      draftScreen.routing.roleId = roleId
 
       await store.actions.screens.save(draftScreen)
       if (draftScreen.props._instanceName.endsWith("List")) {

packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte

@@ -90,7 +90,7 @@
 </script>
 
 <DrawerContent>
-  <div className="container">
+  <div class="container">
     <Layout noPadding>
       <Body size="S">
         {#if !filters?.length}

packages/builder/src/constants/backend/index.js

@@ -84,10 +84,7 @@ export const FIELDS = {
   FORMULA: {
     name: "Formula",
     type: "formula",
-    constraints: {
+    constraints: {},
-      type: "string",
-      presence: false,
-    },
   },
   JSON: {
     name: "JSON",

packages/builder/src/pages/builder/portal/manage/users/index.svelte

@@ -43,7 +43,7 @@
   let createUserModal
   let basicOnboardingModal
 
-  function openBasicOnoboardingModal() {
+  function openBasicOnboardingModal() {
     createUserModal.hide()
     basicOnboardingModal.show()
   }
@@ -91,7 +91,7 @@
 </Layout>
 
 <Modal bind:this={createUserModal}>
-  <AddUserModal on:change={openBasicOnoboardingModal} />
+  <AddUserModal on:change={openBasicOnboardingModal} />
 </Modal>
 <Modal bind:this={basicOnboardingModal}><BasicOnboardingModal {email} /></Modal>
 

packages/builder/src/stores/portal/users.js

@@ -11,7 +11,7 @@ export function createUsersStore() {
   }
 
   async function invite({ email, builder, admin }) {
-    await API.inviteUser({
+    return API.inviteUser({
       email,
       builder,
       admin,
@@ -19,7 +19,7 @@ export function createUsersStore() {
   }
 
   async function acceptInvite(inviteCode, password) {
-    await API.acceptInvite({
+    return API.acceptInvite({
       inviteCode,
       password,
     })

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.66-alpha.0",
+  "version": "1.0.74-alpha.1",
   "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.66-alpha.0",
+  "version": "1.0.74-alpha.1",
   "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.66-alpha.0",
+    "@budibase/bbui": "^1.0.74-alpha.1",
-    "@budibase/frontend-core": "^1.0.66-alpha.0",
+    "@budibase/frontend-core": "^1.0.74-alpha.1",
-    "@budibase/string-templates": "^1.0.66-alpha.0",
+    "@budibase/string-templates": "^1.0.74-alpha.1",
     "@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.66-alpha.0",
+  "version": "1.0.74-alpha.1",
   "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.66-alpha.0",
+    "@budibase/bbui": "^1.0.74-alpha.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/frontend-core/src/api/other.js

@@ -32,7 +32,7 @@ export const buildOtherEndpoints = API => ({
   getBudibaseVersion: async () => {
     return await API.get({
       url: "/api/dev/version",
-    })
+    }).version
   },
 
   /**

packages/frontend-core/src/api/user.js

@@ -113,11 +113,11 @@ export const buildUserEndpoints = API => ({
   },
 
   /**
-   * Accepts an invitation to join the platform and creates a user.
+   * Accepts an invite to join the platform and creates a user.
    * @param inviteCode the invite code sent in the email
    * @param password the password for the newly created user
    */
-  acceptInvitation: async ({ inviteCode, password }) => {
+  acceptInvite: async ({ inviteCode, password }) => {
     return await API.post({
       url: "/api/global/users/invite/accept",
       body: {

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.66-alpha.0",
+  "version": "1.0.74-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -21,6 +21,9 @@
     "dev:stack:down": "node scripts/dev/manage.js down",
     "dev:stack:nuke": "node scripts/dev/manage.js nuke",
     "dev:builder": "yarn run dev:stack:up && nodemon",
+    "generate:proxy:compose": "node scripts/proxy/generateProxyConfig compose",
+    "generate:proxy:preprod": "node scripts/proxy/generateProxyConfig preprod",
+    "generate:proxy:prod": "node scripts/proxy/generateProxyConfig prod",
     "format": "prettier --config ../../.prettierrc.json 'src/**/*.ts' --write",
     "lint": "eslint --fix src/",
     "lint:fix": "yarn run format && yarn run lint",
@@ -70,9 +73,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.66-alpha.0",
+    "@budibase/backend-core": "^1.0.74-alpha.1",
-    "@budibase/client": "^1.0.66-alpha.0",
+    "@budibase/client": "^1.0.74-alpha.1",
-    "@budibase/string-templates": "^1.0.66-alpha.0",
+    "@budibase/string-templates": "^1.0.74-alpha.1",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/server/scripts/dev/manage.js

@@ -37,7 +37,7 @@ async function init() {
     const envFileJson = {
       PORT: 4001,
       MINIO_URL: "http://localhost:4004",
-      COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
+      COUCH_DB_URL: "http://budibase:budibase@localhost:4005",
       REDIS_URL: "localhost:6379",
       WORKER_URL: "http://localhost:4002",
       INTERNAL_API_KEY: "budibase",

packages/server/scripts/proxy/generateProxyConfig.js

@@ -0,0 +1,70 @@
+#!/usr/bin/env node
+const path = require("path")
+const fs = require("fs")
+const { processStringSync } = require("@budibase/string-templates")
+
+const Configs = {
+  prod: {
+    k8s: true,
+    apps: "app-service.budibase.svc.cluster.local",
+    worker: "worker-service.budibase.svc.cluster.local",
+    minio: "minio-service.budibase.svc.cluster.local",
+    couchdb: "budibase-prod-svc-couchdb",
+  },
+  preprod: {
+    k8s: true,
+    apps: "app-service.budibase.svc.cluster.local",
+    worker: "worker-service.budibase.svc.cluster.local",
+    minio: "minio-service.budibase.svc.cluster.local",
+    couchdb: "budibase-preprod-svc-couchdb",
+  },
+  compose: {
+    compose: true,
+    apps: "app-service",
+    worker: "worker-service",
+    minio: "minio-service",
+    couchdb: "couchdb-service",
+    watchtower: "watchtower-service",
+  },
+}
+
+const Commands = {
+  Prod: "prod",
+  Preprod: "preprod",
+  Compose: "compose",
+}
+
+async function init(managementCommand) {
+  const config = Configs[managementCommand]
+  const hostingPath = path.join(process.cwd(), "..", "..", "hosting")
+  const nginxHbsPath = path.join(hostingPath, "nginx.prod.conf.hbs")
+  const nginxOutputPath = path.join(
+    hostingPath,
+    "proxy",
+    ".generated-nginx.prod.conf"
+  )
+  const contents = fs.readFileSync(nginxHbsPath, "utf8")
+  fs.writeFileSync(nginxOutputPath, processStringSync(contents, config))
+}
+
+const managementCommand = process.argv.slice(2)[0]
+
+if (
+  !managementCommand ||
+  !Object.values(Commands).some(command => managementCommand === command)
+) {
+  throw new Error(
+    "You must supply either a 'compose', 'preprod' or 'prod' commmand to generate an NGINX config."
+  )
+}
+
+init(managementCommand)
+  .then(() => {
+    console.log("Done! 🎉")
+  })
+  .catch(err => {
+    console.error(
+      "Something went wrong while creating the nginx configuration",
+      err.message
+    )
+  })

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

@@ -118,5 +118,7 @@ exports.revert = async ctx => {
 }
 
 exports.getBudibaseVersion = async ctx => {
-  ctx.body = require("../../../package.json").version
+  ctx.body = {
+    version: require("../../../package.json").version,
+  }
 }

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

@@ -3,7 +3,6 @@ const { cloneDeep } = require("lodash/fp")
 const { InternalTables } = require("../../../db/utils")
 const userController = require("../user")
 const { FieldTypes } = require("../../../constants")
-const { processStringSync } = require("@budibase/string-templates")
 const { makeExternalQuery } = require("../../../integrations/base/utils")
 const { getAppDB } = require("@budibase/backend-core/context")
 
@@ -52,6 +51,10 @@ exports.validate = async ({ tableId, row, table }) => {
   for (let fieldName of Object.keys(table.schema)) {
     const constraints = cloneDeep(table.schema[fieldName].constraints)
     const type = table.schema[fieldName].type
+    // formulas shouldn't validated, data will be deleted anyway
+    if (type === FieldTypes.FORMULA) {
+      continue
+    }
     // special case for options, need to always allow unselected (null)
     if (type === FieldTypes.OPTIONS && constraints.inclusion) {
       constraints.inclusion.push(null)
@@ -77,11 +80,6 @@ exports.validate = async ({ tableId, row, table }) => {
       } catch (err) {
         errors[fieldName] = [`Contains invalid JSON`]
       }
-    } else if (type === FieldTypes.FORMULA) {
-      res = validateJs.single(
-        processStringSync(table.schema[fieldName].formula, row),
-        constraints
-      )
     } else {
       res = validateJs.single(row[fieldName], constraints)
     }

packages/server/src/db/client.js

@@ -5,7 +5,7 @@ const allDbs = require("pouchdb-all-dbs")
 const find = require("pouchdb-find")
 const env = require("../environment")
 
-const COUCH_DB_URL = getCouchUrl() || "http://localhost:10000/db/"
+const COUCH_DB_URL = getCouchUrl() || "http://localhost:4005"
 
 PouchDB.plugin(replicationStream.plugin)
 PouchDB.plugin(find)

packages/string-templates/package.json

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

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.66-alpha.0",
+  "version": "1.0.74-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,8 +34,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.66-alpha.0",
+    "@budibase/backend-core": "^1.0.74-alpha.1",
-    "@budibase/string-templates": "^1.0.66-alpha.0",
+    "@budibase/string-templates": "^1.0.74-alpha.1",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

packages/worker/scripts/dev/manage.js

@@ -16,7 +16,7 @@ async function init() {
       REDIS_URL: "localhost:6379",
       REDIS_PASSWORD: "budibase",
       MINIO_URL: "http://localhost:4004",
-      COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
+      COUCH_DB_URL: "http://budibase:budibase@localhost:4005",
       COUCH_DB_USERNAME: "budibase",
       COUCH_DB_PASSWORD: "budibase",
       // empty string is false

packages/worker/src/api/controllers/global/configs.js

@@ -246,12 +246,16 @@ exports.destroy = async function (ctx) {
 
 exports.configChecklist = async function (ctx) {
   const db = getGlobalDB()
+  const tenantId = getTenantId()
 
   try {
     // TODO: Watch get started video
 
-    // Apps exist
+    let apps = []
-    const apps = await getAllApps({ idsOnly: true })
+    if (!env.MULTI_TENANCY || tenantId) {
+      // Apps exist
+      apps = await getAllApps({ idsOnly: true, efficient: true })
+    }
 
     // They have set up SMTP
     const smtpConfig = await getScopedFullConfig(db, {

packages/worker/src/api/controllers/system/environment.js

@@ -7,6 +7,6 @@ exports.fetch = async ctx => {
     accountPortalUrl: env.ACCOUNT_PORTAL_URL,
     disableAccountPortal: env.DISABLE_ACCOUNT_PORTAL,
     // in test need to pretend its in production for the UI (Cypress)
-    isDev: env.isDev(),
+    isDev: env.isDev() && !env.isTest(),
   }
 }

packages/worker/src/db/index.js

@@ -4,7 +4,7 @@ const env = require("../environment")
 const { getCouchUrl } = require("@budibase/backend-core/db")
 
 // level option is purely for testing (development)
-const COUCH_DB_URL = getCouchUrl() || "http://localhost:10000/db/"
+const COUCH_DB_URL = getCouchUrl() || "http://localhost:4005"
 
 let POUCH_DB_DEFAULTS = {
   prefix: COUCH_DB_URL,