fix: [DHIS2-17054] handle empty expression value (#3635)

Co-authored-by: Tony Valle <79843014+superskip@users.noreply.github.com>
dhis2 · Jun 6, 2024 · 08291fa · 08291fa
1 parent e93da19
commit 08291fa
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/packages/rules-engine/src/processors/rulesEffectsProcessor/rulesEffectsProcessor.js b/packages/rules-engine/src/processors/rulesEffectsProcessor/rulesEffectsProcessor.js
@@ -239,13 +239,15 @@ export function getRulesEffectsProcessor(
     }
 
     function processDisplayKeyValuePair(effect: ProgramRuleEffect): any {
+        const data = effect.data !== undefined ? effect.data : '';
+
         return {
             type: effectActions.DISPLAY_KEY_VALUE_PAIR,
             id: effect.location,
             displayKeyValuePair: {
                 id: effect.id,
                 key: effect.displayContent,
-                value: typeof effect.data == 'number' ? numberToString(effect.data) : String(effect.data),
+                value: typeof data === 'number' ? numberToString(data) : String(data),
                 ...effect.style,
             },
         };

diff --git a/...les/capture-core/components/WidgetFeedback/WidgetFeedbackContent/WidgetFeedbackContent.js b/...les/capture-core/components/WidgetFeedback/WidgetFeedbackContent/WidgetFeedbackContent.js
@@ -24,13 +24,9 @@ const styles = {
         marginTop: 0,
     },
     listItem: {
-        marginBottom: spacersNum.dp8,
         '&::marker': {
             color: colors.grey500,
         },
-        '& + &': {
-            marginBottom: 0,
-        },
     },
 };
 

diff --git a/src/core_modules/capture-core/rules/__tests__/rulesEffectsForTrackerProgram.test.js b/src/core_modules/capture-core/rules/__tests__/rulesEffectsForTrackerProgram.test.js
@@ -355,6 +355,13 @@ test('expressions with d2Functions in tracker program', () => {
                     location: 'feedback',
                     programRuleActionType: 'DISPLAYKEYVALUEPAIR',
                 },
+                {
+                    id: 'jhflkgjh45',
+                    displayContent: 'key with undefined value',
+                    data: undefined,
+                    location: 'feedback',
+                    programRuleActionType: 'DISPLAYKEYVALUEPAIR',
+                },
                 {
                     id: 'Tx4gHcLselM',
                     displayContent: 'd2:oizp( 10000000 ) = ',
@@ -778,6 +785,15 @@ test('expressions with d2Functions in tracker program', () => {
                 value: '15',
             },
         },
+        {
+            type: 'DISPLAYKEYVALUEPAIR',
+            id: 'feedback',
+            displayKeyValuePair: {
+                id: 'jhflkgjh45',
+                key: 'key with undefined value',
+                value: '',
+            },
+        },
         {
             type: 'DISPLAYTEXT',
             id: 'feedback',