Merge remote-tracking branch 'origin/master' into trigger_automation_action

This commit is contained in:
Michael Shanks 2021-01-11 09:51:48 +00:00
commit ccb2d7de7d
2 changed files with 25 additions and 19 deletions

View File

@ -1,8 +1,8 @@
<script>
import { goto, params } from "@sveltech/routify"
import { goto } from "@sveltech/routify"
import { backendUiStore, store } from "builderStore"
import { notifier } from "builderStore/store/notifications"
import { Input, Label, ModalContent } from "@budibase/bbui"
import { Input, Label, ModalContent, Toggle } from "@budibase/bbui"
import TableDataImport from "../TableDataImport.svelte"
import analytics from "analytics"
import screenTemplates from "builderStore/store/screenTemplates"
@ -20,6 +20,7 @@
let name
let dataImport
let error = ""
let createAutoscreens = true
function checkValid(evt) {
const tableName = evt.target.value
@ -48,23 +49,25 @@
analytics.captureEvent("Table Created", { name })
// Create auto screens
const screens = screenTemplates($store, [table])
.filter(template => defaultScreens.includes(template.id))
.map(template => template.create())
for (let screen of screens) {
// Record the table that created this screen so we can link it later
screen.autoTableId = table._id
await store.actions.screens.create(screen)
}
if (createAutoscreens) {
const screens = screenTemplates($store, [table])
.filter(template => defaultScreens.includes(template.id))
.map(template => template.create())
for (let screen of screens) {
// Record the table that created this screen so we can link it later
screen.autoTableId = table._id
await store.actions.screens.create(screen)
}
// Create autolink to newly created list screen
const listScreen = screens.find(screen =>
screen.props._instanceName.endsWith("List")
)
await store.actions.components.links.save(
listScreen.routing.route,
table.name
)
// Create autolink to newly created list screen
const listScreen = screens.find(screen =>
screen.props._instanceName.endsWith("List")
)
await store.actions.components.links.save(
listScreen.routing.route,
table.name
)
}
// Navigate to new table
$goto(`./table/${table._id}`)
@ -83,6 +86,9 @@
on:input={checkValid}
bind:value={name}
{error} />
<Toggle
text="Generate screens in the design section"
bind:checked={createAutoscreens} />
<div>
<Label grey extraSmall>Create Table from CSV (Optional)</Label>
<TableDataImport bind:dataImport />

View File

@ -36,7 +36,7 @@ const addBuilderPreviewStyles = (styleString, componentId, selectable) => {
// Highlighted selected element
if (componentId === state.selectedComponentId) {
str += `;box-shadow: 0 0 0 ${selectedComponentWidth}px ${selectedComponentColor} inset !important;`
str += `;border: ${selectedComponentWidth}px solid ${selectedComponentColor} !important;`
}
}