Skip to content

FOUR-25589 | Status Filtering In a Settings Tab Created From LaunchPad Does Not Work Correctly #8766

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

Open
mcraeteisha wants to merge 5 commits into
base: develop
Choose a base branch
from
+182 −0
Open

FOUR-25589 | Status Filtering In a Settings Tab Created From LaunchPad Does Not Work Correctly #8766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d6710d
Skip status clause in PMQL if advanced filter set
mcraeteisha Mar 31, 2026
45413cf
Add tests for advanced vs PMQL status filter
mcraeteisha Mar 31, 2026
d4858df
Handle self-service status in advanced filters
mcraeteisha Apr 27, 2026
54d758e
Code cleanup
mcraeteisha Apr 27, 2026
83d1d77
Merge branch 'develop' into bugfix/FOUR-25589
mcraeteisha Apr 27, 2026
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
66 changes: 66 additions & 0 deletions ProcessMaker/Traits/TaskControllerIndexMethods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,18 @@ private function applyPmql($query, $request, $user)
{
$pmql = $request->input('pmql', '');
if (!empty($pmql)) {
if ($this->advancedFilterHasStatus($request)) {
$pmql = $this->removeStatusFromPmql($pmql);

if ($this->advancedFilterHasSelfServiceStatus($request)) {
$pmql = $this->removeUserIdFromPmql($pmql);
}
}

if (empty($pmql)) {
return;
}

try {
$query->pmql($pmql, null, $user);
} catch (QueryException $e) {
Expand All @@ -305,6 +317,60 @@ private function applyPmql($query, $request, $user)
}
}

private function advancedFilterHasStatus($request): bool
{
return !empty($this->getAdvancedFilterArray($request));
}

private function advancedFilterHasSelfServiceStatus($request): bool
{
foreach ($this->getAdvancedFilterArray($request) as $filter) {
$values = (array) ($filter['value'] ?? []);
foreach ($values as $v) {
if (mb_strtolower($v) === 'self service') {
return true;
}
}
}

return false;
}

private function getAdvancedFilterArray($request): array
{
$advancedFilter = $request->input('advanced_filter', '');
if (empty($advancedFilter)) {
return [];
}

$filterArray = is_string($advancedFilter) ? json_decode($advancedFilter, true) : $advancedFilter;
if (!is_array($filterArray)) {
return [];
}

return array_filter($filterArray, function ($filter) {
return isset($filter['subject']['type']) && $filter['subject']['type'] === 'Status';
});
}

private function removeStatusFromPmql(string $pmql): string
{
$pmql = preg_replace('/\s+AND\s+\(status\s*=\s*"[^"]*"\)/i', '', $pmql);
$pmql = preg_replace('/\(status\s*=\s*"[^"]*"\)\s+AND\s+/i', '', $pmql);
$pmql = preg_replace('/\(status\s*=\s*"[^"]*"\)/i', '', $pmql);

return trim($pmql);
}

private function removeUserIdFromPmql(string $pmql): string
{
$pmql = preg_replace('/\s+AND\s+\(user_id\s*=\s*\d+\)/i', '', $pmql);
$pmql = preg_replace('/\(user_id\s*=\s*\d+\)\s+AND\s+/i', '', $pmql);
$pmql = preg_replace('/\(user_id\s*=\s*\d+\)/i', '', $pmql);

return trim($pmql);
}

private function applyAdvancedFilter($query, $request)
{
if ($advancedFilter = $request->input('advanced_filter', '')) {
Expand Down
116 changes: 116 additions & 0 deletions tests/Feature/Api/TasksTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,122 @@ public function testAdvancedFilterByProcessRequestName()
$this->assertEquals($hitTask->id, $json['data'][0]['id']);
}

public function testAdvancedStatusFilterOverridesPmqlStatus()
{
$user = User::factory()->create(['is_administrator' => true]);

$activeTask = ProcessRequestToken::factory()->create([
'status' => 'ACTIVE',
'element_type' => 'task',
'user_id' => $user->id,
'is_self_service' => 0,
]);

$completedTask = ProcessRequestToken::factory()->create([
'status' => 'CLOSED',
'element_type' => 'task',
'user_id' => $user->id,
'is_self_service' => 0,
]);

$statusFilter = json_encode([
[
'subject' => ['type' => 'Status'],
'operator' => '=',
'value' => 'Completed',
],
]);

$response = $this->actingAs($user, 'api')->get(route('api.tasks.index', [
'pmql' => '(user_id = ' . $user->id . ') AND (status = "In Progress")',
'advanced_filter' => $statusFilter,
]));

$response->assertStatus(200);
$data = $response->json('data');
$returnedIds = collect($data)->pluck('id')->toArray();

$this->assertContains($completedTask->id, $returnedIds);
$this->assertNotContains($activeTask->id, $returnedIds);
}

public function testPmqlStatusPreservedWhenNoAdvancedStatusFilter()
{
$user = User::factory()->create(['is_administrator' => true]);

$activeTask = ProcessRequestToken::factory()->create([
'status' => 'ACTIVE',
'element_type' => 'task',
'user_id' => $user->id,
'is_self_service' => 0,
]);

$completedTask = ProcessRequestToken::factory()->create([
'status' => 'CLOSED',
'element_type' => 'task',
'user_id' => $user->id,
'is_self_service' => 0,
]);

$response = $this->actingAs($user, 'api')->get(route('api.tasks.index', [
'pmql' => '(user_id = ' . $user->id . ') AND (status = "In Progress")',
]));

$response->assertStatus(200);
$data = $response->json('data');
$returnedIds = collect($data)->pluck('id')->toArray();

$this->assertContains($activeTask->id, $returnedIds);
$this->assertNotContains($completedTask->id, $returnedIds);
}

public function testSelfServiceFilterOverridesPmqlStatusAndUserId()
{
$user = User::factory()->create(['is_administrator' => true]);
$group = Group::factory()->create();

GroupMember::factory()->create([
'group_id' => $group->id,
'member_id' => $user->id,
'member_type' => User::class,
]);

$selfServiceTask = ProcessRequestToken::factory()->create([
'status' => 'ACTIVE',
'element_type' => 'task',
'user_id' => null,
'is_self_service' => 1,
'self_service_groups' => ['groups' => [strval($group->id)], 'users' => []],
]);

$regularTask = ProcessRequestToken::factory()->create([
'status' => 'ACTIVE',
'element_type' => 'task',
'user_id' => $user->id,
'is_self_service' => 0,
]);

$statusFilter = json_encode([
[
'subject' => ['type' => 'Status'],
'operator' => '=',
'value' => 'Self Service',
],
]);

$response = $this->actingAs($user, 'api')->get(route('api.tasks.index', [
'pmql' => '(user_id = ' . $user->id . ') AND (status = "In Progress")',
'advanced_filter' => $statusFilter,
]));

$response->assertStatus(200);
$data = $response->json('data');
$returnedIds = collect($data)->pluck('id')->toArray();

$this->assertContains($selfServiceTask->id, $returnedIds);
$this->assertNotContains($regularTask->id, $returnedIds);
}

public function testGetScreenFields()
{
$this->be($this->user);
Expand Down
Loading