frontend valiation for crons and fix preset null issue
This commit is contained in:
parent
8bf79c5f10
commit
8e734b2d72
|
@ -2,15 +2,31 @@
|
||||||
import { Button, Select, Input, Label } from "@budibase/bbui"
|
import { Button, Select, Input, Label } from "@budibase/bbui"
|
||||||
import { onMount, createEventDispatcher } from "svelte"
|
import { onMount, createEventDispatcher } from "svelte"
|
||||||
import { flags } from "stores/backend"
|
import { flags } from "stores/backend"
|
||||||
|
import { helpers } from "@budibase/shared-core"
|
||||||
const dispatch = createEventDispatcher()
|
const dispatch = createEventDispatcher()
|
||||||
|
|
||||||
export let value
|
export let value
|
||||||
|
let error
|
||||||
|
|
||||||
|
$: {
|
||||||
|
const exists = CRON_EXPRESSIONS.some(cron => cron.value === value)
|
||||||
|
const customIndex = CRON_EXPRESSIONS.findIndex(
|
||||||
|
cron => cron.label === "Custom"
|
||||||
|
)
|
||||||
|
|
||||||
|
if (!exists && customIndex === -1) {
|
||||||
|
CRON_EXPRESSIONS[0] = { label: "Custom", value: value }
|
||||||
|
} else if (exists && customIndex !== -1) {
|
||||||
|
CRON_EXPRESSIONS.splice(customIndex, 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const onChange = e => {
|
const onChange = e => {
|
||||||
if (e.detail === value) {
|
error = helpers.cron.validate(e.detail).err
|
||||||
|
if (e.detail === value || error) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
value = e.detail
|
value = e.detail
|
||||||
dispatch("change", e.detail)
|
dispatch("change", e.detail)
|
||||||
}
|
}
|
||||||
|
@ -49,6 +65,7 @@
|
||||||
|
|
||||||
<div class="block-field">
|
<div class="block-field">
|
||||||
<Input
|
<Input
|
||||||
|
{error}
|
||||||
on:change={onChange}
|
on:change={onChange}
|
||||||
{value}
|
{value}
|
||||||
on:blur={() => (touched = true)}
|
on:blur={() => (touched = true)}
|
||||||
|
@ -64,7 +81,7 @@
|
||||||
{#if presets}
|
{#if presets}
|
||||||
<Select
|
<Select
|
||||||
on:change={onChange}
|
on:change={onChange}
|
||||||
{value}
|
value={value || "Custom"}
|
||||||
secondary
|
secondary
|
||||||
extraThin
|
extraThin
|
||||||
label="Presets"
|
label="Presets"
|
||||||
|
|
Loading…
Reference in New Issue