Merge branch 'develop' into cypress-testing

lerna.json

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

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.207-alpha.5",
+  "version": "1.0.207-alpha.6",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^1.0.207-alpha.5",
+    "@budibase/types": "^1.0.207-alpha.6",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.207-alpha.5",
+  "version": "1.0.207-alpha.6",
   "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.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.6",
     "@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.207-alpha.5",
+  "version": "1.0.207-alpha.6",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.5",
+    "@budibase/bbui": "^1.0.207-alpha.6",
-    "@budibase/client": "^1.0.207-alpha.5",
+    "@budibase/client": "^1.0.207-alpha.6",
-    "@budibase/frontend-core": "^1.0.207-alpha.5",
+    "@budibase/frontend-core": "^1.0.207-alpha.6",
-    "@budibase/string-templates": "^1.0.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.6",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

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

@@ -2,22 +2,47 @@
   import {
     Body,
     Input,
-    Select,
+    Label,
     ModalContent,
     notifications,
+    Select,
     Toggle,
-    Label,
   } from "@budibase/bbui"
   import { createValidationStore, emailValidator } from "helpers/validation"
   import { users } from "stores/portal"
 
-  export let disabled
+  const password = Math.random().toString(36).substring(2, 22)
-
   const options = ["Email onboarding", "Basic onboarding"]
-  let selected = options[0]
-  let builder, admin
-
   const [email, error, touched] = createValidationStore("", emailValidator)
+  let disabled
+  let builder
+  let admin
+  let selected = "Email onboarding"
+
+  $: basic = selected === "Basic onboarding"
+
+  function addUser() {
+    if (basic) {
+      createUser()
+    } else {
+      createUserFlow()
+    }
+  }
+
+  async function createUser() {
+    try {
+      await users.create({
+        email: $email,
+        password,
+        builder,
+        admin,
+        forceResetPassword: true,
+      })
+      notifications.success("Successfully created user")
+    } catch (error) {
+      notifications.error("Error creating user")
+    }
+  }
 
   async function createUserFlow() {
     try {
@@ -30,7 +55,7 @@
 </script>
 
 <ModalContent
-  onConfirm={createUserFlow}
+  onConfirm={addUser}
   size="M"
   title="Add new user"
   confirmText="Add user"
@@ -47,17 +72,22 @@
   <Select
     placeholder={null}
     bind:value={selected}
-    on:change
     {options}
     label="Add new user via:"
   />
+
   <Input
     type="email"
+    label="Email"
     bind:value={$email}
     error={$touched && $error}
     placeholder="john@doe.com"
-    label="Email"
   />
+
+  {#if basic}
+    <Input disabled label="Password" value={password} />
+  {/if}
+
   <div>
     <div class="toggle">
       <Label size="L">Development access</Label>

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

@@ -1,74 +0,0 @@
-<script>
-  import {
-    ModalContent,
-    Body,
-    Input,
-    notifications,
-    Toggle,
-    Label,
-  } from "@budibase/bbui"
-  import { createValidationStore, emailValidator } from "helpers/validation"
-  import { users } from "stores/portal"
-
-  const [email, error, touched] = createValidationStore("", emailValidator)
-  const password = Math.random().toString(36).slice(2, 20)
-  let builder = false,
-    admin = false
-
-  async function createUser() {
-    try {
-      await users.create({
-        email: $email,
-        password,
-        builder,
-        admin,
-        forceResetPassword: true,
-      })
-      notifications.success("Successfully created user")
-    } catch (error) {
-      notifications.error(error.message)
-    }
-  }
-</script>
-
-<ModalContent
-  onConfirm={createUser}
-  size="M"
-  title="Basic user onboarding"
-  confirmText="Continue"
-  cancelText="Cancel"
-  disabled={$error}
-  error={$touched && $error}
-  showCloseIcon={false}
->
-  <Body size="S">
-    Below you will find the user’s username and password. The password will not
-    be accessible from this point. Please save the credentials.
-  </Body>
-  <Input
-    type="email"
-    label="Email"
-    bind:value={$email}
-    error={$touched && $error}
-  />
-  <Input readonly label="Password" value={password} />
-  <div>
-    <div class="toggle">
-      <Label size="L">Development access</Label>
-      <Toggle text="" bind:value={builder} />
-    </div>
-    <div class="toggle">
-      <Label size="L">Administration access</Label>
-      <Toggle text="" bind:value={admin} />
-    </div>
-  </div>
-</ModalContent>
-
-<style>
-  .toggle {
-    display: grid;
-    grid-template-columns: 78% 1fr;
-    align-items: center;
-    width: 50%;
-  }
-</style>

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

@@ -15,7 +15,6 @@
   } from "@budibase/bbui"
   import TagsRenderer from "./_components/TagsTableRenderer.svelte"
   import AddUserModal from "./_components/AddUserModal.svelte"
-  import BasicOnboardingModal from "./_components/BasicOnboardingModal.svelte"
   import { users } from "stores/portal"
   import { onMount } from "svelte"
 
@@ -30,7 +29,6 @@
   }
 
   let search
-  let email
   $: filteredUsers = $users
     .filter(user => user.email.includes(search || ""))
     .map(user => ({
@@ -41,12 +39,6 @@
     }))
 
   let createUserModal
-  let basicOnboardingModal
-
-  function openBasicOnboardingModal() {
-    createUserModal.hide()
-    basicOnboardingModal.show()
-  }
 
   onMount(async () => {
     try {
@@ -93,9 +85,8 @@
 </Layout>
 
 <Modal bind:this={createUserModal}>
-  <AddUserModal on:change={openBasicOnboardingModal} />
+  <AddUserModal />
 </Modal>
-<Modal bind:this={basicOnboardingModal}><BasicOnboardingModal {email} /></Modal>
 
 <style>
   .field {

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.207-alpha.5",
+  "version": "1.0.207-alpha.6",
   "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.207-alpha.5",
+  "version": "1.0.207-alpha.6",
   "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.207-alpha.5",
+    "@budibase/bbui": "^1.0.207-alpha.6",
-    "@budibase/frontend-core": "^1.0.207-alpha.5",
+    "@budibase/frontend-core": "^1.0.207-alpha.6",
-    "@budibase/string-templates": "^1.0.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.6",
     "@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.207-alpha.5",
+  "version": "1.0.207-alpha.6",
   "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.207-alpha.5",
+    "@budibase/bbui": "^1.0.207-alpha.6",
     "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.207-alpha.5",
+  "version": "1.0.207-alpha.6",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.207-alpha.5",
+    "@budibase/backend-core": "^1.0.207-alpha.6",
-    "@budibase/client": "^1.0.207-alpha.5",
+    "@budibase/client": "^1.0.207-alpha.6",
-    "@budibase/pro": "1.0.207-alpha.5",
+    "@budibase/pro": "1.0.207-alpha.6",
-    "@budibase/string-templates": "^1.0.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.6",
-    "@budibase/types": "^1.0.207-alpha.5",
+    "@budibase/types": "^1.0.207-alpha.6",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",

packages/string-templates/package.json

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

packages/types/package.json

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

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.5",
+  "version": "1.0.207-alpha.6",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,10 +34,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.207-alpha.5",
+    "@budibase/backend-core": "^1.0.207-alpha.6",
-    "@budibase/pro": "1.0.207-alpha.5",
+    "@budibase/pro": "1.0.207-alpha.6",
-    "@budibase/string-templates": "^1.0.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.6",
-    "@budibase/types": "^1.0.207-alpha.5",
+    "@budibase/types": "^1.0.207-alpha.6",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",