Skip to content

The status filter in Processes I Manage stopped working #8611

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
nolanpro merged 1 commit into from
Nov 19, 2025
Merged

The status filter in Processes I Manage stopped working #8611

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
26 changes: 24 additions & 2 deletions ProcessMaker/Models/ProcessRequestToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,13 +753,35 @@ public function valueAliasStatus($value, $expression, $callback = null, User $us

$value = mb_strtolower($value);

return function ($query) use ($value, $statusMap, $expression, $user) {
// Capture processManagerIds from the builder if it's available
// The $callback parameter is actually the $builder from ExtendedPMQL
$builder = $callback;
$processManagerIds = null;
if ($builder && method_exists($builder, 'getQuery')) {
$processManagerIds = $builder->getQuery()->processManagerIds ?? null;
}

return function ($query) use ($value, $statusMap, $expression, $user, $processManagerIds) {
// Also check in the current query in case it's available there
$currentProcessManagerIds = $query->getQuery()->processManagerIds ?? null;
$finalProcessManagerIds = $processManagerIds ?? $currentProcessManagerIds;
$isProcessManager = !empty($finalProcessManagerIds);

if ($value === 'self service') {
if (!$user) {
$user = auth()->user();
}

if ($user) {
if ($isProcessManager) {
// When processesIManage is active, include self-service tasks from managed processes
$selfServiceTaskIds = ProcessRequestToken::select(['id'])
->whereIn('process_id', $finalProcessManagerIds)
->where('is_self_service', 1)
->whereNull('user_id')
->where('status', 'ACTIVE');

$query->whereIn('process_request_tokens.id', $selfServiceTaskIds);
} elseif ($user) {
$taskIds = $user->availableSelfServiceTaskIds();
$query->whereIn('process_request_tokens.id', $taskIds);
} else {
Expand Down
59 changes: 44 additions & 15 deletions ProcessMaker/Traits/TaskControllerIndexMethods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,27 +289,56 @@ private function applyPmql($query, $request, $user)
} catch (SyntaxError $e) {
abort('Your PMQL contains invalid syntax.', 400);
}

// After PMQL is applied, if processesIManage is active, add self-service tasks
// This is done after PMQL to avoid the is_self_service = 0 filter that PMQL might add
if ($request->input('processesIManage') === 'true' && isset($query->getQuery()->processManagerIds)) {
$ids = $query->getQuery()->processManagerIds;
$selfServiceTaskIds = ProcessRequestToken::select(['id'])
->whereIn('process_id', $ids)
->where('is_self_service', 1)
->whereNull('user_id')
->where('status', 'ACTIVE');

// Add self-service tasks using orWhereIn to override PMQL's is_self_service = 0 filter
$query->orWhereIn('process_request_tokens.id', $selfServiceTaskIds);
}
}
}

private function applyAdvancedFilter($query, $request)
{
if ($advancedFilter = $request->input('advanced_filter', '')) {
Filter::filter($query, $advancedFilter);
// Parse the advanced filter
$filterArray = is_string($advancedFilter) ? json_decode($advancedFilter, true) : $advancedFilter;

// Check if processesIManage is active and we have processManagerIds
$processManagerIds = $query->getQuery()->processManagerIds ?? null;
$isProcessManager = !empty($processManagerIds) && $request->input('processesIManage') === 'true';

// If processesIManage is active, handle "Self Service" status filter specially
if ($isProcessManager && is_array($filterArray)) {
$hasSelfServiceFilter = false;
$filteredArray = [];

foreach ($filterArray as $filter) {
// Check if this is a "Self Service" status filter
if (isset($filter['subject']['type']) &&
$filter['subject']['type'] === 'Status' &&
isset($filter['value']) &&
mb_strtolower($filter['value']) === 'self service') {
$hasSelfServiceFilter = true;
// Don't add this filter to the array - we'll handle it manually
continue;
}
$filteredArray[] = $filter;
}

// Apply the filtered advanced_filter (without Self Service)
if (!empty($filteredArray)) {
Filter::filter($query, $filteredArray);
}

// Manually apply the Self Service filter for process managers
if ($hasSelfServiceFilter) {
$selfServiceTaskIds = ProcessRequestToken::select(['id'])
->whereIn('process_id', $processManagerIds)
->where('is_self_service', 1)
->whereNull('user_id')
->where('status', 'ACTIVE');

$query->whereIn('process_request_tokens.id', $selfServiceTaskIds);
}
} else {
// Normal behavior - apply the filter as-is
Filter::filter($query, $advancedFilter);
}
}
}

Expand Down
Loading