CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-21 11:51:00 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience

Browse source
This commit is contained in:
Michael Drury 2022-08-16 15:42:47 +01:00
parent 30406f7f35 b96db6d7b7
commit 09372e2ad7
21 changed files with 110 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/deploy-release.yml vendored
View file

@ -68,6 +68,13 @@ jobs:
]
env:
KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
- name: Re roll the services
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG }}
with:
args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase
- name: Discord Webhook Action
uses: tsickert/discord-webhook@v4.0.0

7
.github/workflows/release-develop.yml vendored
View file

@ -121,6 +121,13 @@ jobs:
env:
KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
- name: Re roll the services
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG }}
with:
args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase
- name: Discord Webhook Action
uses: tsickert/discord-webhook@v4.0.0
with:

2
lerna.json
View file

@ -1,5 +1,5 @@
{
"version": "1.2.39-alpha.6",
"version": "1.2.40",
"npmClient": "yarn",
"packages": [
"packages/*"

4
packages/backend-core/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.2.39-alpha.6",
"version": "1.2.40",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@budibase/types": "1.2.39-alpha.6",
"@budibase/types": "1.2.40",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",
"bcrypt": "5.0.1",

4
packages/bbui/package.json
View file

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

10
packages/builder/package.json
View file

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

1
packages/builder/src/components/backend/DataTable/DataTable.svelte
View file

@ -167,6 +167,7 @@
{/if}
<HideAutocolumnButton bind:hideAutocolumns />
<ImportButton
disabled={$tables.selected?._id === "ta_users"}
tableId={$tables.selected?._id}
on:updaterows={onUpdateRows}
/>

3
packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte
View file

@ -3,11 +3,12 @@
import ImportModal from "../modals/ImportModal.svelte"
export let tableId
export let disabled
let modal
</script>
<ActionButton icon="DataUpload" size="S" quiet on:click={modal.show}>
<ActionButton icon="DataUpload" size="S" quiet on:click={modal.show} {disabled}>
Import
</ActionButton>
<Modal bind:this={modal}>

21
packages/builder/src/pages/builder/invite/index.svelte
View file

@ -1,13 +1,16 @@
<script>
import { Layout, Heading, Body, Button, notifications } from "@budibase/bbui"
import { goto, params } from "@roxi/routify"
import { users } from "stores/portal"
import { users, organisation } from "stores/portal"
import PasswordRepeatInput from "components/common/users/PasswordRepeatInput.svelte"
import Logo from "assets/bb-emblem.svg"
import { onMount } from "svelte"
const inviteCode = $params["?code"]
let password, error
$: company = $organisation.company || "Budibase"
async function acceptInvite() {
try {
await users.acceptInvite(inviteCode, password)
@ -17,16 +20,24 @@
notifications.error(error.message)
}
}
onMount(async () => {
try {
await organisation.init()
} catch (error) {
notifications.error("Error getting org config")
}
})
</script>
<section>
<div class="container">
<Layout>
<img src={Logo} alt="logo" />
<img alt="logo" src={$organisation.logoUrl || Logo} />
<Layout gap="XS" justifyItems="center" noPadding>
<Heading size="M">Accept Invitation</Heading>
<Heading size="M">Invitation to {company}</Heading>
<Body textAlign="center" size="M">
Please enter a password to set up your user.
Please enter a password to get started.
</Body>
</Layout>
<PasswordRepeatInput bind:error bind:password />
@ -46,7 +57,7 @@
}
.container {
margin: 0 auto;
width: 260px;
width: 300px;
display: flex;
flex-direction: column;
justify-content: flex-start;

2
packages/builder/src/pages/builder/portal/apps/_components/AcessFilter.svelte
View file

@ -22,7 +22,7 @@
if (!detail) return
const groupSelected = $groups.find(x => x._id === detail)
const appIds = groupSelected?.apps.map(x => x.appId) || null
const appIds = groupSelected?.apps || null
dispatch("change", appIds)
}

4
packages/builder/src/pages/builder/portal/apps/index.svelte
View file

@ -20,7 +20,7 @@
import { store, automationStore } from "builderStore"
import { API } from "api"
import { onMount } from "svelte"
import { apps, auth, admin, templates, groups } from "stores/portal"
import { apps, auth, admin, templates } from "stores/portal"
import download from "downloadjs"
import { goto } from "@roxi/routify"
import AppRow from "components/start/AppRow.svelte"
@ -355,7 +355,7 @@
</Button>
{/if}
<div class="filter">
{#if $auth.groupsEnabled && $groups.length}
{#if $auth.groupsEnabled}
<AccessFilter on:change={accessFilterAction} />
{/if}
<Select

8
packages/cli/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.2.39-alpha.6",
"version": "1.2.40",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {
@ -26,9 +26,9 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "^1.2.38",
"@budibase/string-templates": "^1.2.38",
"@budibase/types": "^1.2.38",
"@budibase/backend-core": "1.2.40",
"@budibase/string-templates": "1.2.40",
"@budibase/types": "1.2.40",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

8
packages/client/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.2.39-alpha.6",
"version": "1.2.40",
"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.2.39-alpha.6",
"@budibase/frontend-core": "1.2.39-alpha.6",
"@budibase/string-templates": "1.2.39-alpha.6",
"@budibase/bbui": "1.2.40",
"@budibase/frontend-core": "1.2.40",
"@budibase/string-templates": "1.2.40",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View file

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

12
packages/server/package.json
View file

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.2.39-alpha.6",
"version": "1.2.40",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -77,11 +77,11 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "1.2.39-alpha.6",
"@budibase/client": "1.2.39-alpha.6",
"@budibase/pro": "1.2.39-alpha.6",
"@budibase/string-templates": "1.2.39-alpha.6",
"@budibase/types": "1.2.39-alpha.6",
"@budibase/backend-core": "1.2.40",
"@budibase/client": "1.2.40",
"@budibase/pro": "1.2.40",
"@budibase/string-templates": "1.2.40",
"@budibase/types": "^1.2.40",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

13
packages/server/src/api/controllers/view/utils.js
View file

@ -20,8 +20,17 @@ exports.getView = async viewName => {
return null
}
const viewDoc = await db.get(generateMemoryViewID(viewName))
return viewDoc.view
try {
const viewDoc = await db.get(generateMemoryViewID(viewName))
return viewDoc.view
} catch (err) {
// Return null when PouchDB doesn't found the view
if (err.status === 404) {
return null
}
throw err
}
}
}

30
packages/server/yarn.lock
View file

@ -1094,12 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.2.39-alpha.6":
version "1.2.39-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.6.tgz#ebfddd4fa74fff043a60df7cba335b5fcdb84d51"
integrity sha512-1kz9K3MSe5E4d/dSm6jD4BMIX/SSW58d8U787N+1BfzvSkIEd32j7HFs5ij0w9sromvK9FEjpFBfZKqSDRp+5g==
"@budibase/backend-core@1.2.39-alpha.8":
version "1.2.39-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.8.tgz#70c4d3de7c68feaa3d7b183e4c9cfb1baf3d3d47"
integrity sha512-vBGPIei1qVPmbrHKGD4Swf7ECOWGXV+2buRIOkr0gRawK8oLOXc2xYV1zsDM7jd7rTMwtyF86fL/lhaSkXWwKA==
dependencies:
"@budibase/types" "1.2.39-alpha.6"
"@budibase/types" "1.2.39-alpha.8"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -1178,13 +1178,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@1.2.39-alpha.6":
version "1.2.39-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.6.tgz#94a19338c6f59755f34b4bf181ba15ac5eba5404"
integrity sha512-l5IcibGGpd9VCIzY5vZU6rYeJa+1AYNCsWWKMnm7ZeZQgiD62Hyus53pv9GvT4pwpUF60pxybAoTWhbbityCPQ==
"@budibase/pro@1.2.39-alpha.8":
version "1.2.39-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.8.tgz#11433da0dba0e6c81ad93d6cabc5ce165db94e0f"
integrity sha512-1N3FnVPhUwh2KR0IGiN+EjbY3LpF563Ac2FyT/JgyS9wG6NTP0hV/ugA7TZIvkv2XaYroYMYSPBa/wYtWh4xBQ==
dependencies:
"@budibase/backend-core" "1.2.39-alpha.6"
"@budibase/types" "1.2.39-alpha.6"
"@budibase/backend-core" "1.2.39-alpha.8"
"@budibase/types" "1.2.39-alpha.8"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1207,10 +1207,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@1.2.39-alpha.6":
version "1.2.39-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.6.tgz#5c6dc1a130913fb1c7ac6999fc6e03d970d0142f"
integrity sha512-0FHmwsfvAL80PGQM0OSJ6n9CDCtQQrbX8PRdcWOSIhRNlJXNcTsPcBsPbQpZPbgT57GHX/86Fo1rljiMWDwNpw==
"@budibase/types@1.2.39-alpha.8":
version "1.2.39-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.8.tgz#2999dac33da64b41f222d0fe73cfd387957952d9"
integrity sha512-UbknZ3Pnl8tdCPy5XKkuW3OQb1T/L+n1slY8/orm8KpR/TOEhK4Q20JRxENqQo5f9Za8bX4COesLjwAmae426Q==
"@bull-board/api@3.7.0":
version "3.7.0"

2
packages/string-templates/package.json
View file

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

2
packages/types/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "1.2.39-alpha.6",
"version": "1.2.40",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View file

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.2.39-alpha.6",
"version": "1.2.40",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -35,10 +35,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "1.2.39-alpha.6",
"@budibase/pro": "1.2.39-alpha.6",
"@budibase/string-templates": "1.2.39-alpha.6",
"@budibase/types": "1.2.39-alpha.6",
"@budibase/backend-core": "1.2.40",
"@budibase/pro": "1.2.40",
"@budibase/string-templates": "1.2.40",
"@budibase/types": "1.2.40",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

30
packages/worker/yarn.lock
View file

@ -291,12 +291,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.2.39-alpha.6":
version "1.2.39-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.6.tgz#ebfddd4fa74fff043a60df7cba335b5fcdb84d51"
integrity sha512-1kz9K3MSe5E4d/dSm6jD4BMIX/SSW58d8U787N+1BfzvSkIEd32j7HFs5ij0w9sromvK9FEjpFBfZKqSDRp+5g==
"@budibase/backend-core@1.2.39-alpha.8":
version "1.2.39-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.8.tgz#70c4d3de7c68feaa3d7b183e4c9cfb1baf3d3d47"
integrity sha512-vBGPIei1qVPmbrHKGD4Swf7ECOWGXV+2buRIOkr0gRawK8oLOXc2xYV1zsDM7jd7rTMwtyF86fL/lhaSkXWwKA==
dependencies:
"@budibase/types" "1.2.39-alpha.6"
"@budibase/types" "1.2.39-alpha.8"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -325,21 +325,21 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@1.2.39-alpha.6":
version "1.2.39-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.6.tgz#94a19338c6f59755f34b4bf181ba15ac5eba5404"
integrity sha512-l5IcibGGpd9VCIzY5vZU6rYeJa+1AYNCsWWKMnm7ZeZQgiD62Hyus53pv9GvT4pwpUF60pxybAoTWhbbityCPQ==
"@budibase/pro@1.2.39-alpha.8":
version "1.2.39-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.8.tgz#11433da0dba0e6c81ad93d6cabc5ce165db94e0f"
integrity sha512-1N3FnVPhUwh2KR0IGiN+EjbY3LpF563Ac2FyT/JgyS9wG6NTP0hV/ugA7TZIvkv2XaYroYMYSPBa/wYtWh4xBQ==
dependencies:
"@budibase/backend-core" "1.2.39-alpha.6"
"@budibase/types" "1.2.39-alpha.6"
"@budibase/backend-core" "1.2.39-alpha.8"
"@budibase/types" "1.2.39-alpha.8"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.2.39-alpha.6":
version "1.2.39-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.6.tgz#5c6dc1a130913fb1c7ac6999fc6e03d970d0142f"
integrity sha512-0FHmwsfvAL80PGQM0OSJ6n9CDCtQQrbX8PRdcWOSIhRNlJXNcTsPcBsPbQpZPbgT57GHX/86Fo1rljiMWDwNpw==
"@budibase/types@1.2.39-alpha.8":
version "1.2.39-alpha.8"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.8.tgz#2999dac33da64b41f222d0fe73cfd387957952d9"
integrity sha512-UbknZ3Pnl8tdCPy5XKkuW3OQb1T/L+n1slY8/orm8KpR/TOEhK4Q20JRxENqQo5f9Za8bX4COesLjwAmae426Q==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"