FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788

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
caleeli merged 2 commits into from
Dec 4, 2024
Merged

FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f34094
Add savedSearchId filtering test
caleeli Dec 3, 2024
e90c433
Enhance ProcessVariableController to support savedSearchId filtering …
caleeli Dec 3, 2024
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
23 changes: 17 additions & 6 deletions ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use Illuminate\Support\Str;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;

class ProcessVariableController extends Controller
{
Expand All@@ -21,7 +22,7 @@ class ProcessVariableController extends Controller
* @OA\Property(property="id", type="integer", example=1),
* @OA\Property(property="process_id", type="integer", example=1),
* @OA\Property(property="uuid", type="string", format="uuid", example="550e8400-e29b-41d4-a716-446655440000"),
* @OA\Property(property="data_type", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
* @OA\Property(property="field", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
* @OA\Property(property="label", type="string", example="Variable 1 for Process 1"),
* @OA\Property(property="name", type="string", example="var_1_1"),
* @OA\Property(
Expand DownExpand Up@@ -95,22 +96,31 @@ class ProcessVariableController extends Controller
* )
* )
*/
public function index(Request $request): JsonResponse
public function index(Request $request)
{
// Validate request
$validated = $request->validate([
'processIds' => 'required|string',
'page' => 'sometimes|integer|min:1',
'per_page' => 'sometimes|integer|min:1|max:100',
'savedSearchId' => 'sometimes|string',
]);

// Parse process IDs
$processIds = array_map('intval', explode(',', $validated['processIds']));
$perPage = $validated['per_page'] ?? 20;
$page = $validated['page'] ?? 1;
$excludeSavedSearch = $validated['savedSearchId'] ?? 0;

// Generate mock data
$mockData = $this->generateMockData($processIds);
if ($excludeSavedSearch) {
$savedSearch = SavedSearch::find($excludeSavedSearch);
$columns = $savedSearch->current_columns;
$mockData = $mockData->filter(function ($variable) use ($columns) {
return !$columns->pluck('field')->contains($variable['field']);
});
}

// Create paginator
$paginator = new LengthAwarePaginator(
Expand All@@ -122,7 +132,7 @@ public function index(Request $request): JsonResponse
);

return response()->json([
'data' => $paginator->items(),
'data' => array_values($paginator->items()),
'meta' => [
'current_page' => $paginator->currentPage(),
'from' => $paginator->firstItem(),
Expand All@@ -147,7 +157,7 @@ private function generateMockData(array $processIds): Collection
$cacheKey = 'process_variables_' . implode('_', $processIds);

// Try to get variables from cache first
$variables = Cache::remember($cacheKey, now()->addHours(24), function () use ($processIds) {
$variables = Cache::remember($cacheKey, now()->addSeconds(5), function () use ($processIds) {
$variables = collect();

foreach ($processIds as $processId) {
Expand All@@ -157,15 +167,16 @@ private function generateMockData(array $processIds): Collection
'id' => $variables->count() + 1,
'process_id' => $processId,
'uuid' => (string) Str::uuid(),
'data_type' => $this->getRandomDataType(),
'format' => $this->getRandomDataType(),
'label' => "Variable {$i} for Process {$processId}",
'name' => "var_{$processId}_{$i}",
'field' => "data.var_{$processId}_{$i}",
'asset' => [
'id' => "asset_{$processId}_{$i}",
'type' => $this->getRandomAssetType(),
'name' => "Asset {$i} for Process {$processId}",
'uuid' => (string) Str::uuid(),
],
'default' => null,
'created_at' => now()->toIso8601String(),
'updated_at' => now()->toIso8601String(),
]);
Expand Down
53 changes: 46 additions & 7 deletions tests/Feature/Api/V1_1/ProcessVariableControllerTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace Tests\Feature\Api\V1_1;

use ProcessMaker\Models\User;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use Tests\TestCase;
use Tests\Feature\Shared\RequestHelper;

Expand DownExpand Up@@ -37,9 +38,9 @@ public function test_can_get_process_variables_with_pagination(): void
'id',
'process_id',
'uuid',
'data_type',
'format',
'label',
'name',
'field',
'asset' => [
'id',
'type',
Expand All@@ -65,7 +66,7 @@ public function test_can_get_process_variables_with_pagination(): void
$responseData = $response->json();
$this->assertEquals(15, $responseData['meta']['per_page']);
$this->assertEquals(1, $responseData['meta']['current_page']);

// Since we're generating 10 variables per process (3 processes = 30 total)
$this->assertEquals(30, $responseData['meta']['total']);
}
Expand DownExpand Up@@ -108,7 +109,7 @@ public function test_pagination_consistency(): void
// Ensure no duplicate IDs between pages
$firstPageIds = collect($firstPage['data'])->pluck('id');
$secondPageIds = collect($secondPage['data'])->pluck('id');

$this->assertEquals(0, $firstPageIds->intersect($secondPageIds)->count());
}

Expand All@@ -118,9 +119,9 @@ public function test_pagination_consistency(): void
public function test_process_ids_filtering(): void
{
$response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2&per_page=50');

$responseData = $response->json();

// Check that only requested process IDs are returned
$uniqueProcessIds = collect($responseData['data'])
->pluck('process_id')
Expand All@@ -129,8 +130,46 @@ public function test_process_ids_filtering(): void
->all();

$this->assertEquals([1, 2], $uniqueProcessIds);

// Since we generate 10 variables per process, total should be 20
$this->assertEquals(20, $responseData['meta']['total']);
}

/**
* Test filtering with savedSearchId parameter
*/
public function test_saved_search_id_filtering(): void
{
// Create a saved search with specific columns
$savedSearch = SavedSearch::factory()->create([
'meta' => [
'columns' => [
[
'label' => 'Variable 1',
'field' => 'data.var_1_1',
'default' => null,
],
[
'label' => 'Variable 2',
'field' => 'data.var_1_2',
'default' => null,
],
],
],
]);

// Make request with savedSearchId
$response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1&savedSearchId=' . $savedSearch->id);

$responseData = $response->json();

// Check that the filtered variables do not include the fields from the saved search
$filteredFields = collect($responseData['data'])->pluck('field');

$this->assertFalse($filteredFields->contains('data.var_1_1'));
$this->assertFalse($filteredFields->contains('data.var_1_2'));

// Check that the total count is reduced by the number of excluded fields
$this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788

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

caleeli
merged 2 commits into

from

Dec 4, 2024
 Merged


FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f34094

Add savedSearchId filtering test


caleeli Dec 3, 2024
e90c433

Enhance ProcessVariableController to support savedSearchId filtering …


caleeli Dec 3, 2024

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


23 changes: 17 additions & 6 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use Illuminate\Support\Str;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;

class ProcessVariableController extends Controller
{
Expand All@@ -21,7 +22,7 @@ class ProcessVariableController extends Controller
 * @OA\Property(property="id", type="integer", example=1),
 * @OA\Property(property="process_id", type="integer", example=1),
 * @OA\Property(property="uuid", type="string", format="uuid", example="550e8400-e29b-41d4-a716-446655440000"),
 * @OA\Property(property="data_type", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="field", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="label", type="string", example="Variable 1 for Process 1"),
 * @OA\Property(property="name", type="string", example="var_1_1"),
 * @OA\Property(
Expand DownExpand Up@@ -95,22 +96,31 @@ class ProcessVariableController extends Controller
 * )
 * )
 */
 public function index(Request $request): JsonResponse
 public function index(Request $request)
 {
 // Validate request
 $validated = $request->validate([
 'processIds' => 'required|string',
 'page' => 'sometimes|integer|min:1',
 'per_page' => 'sometimes|integer|min:1|max:100',
 'savedSearchId' => 'sometimes|string',
 ]);

 // Parse process IDs
 $processIds = array_map('intval', explode(',', $validated['processIds']));
 $perPage = $validated['per_page'] ?? 20;
 $page = $validated['page'] ?? 1;
 $excludeSavedSearch = $validated['savedSearchId'] ?? 0;

 // Generate mock data
 $mockData = $this->generateMockData($processIds);
 if ($excludeSavedSearch) {
 $savedSearch = SavedSearch::find($excludeSavedSearch);
 $columns = $savedSearch->current_columns;
 $mockData = $mockData->filter(function ($variable) use ($columns) {
 return !$columns->pluck('field')->contains($variable['field']);
 });
 }

 // Create paginator
 $paginator = new LengthAwarePaginator(
Expand All@@ -122,7 +132,7 @@ public function index(Request $request): JsonResponse
 );

 return response()->json([
 'data' => $paginator->items(),
 'data' => array_values($paginator->items()),
 'meta' => [
 'current_page' => $paginator->currentPage(),
 'from' => $paginator->firstItem(),
Expand All@@ -147,7 +157,7 @@ private function generateMockData(array $processIds): Collection
 $cacheKey = 'process_variables_' . implode('_', $processIds);

 // Try to get variables from cache first
 $variables = Cache::remember($cacheKey, now()->addHours(24), function () use ($processIds) {
 $variables = Cache::remember($cacheKey, now()->addSeconds(5), function () use ($processIds) {
 $variables = collect();

 foreach ($processIds as $processId) {
Expand All@@ -157,15 +167,16 @@ private function generateMockData(array $processIds): Collection
 'id' => $variables->count() + 1,
 'process_id' => $processId,
 'uuid' => (string) Str::uuid(),
 'data_type' => $this->getRandomDataType(),
 'format' => $this->getRandomDataType(),
 'label' => "Variable {$i} for Process {$processId}",
 'name' => "var_{$processId}_{$i}",
 'field' => "data.var_{$processId}_{$i}",
 'asset' => [
 'id' => "asset_{$processId}_{$i}",
 'type' => $this->getRandomAssetType(),
 'name' => "Asset {$i} for Process {$processId}",
 'uuid' => (string) Str::uuid(),
 ],
 'default' => null,
 'created_at' => now()->toIso8601String(),
 'updated_at' => now()->toIso8601String(),
 ]);
Expand Down

53 changes: 46 additions & 7 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace Tests\Feature\Api\V1_1;

use ProcessMaker\Models\User;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use Tests\TestCase;
use Tests\Feature\Shared\RequestHelper;

Expand DownExpand Up@@ -37,9 +38,9 @@ public function test_can_get_process_variables_with_pagination(): void
 'id',
 'process_id',
 'uuid',
 'data_type',
 'format',
 'label',
 'name',
 'field',
 'asset' => [
 'id',
 'type',
Expand All@@ -65,7 +66,7 @@ public function test_can_get_process_variables_with_pagination(): void
 $responseData = $response->json();
 $this->assertEquals(15, $responseData['meta']['per_page']);
 $this->assertEquals(1, $responseData['meta']['current_page']);

 // Since we're generating 10 variables per process (3 processes = 30 total)
 $this->assertEquals(30, $responseData['meta']['total']);
 }
Expand DownExpand Up@@ -108,7 +109,7 @@ public function test_pagination_consistency(): void
 // Ensure no duplicate IDs between pages
 $firstPageIds = collect($firstPage['data'])->pluck('id');
 $secondPageIds = collect($secondPage['data'])->pluck('id');

 $this->assertEquals(0, $firstPageIds->intersect($secondPageIds)->count());
 }

Expand All@@ -118,9 +119,9 @@ public function test_pagination_consistency(): void
 public function test_process_ids_filtering(): void
 {
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2&per_page=50');

 $responseData = $response->json();

 // Check that only requested process IDs are returned
 $uniqueProcessIds = collect($responseData['data'])
 ->pluck('process_id')
Expand All@@ -129,8 +130,46 @@ public function test_process_ids_filtering(): void
 ->all();

 $this->assertEquals([1, 2], $uniqueProcessIds);

 // Since we generate 10 variables per process, total should be 20
 $this->assertEquals(20, $responseData['meta']['total']);
 }

 /**
 * Test filtering with savedSearchId parameter
 */
 public function test_saved_search_id_filtering(): void
 {
 // Create a saved search with specific columns
 $savedSearch = SavedSearch::factory()->create([
 'meta' => [
 'columns' => [
 [
 'label' => 'Variable 1',
 'field' => 'data.var_1_1',
 'default' => null,
 ],
 [
 'label' => 'Variable 2',
 'field' => 'data.var_1_2',
 'default' => null,
 ],
 ],
 ],
 ]);

 // Make request with savedSearchId
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1&savedSearchId=' . $savedSearch->id);

 $responseData = $response->json();

 // Check that the filtered variables do not include the fields from the saved search
 $filteredFields = collect($responseData['data'])->pluck('field');

 $this->assertFalse($filteredFields->contains('data.var_1_1'));
 $this->assertFalse($filteredFields->contains('data.var_1_2'));

 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788

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

caleeli
merged 2 commits into

from

Dec 4, 2024
 Merged


FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f34094

Add savedSearchId filtering test


caleeli Dec 3, 2024
e90c433

Enhance ProcessVariableController to support savedSearchId filtering …


caleeli Dec 3, 2024

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


23 changes: 17 additions & 6 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use Illuminate\Support\Str;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;

class ProcessVariableController extends Controller
{
Expand All@@ -21,7 +22,7 @@ class ProcessVariableController extends Controller
 * @OA\Property(property="id", type="integer", example=1),
 * @OA\Property(property="process_id", type="integer", example=1),
 * @OA\Property(property="uuid", type="string", format="uuid", example="550e8400-e29b-41d4-a716-446655440000"),
 * @OA\Property(property="data_type", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="field", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="label", type="string", example="Variable 1 for Process 1"),
 * @OA\Property(property="name", type="string", example="var_1_1"),
 * @OA\Property(
Expand DownExpand Up@@ -95,22 +96,31 @@ class ProcessVariableController extends Controller
 * )
 * )
 */
 public function index(Request $request): JsonResponse
 public function index(Request $request)
 {
 // Validate request
 $validated = $request->validate([
 'processIds' => 'required|string',
 'page' => 'sometimes|integer|min:1',
 'per_page' => 'sometimes|integer|min:1|max:100',
 'savedSearchId' => 'sometimes|string',
 ]);

 // Parse process IDs
 $processIds = array_map('intval', explode(',', $validated['processIds']));
 $perPage = $validated['per_page'] ?? 20;
 $page = $validated['page'] ?? 1;
 $excludeSavedSearch = $validated['savedSearchId'] ?? 0;

 // Generate mock data
 $mockData = $this->generateMockData($processIds);
 if ($excludeSavedSearch) {
 $savedSearch = SavedSearch::find($excludeSavedSearch);
 $columns = $savedSearch->current_columns;
 $mockData = $mockData->filter(function ($variable) use ($columns) {
 return !$columns->pluck('field')->contains($variable['field']);
 });
 }

 // Create paginator
 $paginator = new LengthAwarePaginator(
Expand All@@ -122,7 +132,7 @@ public function index(Request $request): JsonResponse
 );

 return response()->json([
 'data' => $paginator->items(),
 'data' => array_values($paginator->items()),
 'meta' => [
 'current_page' => $paginator->currentPage(),
 'from' => $paginator->firstItem(),
Expand All@@ -147,7 +157,7 @@ private function generateMockData(array $processIds): Collection
 $cacheKey = 'process_variables_' . implode('_', $processIds);

 // Try to get variables from cache first
 $variables = Cache::remember($cacheKey, now()->addHours(24), function () use ($processIds) {
 $variables = Cache::remember($cacheKey, now()->addSeconds(5), function () use ($processIds) {
 $variables = collect();

 foreach ($processIds as $processId) {
Expand All@@ -157,15 +167,16 @@ private function generateMockData(array $processIds): Collection
 'id' => $variables->count() + 1,
 'process_id' => $processId,
 'uuid' => (string) Str::uuid(),
 'data_type' => $this->getRandomDataType(),
 'format' => $this->getRandomDataType(),
 'label' => "Variable {$i} for Process {$processId}",
 'name' => "var_{$processId}_{$i}",
 'field' => "data.var_{$processId}_{$i}",
 'asset' => [
 'id' => "asset_{$processId}_{$i}",
 'type' => $this->getRandomAssetType(),
 'name' => "Asset {$i} for Process {$processId}",
 'uuid' => (string) Str::uuid(),
 ],
 'default' => null,
 'created_at' => now()->toIso8601String(),
 'updated_at' => now()->toIso8601String(),
 ]);
Expand Down

53 changes: 46 additions & 7 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace Tests\Feature\Api\V1_1;

use ProcessMaker\Models\User;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use Tests\TestCase;
use Tests\Feature\Shared\RequestHelper;

Expand DownExpand Up@@ -37,9 +38,9 @@ public function test_can_get_process_variables_with_pagination(): void
 'id',
 'process_id',
 'uuid',
 'data_type',
 'format',
 'label',
 'name',
 'field',
 'asset' => [
 'id',
 'type',
Expand All@@ -65,7 +66,7 @@ public function test_can_get_process_variables_with_pagination(): void
 $responseData = $response->json();
 $this->assertEquals(15, $responseData['meta']['per_page']);
 $this->assertEquals(1, $responseData['meta']['current_page']);

 // Since we're generating 10 variables per process (3 processes = 30 total)
 $this->assertEquals(30, $responseData['meta']['total']);
 }
Expand DownExpand Up@@ -108,7 +109,7 @@ public function test_pagination_consistency(): void
 // Ensure no duplicate IDs between pages
 $firstPageIds = collect($firstPage['data'])->pluck('id');
 $secondPageIds = collect($secondPage['data'])->pluck('id');

 $this->assertEquals(0, $firstPageIds->intersect($secondPageIds)->count());
 }

Expand All@@ -118,9 +119,9 @@ public function test_pagination_consistency(): void
 public function test_process_ids_filtering(): void
 {
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2&per_page=50');

 $responseData = $response->json();

 // Check that only requested process IDs are returned
 $uniqueProcessIds = collect($responseData['data'])
 ->pluck('process_id')
Expand All@@ -129,8 +130,46 @@ public function test_process_ids_filtering(): void
 ->all();

 $this->assertEquals([1, 2], $uniqueProcessIds);

 // Since we generate 10 variables per process, total should be 20
 $this->assertEquals(20, $responseData['meta']['total']);
 }

 /**
 * Test filtering with savedSearchId parameter
 */
 public function test_saved_search_id_filtering(): void
 {
 // Create a saved search with specific columns
 $savedSearch = SavedSearch::factory()->create([
 'meta' => [
 'columns' => [
 [
 'label' => 'Variable 1',
 'field' => 'data.var_1_1',
 'default' => null,
 ],
 [
 'label' => 'Variable 2',
 'field' => 'data.var_1_2',
 'default' => null,
 ],
 ],
 ],
 ]);

 // Make request with savedSearchId
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1&savedSearchId=' . $savedSearch->id);

 $responseData = $response->json();

 // Check that the filtered variables do not include the fields from the saved search
 $filteredFields = collect($responseData['data'])->pluck('field');

 $this->assertFalse($filteredFields->contains('data.var_1_1'));
 $this->assertFalse($filteredFields->contains('data.var_1_2'));

 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788

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

caleeli
merged 2 commits into

from

Dec 4, 2024
 Merged


FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f34094

Add savedSearchId filtering test


caleeli Dec 3, 2024
e90c433

Enhance ProcessVariableController to support savedSearchId filtering …


caleeli Dec 3, 2024

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


23 changes: 17 additions & 6 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use Illuminate\Support\Str;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;

class ProcessVariableController extends Controller
{
Expand All@@ -21,7 +22,7 @@ class ProcessVariableController extends Controller
 * @OA\Property(property="id", type="integer", example=1),
 * @OA\Property(property="process_id", type="integer", example=1),
 * @OA\Property(property="uuid", type="string", format="uuid", example="550e8400-e29b-41d4-a716-446655440000"),
 * @OA\Property(property="data_type", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="field", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="label", type="string", example="Variable 1 for Process 1"),
 * @OA\Property(property="name", type="string", example="var_1_1"),
 * @OA\Property(
Expand DownExpand Up@@ -95,22 +96,31 @@ class ProcessVariableController extends Controller
 * )
 * )
 */
 public function index(Request $request): JsonResponse
 public function index(Request $request)
 {
 // Validate request
 $validated = $request->validate([
 'processIds' => 'required|string',
 'page' => 'sometimes|integer|min:1',
 'per_page' => 'sometimes|integer|min:1|max:100',
 'savedSearchId' => 'sometimes|string',
 ]);

 // Parse process IDs
 $processIds = array_map('intval', explode(',', $validated['processIds']));
 $perPage = $validated['per_page'] ?? 20;
 $page = $validated['page'] ?? 1;
 $excludeSavedSearch = $validated['savedSearchId'] ?? 0;

 // Generate mock data
 $mockData = $this->generateMockData($processIds);
 if ($excludeSavedSearch) {
 $savedSearch = SavedSearch::find($excludeSavedSearch);
 $columns = $savedSearch->current_columns;
 $mockData = $mockData->filter(function ($variable) use ($columns) {
 return !$columns->pluck('field')->contains($variable['field']);
 });
 }

 // Create paginator
 $paginator = new LengthAwarePaginator(
Expand All@@ -122,7 +132,7 @@ public function index(Request $request): JsonResponse
 );

 return response()->json([
 'data' => $paginator->items(),
 'data' => array_values($paginator->items()),
 'meta' => [
 'current_page' => $paginator->currentPage(),
 'from' => $paginator->firstItem(),
Expand All@@ -147,7 +157,7 @@ private function generateMockData(array $processIds): Collection
 $cacheKey = 'process_variables_' . implode('_', $processIds);

 // Try to get variables from cache first
 $variables = Cache::remember($cacheKey, now()->addHours(24), function () use ($processIds) {
 $variables = Cache::remember($cacheKey, now()->addSeconds(5), function () use ($processIds) {
 $variables = collect();

 foreach ($processIds as $processId) {
Expand All@@ -157,15 +167,16 @@ private function generateMockData(array $processIds): Collection
 'id' => $variables->count() + 1,
 'process_id' => $processId,
 'uuid' => (string) Str::uuid(),
 'data_type' => $this->getRandomDataType(),
 'format' => $this->getRandomDataType(),
 'label' => "Variable {$i} for Process {$processId}",
 'name' => "var_{$processId}_{$i}",
 'field' => "data.var_{$processId}_{$i}",
 'asset' => [
 'id' => "asset_{$processId}_{$i}",
 'type' => $this->getRandomAssetType(),
 'name' => "Asset {$i} for Process {$processId}",
 'uuid' => (string) Str::uuid(),
 ],
 'default' => null,
 'created_at' => now()->toIso8601String(),
 'updated_at' => now()->toIso8601String(),
 ]);
Expand Down

53 changes: 46 additions & 7 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace Tests\Feature\Api\V1_1;

use ProcessMaker\Models\User;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use Tests\TestCase;
use Tests\Feature\Shared\RequestHelper;

Expand DownExpand Up@@ -37,9 +38,9 @@ public function test_can_get_process_variables_with_pagination(): void
 'id',
 'process_id',
 'uuid',
 'data_type',
 'format',
 'label',
 'name',
 'field',
 'asset' => [
 'id',
 'type',
Expand All@@ -65,7 +66,7 @@ public function test_can_get_process_variables_with_pagination(): void
 $responseData = $response->json();
 $this->assertEquals(15, $responseData['meta']['per_page']);
 $this->assertEquals(1, $responseData['meta']['current_page']);

 // Since we're generating 10 variables per process (3 processes = 30 total)
 $this->assertEquals(30, $responseData['meta']['total']);
 }
Expand DownExpand Up@@ -108,7 +109,7 @@ public function test_pagination_consistency(): void
 // Ensure no duplicate IDs between pages
 $firstPageIds = collect($firstPage['data'])->pluck('id');
 $secondPageIds = collect($secondPage['data'])->pluck('id');

 $this->assertEquals(0, $firstPageIds->intersect($secondPageIds)->count());
 }

Expand All@@ -118,9 +119,9 @@ public function test_pagination_consistency(): void
 public function test_process_ids_filtering(): void
 {
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2&per_page=50');

 $responseData = $response->json();

 // Check that only requested process IDs are returned
 $uniqueProcessIds = collect($responseData['data'])
 ->pluck('process_id')
Expand All@@ -129,8 +130,46 @@ public function test_process_ids_filtering(): void
 ->all();

 $this->assertEquals([1, 2], $uniqueProcessIds);

 // Since we generate 10 variables per process, total should be 20
 $this->assertEquals(20, $responseData['meta']['total']);
 }

 /**
 * Test filtering with savedSearchId parameter
 */
 public function test_saved_search_id_filtering(): void
 {
 // Create a saved search with specific columns
 $savedSearch = SavedSearch::factory()->create([
 'meta' => [
 'columns' => [
 [
 'label' => 'Variable 1',
 'field' => 'data.var_1_1',
 'default' => null,
 ],
 [
 'label' => 'Variable 2',
 'field' => 'data.var_1_2',
 'default' => null,
 ],
 ],
 ],
 ]);

 // Make request with savedSearchId
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1&savedSearchId=' . $savedSearch->id);

 $responseData = $response->json();

 // Check that the filtered variables do not include the fields from the saved search
 $filteredFields = collect($responseData['data'])->pluck('field');

 $this->assertFalse($filteredFields->contains('data.var_1_1'));
 $this->assertFalse($filteredFields->contains('data.var_1_2'));

 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788

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

caleeli
merged 2 commits into

from

Dec 4, 2024
 Merged


FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f34094

Add savedSearchId filtering test


caleeli Dec 3, 2024
e90c433

Enhance ProcessVariableController to support savedSearchId filtering …


caleeli Dec 3, 2024

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


23 changes: 17 additions & 6 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use Illuminate\Support\Str;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;

class ProcessVariableController extends Controller
{
Expand All@@ -21,7 +22,7 @@ class ProcessVariableController extends Controller
 * @OA\Property(property="id", type="integer", example=1),
 * @OA\Property(property="process_id", type="integer", example=1),
 * @OA\Property(property="uuid", type="string", format="uuid", example="550e8400-e29b-41d4-a716-446655440000"),
 * @OA\Property(property="data_type", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="field", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="label", type="string", example="Variable 1 for Process 1"),
 * @OA\Property(property="name", type="string", example="var_1_1"),
 * @OA\Property(
Expand DownExpand Up@@ -95,22 +96,31 @@ class ProcessVariableController extends Controller
 * )
 * )
 */
 public function index(Request $request): JsonResponse
 public function index(Request $request)
 {
 // Validate request
 $validated = $request->validate([
 'processIds' => 'required|string',
 'page' => 'sometimes|integer|min:1',
 'per_page' => 'sometimes|integer|min:1|max:100',
 'savedSearchId' => 'sometimes|string',
 ]);

 // Parse process IDs
 $processIds = array_map('intval', explode(',', $validated['processIds']));
 $perPage = $validated['per_page'] ?? 20;
 $page = $validated['page'] ?? 1;
 $excludeSavedSearch = $validated['savedSearchId'] ?? 0;

 // Generate mock data
 $mockData = $this->generateMockData($processIds);
 if ($excludeSavedSearch) {
 $savedSearch = SavedSearch::find($excludeSavedSearch);
 $columns = $savedSearch->current_columns;
 $mockData = $mockData->filter(function ($variable) use ($columns) {
 return !$columns->pluck('field')->contains($variable['field']);
 });
 }

 // Create paginator
 $paginator = new LengthAwarePaginator(
Expand All@@ -122,7 +132,7 @@ public function index(Request $request): JsonResponse
 );

 return response()->json([
 'data' => $paginator->items(),
 'data' => array_values($paginator->items()),
 'meta' => [
 'current_page' => $paginator->currentPage(),
 'from' => $paginator->firstItem(),
Expand All@@ -147,7 +157,7 @@ private function generateMockData(array $processIds): Collection
 $cacheKey = 'process_variables_' . implode('_', $processIds);

 // Try to get variables from cache first
 $variables = Cache::remember($cacheKey, now()->addHours(24), function () use ($processIds) {
 $variables = Cache::remember($cacheKey, now()->addSeconds(5), function () use ($processIds) {
 $variables = collect();

 foreach ($processIds as $processId) {
Expand All@@ -157,15 +167,16 @@ private function generateMockData(array $processIds): Collection
 'id' => $variables->count() + 1,
 'process_id' => $processId,
 'uuid' => (string) Str::uuid(),
 'data_type' => $this->getRandomDataType(),
 'format' => $this->getRandomDataType(),
 'label' => "Variable {$i} for Process {$processId}",
 'name' => "var_{$processId}_{$i}",
 'field' => "data.var_{$processId}_{$i}",
 'asset' => [
 'id' => "asset_{$processId}_{$i}",
 'type' => $this->getRandomAssetType(),
 'name' => "Asset {$i} for Process {$processId}",
 'uuid' => (string) Str::uuid(),
 ],
 'default' => null,
 'created_at' => now()->toIso8601String(),
 'updated_at' => now()->toIso8601String(),
 ]);
Expand Down

53 changes: 46 additions & 7 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace Tests\Feature\Api\V1_1;

use ProcessMaker\Models\User;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use Tests\TestCase;
use Tests\Feature\Shared\RequestHelper;

Expand DownExpand Up@@ -37,9 +38,9 @@ public function test_can_get_process_variables_with_pagination(): void
 'id',
 'process_id',
 'uuid',
 'data_type',
 'format',
 'label',
 'name',
 'field',
 'asset' => [
 'id',
 'type',
Expand All@@ -65,7 +66,7 @@ public function test_can_get_process_variables_with_pagination(): void
 $responseData = $response->json();
 $this->assertEquals(15, $responseData['meta']['per_page']);
 $this->assertEquals(1, $responseData['meta']['current_page']);

 // Since we're generating 10 variables per process (3 processes = 30 total)
 $this->assertEquals(30, $responseData['meta']['total']);
 }
Expand DownExpand Up@@ -108,7 +109,7 @@ public function test_pagination_consistency(): void
 // Ensure no duplicate IDs between pages
 $firstPageIds = collect($firstPage['data'])->pluck('id');
 $secondPageIds = collect($secondPage['data'])->pluck('id');

 $this->assertEquals(0, $firstPageIds->intersect($secondPageIds)->count());
 }

Expand All@@ -118,9 +119,9 @@ public function test_pagination_consistency(): void
 public function test_process_ids_filtering(): void
 {
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2&per_page=50');

 $responseData = $response->json();

 // Check that only requested process IDs are returned
 $uniqueProcessIds = collect($responseData['data'])
 ->pluck('process_id')
Expand All@@ -129,8 +130,46 @@ public function test_process_ids_filtering(): void
 ->all();

 $this->assertEquals([1, 2], $uniqueProcessIds);

 // Since we generate 10 variables per process, total should be 20
 $this->assertEquals(20, $responseData['meta']['total']);
 }

 /**
 * Test filtering with savedSearchId parameter
 */
 public function test_saved_search_id_filtering(): void
 {
 // Create a saved search with specific columns
 $savedSearch = SavedSearch::factory()->create([
 'meta' => [
 'columns' => [
 [
 'label' => 'Variable 1',
 'field' => 'data.var_1_1',
 'default' => null,
 ],
 [
 'label' => 'Variable 2',
 'field' => 'data.var_1_2',
 'default' => null,
 ],
 ],
 ],
 ]);

 // Make request with savedSearchId
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1&savedSearchId=' . $savedSearch->id);

 $responseData = $response->json();

 // Check that the filtered variables do not include the fields from the saved search
 $filteredFields = collect($responseData['data'])->pluck('field');

 $this->assertFalse($filteredFields->contains('data.var_1_1'));
 $this->assertFalse($filteredFields->contains('data.var_1_2'));

 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788

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

caleeli
merged 2 commits into

from

Dec 4, 2024
 Merged


FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f34094

Add savedSearchId filtering test


caleeli Dec 3, 2024
e90c433

Enhance ProcessVariableController to support savedSearchId filtering …


caleeli Dec 3, 2024

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


23 changes: 17 additions & 6 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use Illuminate\Support\Str;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;

class ProcessVariableController extends Controller
{
Expand All@@ -21,7 +22,7 @@ class ProcessVariableController extends Controller
 * @OA\Property(property="id", type="integer", example=1),
 * @OA\Property(property="process_id", type="integer", example=1),
 * @OA\Property(property="uuid", type="string", format="uuid", example="550e8400-e29b-41d4-a716-446655440000"),
 * @OA\Property(property="data_type", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="field", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="label", type="string", example="Variable 1 for Process 1"),
 * @OA\Property(property="name", type="string", example="var_1_1"),
 * @OA\Property(
Expand DownExpand Up@@ -95,22 +96,31 @@ class ProcessVariableController extends Controller
 * )
 * )
 */
 public function index(Request $request): JsonResponse
 public function index(Request $request)
 {
 // Validate request
 $validated = $request->validate([
 'processIds' => 'required|string',
 'page' => 'sometimes|integer|min:1',
 'per_page' => 'sometimes|integer|min:1|max:100',
 'savedSearchId' => 'sometimes|string',
 ]);

 // Parse process IDs
 $processIds = array_map('intval', explode(',', $validated['processIds']));
 $perPage = $validated['per_page'] ?? 20;
 $page = $validated['page'] ?? 1;
 $excludeSavedSearch = $validated['savedSearchId'] ?? 0;

 // Generate mock data
 $mockData = $this->generateMockData($processIds);
 if ($excludeSavedSearch) {
 $savedSearch = SavedSearch::find($excludeSavedSearch);
 $columns = $savedSearch->current_columns;
 $mockData = $mockData->filter(function ($variable) use ($columns) {
 return !$columns->pluck('field')->contains($variable['field']);
 });
 }

 // Create paginator
 $paginator = new LengthAwarePaginator(
Expand All@@ -122,7 +132,7 @@ public function index(Request $request): JsonResponse
 );

 return response()->json([
 'data' => $paginator->items(),
 'data' => array_values($paginator->items()),
 'meta' => [
 'current_page' => $paginator->currentPage(),
 'from' => $paginator->firstItem(),
Expand All@@ -147,7 +157,7 @@ private function generateMockData(array $processIds): Collection
 $cacheKey = 'process_variables_' . implode('_', $processIds);

 // Try to get variables from cache first
 $variables = Cache::remember($cacheKey, now()->addHours(24), function () use ($processIds) {
 $variables = Cache::remember($cacheKey, now()->addSeconds(5), function () use ($processIds) {
 $variables = collect();

 foreach ($processIds as $processId) {
Expand All@@ -157,15 +167,16 @@ private function generateMockData(array $processIds): Collection
 'id' => $variables->count() + 1,
 'process_id' => $processId,
 'uuid' => (string) Str::uuid(),
 'data_type' => $this->getRandomDataType(),
 'format' => $this->getRandomDataType(),
 'label' => "Variable {$i} for Process {$processId}",
 'name' => "var_{$processId}_{$i}",
 'field' => "data.var_{$processId}_{$i}",
 'asset' => [
 'id' => "asset_{$processId}_{$i}",
 'type' => $this->getRandomAssetType(),
 'name' => "Asset {$i} for Process {$processId}",
 'uuid' => (string) Str::uuid(),
 ],
 'default' => null,
 'created_at' => now()->toIso8601String(),
 'updated_at' => now()->toIso8601String(),
 ]);
Expand Down

53 changes: 46 additions & 7 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace Tests\Feature\Api\V1_1;

use ProcessMaker\Models\User;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use Tests\TestCase;
use Tests\Feature\Shared\RequestHelper;

Expand DownExpand Up@@ -37,9 +38,9 @@ public function test_can_get_process_variables_with_pagination(): void
 'id',
 'process_id',
 'uuid',
 'data_type',
 'format',
 'label',
 'name',
 'field',
 'asset' => [
 'id',
 'type',
Expand All@@ -65,7 +66,7 @@ public function test_can_get_process_variables_with_pagination(): void
 $responseData = $response->json();
 $this->assertEquals(15, $responseData['meta']['per_page']);
 $this->assertEquals(1, $responseData['meta']['current_page']);

 // Since we're generating 10 variables per process (3 processes = 30 total)
 $this->assertEquals(30, $responseData['meta']['total']);
 }
Expand DownExpand Up@@ -108,7 +109,7 @@ public function test_pagination_consistency(): void
 // Ensure no duplicate IDs between pages
 $firstPageIds = collect($firstPage['data'])->pluck('id');
 $secondPageIds = collect($secondPage['data'])->pluck('id');

 $this->assertEquals(0, $firstPageIds->intersect($secondPageIds)->count());
 }

Expand All@@ -118,9 +119,9 @@ public function test_pagination_consistency(): void
 public function test_process_ids_filtering(): void
 {
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2&per_page=50');

 $responseData = $response->json();

 // Check that only requested process IDs are returned
 $uniqueProcessIds = collect($responseData['data'])
 ->pluck('process_id')
Expand All@@ -129,8 +130,46 @@ public function test_process_ids_filtering(): void
 ->all();

 $this->assertEquals([1, 2], $uniqueProcessIds);

 // Since we generate 10 variables per process, total should be 20
 $this->assertEquals(20, $responseData['meta']['total']);
 }

 /**
 * Test filtering with savedSearchId parameter
 */
 public function test_saved_search_id_filtering(): void
 {
 // Create a saved search with specific columns
 $savedSearch = SavedSearch::factory()->create([
 'meta' => [
 'columns' => [
 [
 'label' => 'Variable 1',
 'field' => 'data.var_1_1',
 'default' => null,
 ],
 [
 'label' => 'Variable 2',
 'field' => 'data.var_1_2',
 'default' => null,
 ],
 ],
 ],
 ]);

 // Make request with savedSearchId
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1&savedSearchId=' . $savedSearch->id);

 $responseData = $response->json();

 // Check that the filtered variables do not include the fields from the saved search
 $filteredFields = collect($responseData['data'])->pluck('field');

 $this->assertFalse($filteredFields->contains('data.var_1_1'));
 $this->assertFalse($filteredFields->contains('data.var_1_2'));

 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788

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

caleeli
merged 2 commits into

from

Dec 4, 2024
 Merged


FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f34094

Add savedSearchId filtering test


caleeli Dec 3, 2024
e90c433

Enhance ProcessVariableController to support savedSearchId filtering …


caleeli Dec 3, 2024

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


23 changes: 17 additions & 6 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use Illuminate\Support\Str;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;

class ProcessVariableController extends Controller
{
Expand All@@ -21,7 +22,7 @@ class ProcessVariableController extends Controller
 * @OA\Property(property="id", type="integer", example=1),
 * @OA\Property(property="process_id", type="integer", example=1),
 * @OA\Property(property="uuid", type="string", format="uuid", example="550e8400-e29b-41d4-a716-446655440000"),
 * @OA\Property(property="data_type", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="field", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="label", type="string", example="Variable 1 for Process 1"),
 * @OA\Property(property="name", type="string", example="var_1_1"),
 * @OA\Property(
Expand DownExpand Up@@ -95,22 +96,31 @@ class ProcessVariableController extends Controller
 * )
 * )
 */
 public function index(Request $request): JsonResponse
 public function index(Request $request)
 {
 // Validate request
 $validated = $request->validate([
 'processIds' => 'required|string',
 'page' => 'sometimes|integer|min:1',
 'per_page' => 'sometimes|integer|min:1|max:100',
 'savedSearchId' => 'sometimes|string',
 ]);

 // Parse process IDs
 $processIds = array_map('intval', explode(',', $validated['processIds']));
 $perPage = $validated['per_page'] ?? 20;
 $page = $validated['page'] ?? 1;
 $excludeSavedSearch = $validated['savedSearchId'] ?? 0;

 // Generate mock data
 $mockData = $this->generateMockData($processIds);
 if ($excludeSavedSearch) {
 $savedSearch = SavedSearch::find($excludeSavedSearch);
 $columns = $savedSearch->current_columns;
 $mockData = $mockData->filter(function ($variable) use ($columns) {
 return !$columns->pluck('field')->contains($variable['field']);
 });
 }

 // Create paginator
 $paginator = new LengthAwarePaginator(
Expand All@@ -122,7 +132,7 @@ public function index(Request $request): JsonResponse
 );

 return response()->json([
 'data' => $paginator->items(),
 'data' => array_values($paginator->items()),
 'meta' => [
 'current_page' => $paginator->currentPage(),
 'from' => $paginator->firstItem(),
Expand All@@ -147,7 +157,7 @@ private function generateMockData(array $processIds): Collection
 $cacheKey = 'process_variables_' . implode('_', $processIds);

 // Try to get variables from cache first
 $variables = Cache::remember($cacheKey, now()->addHours(24), function () use ($processIds) {
 $variables = Cache::remember($cacheKey, now()->addSeconds(5), function () use ($processIds) {
 $variables = collect();

 foreach ($processIds as $processId) {
Expand All@@ -157,15 +167,16 @@ private function generateMockData(array $processIds): Collection
 'id' => $variables->count() + 1,
 'process_id' => $processId,
 'uuid' => (string) Str::uuid(),
 'data_type' => $this->getRandomDataType(),
 'format' => $this->getRandomDataType(),
 'label' => "Variable {$i} for Process {$processId}",
 'name' => "var_{$processId}_{$i}",
 'field' => "data.var_{$processId}_{$i}",
 'asset' => [
 'id' => "asset_{$processId}_{$i}",
 'type' => $this->getRandomAssetType(),
 'name' => "Asset {$i} for Process {$processId}",
 'uuid' => (string) Str::uuid(),
 ],
 'default' => null,
 'created_at' => now()->toIso8601String(),
 'updated_at' => now()->toIso8601String(),
 ]);
Expand Down

53 changes: 46 additions & 7 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace Tests\Feature\Api\V1_1;

use ProcessMaker\Models\User;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use Tests\TestCase;
use Tests\Feature\Shared\RequestHelper;

Expand DownExpand Up@@ -37,9 +38,9 @@ public function test_can_get_process_variables_with_pagination(): void
 'id',
 'process_id',
 'uuid',
 'data_type',
 'format',
 'label',
 'name',
 'field',
 'asset' => [
 'id',
 'type',
Expand All@@ -65,7 +66,7 @@ public function test_can_get_process_variables_with_pagination(): void
 $responseData = $response->json();
 $this->assertEquals(15, $responseData['meta']['per_page']);
 $this->assertEquals(1, $responseData['meta']['current_page']);

 // Since we're generating 10 variables per process (3 processes = 30 total)
 $this->assertEquals(30, $responseData['meta']['total']);
 }
Expand DownExpand Up@@ -108,7 +109,7 @@ public function test_pagination_consistency(): void
 // Ensure no duplicate IDs between pages
 $firstPageIds = collect($firstPage['data'])->pluck('id');
 $secondPageIds = collect($secondPage['data'])->pluck('id');

 $this->assertEquals(0, $firstPageIds->intersect($secondPageIds)->count());
 }

Expand All@@ -118,9 +119,9 @@ public function test_pagination_consistency(): void
 public function test_process_ids_filtering(): void
 {
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2&per_page=50');

 $responseData = $response->json();

 // Check that only requested process IDs are returned
 $uniqueProcessIds = collect($responseData['data'])
 ->pluck('process_id')
Expand All@@ -129,8 +130,46 @@ public function test_process_ids_filtering(): void
 ->all();

 $this->assertEquals([1, 2], $uniqueProcessIds);

 // Since we generate 10 variables per process, total should be 20
 $this->assertEquals(20, $responseData['meta']['total']);
 }

 /**
 * Test filtering with savedSearchId parameter
 */
 public function test_saved_search_id_filtering(): void
 {
 // Create a saved search with specific columns
 $savedSearch = SavedSearch::factory()->create([
 'meta' => [
 'columns' => [
 [
 'label' => 'Variable 1',
 'field' => 'data.var_1_1',
 'default' => null,
 ],
 [
 'label' => 'Variable 2',
 'field' => 'data.var_1_2',
 'default' => null,
 ],
 ],
 ],
 ]);

 // Make request with savedSearchId
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1&savedSearchId=' . $savedSearch->id);

 $responseData = $response->json();

 // Check that the filtered variables do not include the fields from the saved search
 $filteredFields = collect($responseData['data'])->pluck('field');

 $this->assertFalse($filteredFields->contains('data.var_1_1'));
 $this->assertFalse($filteredFields->contains('data.var_1_2'));

 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788

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

caleeli
merged 2 commits into

from

Dec 4, 2024
 Merged


FOUR-20521 [ACTIVE COLUMNS] Optimize Rendering with Virtual Scrolling #7788
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f34094

Add savedSearchId filtering test


caleeli Dec 3, 2024
e90c433

Enhance ProcessVariableController to support savedSearchId filtering …


caleeli Dec 3, 2024

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


23 changes: 17 additions & 6 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use Illuminate\Support\Str;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;

class ProcessVariableController extends Controller
{
Expand All@@ -21,7 +22,7 @@ class ProcessVariableController extends Controller
 * @OA\Property(property="id", type="integer", example=1),
 * @OA\Property(property="process_id", type="integer", example=1),
 * @OA\Property(property="uuid", type="string", format="uuid", example="550e8400-e29b-41d4-a716-446655440000"),
 * @OA\Property(property="data_type", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="field", type="string", enum={"string", "number", "boolean", "array"}, example="string"),
 * @OA\Property(property="label", type="string", example="Variable 1 for Process 1"),
 * @OA\Property(property="name", type="string", example="var_1_1"),
 * @OA\Property(
Expand DownExpand Up@@ -95,22 +96,31 @@ class ProcessVariableController extends Controller
 * )
 * )
 */
 public function index(Request $request): JsonResponse
 public function index(Request $request)
 {
 // Validate request
 $validated = $request->validate([
 'processIds' => 'required|string',
 'page' => 'sometimes|integer|min:1',
 'per_page' => 'sometimes|integer|min:1|max:100',
 'savedSearchId' => 'sometimes|string',
 ]);

 // Parse process IDs
 $processIds = array_map('intval', explode(',', $validated['processIds']));
 $perPage = $validated['per_page'] ?? 20;
 $page = $validated['page'] ?? 1;
 $excludeSavedSearch = $validated['savedSearchId'] ?? 0;

 // Generate mock data
 $mockData = $this->generateMockData($processIds);
 if ($excludeSavedSearch) {
 $savedSearch = SavedSearch::find($excludeSavedSearch);
 $columns = $savedSearch->current_columns;
 $mockData = $mockData->filter(function ($variable) use ($columns) {
 return !$columns->pluck('field')->contains($variable['field']);
 });
 }

 // Create paginator
 $paginator = new LengthAwarePaginator(
Expand All@@ -122,7 +132,7 @@ public function index(Request $request): JsonResponse
 );

 return response()->json([
 'data' => $paginator->items(),
 'data' => array_values($paginator->items()),
 'meta' => [
 'current_page' => $paginator->currentPage(),
 'from' => $paginator->firstItem(),
Expand All@@ -147,7 +157,7 @@ private function generateMockData(array $processIds): Collection
 $cacheKey = 'process_variables_' . implode('_', $processIds);

 // Try to get variables from cache first
 $variables = Cache::remember($cacheKey, now()->addHours(24), function () use ($processIds) {
 $variables = Cache::remember($cacheKey, now()->addSeconds(5), function () use ($processIds) {
 $variables = collect();

 foreach ($processIds as $processId) {
Expand All@@ -157,15 +167,16 @@ private function generateMockData(array $processIds): Collection
 'id' => $variables->count() + 1,
 'process_id' => $processId,
 'uuid' => (string) Str::uuid(),
 'data_type' => $this->getRandomDataType(),
 'format' => $this->getRandomDataType(),
 'label' => "Variable {$i} for Process {$processId}",
 'name' => "var_{$processId}_{$i}",
 'field' => "data.var_{$processId}_{$i}",
 'asset' => [
 'id' => "asset_{$processId}_{$i}",
 'type' => $this->getRandomAssetType(),
 'name' => "Asset {$i} for Process {$processId}",
 'uuid' => (string) Str::uuid(),
 ],
 'default' => null,
 'created_at' => now()->toIso8601String(),
 'updated_at' => now()->toIso8601String(),
 ]);
Expand Down

53 changes: 46 additions & 7 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace Tests\Feature\Api\V1_1;

use ProcessMaker\Models\User;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use Tests\TestCase;
use Tests\Feature\Shared\RequestHelper;

Expand DownExpand Up@@ -37,9 +38,9 @@ public function test_can_get_process_variables_with_pagination(): void
 'id',
 'process_id',
 'uuid',
 'data_type',
 'format',
 'label',
 'name',
 'field',
 'asset' => [
 'id',
 'type',
Expand All@@ -65,7 +66,7 @@ public function test_can_get_process_variables_with_pagination(): void
 $responseData = $response->json();
 $this->assertEquals(15, $responseData['meta']['per_page']);
 $this->assertEquals(1, $responseData['meta']['current_page']);

 // Since we're generating 10 variables per process (3 processes = 30 total)
 $this->assertEquals(30, $responseData['meta']['total']);
 }
Expand DownExpand Up@@ -108,7 +109,7 @@ public function test_pagination_consistency(): void
 // Ensure no duplicate IDs between pages
 $firstPageIds = collect($firstPage['data'])->pluck('id');
 $secondPageIds = collect($secondPage['data'])->pluck('id');

 $this->assertEquals(0, $firstPageIds->intersect($secondPageIds)->count());
 }

Expand All@@ -118,9 +119,9 @@ public function test_pagination_consistency(): void
 public function test_process_ids_filtering(): void
 {
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2&per_page=50');

 $responseData = $response->json();

 // Check that only requested process IDs are returned
 $uniqueProcessIds = collect($responseData['data'])
 ->pluck('process_id')
Expand All@@ -129,8 +130,46 @@ public function test_process_ids_filtering(): void
 ->all();

 $this->assertEquals([1, 2], $uniqueProcessIds);

 // Since we generate 10 variables per process, total should be 20
 $this->assertEquals(20, $responseData['meta']['total']);
 }

 /**
 * Test filtering with savedSearchId parameter
 */
 public function test_saved_search_id_filtering(): void
 {
 // Create a saved search with specific columns
 $savedSearch = SavedSearch::factory()->create([
 'meta' => [
 'columns' => [
 [
 'label' => 'Variable 1',
 'field' => 'data.var_1_1',
 'default' => null,
 ],
 [
 'label' => 'Variable 2',
 'field' => 'data.var_1_2',
 'default' => null,
 ],
 ],
 ],
 ]);

 // Make request with savedSearchId
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1&savedSearchId=' . $savedSearch->id);

 $responseData = $response->json();

 // Check that the filtered variables do not include the fields from the saved search
 $filteredFields = collect($responseData['data'])->pluck('field');

 $this->assertFalse($filteredFields->contains('data.var_1_1'));
 $this->assertFalse($filteredFields->contains('data.var_1_2'));

 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }
}