#1543 | Include only unvoided dashboards when fetching dashboards for…

… a user group
avniproject · Nov 11, 2024 · 3d96864 · 3d96864
1 parent 87c1b2a
commit 3d96864
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packages/openchs-android/src/service/customDashboard/CustomDashboardService.js b/packages/openchs-android/src/service/customDashboard/CustomDashboardService.js
@@ -28,7 +28,8 @@ function getGroupDashboards(privilegeService, entityService) {
     const ownedGroupsQuery = _.map(privilegeService.ownedGroups(), ({groupUuid}) => `group.uuid = '${groupUuid}'`).join(' OR ');
     return entityService.getAllNonVoided(GroupDashboard.schema.name)
         .filtered(_.isEmpty(ownedGroupsQuery) ? 'uuid = null' : ownedGroupsQuery)
-        .filtered('TRUEPREDICATE DISTINCT(dashboard.uuid)');
+        .filtered('TRUEPREDICATE DISTINCT(dashboard.uuid)')
+        .filtered('dashboard.voided = false');
 }
 
 function getDashboardsBasedOnPrivilege(privilegeService, entityService, customDashboardService) {