Merge branch 'develop' into clear_form_action

# Conflicts: # packages/client/src/utils/buttonActions.js
5 years ago · aea2de9058
17 changed files with 63 additions and 31 deletions
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.9.80-alpha.4",
+  "version": "0.9.80-alpha.7",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "0.9.80-alpha.4",
+  "version": "0.9.80-alpha.7",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/bbui",
  "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.80-alpha.4",
+  "version": "0.9.80-alpha.7",
  "license": "AGPL-3.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "0.9.80-alpha.4",
+  "version": "0.9.80-alpha.7",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.80-alpha.4",
-    "@budibase/client": "^0.9.80-alpha.4",
+    "@budibase/bbui": "^0.9.80-alpha.7",
+    "@budibase/client": "^0.9.80-alpha.7",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.80-alpha.4",
+    "@budibase/string-templates": "^0.9.80-alpha.7",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte
@ -58,5 +58,6 @@
    align-items: stretch;
    gap: var(--spacing-l);
    background-color: var(--background);
+    overflow-y: auto;
  }
 </style>
--- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
@ -19,7 +19,8 @@
  import { fetchData } from "helpers"
  import { users, auth } from "stores/portal"

-  import TagsRenderer from "./_components/TagsTableRenderer.svelte"
+  import TagsRenderer from "./_components/RolesTagsTableRenderer.svelte"
+
  import UpdateRolesModal from "./_components/UpdateRolesModal.svelte"
  import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte"

--- a/packages/builder/src/pages/builder/portal/manage/users/_components/RolesTagsTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/RolesTagsTableRenderer.svelte
@ -0,0 +1,8 @@
+<script>
+  import TagsTableRenderer from "./TagsTableRenderer.svelte"
+  export let value
+
+  $: roles = value?.filter(role => role != null).map(role => role.name) ?? []
+</script>
+
+<TagsTableRenderer value={roles} />
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/TagsTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/TagsTableRenderer.svelte
@ -4,9 +4,9 @@

  const displayLimit = 5

-  $: roles = value?.filter(role => role != null).map(role => role.name) ?? []
-  $: tags = roles.slice(0, displayLimit)
-  $: leftover = roles.length - tags.length
+  $: values = value?.filter(value => value != null) ?? []
+  $: tags = values.slice(0, displayLimit)
+  $: leftover = values.length - tags.length
 </script>

 <div class="tag-renderer">
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "0.9.80-alpha.4",
+  "version": "0.9.80-alpha.7",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "0.9.80-alpha.4",
+  "version": "0.9.80-alpha.7",
  "license": "MPL-2.0",
  "module": "dist/budibase-client.js",
  "main": "dist/budibase-client.js",
@ -18,9 +18,9 @@
    "dev:builder": "rollup -cw"
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.80-alpha.4",
-    "@budibase/standard-components": "^0.9.80-alpha.4",
-    "@budibase/string-templates": "^0.9.80-alpha.4",
+    "@budibase/bbui": "^0.9.80-alpha.7",
+    "@budibase/standard-components": "^0.9.80-alpha.7",
+    "@budibase/string-templates": "^0.9.80-alpha.7",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
--- a/packages/client/src/store/app.js
+++ b/packages/client/src/store/app.js
@ -6,8 +6,15 @@ const createAppStore = () => {

  // Fetches the app definition including screens, layouts and theme
  const fetchAppDefinition = async () => {
-    const appDefinition = await API.fetchAppPackage(get(store).appId)
-    store.set(appDefinition)
+    const appId = get(store)?.appId
+    if (!appId) {
+      throw "Cannot fetch app definition without app ID set"
+    }
+    const appDefinition = await API.fetchAppPackage(appId)
+    store.set({
+      ...appDefinition,
+      appId: appDefinition?.application?.appId,
+    })
  }

  // Sets the initial app ID
--- a/packages/client/src/store/auth.js
+++ b/packages/client/src/store/auth.js
@ -10,9 +10,14 @@ const createAuthStore = () => {
    store.set(user)
  }

+  const logOut = async () => {
+    window.document.cookie = `budibase:auth=; budibase:currentapp=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;`
+    window.location = "/builder/auth/login"
+  }
+
  return {
    subscribe: store.subscribe,
-    actions: { fetchUser },
+    actions: { fetchUser, logOut },
  }
 }

--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@ -1,5 +1,10 @@
 import { get } from "svelte/store"
-import { routeStore, builderStore, confirmationStore } from "../store"
+import {
+  routeStore,
+  builderStore,
+  confirmationStore,
+  authStore,
+} from "../store"
 import { saveRow, deleteRow, executeQuery, triggerAutomation } from "../api"
 import { ActionTypes } from "../constants"

@ -77,6 +82,10 @@ const refreshDatasourceHandler = async (action, context) => {
  )
 }

+const logoutHandler = async () => {
+  await authStore.actions.logOut()
+}
+
 const clearFormHandler = async (action, context) => {
  return await executeActionHandler(
    context,
@ -93,6 +102,7 @@ const handlerMap = {
  ["Trigger Automation"]: triggerAutomationHandler,
  ["Validate Form"]: validateFormHandler,
  ["Refresh Datasource"]: refreshDatasourceHandler,
+  ["Log Out"]: logoutHandler,
  ["Clear Form"]: clearFormHandler
 }

--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "0.9.80-alpha.4",
+  "version": "0.9.80-alpha.7",
  "description": "Budibase Web Server",
  "main": "src/index.js",
  "repository": {
@ -60,9 +60,9 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.80-alpha.4",
-    "@budibase/client": "^0.9.80-alpha.4",
-    "@budibase/string-templates": "^0.9.80-alpha.4",
+    "@budibase/auth": "^0.9.80-alpha.7",
+    "@budibase/client": "^0.9.80-alpha.7",
+    "@budibase/string-templates": "^0.9.80-alpha.7",
    "@elastic/elasticsearch": "7.10.0",
    "@koa/router": "8.0.0",
    "@sendgrid/mail": "7.1.1",
@ -115,7 +115,7 @@
  "devDependencies": {
    "@babel/core": "^7.14.3",
    "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.80-alpha.4",
+    "@budibase/standard-components": "^0.9.80-alpha.7",
    "@jest/test-sequencer": "^24.8.0",
    "@types/bull": "^3.15.1",
    "@types/jest": "^26.0.23",
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@ -29,11 +29,11 @@
  "keywords": [
    "svelte"
  ],
-  "version": "0.9.80-alpha.4",
+  "version": "0.9.80-alpha.7",
  "license": "MIT",
  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
  "dependencies": {
-    "@budibase/bbui": "^0.9.80-alpha.4",
+    "@budibase/bbui": "^0.9.80-alpha.7",
    "@spectrum-css/card": "^3.0.3",
    "@spectrum-css/link": "^3.1.3",
    "@spectrum-css/page": "^3.0.1",
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "0.9.80-alpha.4",
+  "version": "0.9.80-alpha.7",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "0.9.80-alpha.4",
+  "version": "0.9.80-alpha.7",
  "description": "Budibase background service",
  "main": "src/index.js",
  "repository": {
@ -21,8 +21,8 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.80-alpha.4",
-    "@budibase/string-templates": "^0.9.80-alpha.4",
+    "@budibase/auth": "^0.9.80-alpha.7",
+    "@budibase/string-templates": "^0.9.80-alpha.7",
    "@koa/router": "^8.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",
    "aws-sdk": "^2.811.0",