From 38c7b7d9e932ffbefd2d4087d5db47f0a0e834a7 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 11:54:45 +0100 Subject: [PATCH] fix(shared): Handle YAML imports --- sites/shared/components/account/import.mjs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sites/shared/components/account/import.mjs b/sites/shared/components/account/import.mjs index 986b96d9f57..d48f24981c0 100644 --- a/sites/shared/components/account/import.mjs +++ b/sites/shared/components/account/import.mjs @@ -11,6 +11,7 @@ import { FileInput } from 'shared/components/inputs.mjs' import { Yaml } from 'shared/components/yaml.mjs' import { Popout } from 'shared/components/popout/index.mjs' import { linkClasses } from 'shared/components/link.mjs' +import yaml from 'yaml' export const ns = ['account', 'status'] @@ -39,23 +40,26 @@ export const Importer = () => { * Treat each set */ for (const set of data) { - if (set.measurements) { + if (set.measurements || set.measies) { const name = set.name || 'J. Doe' setLoadingStatus([true, `Importing ${name}`]) const result = await backend.createSet({ name: set.name || 'J. Doe', units: set.units || 'metric', notes: set.notes || '', - measies: set.measurements, + measies: set.measurements || set.measies, userId: account.id, }) if (result.success) setLoadingStatus([true, `Imported ${name}`, true, true]) else setLoadingStatus([true, `Import of ${name} failed`, true, false]) + } else { + setLoadingStatus([true, `Invalid format`, true, false]) } } } catch (err) { setError(err) console.log(err) + setLoadingStatus([true, `Import of ${name} failed`, true, false]) } }