Skip to content

fix: Process isn't displayed in I manage filter if I'm a member only in its management space - EXO-76971 #428

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

Merged
Jihed525 merged 1 commit into from
Feb 17, 2025
Merged

fix: Process isn't displayed in I manage filter if I'm a member only in its management space - EXO-76971 #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 33 additions & 24 deletions processes-services/src/main/java/org/exoplatform/processes/dao/WorkFlowDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,33 +55,41 @@ private String buildWorkflowQuery(ProcessesFilter processesFilter, List<String>
String q = processesFilter.getQuery();
Boolean enabled = processesFilter.getEnabled();
Boolean manager = processesFilter.getManager();
boolean managerProcess = memberships.stream().anyMatch(m -> m.endsWith("platform/processes"));
String query = " ( workFlow.title like '%" + q + "%' OR workFlow.description like '%" + q + "%' OR workFlow.summary like '%" + q + "%' )";
String queryString = "SELECT DISTINCT workFlow FROM WorkFlow workFlow";
if(memberships != null) {
queryString = queryString + " LEFT JOIN workFlow.manager manager "
+ " LEFT JOIN workFlow.participator participator ";
}
if(StringUtils.isNotEmpty(q) || memberships != null || enabled != null){
queryString = queryString + " WHERE";
if (StringUtils.isNotEmpty(q)){
queryString = queryString + " ( workFlow.title like '%" + q + "%'";
queryString = queryString + " OR workFlow.description like '%" + q + "%'";
queryString = queryString + " OR workFlow.summary like '%" + q + "%' )";
queryString = queryString + " AND";
}
if ( enabled != null){
queryString = queryString + " workFlow.enabled = " + enabled;
queryString = queryString + " AND";
if (enabled != null || manager == true || managerProcess == false) {
if(memberships != null) {
if ( Boolean.FALSE.equals(manager)) {
queryString = queryString + " LEFT JOIN workFlow.manager manager";
}
queryString = queryString + " LEFT JOIN workFlow.participator participator";
}
if ( memberships != null){
queryString = queryString + " ( manager IN ('"+String.join("','", getMembersShipGroup(memberships))+"') ";
if ( Boolean.FALSE.equals(manager)){
queryString = queryString + " OR participator IN ('"+String.join("','", memberships)+"')) ";
} else {
queryString = queryString + " AND participator IN ('"+String.join("','", memberships)+"')) ";
if(StringUtils.isNotEmpty(q) || memberships != null || enabled != null){
queryString = queryString + " WHERE";
if (StringUtils.isNotEmpty(q)){
queryString = queryString + query;
queryString = queryString + " AND";
}
if ( enabled != null){
queryString = queryString + " workFlow.enabled = " + enabled;
queryString = queryString + " AND";
}
if ( memberships != null){
if ( Boolean.FALSE.equals(manager)){
queryString = queryString + " ( manager IN ('"+String.join("','", getMembersShipGroup(memberships))+"') ";
queryString = queryString + " OR participator IN ('"+String.join("','", memberships)+"')) ";
} else {
queryString = queryString + " participator IN ('"+String.join("','", memberships)+"') ";
}
}
if (queryString.endsWith(" AND")) {
queryString = queryString.substring(0, queryString.length() - 4);
}
}
if (queryString.endsWith(" AND")) {
queryString = queryString.substring(0, queryString.length() - 4);
} else {
if (StringUtils.isNotEmpty(q)) {
queryString = queryString + " WHERE" + query;
}
}

Expand All @@ -90,7 +98,8 @@ private String buildWorkflowQuery(ProcessesFilter processesFilter, List<String>

private List<String> getMembersShipGroup(List<String> memberships) {
return memberships.stream()
.map(s -> (!s.startsWith("manager:/") && !s.startsWith("member:/")) ? s : s.replace("manager:","").replace("member:","") )
.map(s -> (!s.startsWith("manager:/") && !s.startsWith("member:/") && !s.startsWith("*:/"))
? s : s.replace("manager:","").replace("member:","").replace("*:",""))
.collect(Collectors.toList());
}

Expand Down
1 change: 0 additions & 1 deletion processes-webapp/src/main/webapp/vue-app/processes/components/WorkFlowCardItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<template #activator="{ on, attrs }">
<v-btn
:class="isMobile ? 'three-dots mr-n2 mt-3' : 'three-dots mt-1'"
dark
icon
v-bind="attrs"
v-on="!isMobileMenu && on"
Expand Down