From aa2acd067926a3fa343f4554a17b68e075664854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laureline=20Val=C3=A9rie=20David?= Date: Tue, 24 Sep 2024 09:03:31 +0200 Subject: [PATCH] Optimize build text computation --- components/viewer/utils/ExportCode.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/viewer/utils/ExportCode.vue b/components/viewer/utils/ExportCode.vue index 139c15f..1b760da 100644 --- a/components/viewer/utils/ExportCode.vue +++ b/components/viewer/utils/ExportCode.vue @@ -129,6 +129,10 @@ const exportText = computed(() => { return R.pipe( R.map(({ packRow, choices }: PackRow): string => { const choiceTitles = R.map(({ obj, count }) => { + let result = obj.title; + if (count > 1 || obj.isSelectableMultiple) { + result += ` x ${count}`; + } if (R.isNotEmpty(obj.addons) && exportAddons.value) { const activeAddons = R.filter((addon) => { const condition = buildConditions(addon); @@ -136,14 +140,10 @@ const exportText = computed(() => { }, obj.addons); if (R.isNotEmpty(activeAddons)) { const addonTitles = R.map((addon) => addon.title, activeAddons); - if (count > 1 || obj.isSelectableMultiple) - return `${obj.title} x ${count} ( ${R.join(' , ', addonTitles)} )`; - else return `${obj.title} ( ${R.join(' , ', addonTitles)} )`; + result += ` (${R.join(' , ', addonTitles)})`; } } - if (count > 1 || obj.isSelectableMultiple) - return `${obj.title} x ${count}`; - else return obj.title; + return result; }, choices); if (exportTextHeaders.value) { return R.concat(`**${packRow.title}**\n`, R.join(', ', choiceTitles));