Merge remote-tracking branch 'origin/develop' into feature/required-field-focus

.github/workflows/smoke_test.yaml

@@ -41,12 +41,12 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: Test Reports
-          path: packages/builder/cypress/reports/mocha
+          path: packages/builder/cypress/reports/testReport.html
 
       - name: Cypress Discord Notify
-        run: yarn test:e2e:ci:report
+        run: yarn test:e2e:ci:notify
         env:
           CYPRESS_WEBHOOK_URL: ${{ secrets.BUDI_QA_WEBHOOK }}
           CYPRESS_OUTCOME: ${{ steps.cypress.outcome }}
           CYPRESS_DASHBOARD_URL: ${{ steps.cypress.outputs.dashboardUrl }}
-          GITHUB_RUN_URL: ${{ env.GITHUB_SERVER_URL }}/${{ env.GITHUB_REPOSITORY }}/actions/runs/${{ env.GITHUB_RUN_ID }}
+          GITHUB_RUN_URL: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.167-alpha.7",
+  "version": "1.0.167-alpha.8",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

package.json

@@ -49,7 +49,7 @@
     "test:e2e": "lerna run cy:test --stream",
     "test:e2e:ci": "lerna run cy:ci --stream",
     "test:e2e:ci:record": "lerna run cy:ci:record --stream",
-    "test:e2e:ci:report": "lerna run cy:ci:report",
+    "test:e2e:ci:notify": "lerna run cy:ci:notify",
     "build:specs": "lerna run specs",
     "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",

packages/backend-core/package.json

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

packages/bbui/package.json

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

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.167-alpha.7",
+  "version": "1.0.167-alpha.8",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -17,8 +17,9 @@
     "cy:run:ci:record": "xvfb-run cypress run --headed --browser chrome --record",
     "cy:test": "start-server-and-test cy:setup http://localhost:4100/builder cy:run",
     "cy:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci",
-    "cy:ci:record": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci:record",
-    "cy:ci:report": "node scripts/cypressResultsWebhook",
+    "cy:ci:record": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci:record && npm run cy:ci:report",
+    "cy:ci:report": "mochawesome-merge cypress/reports/*.json > cypress/reports/testReport.json && marge cypress/reports/testReport.json --reportDir cypress/reports --inline",
+    "cy:ci:notify": "node scripts/cypressResultsWebhook",
     "cy:debug": "start-server-and-test cy:setup http://localhost:4100/builder cy:open",
     "cy:debug:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:open"
   },
@@ -68,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.167-alpha.7",
-    "@budibase/client": "^1.0.167-alpha.7",
-    "@budibase/frontend-core": "^1.0.167-alpha.7",
-    "@budibase/string-templates": "^1.0.167-alpha.7",
+    "@budibase/bbui": "^1.0.167-alpha.8",
+    "@budibase/client": "^1.0.167-alpha.8",
+    "@budibase/frontend-core": "^1.0.167-alpha.8",
+    "@budibase/string-templates": "^1.0.167-alpha.8",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/reporterConfig.json

@@ -1,10 +1,10 @@
 {
   "reporterEnabled": "mochawesome",
   "mochawesomeReporterOptions": {
-    "reportDir": "cypress/reports/mocha",
+    "reportDir": "cypress/reports",
     "quiet": true,
     "overwrite": false,
-    "html": true,
+    "html": false,
     "json": true
   }
 }

packages/builder/scripts/cypressResultsWebhook.js

@@ -2,7 +2,7 @@
 
 const fetch = require("node-fetch")
 const path = require("path")
-const { merge } = require("mochawesome-merge")
+const fs = require("fs")
 
 const WEBHOOK_URL = process.env.CYPRESS_WEBHOOK_URL
 const OUTCOME = process.env.CYPRESS_OUTCOME
@@ -17,11 +17,10 @@ async function generateReport() {
     "..",
     "cypress",
     "reports",
-    "mocha",
-    "*.json"
+    "testReport.json"
   )
-  const testReport = await merge({ files: [REPORT_PATH] })
-  return testReport
+  const report = fs.readFileSync(REPORT_PATH, "utf-8")
+  return JSON.parse(report)
 }
 
 async function discordCypressResultsNotification(report) {
@@ -66,7 +65,7 @@ async function discordCypressResultsNotification(report) {
           fields: [
             {
               name: "Commit",
-              value: GIT_SHA || "None Supplied",
+              value: `https://github.com/Budibase/budibase/commit/${GIT_SHA}`,
             },
             {
               name: "Cypress Dashboard URL",
@@ -74,7 +73,7 @@ async function discordCypressResultsNotification(report) {
             },
             {
               name: "Github Actions Run URL",
-              value: GITHUB_ACTIONS_RUN_URL,
+              value: GITHUB_ACTIONS_RUN_URL || "None Supplied",
             },
             {
               name: "Test Suites",
@@ -106,7 +105,7 @@ async function discordCypressResultsNotification(report) {
             },
             {
               name: "Pass Percentage",
-              value: passPercent,
+              value: Math.floor(passPercent),
             },
           ],
         },

packages/cli/package.json

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

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.167-alpha.7",
+  "version": "1.0.167-alpha.8",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -69,10 +69,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.167-alpha.7",
-    "@budibase/client": "^1.0.167-alpha.7",
-    "@budibase/pro": "1.0.167-alpha.7",
-    "@budibase/string-templates": "^1.0.167-alpha.7",
+    "@budibase/backend-core": "^1.0.167-alpha.8",
+    "@budibase/client": "^1.0.167-alpha.8",
+    "@budibase/pro": "1.0.167-alpha.8",
+    "@budibase/string-templates": "^1.0.167-alpha.8",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.167-alpha.7",
+  "version": "1.0.167-alpha.8",
   "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.167-alpha.7",
+  "version": "1.0.167-alpha.8",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.167-alpha.7",
-    "@budibase/pro": "1.0.167-alpha.7",
-    "@budibase/string-templates": "^1.0.167-alpha.7",
+    "@budibase/backend-core": "^1.0.167-alpha.8",
+    "@budibase/pro": "1.0.167-alpha.8",
+    "@budibase/string-templates": "^1.0.167-alpha.8",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",