From 2ec91b68b6164705ae0e0dccdcbe61c0d7774095 Mon Sep 17 00:00:00 2001 From: minotogna Date: Fri, 18 Oct 2024 18:36:29 +0200 Subject: [PATCH] 4033: Use Objects.isNil to check props to clone --- src/meta/assessment/cols.ts | 15 ++++++++------- src/meta/assessment/rows.ts | 15 ++++++++------- src/meta/assessment/sections.ts | 4 ++-- src/meta/assessment/subSections.ts | 5 +++-- src/meta/assessment/tableSections.ts | 4 ++-- src/meta/assessment/tables.ts | 10 +++++----- 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/meta/assessment/cols.ts b/src/meta/assessment/cols.ts index 55f1be7bc5..397f86b86d 100644 --- a/src/meta/assessment/cols.ts +++ b/src/meta/assessment/cols.ts @@ -16,18 +16,19 @@ const cloneProps = (props: { cycleSource: Cycle; cycleTarget: Cycle; col: Col }) const _props: Col['props'] = Objects.cloneDeep(col.props) _props.cycles.push(cycleTargetUuid) - if (_props.calculateFn?.[cycleSourceUuid]) + if (!Objects.isNil(_props.calculateFn?.[cycleSourceUuid])) _props.calculateFn[cycleTargetUuid] = Objects.cloneDeep(_props.calculateFn[cycleSourceUuid]) - if (_props.classNames?.[cycleSourceUuid]) + if (!Objects.isNil(_props.classNames?.[cycleSourceUuid])) _props.classNames[cycleTargetUuid] = Objects.cloneDeep(_props.classNames[cycleSourceUuid]) - if (_props.labels?.[cycleSourceUuid]) + if (!Objects.isNil(_props.labels?.[cycleSourceUuid])) _props.labels[cycleTargetUuid] = Objects.cloneDeep(_props.labels[cycleSourceUuid]) - if (_props.linkedNodes?.[cycleSourceUuid]) + if (!Objects.isNil(_props.linkedNodes?.[cycleSourceUuid])) _props.linkedNodes[cycleTargetUuid] = Objects.cloneDeep(_props.linkedNodes[cycleSourceUuid]) - if (_props.style?.[cycleSourceUuid]) _props.style[cycleTargetUuid] = Objects.cloneDeep(_props.style[cycleSourceUuid]) - if (_props.validateFns?.[cycleSourceUuid]) + if (!Objects.isNil(_props.style?.[cycleSourceUuid])) + _props.style[cycleTargetUuid] = Objects.cloneDeep(_props.style[cycleSourceUuid]) + if (!Objects.isNil(_props.validateFns?.[cycleSourceUuid])) _props.validateFns[cycleTargetUuid] = Objects.cloneDeep(_props.validateFns[cycleSourceUuid]) - if (_props.variableNo?.[cycleSourceUuid]) + if (!Objects.isNil(_props.variableNo?.[cycleSourceUuid])) _props.variableNo[cycleTargetUuid] = Objects.cloneDeep(_props.variableNo[cycleSourceUuid]) return _props diff --git a/src/meta/assessment/rows.ts b/src/meta/assessment/rows.ts index 420e3f2242..2761576712 100644 --- a/src/meta/assessment/rows.ts +++ b/src/meta/assessment/rows.ts @@ -12,18 +12,19 @@ const cloneProps = (props: { cycleSource: Cycle; cycleTarget: Cycle; row: Row }) const _props: Row['props'] = Objects.cloneDeep(row.props) _props.cycles.push(cycleTargetUuid) - if (_props.calculateFn?.[cycleSourceUuid]) + if (!Objects.isNil(_props.calculateFn?.[cycleSourceUuid])) _props.calculateFn[cycleTargetUuid] = Objects.cloneDeep(_props.calculateFn[cycleSourceUuid]) - if (_props.calculateIf?.[cycleSourceUuid]) + if (!Objects.isNil(_props.calculateIf?.[cycleSourceUuid])) _props.calculateIf[cycleTargetUuid] = Objects.cloneDeep(_props.calculateIf[cycleSourceUuid]) - if (_props.chart?.[cycleSourceUuid]) _props.chart[cycleTargetUuid] = Objects.cloneDeep(_props.chart[cycleSourceUuid]) - if (_props.excludeFromDataExport?.[cycleSourceUuid]) + if (!Objects.isNil(_props.chart?.[cycleSourceUuid])) + _props.chart[cycleTargetUuid] = Objects.cloneDeep(_props.chart[cycleSourceUuid]) + if (!Objects.isNil(_props.excludeFromDataExport?.[cycleSourceUuid])) _props.excludeFromDataExport[cycleTargetUuid] = Objects.cloneDeep(_props.excludeFromDataExport[cycleSourceUuid]) - if (_props.linkToSection?.[cycleSourceUuid]) + if (!Objects.isNil(_props.linkToSection?.[cycleSourceUuid])) _props.linkToSection[cycleTargetUuid] = Objects.cloneDeep(_props.linkToSection[cycleSourceUuid]) - if (_props.validateFns?.[cycleSourceUuid]) + if (!Objects.isNil(_props.validateFns?.[cycleSourceUuid])) _props.validateFns[cycleTargetUuid] = Objects.cloneDeep(_props.validateFns[cycleSourceUuid]) - if (_props.withReview?.[cycleSourceUuid]) + if (!Objects.isNil(_props.withReview?.[cycleSourceUuid])) _props.withReview[cycleTargetUuid] = Objects.cloneDeep(_props.withReview[cycleSourceUuid]) return _props diff --git a/src/meta/assessment/sections.ts b/src/meta/assessment/sections.ts index 54db747103..b4093e8c05 100644 --- a/src/meta/assessment/sections.ts +++ b/src/meta/assessment/sections.ts @@ -12,9 +12,9 @@ const cloneProps = (props: { cycleSource: Cycle; cycleTarget: Cycle; section: Se const _props: Section['props'] = Objects.cloneDeep(section.props) _props.cycles.push(cycleTargetUuid) - if (_props.anchors?.[cycleSourceUuid]) + if (!Objects.isNil(_props.anchors?.[cycleSourceUuid])) _props.anchors[cycleTargetUuid] = Objects.cloneDeep(_props.anchors[cycleSourceUuid]) - if (_props.labels?.[cycleSourceUuid]) + if (!Objects.isNil(_props.labels?.[cycleSourceUuid])) _props.labels[cycleTargetUuid] = Objects.cloneDeep(_props.labels[cycleSourceUuid]) return _props diff --git a/src/meta/assessment/subSections.ts b/src/meta/assessment/subSections.ts index bd135ac06b..cd1693f0d6 100644 --- a/src/meta/assessment/subSections.ts +++ b/src/meta/assessment/subSections.ts @@ -21,9 +21,10 @@ const cloneProps = (props: { cycleSource: Cycle; cycleTarget: Cycle; subSection: Objects.unset(descriptionsSource, ['nationalData', 'dataSources', 'text']) _props.descriptions[cycleTargetUuid] = descriptionsSource } - if (_props.hidden?.[cycleSourceUuid]) + if (!Objects.isNil(_props.hidden?.[cycleSourceUuid])) _props.hidden[cycleTargetUuid] = Objects.cloneDeep(_props.hidden[cycleSourceUuid]) - if (_props.hints?.[cycleSourceUuid]) _props.hints[cycleTargetUuid] = Objects.cloneDeep(_props.hints[cycleSourceUuid]) + if (!Objects.isNil(_props.hints?.[cycleSourceUuid])) + _props.hints[cycleTargetUuid] = Objects.cloneDeep(_props.hints[cycleSourceUuid]) return _props } diff --git a/src/meta/assessment/tableSections.ts b/src/meta/assessment/tableSections.ts index 644d4f2143..33a1ab011c 100644 --- a/src/meta/assessment/tableSections.ts +++ b/src/meta/assessment/tableSections.ts @@ -16,9 +16,9 @@ const cloneProps = (props: { const _props: TableSection['props'] = Objects.cloneDeep(tableSection.props) _props.cycles.push(cycleTargetUuid) - if (_props.descriptions?.[cycleSourceUuid]) + if (!Objects.isNil(_props.descriptions?.[cycleSourceUuid])) _props.descriptions[cycleTargetUuid] = Objects.cloneDeep(_props.descriptions[cycleSourceUuid]) - if (_props.labels?.[cycleSourceUuid]) + if (!Objects.isNil(_props.labels?.[cycleSourceUuid])) Objects.cloneDeep((_props.labels[cycleTargetUuid] = _props.labels[cycleSourceUuid])) return _props diff --git a/src/meta/assessment/tables.ts b/src/meta/assessment/tables.ts index 387d6a9648..931047b966 100644 --- a/src/meta/assessment/tables.ts +++ b/src/meta/assessment/tables.ts @@ -12,15 +12,15 @@ const cloneProps = (props: { cycleSource: Cycle; cycleTarget: Cycle; table: Tabl const _props: Table['props'] = Objects.cloneDeep(table.props) _props.cycles.push(cycleTargetUuid) - if (_props.cellsExportAlways?.[cycleSourceUuid]) + if (!Objects.isNil(_props.cellsExportAlways?.[cycleSourceUuid])) _props.cellsExportAlways[cycleTargetUuid] = Objects.cloneDeep(_props.cellsExportAlways[cycleSourceUuid]) - if (_props.columnNames?.[cycleSourceUuid]) + if (!Objects.isNil(_props.columnNames?.[cycleSourceUuid])) _props.columnNames[cycleTargetUuid] = Objects.cloneDeep(_props.columnNames[cycleSourceUuid]) - if (_props.columnsExport?.[cycleSourceUuid]) + if (!Objects.isNil(_props.columnsExport?.[cycleSourceUuid])) _props.columnsExport[cycleTargetUuid] = Objects.cloneDeep(_props.columnsExport[cycleSourceUuid]) - if (_props.columnsExportAlways?.[cycleSourceUuid]) + if (!Objects.isNil(_props.columnsExportAlways?.[cycleSourceUuid])) _props.columnsExportAlways[cycleTargetUuid] = Objects.cloneDeep(_props.columnsExportAlways[cycleSourceUuid]) - if (_props.disableErrorMessage?.[cycleSourceUuid]) + if (!Objects.isNil(_props.disableErrorMessage?.[cycleSourceUuid])) _props.disableErrorMessage[cycleTargetUuid] = Objects.cloneDeep(_props.disableErrorMessage[cycleSourceUuid]) return _props