Browse Source

Merge remote-tracking branch 'origin/develop' into feature/table-row-selection

master
Peter Clement 5 years ago
parent
commit
8ef013f173
  1. 2
      lerna.json
  2. 2
      packages/backend-core/package.json
  3. 4
      packages/bbui/package.json
  4. 57
      packages/bbui/src/Modal/Modal.svelte
  5. 10
      packages/builder/package.json
  6. 3
      packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
  7. 4
      packages/builder/src/helpers/data/utils.js
  8. 2
      packages/builder/src/stores/backend/queries.js
  9. 2
      packages/cli/package.json
  10. 8
      packages/client/package.json
  11. 6
      packages/client/src/utils/buttonActions.js
  12. 4
      packages/frontend-core/package.json
  13. 8
      packages/server/package.json
  14. 2
      packages/string-templates/package.json
  15. 6
      packages/worker/package.json

2
lerna.json

@ -1,5 +1,5 @@
{ {
"version": "1.0.76-alpha.5", "version": "1.0.79-alpha.0",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

2
packages/backend-core/package.json

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

4
packages/bbui/package.json

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

57
packages/bbui/src/Modal/Modal.svelte

@ -54,34 +54,43 @@
<svelte:window on:keydown={handleKey} /> <svelte:window on:keydown={handleKey} />
<!-- These svelte if statements need to be defined like this. --> {#if inline}
<!-- The modal transitions do not work if nested inside more than one "if" --> {#if visible}
{#if visible && inline} <div use:focusFirstInput class="spectrum-Modal inline is-open">
<div use:focusFirstInput class="spectrum-Modal inline is-open"> <slot />
<slot /> </div>
</div> {/if}
{:else if visible} {:else}
<!--
We cannot conditionally render the portal as this leads to a missing
insertion point when using nested modals. Therefore we just conditionally
render the content of the portal.
It still breaks the modal animation, but its better than soft bricking the
screen.
-->
<Portal target=".modal-container"> <Portal target=".modal-container">
<div {#if visible}
class="spectrum-Underlay is-open" <div
in:fade={{ duration: 200 }} class="spectrum-Underlay is-open"
out:fade|local={{ duration: 200 }} in:fade={{ duration: 200 }}
on:mousedown|self={cancel} out:fade|local={{ duration: 200 }}
> on:mousedown|self={cancel}
<div class="modal-wrapper" on:mousedown|self={cancel}> >
<div class="modal-inner-wrapper" on:mousedown|self={cancel}> <div class="modal-wrapper" on:mousedown|self={cancel}>
<slot name="outside" /> <div class="modal-inner-wrapper" on:mousedown|self={cancel}>
<div <slot name="outside" />
use:focusFirstInput <div
class="spectrum-Modal is-open" use:focusFirstInput
in:fly={{ y: 30, duration: 200 }} class="spectrum-Modal is-open"
out:fly|local={{ y: 30, duration: 200 }} in:fly={{ y: 30, duration: 200 }}
> out:fly|local={{ y: 30, duration: 200 }}
<slot /> >
<slot />
</div>
</div> </div>
</div> </div>
</div> </div>
</div> {/if}
</Portal> </Portal>
{/if} {/if}

10
packages/builder/package.json

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "1.0.76-alpha.5", "version": "1.0.79-alpha.0",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -65,10 +65,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.76-alpha.5", "@budibase/bbui": "^1.0.79-alpha.0",
"@budibase/client": "^1.0.76-alpha.5", "@budibase/client": "^1.0.79-alpha.0",
"@budibase/frontend-core": "^1.0.76-alpha.5", "@budibase/frontend-core": "^1.0.79-alpha.0",
"@budibase/string-templates": "^1.0.76-alpha.5", "@budibase/string-templates": "^1.0.79-alpha.0",
"@sentry/browser": "5.19.1", "@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1", "@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1", "@spectrum-css/vars": "^3.0.1",

3
packages/builder/src/components/backend/DataTable/ViewDataTable.svelte

@ -57,7 +57,8 @@
{data} {data}
{loading} {loading}
{type} {type}
allowEditing={!view?.calculation} allowEditing={false}
rowCount={10}
bind:hideAutocolumns bind:hideAutocolumns
> >
<ViewFilterButton {view} /> <ViewFilterButton {view} />

4
packages/builder/src/helpers/data/utils.js

@ -30,8 +30,8 @@ export function breakQueryString(qs) {
const params = qs.split("&") const params = qs.split("&")
let paramObj = {} let paramObj = {}
for (let param of params) { for (let param of params) {
const [key, value] = param.split("=") const split = param.split("=")
paramObj[key] = value paramObj[split[0]] = split.slice(1).join("=")
} }
return paramObj return paramObj
} }

2
packages/builder/src/stores/backend/queries.js

@ -60,7 +60,7 @@ export function createQueriesStore() {
}) })
return savedQuery return savedQuery
}, },
import: async (data, datasourceId) => { import: async ({ data, datasourceId }) => {
return await API.importQueries({ return await API.importQueries({
datasourceId, datasourceId,
data, data,

2
packages/cli/package.json

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "1.0.76-alpha.5", "version": "1.0.79-alpha.0",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js", "main": "src/index.js",
"bin": { "bin": {

8
packages/client/package.json

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "1.0.76-alpha.5", "version": "1.0.79-alpha.0",
"license": "MPL-2.0", "license": "MPL-2.0",
"module": "dist/budibase-client.js", "module": "dist/budibase-client.js",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.76-alpha.5", "@budibase/bbui": "^1.0.79-alpha.0",
"@budibase/frontend-core": "^1.0.76-alpha.5", "@budibase/frontend-core": "^1.0.79-alpha.0",
"@budibase/string-templates": "^1.0.76-alpha.5", "@budibase/string-templates": "^1.0.79-alpha.0",
"@spectrum-css/button": "^3.0.3", "@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3", "@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3", "@spectrum-css/divider": "^1.0.3",

6
packages/client/src/utils/buttonActions.js

@ -127,12 +127,16 @@ const queryExecutionHandler = async action => {
// Trigger a notification and invalidate the datasource as long as this // Trigger a notification and invalidate the datasource as long as this
// was not a readable query // was not a readable query
if (!query.readable) { if (!query.readable) {
API.notifications.error.success("Query executed successfully") notificationStore.actions.success("Query executed successfully")
await dataSourceStore.actions.invalidateDataSource(query.datasourceId) await dataSourceStore.actions.invalidateDataSource(query.datasourceId)
} }
return { result } return { result }
} catch (error) { } catch (error) {
notificationStore.actions.error(
"An error occurred while executing the query"
)
// Abort next actions // Abort next actions
return false return false
} }

4
packages/frontend-core/package.json

@ -1,12 +1,12 @@
{ {
"name": "@budibase/frontend-core", "name": "@budibase/frontend-core",
"version": "1.0.76-alpha.5", "version": "1.0.79-alpha.0",
"description": "Budibase frontend core libraries used in builder and client", "description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.76-alpha.5", "@budibase/bbui": "^1.0.79-alpha.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"svelte": "^3.46.2" "svelte": "^3.46.2"
} }

8
packages/server/package.json

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

2
packages/string-templates/package.json

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

6
packages/worker/package.json

@ -1,7 +1,7 @@
{ {
"name": "@budibase/worker", "name": "@budibase/worker",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "1.0.76-alpha.5", "version": "1.0.79-alpha.0",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -34,8 +34,8 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "^1.0.76-alpha.5", "@budibase/backend-core": "^1.0.79-alpha.0",
"@budibase/string-templates": "^1.0.76-alpha.5", "@budibase/string-templates": "^1.0.79-alpha.0",
"@koa/router": "^8.0.0", "@koa/router": "^8.0.0",
"@sentry/node": "^6.0.0", "@sentry/node": "^6.0.0",
"@techpass/passport-openidconnect": "^0.3.0", "@techpass/passport-openidconnect": "^0.3.0",

Loading…
Cancel
Save