Merge branch 'develop' of github.com:Budibase/budibase into feature/rest-redesign

lerna.json

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

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "1.0.5-alpha.1",
+  "version": "1.0.6-alpha.1",
   "description": "Authentication middlewares for budibase builder and apps",
   "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.5-alpha.1",
+  "version": "1.0.6-alpha.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.5-alpha.1",
+  "version": "1.0.6-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.5-alpha.1",
+    "@budibase/bbui": "^1.0.6-alpha.1",
-    "@budibase/client": "^1.0.5-alpha.1",
+    "@budibase/client": "^1.0.6-alpha.1",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.5-alpha.1",
+    "@budibase/string-templates": "^1.0.6-alpha.1",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/builderStore/store/frontend.js

@@ -82,7 +82,7 @@ export const getFrontendStore = () => {
         libraries: application.componentLibraries,
         components,
         clientFeatures: {
-          ...state.clientFeatures,
+          ...INITIAL_FRONTEND_STATE.clientFeatures,
           ...components.features,
         },
         name: application.name,

packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte

@@ -149,7 +149,7 @@
       </Button>
       <DrawerContent slot="body">
         <Layout noPadding>
-          {#if getQueryParams(value._id).length > 0}
+          {#if getQueryParams(value).length > 0}
             <ParameterBuilder
               bind:customParams={value.queryParams}
               parameters={getQueryParams(value)}

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.5-alpha.1",
+  "version": "1.0.6-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.5-alpha.1",
+  "version": "1.0.6-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.5-alpha.1",
+    "@budibase/bbui": "^1.0.6-alpha.1",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.5-alpha.1",
+    "@budibase/string-templates": "^1.0.6-alpha.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.5-alpha.1",
+  "version": "1.0.6-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -69,9 +69,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/auth": "^1.0.5-alpha.1",
+    "@budibase/auth": "^1.0.6-alpha.1",
-    "@budibase/client": "^1.0.5-alpha.1",
+    "@budibase/client": "^1.0.6-alpha.1",
-    "@budibase/string-templates": "^1.0.5-alpha.1",
+    "@budibase/string-templates": "^1.0.6-alpha.1",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/server/scripts/integrations/oracle/oracle.md

@@ -84,7 +84,7 @@ The `HR` schema is populated with dummy data by default in oracle for testing pu
 To connect to the HR schema first update the user password and unlock the account by performing
 ```sql
 ALTER USER hr ACCOUNT UNLOCK;
-ALTER USER hr IDENTIFIED BY hr
+ALTER USER hr IDENTIFIED BY hr;
 ```
 You should now be able to connect to the hr schema using the credentials hr/hr
 

packages/server/src/integrations/oracle.ts

@@ -381,7 +381,7 @@ module OracleModule {
       }`
       const attributes: ConnectionAttributes = {
         user: this.config.user,
-        password: this.config.user,
+        password: this.config.password,
         connectString,
       }
       return oracledb.getConnection(attributes)

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.5-alpha.1",
+  "version": "1.0.6-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.5-alpha.1",
+  "version": "1.0.6-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/auth": "^1.0.5-alpha.1",
+    "@budibase/auth": "^1.0.6-alpha.1",
-    "@budibase/string-templates": "^1.0.5-alpha.1",
+    "@budibase/string-templates": "^1.0.6-alpha.1",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",