Browse Source

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

master
mike12345567 5 years ago
parent
commit
19c096c3e5
  1. 6
      packages/bbui/src/InlineAlert/InlineAlert.svelte
  2. 2
      packages/server/src/api/controllers/datasource.js

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

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

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

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

Loading…
Cancel
Save