Browse Source

merge

pull/1382/head
Martin McKeaveney 5 years ago
parent
commit
9eb6b541e9
  1. 7
      .github/workflows/release.yml
  2. 2
      lerna.json
  3. 6
      packages/builder/package.json
  4. 2
      packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
  5. 7
      packages/builder/src/components/common/DrawerBindableInput.svelte
  6. 15
      packages/builder/src/pages/[application]/data/datasource/index.svelte
  7. 4
      packages/cli/package.json
  8. 8
      packages/client/package.json
  9. 10
      packages/server/package.json
  10. 8
      packages/server/src/api/routes/tests/webhook.spec.js
  11. 1
      packages/server/src/automations/steps/createUser.js
  12. 122
      packages/server/src/electron.js
  13. 4
      packages/standard-components/package.json
  14. 4
      packages/string-templates/package.json
  15. 2
      packages/worker/package.json

7
.github/workflows/release.yml

@ -1,6 +1,13 @@
name: Budibase Release
on:
workflow_dispatch:
inputs:
name:
description: 'Version'
required: false
default: '0.8'
# Trigger the workflow on push with tags,
# but only for the master branch
push:

2
lerna.json

@ -1,5 +1,5 @@
{
"version": "0.8.9",
"version": "0.8.14",
"npmClient": "yarn",
"packages": [
"packages/*"

6
packages/builder/package.json

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "0.8.9",
"version": "0.8.14",
"license": "AGPL-3.0",
"private": true,
"scripts": {
@ -64,9 +64,9 @@
},
"dependencies": {
"@budibase/bbui": "^1.58.13",
"@budibase/client": "^0.8.9",
"@budibase/client": "^0.8.14",
"@budibase/colorpicker": "1.1.2",
"@budibase/string-templates": "^0.8.9",
"@budibase/string-templates": "^0.8.14",
"@budibase/svelte-ag-grid": "^1.0.4",
"@sentry/browser": "5.19.1",
"@svelteschool/svelte-forms": "0.7.0",

2
packages/builder/src/components/automation/SetupPanel/RowSelector.svelte

@ -1,6 +1,6 @@
<script>
import { backendUiStore } from "builderStore"
import { Select } from "@budibase/bbui"
import { Select, Label } from "@budibase/bbui"
import DrawerBindableInput from "../../common/DrawerBindableInput.svelte"
import AutomationBindingPanel from "./AutomationBindingPanel.svelte"

7
packages/builder/src/components/common/DrawerBindableInput.svelte

@ -1,5 +1,5 @@
<script>
import { Icon, Input, Drawer, Body, Button } from "@budibase/bbui"
import { Icon, Input, Drawer, Label, Body, Button } from "@budibase/bbui"
import {
readableToRuntimeBinding,
runtimeToReadableBinding,
@ -14,6 +14,7 @@
export let thin = true
export let title = "Bindings"
export let placeholder
export let label
let bindingDrawer
@ -32,6 +33,7 @@
<div class="control">
<Input
{label}
{thin}
value={readableValue}
on:change={event => onChange(event.target.value)}
@ -67,7 +69,6 @@
.icon {
right: 2px;
top: 2px;
bottom: 2px;
position: absolute;
align-items: center;
@ -80,7 +81,9 @@
border-bottom-right-radius: var(--border-radius-m);
color: var(--grey-7);
font-size: 14px;
height: 40px;
}
.icon:hover {
color: var(--ink);
cursor: pointer;

15
packages/builder/src/pages/[application]/data/datasource/index.svelte

@ -1,18 +1,27 @@
<script>
import { backendUiStore } from "builderStore"
import { goto } from "@sveltech/routify"
import { goto, leftover } from "@sveltech/routify"
import { onMount } from "svelte"
onMount(async () => {
// navigate to first table in list, if not already selected
$backendUiStore.datasources.length > 0 &&
// and this is the final url (i.e. no selectedTable)
if (
!$leftover &&
$backendUiStore.datasources.length > 0 &&
!$backendUiStore.selectedDatasourceId
) {
// this file routes as .../tables/index, so, go up one.
$goto(`../${$backendUiStore.datasources[0]._id}`)
}
})
</script>
{#if $backendUiStore.tables.length === 0}
<i>Connect your first datasource to start building.</i>
{:else}<i>Select a datasource to edit</i>{/if}
{:else}
<i>Select a datasource to edit</i>
{/if}
<style>
i {

4
packages/cli/package.json

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

8
packages/client/package.json

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "0.8.9",
"version": "0.8.14",
"license": "MPL-2.0",
"main": "dist/budibase-client.js",
"module": "dist/budibase-client.js",
@ -9,13 +9,13 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/string-templates": "^0.8.9",
"@budibase/string-templates": "^0.8.14",
"regexparam": "^1.3.0",
"shortid": "^2.2.15",
"svelte-spa-router": "^3.0.5"
},
"devDependencies": {
"@budibase/standard-components": "^0.8.9",
"@budibase/standard-components": "^0.8.14",
"@rollup/plugin-commonjs": "^16.0.0",
"@rollup/plugin-node-resolve": "^10.0.0",
"fs-extra": "^8.1.0",
@ -29,5 +29,5 @@
"svelte": "^3.30.0",
"svelte-jester": "^1.0.6"
},
"gitHead": "1b95326b20d1352d36305910259228b96a683dc7"
"gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
}

10
packages/server/package.json

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "0.8.9",
"version": "0.8.14",
"description": "Budibase Web Server",
"main": "src/electron.js",
"repository": {
@ -80,8 +80,8 @@
"author": "Budibase",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@budibase/client": "^0.8.9",
"@budibase/string-templates": "^0.8.9",
"@budibase/client": "^0.8.14",
"@budibase/string-templates": "^0.8.14",
"@elastic/elasticsearch": "7.10.0",
"@koa/router": "8.0.0",
"@sendgrid/mail": "7.1.1",
@ -135,7 +135,7 @@
"zlib": "1.0.5"
},
"devDependencies": {
"@budibase/standard-components": "^0.8.9",
"@budibase/standard-components": "^0.8.14",
"@jest/test-sequencer": "^24.8.0",
"docker-compose": "^0.23.6",
"electron": "10.1.3",
@ -147,5 +147,5 @@
"pouchdb-adapter-memory": "^7.2.1",
"supertest": "^4.0.2"
},
"gitHead": "1b95326b20d1352d36305910259228b96a683dc7"
"gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
}

8
packages/server/src/api/routes/tests/webhook.spec.js

@ -108,14 +108,6 @@ describe("/webhooks", () => {
type: "object",
})
})
it("should apply authorization to endpoint", async () => {
await checkBuilderEndpoint({
config,
method: "POST",
url: `/api/webhooks/schema/${config.getAppId()}/${webhook._id}`,
})
})
})
describe("trigger", () => {

1
packages/server/src/automations/steps/createUser.js

@ -23,7 +23,6 @@ module.exports.definition = {
},
password: {
type: "string",
customType: "password",
title: "Password",
},
roleId: {

122
packages/server/src/electron.js

@ -82,12 +82,122 @@
// }
// })
// app.on("activate", () => {
// // On macOS it's common to re-create a window in the app when the
// // dock icon is clicked and there are no other windows open.
// if (win === null) createWindow()
// })
// }
app.on("activate", () => {
// On macOS it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
if (win === null) createWindow()
})
const template = [
// { role: 'appMenu' }
...(isMac
? [
{
label: app.name,
submenu: [
{ role: "about" },
{ type: "separator" },
{ role: "services" },
{ type: "separator" },
{ role: "hide" },
{ role: "hideothers" },
{ role: "unhide" },
{ type: "separator" },
{ role: "quit" },
],
},
]
: []),
// { role: 'fileMenu' }
{
label: "File",
submenu: [isMac ? { role: "close" } : { role: "quit" }],
},
// { role: 'editMenu' }
{
label: "Edit",
submenu: [
{ role: "undo" },
{ role: "redo" },
{ type: "separator" },
{ role: "cut" },
{ role: "copy" },
{ role: "paste" },
...(isMac
? [
{ role: "pasteAndMatchStyle" },
{ role: "delete" },
{ role: "selectAll" },
{ type: "separator" },
{
label: "Speech",
submenu: [{ role: "startSpeaking" }, { role: "stopSpeaking" }],
},
]
: [{ role: "delete" }, { type: "separator" }, { role: "selectAll" }]),
],
},
// { role: 'viewMenu' }
{
label: "View",
submenu: [
{ role: "reload" },
{ role: "forceReload" },
{ role: "toggleDevTools" },
{ type: "separator" },
{ role: "resetZoom" },
{ role: "zoomIn" },
{ role: "zoomOut" },
{ type: "separator" },
{ role: "togglefullscreen" },
],
},
// { role: 'windowMenu' }
{
label: "Window",
submenu: [
{ role: "minimize" },
{ role: "zoom" },
...(isMac
? [
{ type: "separator" },
{ role: "front" },
{ type: "separator" },
{ role: "window" },
]
: [{ role: "close" }]),
],
},
{
role: "help",
submenu: [
{
label: "Learn More",
click: () => shell.openExternal("https://www.budibase.com/"),
},
{
label: "Documentation",
click: () => shell.openExternal("https://docs.budibase.com/"),
},
{
label: "Search issues",
click: () =>
shell.openExternal("https://github.com/Budibase/budibase/issues"),
},
{
label: "Community discussions",
click: () =>
shell.openExternal(
"https://github.com/Budibase/budibase/discussions"
),
},
],
},
]
const menu = Menu.buildFromTemplate(template)
Menu.setApplicationMenu(menu)
}
// autoUpdater.on("update-downloaded", (event, releaseNotes, releaseName) => {
// const dialogOpts = {

4
packages/standard-components/package.json

@ -35,9 +35,9 @@
"keywords": [
"svelte"
],
"version": "0.8.9",
"version": "0.8.14",
"license": "MIT",
"gitHead": "1b95326b20d1352d36305910259228b96a683dc7",
"gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321",
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.1.0",
"@budibase/bbui": "^1.58.13",

4
packages/string-templates/package.json

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "0.8.9",
"version": "0.8.14",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.js",
"module": "src/index.js",
@ -33,5 +33,5 @@
"rollup-plugin-terser": "^7.0.2",
"typescript": "^4.1.3"
},
"gitHead": "1b95326b20d1352d36305910259228b96a683dc7"
"gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
}

2
packages/worker/package.json

@ -1,7 +1,7 @@
{
"name": "@budibase/deployment",
"email": "hi@budibase.com",
"version": "0.8.9",
"version": "0.8.14",
"description": "Budibase Deployment Server",
"main": "src/index.js",
"repository": {

Loading…
Cancel
Save