Merge remote-tracking branch 'upstream/master' into feature/builder-organization
This commit is contained in:
kevmodrome
commit
9c99f416a7
16 changed files with 48 additions and 24 deletions
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "0.0.27",
|
||||
"version": "0.0.29",
|
||||
"npmClient": "yarn",
|
||||
"packages": [
|
||||
"packages/*"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
"publishdev": "yarn build && node ./scripts/publishDev.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@budibase/client": "^0.0.27",
|
||||
"@budibase/client": "^0.0.29",
|
||||
"fs-extra": "^8.1.0",
|
||||
"lodash": "^4.17.15",
|
||||
"npm-run-all": "^4.1.5",
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
"keywords": [
|
||||
"svelte"
|
||||
],
|
||||
"version": "0.0.27",
|
||||
"version": "0.0.29",
|
||||
"license": "MIT",
|
||||
"gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/builder",
|
||||
"version": "0.0.27",
|
||||
"version": "0.0.29",
|
||||
"license": "AGPL-3.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
]
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/client": "^0.0.27",
|
||||
"@budibase/client": "^0.0.29",
|
||||
"@nx-js/compiler-util": "^2.0.0",
|
||||
"codemirror": "^5.51.0",
|
||||
"date-fns": "^1.29.0",
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<div>
|
||||
<h4 style="margin-bottom: 20px">Choose an Application</h4>
|
||||
{#each $store.apps as app}
|
||||
<a href={`#/${app}`} class="app-link">{app}</a>
|
||||
<a href={`#${app}`} class="app-link">{app}</a>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<script>
|
||||
import { tick } from "svelte"
|
||||
import { store, backendUiStore } from "builderStore"
|
||||
import api from "builderStore/api"
|
||||
import getIcon from "../common/icon"
|
||||
import { CheckIcon } from "../common/Icons"
|
||||
|
||||
|
|
@ -13,6 +14,23 @@
|
|||
backendUiStore.actions.views.select(views[0])
|
||||
backendUiStore.actions.database.select(database)
|
||||
}
|
||||
|
||||
async function deleteDatabase(database) {
|
||||
const DELETE_DATABASE_URL = `/_builder/instance/_master/0/api/record/applications/${$store.appId}/instances/${database.id}`
|
||||
const response = await api.delete(DELETE_DATABASE_URL)
|
||||
store.update(state => {
|
||||
state.appInstances = state.appInstances.filter(
|
||||
db => db.id !== database.id
|
||||
)
|
||||
return state
|
||||
})
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
if ($store.appInstances.length > 0) {
|
||||
selectDatabase($store.appInstances[0])
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<div class="root">
|
||||
|
|
@ -24,12 +42,15 @@
|
|||
<CheckIcon />
|
||||
{/if}
|
||||
</span>
|
||||
|
||||
<i
|
||||
class="ri-delete-bin-7-line hoverable uk-margin-small-left"
|
||||
on:click={() => deleteDatabase(database)} />
|
||||
<button
|
||||
class:active={database.id === $backendUiStore.selectedDatabase.id}
|
||||
on:click={() => selectDatabase(database)}>
|
||||
{database.name}
|
||||
</button>
|
||||
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
|
|
@ -53,6 +74,8 @@
|
|||
|
||||
li {
|
||||
margin: 0.5rem 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
button {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "budibase",
|
||||
"version": "0.0.27",
|
||||
"version": "0.0.29",
|
||||
"description": "Budibase CLI",
|
||||
"repository": "https://github.com/Budibase/Budibase",
|
||||
"homepage": "https://budibase.com",
|
||||
|
|
@ -20,8 +20,8 @@
|
|||
"author": "Budibase",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
"@budibase/datastores": "^0.0.27",
|
||||
"@budibase/server": "^0.0.27",
|
||||
"@budibase/datastores": "^0.0.29",
|
||||
"@budibase/server": "^0.0.29",
|
||||
"@inquirer/password": "^0.0.6-alpha.0",
|
||||
"chalk": "^2.4.2",
|
||||
"fs-extra": "^8.1.0",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/client",
|
||||
"version": "0.0.27",
|
||||
"version": "0.0.29",
|
||||
"license": "MPL-2.0",
|
||||
"main": "dist/budibase-client.js",
|
||||
"module": "dist/budibase-client.esm.mjs",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/core",
|
||||
"version": "0.0.27",
|
||||
"version": "0.0.29",
|
||||
"description": "core javascript library for budibase",
|
||||
"main": "dist/budibase-core.umd.js",
|
||||
"module": "dist/budibase-core.esm.js",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/datastores",
|
||||
"version": "0.0.27",
|
||||
"version": "0.0.29",
|
||||
"description": "implementations of all the datastores... azureblob, local etc",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
"@babel/core": "^7.1.2",
|
||||
"@babel/node": "^7.0.0",
|
||||
"@babel/preset-env": "^7.1.0",
|
||||
"@budibase/core": "^0.0.27",
|
||||
"@budibase/core": "^0.0.29",
|
||||
"es6-promisify": "^6.0.1",
|
||||
"fs-extra": "^8.1.0",
|
||||
"lodash": "^4.17.13",
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
"publishdev": "yarn build && node ./scripts/publishDev.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@budibase/client": "^0.0.27",
|
||||
"@budibase/standard-components": "^0.0.27",
|
||||
"@budibase/client": "^0.0.29",
|
||||
"@budibase/standard-components": "^0.0.29",
|
||||
"@material/button": "^4.0.0",
|
||||
"@material/checkbox": "^4.0.0",
|
||||
"@material/data-table": "4.0.0",
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
"keywords": [
|
||||
"svelte"
|
||||
],
|
||||
"version": "0.0.27",
|
||||
"version": "0.0.29",
|
||||
"license": "MIT",
|
||||
"gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e",
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@
|
|||
|
||||
function handleOnClick() {
|
||||
let item = { _id, checked, label, value }
|
||||
debugger
|
||||
if (context === "checkboxgroup") {
|
||||
let idx = selectedItems.getItemIdx($selectedItems, _id)
|
||||
if (idx > -1) {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
if (_bb.isBound(_bb.props.value)) {
|
||||
_bb.setStateFromBinding(_bb.props.value, value)
|
||||
}
|
||||
debugger
|
||||
_bb.call(onChange, value)
|
||||
}, value)
|
||||
_bb.setContext("BBMD:checkbox:selectedItemsStore", selectedItemsStore)
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@
|
|||
|
||||
<div class="mdc-menu-surface--anchor">
|
||||
<Textfield
|
||||
{_bb}
|
||||
{label}
|
||||
onChange={dateFieldChange}
|
||||
value={selectedDate}
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@ TODO:Needs error handling - this will depend on how Budibase handles errors
|
|||
{#if renderLeadingIcon}
|
||||
{#if useIconButton}
|
||||
<IconButton
|
||||
{_bb}
|
||||
{icon}
|
||||
context="mdc-text-field__icon mdc-text-field__icon--leading"
|
||||
onClick={iconButtonClick} />
|
||||
|
|
@ -152,6 +153,7 @@ TODO:Needs error handling - this will depend on how Budibase handles errors
|
|||
{#if renderTrailingIcon}
|
||||
{#if useIconButton}
|
||||
<IconButton
|
||||
{_bb}
|
||||
{icon}
|
||||
context="mdc-text-field__icon mdc-text-field__icon--trailing"
|
||||
onClick={iconButtonClick} />
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/server",
|
||||
"version": "0.0.27",
|
||||
"version": "0.0.29",
|
||||
"description": "Budibase Web Server",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
"author": "Michael Shanks",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
"@budibase/client": "^0.0.27",
|
||||
"@budibase/core": "^0.0.27",
|
||||
"@budibase/client": "^0.0.29",
|
||||
"@budibase/core": "^0.0.29",
|
||||
"@koa/router": "^8.0.0",
|
||||
"fs-extra": "^8.1.0",
|
||||
"koa": "^2.7.0",
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
"publishdev": "yarn build && node ./scripts/publishDev.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@budibase/client": "^0.0.27",
|
||||
"@budibase/client": "^0.0.29",
|
||||
"@nx-js/compiler-util": "^2.0.0",
|
||||
"bcryptjs": "2.4.3",
|
||||
"fs-extra": "^8.1.0",
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
"keywords": [
|
||||
"svelte"
|
||||
],
|
||||
"version": "0.0.27",
|
||||
"version": "0.0.29",
|
||||
"license": "MIT",
|
||||
"gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue