From c84c1ff0b83448b896c1b5536e4e3763c3fe6c78 Mon Sep 17 00:00:00 2001 From: Meena Brend Date: Fri, 5 Jul 2024 07:53:48 +0100 Subject: [PATCH 1/3] Use component builder for Collapsible [sc-26421] --- lib/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/index.js b/lib/index.js index f22b02a..a642b31 100644 --- a/lib/index.js +++ b/lib/index.js @@ -41,6 +41,10 @@ module.exports = async function extractDefaults (cardscript) { } break case 'Collapsible': + if (element.id) { + applyDefaultValue(defaultValues, defaultValue, apiLookupPath, cardListPath, element.id + 'Collapsible') + } + element.card.body.forEach(parseElement) break case 'Input.ApiLookup': { @@ -262,7 +266,7 @@ function extractDefaultValue ({ type, value, isMultiSelect, editor }) { defaultValue = '' } - if (type === 'Input.Toggle') { + if (type === 'Input.Toggle' || type === 'Collapsible') { if (value !== undefined) { if (value === 'true') defaultValue = true if (value === 'false') defaultValue = false From 2de38e92503216da400318be6cf0de63571d9e5a Mon Sep 17 00:00:00 2001 From: meenahoda Date: Fri, 5 Jul 2024 08:06:05 +0100 Subject: [PATCH 2/3] return to using id only --- lib/index.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/index.js b/lib/index.js index a642b31..181b64f 100644 --- a/lib/index.js +++ b/lib/index.js @@ -42,7 +42,7 @@ module.exports = async function extractDefaults (cardscript) { break case 'Collapsible': if (element.id) { - applyDefaultValue(defaultValues, defaultValue, apiLookupPath, cardListPath, element.id + 'Collapsible') + applyDefaultValue(defaultValues, defaultValue, apiLookupPath, cardListPath, element.id) } element.card.body.forEach(parseElement) @@ -267,10 +267,17 @@ function extractDefaultValue ({ type, value, isMultiSelect, editor }) { } if (type === 'Input.Toggle' || type === 'Collapsible') { - if (value !== undefined) { - if (value === 'true') defaultValue = true - if (value === 'false') defaultValue = false - } else { + console.log({ value }) + + if (value === 'true') { + defaultValue = true + } + + if (value === 'false') { + defaultValue = false + } + + if (value === undefined) { defaultValue = false } } @@ -278,6 +285,7 @@ function extractDefaultValue ({ type, value, isMultiSelect, editor }) { if (defaultValue === undefined) { defaultValue = null } + return defaultValue } From 953d8f358c425664798b8e8bc91a92d2e0e38f42 Mon Sep 17 00:00:00 2001 From: meenahoda Date: Fri, 5 Jul 2024 08:18:46 +0100 Subject: [PATCH 3/3] remove log --- lib/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/index.js b/lib/index.js index 181b64f..3dbc750 100644 --- a/lib/index.js +++ b/lib/index.js @@ -267,8 +267,6 @@ function extractDefaultValue ({ type, value, isMultiSelect, editor }) { } if (type === 'Input.Toggle' || type === 'Collapsible') { - console.log({ value }) - if (value === 'true') { defaultValue = true }