Merge pull request #6692 from judofosu/waltz-6602-report-grid

Report Grid: person view should included non-direct apps

Author: davidwatkins73

waltz-service/src/main/java/org/finos/waltz/service/report_grid/ReportGridFilterViewService.java

@@ -327,9 +327,9 @@ private ReportGridFilterInfo parseGridFilterInfo(Long appGroupId,
     private IdSelectionOptions mkSelectionOptionsFromGridInfoRow(List<String> gridInfo) {
         String vantagePointKind = gridInfo.get(2);
         String vantagePointId = gridInfo.get(3);
-        return modifySelectionOptionsForGrid(mkOpts(mkRef(
+        return mkOpts(mkRef(
                 EntityKind.valueOf(vantagePointKind),
-                Long.parseLong(vantagePointId))));
+                Long.parseLong(vantagePointId)));
     }
 
 

waltz-service/src/main/java/org/finos/waltz/service/report_grid/ReportGridService.java

@@ -48,7 +48,6 @@
 import static org.finos.waltz.common.Checks.checkTrue;
 import static org.finos.waltz.common.SetUtilities.map;
 import static org.finos.waltz.model.EntityReference.mkRef;
-import static org.finos.waltz.service.report_grid.ReportGridUtilities.modifySelectionOptionsForGrid;
 
 @Service
 public class ReportGridService {
@@ -110,7 +109,6 @@ public Optional<ReportGrid> getByIdAndSelectionOptions(
         // WARNING:  The grid computation is very slow if given a large person tree.
         //    Therefore we restrict it to EXACT only behaviour.
         //    If you are changing this please ensure you have tested with realistic test data.
-        IdSelectionOptions opts = modifySelectionOptionsForGrid(idSelectionOptions);
 
         LOG.info("ReportGrid - getting by ID={} SelectionOptions={}", id, idSelectionOptions);
         ReportGridDefinition definition = reportGridDao.getGridDefinitionById(id);
@@ -122,7 +120,7 @@ public Optional<ReportGrid> getByIdAndSelectionOptions(
 
         EntityKind targetKind = definition.subjectKind();
 
-        ReportGridInstance instance = mkInstance(id, opts, targetKind);
+        ReportGridInstance instance = mkInstance(id, idSelectionOptions, targetKind);
 
         Set<ReportGridMember> members = reportGridMemberService.findByGridId(id);