Merge branch 'develop' of github.com:Budibase/budibase into ak-fixes

5 years ago · 4b7cc205ae
14 changed files with 44 additions and 34 deletions
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
  "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.150-alpha.0",
+  "version": "0.9.151-alpha.0",
  "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.150-alpha.0",
+  "version": "0.9.151-alpha.0",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.150-alpha.0",
-    "@budibase/client": "^0.9.150-alpha.0",
+    "@budibase/bbui": "^0.9.151-alpha.0",
+    "@budibase/client": "^0.9.151-alpha.0",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.150-alpha.0",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@ -8,7 +8,6 @@ import {
  selectedComponent,
  selectedAccessRole,
 } from "builderStore"
-import { notifications } from "@budibase/bbui"
 import {
  datasources,
  integrations,
@ -16,7 +15,6 @@ import {
  database,
  tables,
 } from "stores/backend"
-
 import { fetchComponentLibDefinitions } from "../loadComponentLibraries"
 import api from "../api"
 import { FrontendTypes } from "constants"
@ -472,8 +470,7 @@ export const getFrontendStore = () => {

        // Ensure we aren't deleting the screen slot
        if (component._component?.endsWith("/screenslot")) {
-          notifications.error("You can't delete the screen slot")
-          return
+          throw "You can't delete the screen slot"
        }

        // Ensure we aren't deleting something that contains the screen slot
@ -482,10 +479,7 @@ export const getFrontendStore = () => {
          "@budibase/standard-components/screenslot"
        )
        if (screenslot != null) {
-          notifications.error(
-            "You can't delete a component that contains the screen slot"
-          )
-          return
+          throw "You can't delete a component that contains the screen slot"
        }

        const parent = findComponentParent(asset.props, component._id)
--- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
+++ b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
@ -6,7 +6,13 @@
  import { Screen } from "builderStore/store/screenTemplates/utils/Screen"
  import { FrontendTypes } from "constants"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { ProgressCircle, Layout, Heading, Body } from "@budibase/bbui"
+  import {
+    ProgressCircle,
+    Layout,
+    Heading,
+    Body,
+    notifications,
+  } from "@budibase/bbui"
  import ErrorSVG from "assets/error.svg?raw"
  import { findComponent, findComponentPath } from "builderStore/storeUtils"

@ -166,10 +172,15 @@
    confirmDeleteDialog.show()
  }

-  const deleteComponent = () => {
-    store.actions.components.delete({ _id: idToDelete })
+  const deleteComponent = async () => {
+    try {
+      await store.actions.components.delete({ _id: idToDelete })
+    } catch (error) {
+      notifications.error(error)
+    }
    idToDelete = null
  }
+
  const cancelDeleteComponent = () => {
    idToDelete = null
  }
--- a/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
@ -3,7 +3,7 @@
  import { store, currentAsset } from "builderStore"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
  import { findComponentParent } from "builderStore/storeUtils"
-  import { ActionMenu, MenuItem, Icon } from "@budibase/bbui"
+  import { ActionMenu, MenuItem, Icon, notifications } from "@budibase/bbui"

  export let component

@ -51,7 +51,11 @@
  }

  const deleteComponent = async () => {
-    await store.actions.components.delete(component)
+    try {
+      await store.actions.components.delete(component)
+    } catch (error) {
+      notifications.error(error)
+    }
  }

  const storeComponentForCopy = (cut = false) => {
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
  "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.150-alpha.0",
+  "version": "0.9.151-alpha.0",
  "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": "^0.9.150-alpha.0",
+    "@budibase/bbui": "^0.9.151-alpha.0",
    "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.150-alpha.0",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
  "description": "Budibase Web Server",
  "main": "src/index.js",
  "repository": {
@ -66,9 +66,9 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.150-alpha.0",
-    "@budibase/client": "^0.9.150-alpha.0",
-    "@budibase/string-templates": "^0.9.150-alpha.0",
+    "@budibase/auth": "^0.9.151-alpha.0",
+    "@budibase/client": "^0.9.151-alpha.0",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
    "@elastic/elasticsearch": "7.10.0",
    "@koa/router": "8.0.0",
    "@sendgrid/mail": "7.1.1",
--- a/packages/server/src/utilities/usageQuota.js
+++ b/packages/server/src/utilities/usageQuota.js
@ -58,7 +58,7 @@ exports.update = async (property, usage) => {
    // increment the quota
    quota.usageQuota[property] += usage

-    if (quota.usageQuota[property] >= quota.usageLimits[property]) {
+    if (quota.usageQuota[property] > quota.usageLimits[property]) {
      throw new Error(
        `You have exceeded your usage quota of ${quota.usageLimits[property]} ${property}.`
      )
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "0.9.150-alpha.0",
+  "version": "0.9.151-alpha.0",
  "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.150-alpha.0",
+  "version": "0.9.151-alpha.0",
  "description": "Budibase background service",
  "main": "src/index.js",
  "repository": {
@ -27,8 +27,8 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.150-alpha.0",
-    "@budibase/string-templates": "^0.9.150-alpha.0",
+    "@budibase/auth": "^0.9.151-alpha.0",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
    "@koa/router": "^8.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",
    "aws-sdk": "^2.811.0",
--- a/packages/worker/src/utilities/email.js
+++ b/packages/worker/src/utilities/email.js
@ -113,7 +113,7 @@ async function getSmtpConfiguration(db, workspaceId = null, automation) {
    params.workspace = workspaceId
  }

-  const customConfig = getScopedConfig(db, params)
+  const customConfig = await getScopedConfig(db, params)

  if (customConfig) {
    return customConfig
@ -125,6 +125,7 @@ async function getSmtpConfiguration(db, workspaceId = null, automation) {
      port: env.SMTP_PORT,
      host: env.SMTP_HOST,
      secure: false,
+      from: env.SMTP_FROM_ADDRESS,
      auth: {
        user: env.SMTP_USER,
        pass: env.SMTP_PASSWORD,