Merge pull request #8781 from ProcessMaker/bugfix/FOUR-30703

FOUR-30703 | Save Search Shows “Error Loading Items” in Available Columns

Author: nolanpro

ProcessMaker/Models/ProcessRequestToken.php

@@ -640,21 +640,21 @@ public function scopeFilter($query, $filter)
         $setting = Setting::byKey('indexed-search');
         if ($setting && $setting->config['enabled'] === true) {
             if (is_numeric($filter)) {
-                $query->whereIn('id', [$filter]);
+                $query->whereIn('process_request_tokens.id', [$filter]);
             } else {
                 $matches = self::search($filter)->take(10000)->get()->pluck('id');
-                $query->whereIn('id', $matches);
+                $query->whereIn('process_request_tokens.id', $matches);
             }
         } else {
             $filter = '%' . mb_strtolower($filter) . '%';
             $query->where(function ($query) use ($filter) {
                 $query->where(DB::raw('LOWER(element_name)'), 'like', $filter)
                     ->orWhere(DB::raw('LOWER(data)'), 'like', $filter)
                     ->orWhere(DB::raw('LOWER(status)'), 'like', $filter)
-                    ->orWhere('id', 'like', $filter)
-                    ->orWhere('created_at', 'like', $filter)
-                    ->orWhere('due_at', 'like', $filter)
-                    ->orWhere('updated_at', 'like', $filter)
+                    ->orWhere('process_request_tokens.id', 'like', $filter)
+                    ->orWhere('process_request_tokens.created_at', 'like', $filter)
+                    ->orWhere('process_request_tokens.due_at', 'like', $filter)
+                    ->orWhere('process_request_tokens.updated_at', 'like', $filter)
                     ->orWhereHas('processRequest', function ($query) use ($filter) {
                         $query->where(DB::raw('LOWER(name)'), 'like', $filter);
                     })

tests/Feature/Api/TasksTest.php

@@ -20,6 +20,7 @@
 use ProcessMaker\Models\ProcessTaskAssignment;
 use ProcessMaker\Models\Screen;
 use ProcessMaker\Models\ScreenVersion;
+use ProcessMaker\Models\Setting;
 use ProcessMaker\Models\User;
 use ProcessMaker\Notifications\ActivityActivatedNotification;
 use ProcessMaker\Providers\AuthServiceProvider;
@@ -913,4 +914,115 @@ public function testGetAllTaskTypes()
         $this->assertEquals($scriptTask->id, $response['data'][1]['id']);
         $this->assertEquals($gatewayTask->id, $response['data'][2]['id']);
     }
+
+    /**
+     * Test that the free-text filter parameter works on the tasks endpoint.
+     */
+    public function testFilterByFreeTextSearch()
+    {
+        $request = ProcessRequest::factory()->create();
+
+        $matchingTask = ProcessRequestToken::factory()->create([
+            'element_type' => 'task',
+            'element_name' => 'UniqueSearchableTaskName',
+            'status' => 'ACTIVE',
+            'process_request_id' => $request->id,
+        ]);
+
+        ProcessRequestToken::factory()->create([
+            'element_type' => 'task',
+            'element_name' => 'OtherTask',
+            'status' => 'ACTIVE',
+            'process_request_id' => $request->id,
+        ]);
+
+        $response = $this->apiCall('GET', route('api.' . $this->resource . '.index', [
+            'filter' => 'UniqueSearchableTaskName',
+            'per_page' => 50,
+        ]));
+
+        $response->assertStatus(200);
+        $data = $response->json('data');
+        $this->assertNotEmpty($data);
+        $this->assertTrue(
+            collect($data)->contains('id', $matchingTask->id),
+            'Expected matching task to appear in filtered results'
+        );
+        $this->assertFalse(
+            collect($data)->contains('element_name', 'OtherTask'),
+            'Expected non-matching task to be excluded from filtered results'
+        );
+    }
+
+    /**
+     * Build a query that joins process_request_tokens to itself via a
+     * subquery aliased `cte`, matching the pattern used by the Saved Search
+     * package. Any WHERE clauses added afterwards must use qualified column
+     * names or they will hit an "ambiguous column" error.
+     */
+    private function buildJoinedSubquery()
+    {
+        $query = ProcessRequestToken::query()->where('element_type', 'task');
+
+        $subQuery = clone $query;
+        $subQuery->select('id', 'updated_at')->latest('updated_at')->take(25);
+
+        $query->select('process_request_tokens.*')
+            ->joinSub($subQuery, 'cte', function ($join) {
+                $join->on('process_request_tokens.id', '=', 'cte.id');
+            });
+
+        return $query;
+    }
+
+    /**
+     * Test that scopeFilter's non-indexed branch works when the query has
+     * a join that introduces duplicate column names (Saved Search pattern).
+     */
+    public function testScopeFilterWorksWithJoinedSubquery()
+    {
+        $request = ProcessRequest::factory()->create();
+
+        ProcessRequestToken::factory()->create([
+            'element_type' => 'task',
+            'element_name' => 'JoinTestTask',
+            'status' => 'ACTIVE',
+            'process_request_id' => $request->id,
+        ]);
+
+        $query = $this->buildJoinedSubquery();
+        $query->filter('JoinTestTask');
+
+        $results = $query->get();
+
+        $this->assertNotEmpty($results);
+        $this->assertTrue($results->contains('element_name', 'JoinTestTask'));
+    }
+
+    /**
+     * Test that scopeFilter's indexed-search branch (numeric filter path)
+     * uses a qualified `id` column so it works with the Saved Search join.
+     */
+    public function testScopeFilterIndexedSearchNumericWorksWithJoinedSubquery()
+    {
+        Setting::updateOrCreate(
+            ['key' => 'indexed-search'],
+            ['config' => ['enabled' => true]]
+        );
+
+        $request = ProcessRequest::factory()->create();
+
+        $task = ProcessRequestToken::factory()->create([
+            'element_type' => 'task',
+            'status' => 'ACTIVE',
+            'process_request_id' => $request->id,
+        ]);
+
+        $query = $this->buildJoinedSubquery();
+        $query->filter((string) $task->id);
+
+        $results = $query->get();
+
+        $this->assertTrue($results->contains('id', $task->id));
+    }
 }