#1256 | Show error if there is mismatch in count between configured a…

…nd query returned nested cards count
avniproject · Jan 25, 2024 · d13fba8 · d13fba8
1 parent 0ff1f7d
commit d13fba8
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 13 deletions.
diff --git a/packages/openchs-android/src/action/customDashboard/CustomDashboardActions.js b/packages/openchs-android/src/action/customDashboard/CustomDashboardActions.js
@@ -8,6 +8,7 @@ import General from "../../utility/General";
 import DashboardFilterService from "../../service/reports/DashboardFilterService";
 import CustomDashboardCacheService from '../../service/CustomDashboardCacheService';
 import CryptoUtils from '../../utility/CryptoUtils';
+import MessageService from '../../service/MessageService';
 
 class CustomDashboardActions {
 
@@ -109,6 +110,7 @@ class CustomDashboardActions {
     }
 
     static refreshCount(state, action, context) {
+        const I18n = context.get(MessageService).getI18n();
         const reportCardSectionMappings = state.reportCardSectionMappings;
         const newState = {...state};
         newState.ruleInput = action.filterApplied ? action.ruleInput : newState.ruleInput;
@@ -117,15 +119,27 @@ class CustomDashboardActions {
             const start = new Date();
             const countQueryResponse = context.get(ReportCardService).getReportCardCount(rcm.card, newState.ruleInput.ruleInputArray);
             if(rcm.card.nested) {
-                _.map(countQueryResponse, (reportCard, index) => {
-                    const itemKey = rcm.card.getCardId(index);
-                    newState.cardToCountResultMap[itemKey] = {
-                        ...reportCard,
-                        itemKey
-                    };
-                });
-                countQueryResponse && countQueryResponse.length != rcm.card.countOfCards && General.logWarn('CustomDashboardActions',
-                  `${rcm.card.name} query returned different number of nested cards(${countQueryResponse.length}) than expected(${rcm.card.countOfCards})`);
+                if(countQueryResponse && countQueryResponse.length === rcm.card.countOfCards) {
+                    _.map(countQueryResponse, (reportCard, index) => {
+                        const itemKey = rcm.card.getCardId(index);
+                        newState.cardToCountResultMap[itemKey] = {
+                            ...reportCard,
+                            itemKey
+                        };
+                    });
+                } else if(countQueryResponse && countQueryResponse.length !== rcm.card.countOfCards) {
+                    Array(rcm.card.countOfCards).fill(rcm.card).map((reportCard, index) => {
+                        const itemKey = reportCard.getCardId(index);
+                        newState.cardToCountResultMap[itemKey] = {
+                            hasError: true,
+                            primaryValue: I18n.t("Error"),
+                            secondaryValue: `Configured number of cards don\'t match with the number of cards in the rule`,
+                            // secondaryValue: null,
+                            lineListFunction: _.noop(),
+                            itemKey
+                        };
+                    });
+                }
             } else {
                 newState.cardToCountResultMap[rcm.card.getCardId()] = countQueryResponse;
             }

diff --git a/packages/openchs-android/src/views/customDashboard/CardListView.js b/packages/openchs-android/src/views/customDashboard/CardListView.js
@@ -18,8 +18,8 @@ export const CardListView = ({reportCard, I18n, onCardPress, countResult}) => {
                     direction={'column'}
                     primary={countResult.primaryValue}
                     secondary={countResult.secondaryValue}
-                    primaryStyle={[styles.primaryTextStyle, {color: textColor}]}
-                    secondaryStyle={[styles.secondaryTextStyle, {color: textColor}]}
+                    primaryStyle={[styles.primaryTextStyle, {color: textColor}, countResult.hasError && styles.cardPrimaryTextErrorStyle]}
+                    secondaryStyle={[styles.secondaryTextStyle, {color: textColor}, countResult.hasError && styles.cardSecondaryTextErrorStyle]}
                 />
         )
     };
@@ -78,5 +78,13 @@ const styles = StyleSheet.create({
     secondaryTextStyle: {
         fontSize: 23,
         fontStyle: 'normal',
+    },
+    cardPrimaryTextErrorStyle: {
+        fontSize: 11,
+        fontStyle: 'normal',
+    },
+    cardSecondaryTextErrorStyle: {
+        fontSize: 9,
+        fontStyle: 'normal',
     }
 });
diff --git a/packages/openchs-android/src/views/customDashboard/CardTileView.js b/packages/openchs-android/src/views/customDashboard/CardTileView.js
@@ -19,8 +19,8 @@ const renderNumber = function (countResult, textColor) {
                 direction={'row'}
                 primary={countResult.primaryValue}
                 secondary={countResult.secondaryValue}
-                primaryStyle={[styles.cardPrimaryTextStyle, {color: textColor}]}
-                secondaryStyle={[styles.cardSecondaryTextStyle, {color: textColor}]}
+                primaryStyle={[styles.cardPrimaryTextStyle, {color: textColor}, countResult.hasError && styles.cardPrimaryTextErrorStyle]}
+                secondaryStyle={[styles.cardSecondaryTextStyle, {color: textColor}, countResult.hasError && styles.cardSecondaryTextErrorStyle]}
             />
     )
 };
@@ -87,5 +87,13 @@ const styles = StyleSheet.create({
         flexDirection: 'column',
         alignItems: 'flex-end',
         flex: 1
+    },
+    cardPrimaryTextErrorStyle: {
+        fontSize: 11,
+        fontStyle: 'normal',
+    },
+    cardSecondaryTextErrorStyle: {
+        fontSize: 8,
+        fontStyle: 'normal',
     }
 });