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

Updating inline alert component to handle newlines as different elements, putting out error with new lines.

This commit is contained in:
mike12345567 2021-11-22 10:37:58 +00:00
parent 38c7f3ab90
commit 9be833d5e1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/bbui/src/InlineAlert/InlineAlert.svelte
View File

@ -8,6 +8,8 @@
export let onConfirm = undefined export let onConfirm = undefined
$: icon = selectIcon(type) $: icon = selectIcon(type)
// if newlines used, convert them to different elements
$: split = message.split("\n")
function selectIcon(alertType) { function selectIcon(alertType) {
switch (alertType) { switch (alertType) {
@ -33,7 +35,9 @@
<use xlink:href="#spectrum-icon-18-{icon}" /> <use xlink:href="#spectrum-icon-18-{icon}" />
</svg> </svg>
<div class="spectrum-InLineAlert-header">{header}</div> <div class="spectrum-InLineAlert-header">{header}</div>
<div class="spectrum-InLineAlert-content">{message}</div> {#each split as splitMsg}
<div class="spectrum-InLineAlert-content">{splitMsg}</div>
{/each}
{#if onConfirm} {#if onConfirm}
<div class="spectrum-InLineAlert-footer"> <div class="spectrum-InLineAlert-footer">
<Button secondary on:click={onConfirm}>OK</Button> <Button secondary on:click={onConfirm}>OK</Button>

2
packages/server/src/api/controllers/datasource.js
View File

@ -163,7 +163,7 @@ function updateError(error, newError, tables) {
error = "" error = ""
} }
if (error.length > 0) { if (error.length > 0) {
error += " - " error += "\n"
} }
error += `${newError} ${tables.join(", ")}` error += `${newError} ${tables.join(", ")}`
return error return error