Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Report Grid: person view should included non-direct apps #6692

Merged
merged 6 commits into from
Aug 7, 2023
Merged

Report Grid: person view should included non-direct apps #6692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88f78dc
Skip id selection options modification
judithofosu Aug 4, 2023
ac616b8
Merge branch 'finos:master' into waltz-6602-report-grid
judithofosu Aug 4, 2023
fd596de
skip modification of selection options for grid
judithofosu Aug 4, 2023
e421a1f
Merge branch 'waltz-6602-report-grid' of github.com:judofosu/waltz in…
judithofosu Aug 4, 2023
0e99c07
Merge branch 'finos:master' into waltz-6602-report-grid
judithofosu Aug 4, 2023
e878220
Merge branch 'waltz-6602-report-grid' of github.com:judofosu/waltz in…
judithofosu Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ervice/src/main/java/org/finos/waltz/service/report_grid/ReportGridFilterViewService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
}


Expand Down
4 changes: 1 addition & 3 deletions waltz-service/src/main/java/org/finos/waltz/service/report_grid/ReportGridService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
Expand All @@ -122,7 +120,7 @@ public Optional<ReportGrid> getByIdAndSelectionOptions(

EntityKind targetKind = definition.subjectKind();

ReportGridInstance instance = mkInstance(id, opts, targetKind);
ReportGridInstance instance = mkInstance(id, idSelectionOptions, targetKind);
davidwatkins73 marked this conversation as resolved.
Show resolved Hide resolved

Set<ReportGridMember> members = reportGridMemberService.findByGridId(id);

Expand Down