MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Budibase/budibase into feature/model-view-select

This commit is contained in:
cmack 2020-08-25 11:18:08 +01:00
parent f8171b6018 443e85d3a6
commit e7f7a705e2
23 changed files with 83 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

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

6
packages/builder/cypress/integration/createTable.spec.js
View File

@ -38,10 +38,10 @@ context('Create a Table', () => {
it('edits a record', () => { it('edits a record', () => {
cy.get("tbody .ri-more-line").click() cy.get("tbody .ri-more-line").click()
cy.get("[data-cy=edit-row]").click() cy.get("[data-cy=edit-row]").click()
cy.get(".actions input").type("updatedRecord") cy.get(".actions input").type("Updated")
cy.contains("Save").click() cy.contains("Save").click()
cy.contains('updatedRecord').should('have.text', 'updatedRecord') cy.contains('RoverUpdated').should('have.text', 'RoverUpdated')
}) })
it('deletes a record', () => { it('deletes a record', () => {
@ -49,7 +49,7 @@ context('Create a Table', () => {
cy.get("[data-cy=delete-row]").click() cy.get("[data-cy=delete-row]").click()
cy.get(".modal-actions").contains("Delete").click() cy.get(".modal-actions").contains("Delete").click()
cy.contains('updatedRecord').should('not.exist') cy.contains('RoverUpdated').should('not.exist')
}) })
it('deletes a column', () => { it('deletes a column', () => {

6
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "0.1.17", "version": "0.1.19",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -57,8 +57,8 @@
] ]
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.24.2", "@budibase/bbui": "^1.24.1",
"@budibase/client": "^0.1.17", "@budibase/client": "^0.1.19",
"@budibase/colorpicker": "^1.0.1", "@budibase/colorpicker": "^1.0.1",
"@sentry/browser": "5.19.1", "@sentry/browser": "5.19.1",
"@svelteschool/svelte-forms": "^0.7.0", "@svelteschool/svelte-forms": "^0.7.0",

8
packages/builder/src/builderStore/store/backend.js
View File

@ -93,7 +93,13 @@ export const getBackendUiStore = () => {
saveField: ({ originalName, field }) => { saveField: ({ originalName, field }) => {
store.update(state => { store.update(state => {
// delete the original if renaming // delete the original if renaming
delete state.draftModel.schema[originalName] if (originalName) {
delete state.draftModel.schema[originalName]
state.draftModel._rename = {
old: originalName,
updated: field.name,
}
}
state.draftModel.schema[field.name] = cloneDeep(field) state.draftModel.schema[field.name] = cloneDeep(field)

2
packages/builder/src/components/common/DatePicker.svelte
View File

@ -24,7 +24,7 @@
}) })
</script> </script>
<div class="uk-margin"> <div class="bb-margin-m">
<label class="uk-form-label">{label}</label> <label class="uk-form-label">{label}</label>
<div class="uk-form-controls"> <div class="uk-form-controls">
<input <input

7
packages/builder/src/components/database/DataTable/ModelDataTable.svelte
View File

@ -45,9 +45,9 @@
$: sort = $backendUiStore.sort $: sort = $backendUiStore.sort
$: sorted = sort ? fsort(data)[sort.direction](sort.column) : data $: sorted = sort ? fsort(data)[sort.direction](sort.column) : data
$: headers = Object.keys($backendUiStore.selectedModel.schema).filter( $: headers = Object.keys($backendUiStore.selectedModel.schema)
id => !INTERNAL_HEADERS.includes(id) .sort()
) .filter(id => !INTERNAL_HEADERS.includes(id))
$: schema = $backendUiStore.selectedModel.schema $: schema = $backendUiStore.selectedModel.schema
</script> </script>
@ -178,7 +178,6 @@
.popovers { .popovers {
display: flex; display: flex;
gap: var(--spacing-m);
} }
.no-data { .no-data {

5
packages/builder/src/components/database/DataTable/Table.svelte
View File

@ -132,7 +132,10 @@
.popovers { .popovers {
display: flex; display: flex;
gap: var(--spacing-l); }
:global(.popovers > div) {
margin-right: var(--spacing-m);
} }
.no-data { .no-data {

13
packages/builder/src/components/database/DataTable/modals/CreateEditColumn.svelte
View File

@ -46,6 +46,7 @@
const { type, constraints } = fieldDefinitions[ const { type, constraints } = fieldDefinitions[
event.target.value.toUpperCase() event.target.value.toUpperCase()
] ]
field.type = type field.type = type
field.constraints = constraints field.constraints = constraints
} }
@ -58,9 +59,9 @@
secondary secondary
thin thin
on:change={handleFieldConstraints} on:change={handleFieldConstraints}
bind:value={field.value}> bind:value={field.type}>
{#each Object.values(fieldDefinitions) as field} {#each Object.values(fieldDefinitions) as field}
<option value={field.value}>{field.name}</option> <option value={field.type}>{field.name}</option>
{/each} {/each}
</Select> </Select>
@ -73,28 +74,28 @@
on:change={() => (field.constraints.presence.allowEmpty = required)} /> on:change={() => (field.constraints.presence.allowEmpty = required)} />
</div> </div>
{#if field.value === 'string' && field.constraints} {#if field.type === 'string' && field.constraints}
<NumberBox <NumberBox
label="Max Length" label="Max Length"
bind:value={field.constraints.length.maximum} /> bind:value={field.constraints.length.maximum} />
<ValuesList <ValuesList
label="Categories" label="Categories"
bind:values={field.constraints.inclusion} /> bind:values={field.constraints.inclusion} />
{:else if field.value === 'datetime' && field.constraints} {:else if field.type === 'datetime' && field.constraints}
<DatePicker <DatePicker
label="Min Value" label="Min Value"
bind:value={field.constraints.datetime.earliest} /> bind:value={field.constraints.datetime.earliest} />
<DatePicker <DatePicker
label="Max Value" label="Max Value"
bind:value={field.constraints.datetime.latest} /> bind:value={field.constraints.datetime.latest} />
{:else if field.value === 'number' && field.constraints} {:else if field.type === 'number' && field.constraints}
<NumberBox <NumberBox
label="Min Value" label="Min Value"
bind:value={field.constraints.numericality.greaterThanOrEqualTo} /> bind:value={field.constraints.numericality.greaterThanOrEqualTo} />
<NumberBox <NumberBox
label="Max Value" label="Max Value"
bind:value={field.constraints.numericality.lessThanOrEqualTo} /> bind:value={field.constraints.numericality.lessThanOrEqualTo} />
{:else if field.value === 'link'} {:else if field.type === 'link'}
<div class="field"> <div class="field">
<label>Link</label> <label>Link</label>
<select class="budibase__input" bind:value={field.modelId}> <select class="budibase__input" bind:value={field.modelId}>

2
packages/builder/src/components/database/DataTable/modals/CreateEditRecord.svelte
View File

@ -66,7 +66,7 @@
<ErrorsBox {errors} /> <ErrorsBox {errors} />
<form on:submit|preventDefault class="uk-form-stacked"> <form on:submit|preventDefault class="uk-form-stacked">
{#each modelSchema as [key, meta]} {#each modelSchema as [key, meta]}
<div class="uk-margin"> <div class="bb-margin-xl">
{#if meta.type === 'link'} {#if meta.type === 'link'}
<LinkedRecordSelector <LinkedRecordSelector
bind:linked={record[key]} bind:linked={record[key]}

6
packages/builder/src/components/database/DataTable/popovers/View.svelte
View File

@ -21,7 +21,9 @@
$: fields = Object.keys($backendUiStore.selectedModel.schema).filter(key => { $: fields = Object.keys($backendUiStore.selectedModel.schema).filter(key => {
return $backendUiStore.selectedModel.schema[key].type === "number" return $backendUiStore.selectedModel.schema[key].type === "number"
}) })
$: views = $backendUiStore.models.flatMap(model => Object.keys(model.views)) $: views = $backendUiStore.models.flatMap(model =>
Object.keys(model.views || {})
)
function saveView() { function saveView() {
if (views.includes(name)) { if (views.includes(name)) {
@ -41,7 +43,7 @@
<div bind:this={anchor}> <div bind:this={anchor}>
<TextButton text small on:click={dropdown.show}> <TextButton text small on:click={dropdown.show}>
<Icon name="addrow" /> <Icon name="view" />
Create New View Create New View
</TextButton> </TextButton>
</div> </div>

13
packages/builder/src/components/userInterface/NewScreen.svelte
View File

@ -80,11 +80,11 @@
okText="Create Screen"> okText="Create Screen">
<div data-cy="new-screen-dialog"> <div data-cy="new-screen-dialog">
<div class="uk-margin"> <div class="bb-margin-xl">
<Input label="Name" bind:value={name} /> <Input label="Name" bind:value={name} />
</div> </div>
<div class="uk-margin"> <div class="bb-margin-xl">
<Input <Input
label="Url" label="Url"
error={routeError} error={routeError}
@ -92,7 +92,7 @@
on:change={routeChanged} /> on:change={routeChanged} />
</div> </div>
<div class="uk-margin"> <div class="bb-margin-xl">
<label>Layout Component</label> <label>Layout Component</label>
<Select bind:value={layoutComponent} secondary> <Select bind:value={layoutComponent} secondary>
{#each layoutComponents as { _component, name }} {#each layoutComponents as { _component, name }}
@ -103,10 +103,3 @@
</div> </div>
</ConfirmDialog> </ConfirmDialog>
<style>
.uk-margin {
display: flex;
flex-direction: column;
}
</style>

2
packages/builder/src/components/workflow/SetupPanel/ParamInputs/ComponentSelector.svelte
View File

@ -23,7 +23,7 @@
} }
</script> </script>
<div class="uk-margin block-field"> <div class="bb-margin-xl block-field">
<label class="uk-form-label">Page</label> <label class="uk-form-label">Page</label>
<div class="uk-form-controls"> <div class="uk-form-controls">
<select class="budibase__input" bind:value={pageName}> <select class="budibase__input" bind:value={pageName}>

2
packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
View File

@ -4,7 +4,7 @@
export let value export let value
</script> </script>
<div class="uk-margin block-field"> <div class="bb-margin-xl block-field">
<div class="uk-form-controls"> <div class="uk-form-controls">
<select class="budibase__input" bind:value> <select class="budibase__input" bind:value>
<option value="" /> <option value="" />

6
packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
View File

@ -5,7 +5,7 @@
export let value export let value
</script> </script>
<div class="uk-margin block-field"> <div class="bb-margin-xl block-field">
<div class="uk-form-controls"> <div class="uk-form-controls">
<select class="budibase__input" bind:value={value.model}> <select class="budibase__input" bind:value={value.model}>
{#each $backendUiStore.models as model} {#each $backendUiStore.models as model}
@ -16,10 +16,10 @@
</div> </div>
{#if value.model} {#if value.model}
<div class="uk-margin block-field"> <div class="bb-margin-xl block-field">
<label class="uk-form-label fields">Fields</label> <label class="uk-form-label fields">Fields</label>
{#each Object.keys(value.model.schema) as field} {#each Object.keys(value.model.schema) as field}
<div class="uk-form-controls uk-margin"> <div class="uk-form-controls bb-margin-xl">
<Input bind:value={value[field]} label={field} /> <Input bind:value={value[field]} label={field} />
</div> </div>
{/each} {/each}

6
packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte
View File

@ -81,7 +81,7 @@
{/if} {/if}
</header> </header>
{#if selectedTab === 'TEST'} {#if selectedTab === 'TEST'}
<div class="uk-margin config-item"> <div class="bb-margin-m">
{#if testResult} {#if testResult}
<button <button
transition:fade transition:fade
@ -111,12 +111,10 @@
<div class="panel"> <div class="panel">
<div class="panel-body"> <div class="panel-body">
<div class="block-label">Workflow: {workflow.name}</div> <div class="block-label">Workflow: {workflow.name}</div>
<div class="config-item">
<Input label="Name" bind:value={workflow.name} thin />
</div>
<div class="config-item"> <div class="config-item">
<label class="uk-form-label">User Access</label> <label class="uk-form-label">User Access</label>
<div class="access-levels"> <div class="access-levels">
{#each ACCESS_LEVELS as level} {#each ACCESS_LEVELS as level}
<span class="access-level"> <span class="access-level">
<label>{level.name}</label> <label>{level.name}</label>

153
packages/builder/src/constants/backend/index.js
View File

@ -3,7 +3,6 @@ export const FIELDS = {
name: "Plain Text", name: "Plain Text",
icon: "ri-text", icon: "ri-text",
type: "string", type: "string",
value: "string",
constraints: { constraints: {
type: "string", type: "string",
length: {}, length: {},
@ -14,7 +13,6 @@ export const FIELDS = {
name: "Number", name: "Number",
icon: "ri-number-1", icon: "ri-number-1",
type: "number", type: "number",
value: "number",
constraints: { constraints: {
type: "number", type: "number",
presence: { allowEmpty: true }, presence: { allowEmpty: true },
@ -25,7 +23,6 @@ export const FIELDS = {
name: "True/False", name: "True/False",
icon: "ri-toggle-line", icon: "ri-toggle-line",
type: "boolean", type: "boolean",
value: "boolean",
constraints: { constraints: {
type: "boolean", type: "boolean",
presence: { allowEmpty: true }, presence: { allowEmpty: true },
@ -40,21 +37,21 @@ export const FIELDS = {
// presence: { allowEmpty: true }, // presence: { allowEmpty: true },
// }, // },
// }, // },
DATETIME: { // DATETIME: {
name: "Date/Time", // name: "Date/Time",
icon: "ri-calendar-event-fill", // icon: "ri-calendar-event-fill",
type: "string", // type: "string",
value: "datetime", // value: "datetime",
constraints: { // constraints: {
type: "string", // type: "string",
length: {}, // length: {},
presence: { allowEmpty: true }, // presence: { allowEmpty: true },
datetime: { // datetime: {
latest: "", // latest: "",
earliest: "", // earliest: "",
}, // },
}, // },
}, // },
// IMAGE: { // IMAGE: {
// name: "File", // name: "File",
// icon: "ri-image-line", // icon: "ri-image-line",
@ -83,123 +80,3 @@ export const FIELDS = {
// }, // },
// }, // },
} }
export const BLOCKS = {
NAME: {
name: "Name",
icon: "ri-text",
type: "string",
constraints: {
type: "string",
length: {},
presence: { allowEmpty: true },
},
},
COMPANY: {
name: "Company",
icon: "ri-store-line",
type: "string",
constraints: {
type: "string",
length: {},
presence: { allowEmpty: true },
},
},
EMAIL: {
name: "Email",
icon: "ri-mail-line",
type: "string",
constraints: {
type: "string",
length: {},
presence: { allowEmpty: true },
},
},
PHONE_NUMBER: {
name: "Phone No.",
icon: "ri-phone-line",
type: "number",
constraints: {
type: "number",
presence: { allowEmpty: true },
numericality: {},
},
},
VALUE: {
name: "Value",
icon: "ri-number-5",
type: "number",
constraints: {
type: "number",
presence: { allowEmpty: true },
numericality: {},
},
},
ACTIVE: {
name: "Active",
icon: "ri-toggle-line",
type: "boolean",
constraints: {
type: "boolean",
presence: { allowEmpty: true },
},
},
URL: {
name: "URL",
icon: "ri-link",
type: "string",
constraints: {
type: "string",
length: {},
presence: { allowEmpty: true },
},
},
IMAGE: {
name: "Image URL",
icon: "ri-image-line",
type: "string",
constraints: {
type: "string",
length: {},
presence: { allowEmpty: true },
},
},
// PRIORITY: {
// name: "Options",
// icon: "ri-list-check-2",
// type: "options",
// constraints: {
// type: "string",
// presence: { allowEmpty: true },
// inclusion: ["low", "medium", "high"],
// },
// },
END_DATE: {
name: "End Date",
icon: "ri-calendar-event-fill",
type: "string",
constraints: {
type: "string",
length: {},
presence: { allowEmpty: true },
},
},
// AVATAR: {
// name: "Avatar",
// icon: "ri-image-line",
// type: "image",
// constraints: {
// type: "string",
// presence: { allowEmpty: true },
// },
// },
// PDF: {
// name: "PDF",
// icon: "ri-file-line",
// type: "file",
// constraints: {
// type: "string",
// presence: { allowEmpty: true },
// },
// },
}

15
packages/builder/src/global.css
View File

@ -94,4 +94,19 @@ textarea {
.hoverable:hover { .hoverable:hover {
cursor: pointer; cursor: pointer;
}
.bb-margin-m {
margin-bottom: var(--spacing-m);
}
* + .bb-margin-m {
margin-top: var(--spacing-m);
}
.bb-margin-xl {
margin-bottom: var(--spacing-xl);
}
* + .bb-margin-xl {
margin-top: var(--spacing-xl);
} }

4
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "budibase", "name": "budibase",
"version": "0.1.17", "version": "0.1.19",
"description": "Budibase CLI", "description": "Budibase CLI",
"repository": "https://github.com/Budibase/Budibase", "repository": "https://github.com/Budibase/Budibase",
"homepage": "https://www.budibase.com", "homepage": "https://www.budibase.com",
@ -17,7 +17,7 @@
"author": "Budibase", "author": "Budibase",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@budibase/server": "^0.1.17", "@budibase/server": "^0.1.19",
"@inquirer/password": "^0.0.6-alpha.0", "@inquirer/password": "^0.0.6-alpha.0",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",

2
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "0.1.17", "version": "0.1.19",
"license": "MPL-2.0", "license": "MPL-2.0",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
"module": "dist/budibase-client.esm.mjs", "module": "dist/budibase-client.esm.mjs",

4
packages/server/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/server", "name": "@budibase/server",
"version": "0.1.17", "version": "0.1.19",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/electron.js", "main": "src/electron.js",
"repository": { "repository": {
@ -42,7 +42,7 @@
"author": "Michael Shanks", "author": "Michael Shanks",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@budibase/client": "^0.1.17", "@budibase/client": "^0.1.19",
"@koa/router": "^8.0.0", "@koa/router": "^8.0.0",
"@sendgrid/mail": "^7.1.1", "@sendgrid/mail": "^7.1.1",
"@sentry/node": "^5.19.2", "@sentry/node": "^5.19.2",

1
packages/standard-components/.gitignore vendored
View File

@ -3,3 +3,4 @@ node_modules
yarn.lock yarn.lock
package-lock.json package-lock.json
dist/index.js dist/index.js
dist/index.js.map

2
packages/standard-components/dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
packages/standard-components/package.json
View File

@ -13,7 +13,7 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"devDependencies": { "devDependencies": {
"@budibase/client": "^0.1.17", "@budibase/client": "^0.1.19",
"@rollup/plugin-commonjs": "^11.1.0", "@rollup/plugin-commonjs": "^11.1.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"rollup": "^1.11.0", "rollup": "^1.11.0",
@ -31,7 +31,7 @@
"keywords": [ "keywords": [
"svelte" "svelte"
], ],
"version": "0.1.17", "version": "0.1.19",
"license": "MIT", "license": "MIT",
"gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691", "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
"dependencies": { "dependencies": {