#1461 | Fix display and hide of appliedFiltersV2

avniproject · Aug 1, 2024 · f7e3aff · f7e3aff
1 parent a8c2e54
commit f7e3aff
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/packages/openchs-android/src/action/customDashboard/CustomDashboardActions.js b/packages/openchs-android/src/action/customDashboard/CustomDashboardActions.js
@@ -27,12 +27,16 @@ function loadCurrentDashboardInfo(context, state) {
     state.customDashboardFilters = selectedFilterValues;
     if (state.activeDashboardUUID) {
         state.reportCardSectionMappings = getReportsCards(state.activeDashboardUUID, context);
-        state.hasFiltersSet = selectedFilterValues && Object.values(selectedFilterValues).length > 0
-        && Object.values(selectedFilterValues).some(sfv => !_.isNil(sfv) && !_.isEmpty(sfv));
+        state.hasFiltersSet = getHasFiltersSet(selectedFilterValues);
     }
     return state;
 }
 
+function getHasFiltersSet(selectedFilterValues) {
+    return selectedFilterValues && Object.values(selectedFilterValues).length > 0
+      && Object.values(selectedFilterValues).some(sfv => !_.isNil(sfv) && !_.isEmpty(sfv));
+}
+
 function getViewName(standardReportCardType) {
     switch (true) {
         case _.isNil(standardReportCardType) :
@@ -132,6 +136,7 @@ class CustomDashboardActions {
 
         const {selectedFilterValues} = customDashboardService.getDashboardData(state.activeDashboardUUID);
         newState.customDashboardFilters = selectedFilterValues;
+        newState.hasFiltersSet = getHasFiltersSet(selectedFilterValues);
         const userSettings = userInfoService.getUserSettingsObject();
 
         const I18n = context.get(MessageService).getI18n();