From dddaa2040e539cdc882471e51c80d2fe19ec9ca3 Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Wed, 23 Jun 2021 14:48:19 +0200 Subject: [PATCH] Trim inputs in 'Form' --- .eslintrc.json | 2 +- src/Form.svelte | 10 +++++++++- src/base/registrations/Update.svelte | 1 - src/base/registrations/View.svelte | 7 +++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index f71032ae7..8ebf83841 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -67,7 +67,7 @@ "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/semi": ["error"], "@typescript-eslint/member-delimiter-style": [ - "warn", { + "error", { "multiline": { "delimiter": "semi", "requireLast": true diff --git a/src/Form.svelte b/src/Form.svelte index ddc51fc32..9fed47171 100644 --- a/src/Form.svelte +++ b/src/Form.svelte @@ -19,8 +19,16 @@ export let disabled = false; export let config: Config; + const cleanup = (fields: Field[]): { name: string; value: string | null }[] => { + return fields.filter(field => field.editable).map(field => { + return { + name: field.name, + value: field.value && field.value.trim(), + }; + }); + }; const dispatch = createEventDispatcher(); - const save = () => dispatch('save', fields); + const save = () => dispatch('save', cleanup(fields)); const cancel = () => dispatch('cancel'); diff --git a/src/base/registrations/Update.svelte b/src/base/registrations/Update.svelte index 5e1d45d35..a048fcc5e 100644 --- a/src/base/registrations/Update.svelte +++ b/src/base/registrations/Update.svelte @@ -27,7 +27,6 @@ const dispatch = createEventDispatcher(); - /* let state: State = { status: Status.Signing }; */ let state: State = { status: Status.Failed, error: "Error registering, something happened." }; onMount(async () => { diff --git a/src/base/registrations/View.svelte b/src/base/registrations/View.svelte index 629104695..d9c5aca04 100644 --- a/src/base/registrations/View.svelte +++ b/src/base/registrations/View.svelte @@ -67,14 +67,13 @@ }); }); - const onSave = async (event: { detail: Field[] }) => { + const onSave = async (event: { detail: { name: string; value: string | null }[] }) => { assert(state.status === Status.Found, "registration must be found"); updateRecords = event.detail - .filter(r => r.editable && r.value !== null) + .filter(f => f.value !== null) .map(f => { - assert(f.value !== null); - return { name: f.name, value: f.value }; + return { name: f.name, value: f.value as string }; }); };