FOUR-21522 Fix Get variable list without VarFinder package was not implemented#7912

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 3 commits into from
Jan 17, 2025
Merged

FOUR-21522 Fix Get variable list without VarFinder package was not implemented #7912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ca4df9
Add test for retrieving process variables from screens with pagination
caleeli Jan 16, 2025
db815ec
Implement retrieval of process variables from screens and enhance pag…
caleeli Jan 16, 2025
2d419d1
Add validation for processIds input and ensure pagination parameters …
caleeli Jan 17, 2025
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
60 changes: 56 additions & 4 deletions ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use ProcessMaker\Managers\ExportManager;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\Screen;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use ProcessMaker\Package\VariableFinder\Models\ProcessVariable;

Expand DownExpand Up@@ -202,7 +205,7 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
{
// If the classes or tables do not exist, fallback to a saved search approach.
if (!class_exists(ProcessVariable::class) || !Schema::hasTable('process_variables')) {
return $this->getProcessesVariablesFromSavedSearch($processIds);
return $this->getProcessesVariablesFrom($processIds);
}

// Determine which columns to exclude based on the saved search
Expand All@@ -219,7 +222,8 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
$query = DB::table('var_finder_variables AS vfv')
->join('asset_variables AS av', 'vfv.asset_variable_id', '=', 'av.id')
->join('process_variables AS pv', 'av.id', '=', 'pv.asset_variable_id')
->whereIn('pv.process_id', $processIds);
->whereIn('pv.process_id', $processIds)
->orderBy('vfv.id');

if (!empty($activeColumns)) {
$query->whereNotIn('vfv.field', $activeColumns);
Expand All@@ -243,8 +247,56 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
*
* @return void
*/
public static function mock()
public static function mock(bool $value = true)
{
static::$mockData = true;
static::$mockData = $value;
}

/**
* Retrieve process variables from its screens.
*
* @param array $processIds
*
* @return LengthAwarePaginator
*/
private function getProcessesVariablesFrom(array $processIds)
{
$perPage = request()->get('per_page', 20);
// Validate processIds input is required
if (empty($processIds)) {
return new LengthAwarePaginator([], 0, $perPage, 1);
}

// Get screens used in the processes
$processes = Process::whereIn('id', $processIds)->get();
Comment thread
rodriquelca marked this conversation as resolved.
$ids = collect([]);
foreach ($processes as $process) {
$manager = app(ExportManager::class);
try {
$ids = $ids->merge($manager->getDependenciesOfType(Screen::class, $process));
} catch (\Exception $e) {
$ids = collect([]);
}
}

// Get columns from screens
$columns = collect([]);
$screens = Screen::whereIn('id', $ids->unique())->where('type', '!=', 'DISPLAY')->get();
foreach ($screens as $screen) {
$screenColumns = $screen->fields->map(function ($item) {
$item->field = "data.{$item->field}";

return $item;
});

$columns = $columns->merge($screenColumns);
}

// Paginate the result
$page = request()->get('page', 1);
$total = $columns->count();
$items = $columns->forPage($page, $perPage);

return new LengthAwarePaginator($items, $total, $perPage, $page);
}
}
90 changes: 90 additions & 0 deletions tests/Feature/Api/V1_1/ProcessVariableControllerTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,58 @@ public function test_can_get_process_variables_with_pagination(): void
$this->assertEquals(30, $responseData['meta']['total']);
}

/**
* Test successful variables retrieval with pagination
*/
public function test_can_get_process_variables_from_process_screens_with_pagination(): void
{
$bpmn = file_get_contents(base_path('tests/Feature/Api/bpmnPatterns/SimpleTaskProcess.bpmn'));
ProcessVariableController::mock(false);
$screen1 = $this->createScreenWithFields(1, 10);
$screen2 = $this->createScreenWithFields(2, 10);
$screen3 = $this->createScreenWithFields(3, 10);
Process::factory()->create(['id' => 1, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen1->id . '"', $bpmn)]);
Process::factory()->create(['id' => 2, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen2->id . '"', $bpmn)]);
Process::factory()->create(['id' => 3, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen3->id . '"', $bpmn)]);

// Make request to the endpoint
$response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2,3&page=1&per_page=15');

// Assert response structure and status
$response->assertStatus(200)
->assertJsonStructure([
'data' => [
'*' => [
//'id',
//'process_id',
'format',
'label',
'field',
'default',
//'created_at',
//'updated_at',
]
],
'meta' => [
'current_page',
'from',
'last_page',
'path',
'per_page',
'to',
'total',
]
]);

// Assert pagination works correctly
$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']);
}

private function mockVariableFinder(array $processIds, $excludeSavedSearch)
{
// Create a cache key based on process IDs
Expand DownExpand Up@@ -281,4 +333,42 @@ public function test_saved_search_id_filtering(): void
// Check that the total count is reduced by the number of excluded fields
$this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
}

/**
* Create a screen with a given number of fields
*
* @param int $processId
* @param int $fieldsCount
*
* @return Screen
*/
private function createScreenWithFields(int $processId, int $fieldsCount)
{
$items = [];
for ($i = 1; $i <= $fieldsCount; $i++) {
$items[] = [
'component' => 'FormInput',
'config' => [
'name' => "var_{$processId}_{$i}",
'type' => 'text',
'label' => "Variable {$i} for Process {$processId}",
'helper' => null,
'dataFormat' => 'string',
'validation' => null,
'placeholder' => null,
],
];
}

return Screen::factory()->create([
'config' => [
[
[
'name' => 'screen name',
'items' => $items,
],
]
],
]);
}
}
, '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-21522 Fix Get variable list without VarFinder package was not implemented#7912

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 3 commits into

from

Jan 17, 2025
 Merged


FOUR-21522 Fix Get variable list without VarFinder package was not implemented
#7912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


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

Add test for retrieving process variables from screens with pagination


caleeli Jan 16, 2025
db815ec

Implement retrieval of process variables from screens and enhance pag…


caleeli Jan 16, 2025
2d419d1

Add validation for processIds input and ensure pagination parameters …


caleeli Jan 17, 2025

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


60 changes: 56 additions & 4 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use ProcessMaker\Managers\ExportManager;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\Screen;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use ProcessMaker\Package\VariableFinder\Models\ProcessVariable;

Expand DownExpand Up@@ -202,7 +205,7 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 {
 // If the classes or tables do not exist, fallback to a saved search approach.
 if (!class_exists(ProcessVariable::class) || !Schema::hasTable('process_variables')) {
 return $this->getProcessesVariablesFromSavedSearch($processIds);
 return $this->getProcessesVariablesFrom($processIds);
 }

 // Determine which columns to exclude based on the saved search
Expand All@@ -219,7 +222,8 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 $query = DB::table('var_finder_variables AS vfv')
 ->join('asset_variables AS av', 'vfv.asset_variable_id', '=', 'av.id')
 ->join('process_variables AS pv', 'av.id', '=', 'pv.asset_variable_id')
 ->whereIn('pv.process_id', $processIds);
 ->whereIn('pv.process_id', $processIds)
 ->orderBy('vfv.id');

 if (!empty($activeColumns)) {
 $query->whereNotIn('vfv.field', $activeColumns);
Expand All@@ -243,8 +247,56 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 *
 * @return void
 */
 public static function mock()
 public static function mock(bool $value = true)
 {
 static::$mockData = true;
 static::$mockData = $value;
 }

 /**
 * Retrieve process variables from its screens.
 *
 * @param array $processIds
 *
 * @return LengthAwarePaginator
 */
 private function getProcessesVariablesFrom(array $processIds)
 {
 $perPage = request()->get('per_page', 20);
 // Validate processIds input is required
 if (empty($processIds)) {
 return new LengthAwarePaginator([], 0, $perPage, 1);
 }

 // Get screens used in the processes
 $processes = Process::whereIn('id', $processIds)->get();
Comment thread
rodriquelca marked this conversation as resolved.

 $ids = collect([]);
 foreach ($processes as $process) {
 $manager = app(ExportManager::class);
 try {
 $ids = $ids->merge($manager->getDependenciesOfType(Screen::class, $process));
 } catch (\Exception $e) {
 $ids = collect([]);
 }
 }

 // Get columns from screens
 $columns = collect([]);
 $screens = Screen::whereIn('id', $ids->unique())->where('type', '!=', 'DISPLAY')->get();
 foreach ($screens as $screen) {
 $screenColumns = $screen->fields->map(function ($item) {
 $item->field = "data.{$item->field}";

 return $item;
 });

 $columns = $columns->merge($screenColumns);
 }

 // Paginate the result
 $page = request()->get('page', 1);
 $total = $columns->count();
 $items = $columns->forPage($page, $perPage);

 return new LengthAwarePaginator($items, $total, $perPage, $page);
 }
}

90 changes: 90 additions & 0 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,58 @@ public function test_can_get_process_variables_with_pagination(): void
 $this->assertEquals(30, $responseData['meta']['total']);
 }

 /**
 * Test successful variables retrieval with pagination
 */
 public function test_can_get_process_variables_from_process_screens_with_pagination(): void
 {
 $bpmn = file_get_contents(base_path('tests/Feature/Api/bpmnPatterns/SimpleTaskProcess.bpmn'));
 ProcessVariableController::mock(false);
 $screen1 = $this->createScreenWithFields(1, 10);
 $screen2 = $this->createScreenWithFields(2, 10);
 $screen3 = $this->createScreenWithFields(3, 10);
 Process::factory()->create(['id' => 1, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen1->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 2, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen2->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 3, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen3->id . '"', $bpmn)]);

 // Make request to the endpoint
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2,3&page=1&per_page=15');

 // Assert response structure and status
 $response->assertStatus(200)
 ->assertJsonStructure([
 'data' => [
 '*' => [
 //'id',
 //'process_id',
 'format',
 'label',
 'field',
 'default',
 //'created_at',
 //'updated_at',
 ]
 ],
 'meta' => [
 'current_page',
 'from',
 'last_page',
 'path',
 'per_page',
 'to',
 'total',
 ]
 ]);

 // Assert pagination works correctly
 $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']);
 }

 private function mockVariableFinder(array $processIds, $excludeSavedSearch)
 {
 // Create a cache key based on process IDs
Expand DownExpand Up@@ -281,4 +333,42 @@ public function test_saved_search_id_filtering(): void
 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }

 /**
 * Create a screen with a given number of fields
 *
 * @param int $processId
 * @param int $fieldsCount
 *
 * @return Screen
 */
 private function createScreenWithFields(int $processId, int $fieldsCount)
 {
 $items = [];
 for ($i = 1; $i <= $fieldsCount; $i++) {
 $items[] = [
 'component' => 'FormInput',
 'config' => [
 'name' => "var_{$processId}_{$i}",
 'type' => 'text',
 'label' => "Variable {$i} for Process {$processId}",
 'helper' => null,
 'dataFormat' => 'string',
 'validation' => null,
 'placeholder' => null,
 ],
 ];
 }

 return Screen::factory()->create([
 'config' => [
 [
 [
 'name' => 'screen name',
 'items' => $items,
 ],
 ]
 ],
 ]);
 }
}

, '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-21522 Fix Get variable list without VarFinder package was not implemented#7912

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 3 commits into

from

Jan 17, 2025
 Merged


FOUR-21522 Fix Get variable list without VarFinder package was not implemented
#7912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


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

Add test for retrieving process variables from screens with pagination


caleeli Jan 16, 2025
db815ec

Implement retrieval of process variables from screens and enhance pag…


caleeli Jan 16, 2025
2d419d1

Add validation for processIds input and ensure pagination parameters …


caleeli Jan 17, 2025

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


60 changes: 56 additions & 4 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use ProcessMaker\Managers\ExportManager;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\Screen;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use ProcessMaker\Package\VariableFinder\Models\ProcessVariable;

Expand DownExpand Up@@ -202,7 +205,7 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 {
 // If the classes or tables do not exist, fallback to a saved search approach.
 if (!class_exists(ProcessVariable::class) || !Schema::hasTable('process_variables')) {
 return $this->getProcessesVariablesFromSavedSearch($processIds);
 return $this->getProcessesVariablesFrom($processIds);
 }

 // Determine which columns to exclude based on the saved search
Expand All@@ -219,7 +222,8 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 $query = DB::table('var_finder_variables AS vfv')
 ->join('asset_variables AS av', 'vfv.asset_variable_id', '=', 'av.id')
 ->join('process_variables AS pv', 'av.id', '=', 'pv.asset_variable_id')
 ->whereIn('pv.process_id', $processIds);
 ->whereIn('pv.process_id', $processIds)
 ->orderBy('vfv.id');

 if (!empty($activeColumns)) {
 $query->whereNotIn('vfv.field', $activeColumns);
Expand All@@ -243,8 +247,56 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 *
 * @return void
 */
 public static function mock()
 public static function mock(bool $value = true)
 {
 static::$mockData = true;
 static::$mockData = $value;
 }

 /**
 * Retrieve process variables from its screens.
 *
 * @param array $processIds
 *
 * @return LengthAwarePaginator
 */
 private function getProcessesVariablesFrom(array $processIds)
 {
 $perPage = request()->get('per_page', 20);
 // Validate processIds input is required
 if (empty($processIds)) {
 return new LengthAwarePaginator([], 0, $perPage, 1);
 }

 // Get screens used in the processes
 $processes = Process::whereIn('id', $processIds)->get();
Comment thread
rodriquelca marked this conversation as resolved.

 $ids = collect([]);
 foreach ($processes as $process) {
 $manager = app(ExportManager::class);
 try {
 $ids = $ids->merge($manager->getDependenciesOfType(Screen::class, $process));
 } catch (\Exception $e) {
 $ids = collect([]);
 }
 }

 // Get columns from screens
 $columns = collect([]);
 $screens = Screen::whereIn('id', $ids->unique())->where('type', '!=', 'DISPLAY')->get();
 foreach ($screens as $screen) {
 $screenColumns = $screen->fields->map(function ($item) {
 $item->field = "data.{$item->field}";

 return $item;
 });

 $columns = $columns->merge($screenColumns);
 }

 // Paginate the result
 $page = request()->get('page', 1);
 $total = $columns->count();
 $items = $columns->forPage($page, $perPage);

 return new LengthAwarePaginator($items, $total, $perPage, $page);
 }
}

90 changes: 90 additions & 0 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,58 @@ public function test_can_get_process_variables_with_pagination(): void
 $this->assertEquals(30, $responseData['meta']['total']);
 }

 /**
 * Test successful variables retrieval with pagination
 */
 public function test_can_get_process_variables_from_process_screens_with_pagination(): void
 {
 $bpmn = file_get_contents(base_path('tests/Feature/Api/bpmnPatterns/SimpleTaskProcess.bpmn'));
 ProcessVariableController::mock(false);
 $screen1 = $this->createScreenWithFields(1, 10);
 $screen2 = $this->createScreenWithFields(2, 10);
 $screen3 = $this->createScreenWithFields(3, 10);
 Process::factory()->create(['id' => 1, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen1->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 2, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen2->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 3, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen3->id . '"', $bpmn)]);

 // Make request to the endpoint
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2,3&page=1&per_page=15');

 // Assert response structure and status
 $response->assertStatus(200)
 ->assertJsonStructure([
 'data' => [
 '*' => [
 //'id',
 //'process_id',
 'format',
 'label',
 'field',
 'default',
 //'created_at',
 //'updated_at',
 ]
 ],
 'meta' => [
 'current_page',
 'from',
 'last_page',
 'path',
 'per_page',
 'to',
 'total',
 ]
 ]);

 // Assert pagination works correctly
 $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']);
 }

 private function mockVariableFinder(array $processIds, $excludeSavedSearch)
 {
 // Create a cache key based on process IDs
Expand DownExpand Up@@ -281,4 +333,42 @@ public function test_saved_search_id_filtering(): void
 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }

 /**
 * Create a screen with a given number of fields
 *
 * @param int $processId
 * @param int $fieldsCount
 *
 * @return Screen
 */
 private function createScreenWithFields(int $processId, int $fieldsCount)
 {
 $items = [];
 for ($i = 1; $i <= $fieldsCount; $i++) {
 $items[] = [
 'component' => 'FormInput',
 'config' => [
 'name' => "var_{$processId}_{$i}",
 'type' => 'text',
 'label' => "Variable {$i} for Process {$processId}",
 'helper' => null,
 'dataFormat' => 'string',
 'validation' => null,
 'placeholder' => null,
 ],
 ];
 }

 return Screen::factory()->create([
 'config' => [
 [
 [
 'name' => 'screen name',
 'items' => $items,
 ],
 ]
 ],
 ]);
 }
}

, '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-21522 Fix Get variable list without VarFinder package was not implemented#7912

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 3 commits into

from

Jan 17, 2025
 Merged


FOUR-21522 Fix Get variable list without VarFinder package was not implemented
#7912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


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

Add test for retrieving process variables from screens with pagination


caleeli Jan 16, 2025
db815ec

Implement retrieval of process variables from screens and enhance pag…


caleeli Jan 16, 2025
2d419d1

Add validation for processIds input and ensure pagination parameters …


caleeli Jan 17, 2025

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


60 changes: 56 additions & 4 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use ProcessMaker\Managers\ExportManager;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\Screen;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use ProcessMaker\Package\VariableFinder\Models\ProcessVariable;

Expand DownExpand Up@@ -202,7 +205,7 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 {
 // If the classes or tables do not exist, fallback to a saved search approach.
 if (!class_exists(ProcessVariable::class) || !Schema::hasTable('process_variables')) {
 return $this->getProcessesVariablesFromSavedSearch($processIds);
 return $this->getProcessesVariablesFrom($processIds);
 }

 // Determine which columns to exclude based on the saved search
Expand All@@ -219,7 +222,8 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 $query = DB::table('var_finder_variables AS vfv')
 ->join('asset_variables AS av', 'vfv.asset_variable_id', '=', 'av.id')
 ->join('process_variables AS pv', 'av.id', '=', 'pv.asset_variable_id')
 ->whereIn('pv.process_id', $processIds);
 ->whereIn('pv.process_id', $processIds)
 ->orderBy('vfv.id');

 if (!empty($activeColumns)) {
 $query->whereNotIn('vfv.field', $activeColumns);
Expand All@@ -243,8 +247,56 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 *
 * @return void
 */
 public static function mock()
 public static function mock(bool $value = true)
 {
 static::$mockData = true;
 static::$mockData = $value;
 }

 /**
 * Retrieve process variables from its screens.
 *
 * @param array $processIds
 *
 * @return LengthAwarePaginator
 */
 private function getProcessesVariablesFrom(array $processIds)
 {
 $perPage = request()->get('per_page', 20);
 // Validate processIds input is required
 if (empty($processIds)) {
 return new LengthAwarePaginator([], 0, $perPage, 1);
 }

 // Get screens used in the processes
 $processes = Process::whereIn('id', $processIds)->get();
Comment thread
rodriquelca marked this conversation as resolved.

 $ids = collect([]);
 foreach ($processes as $process) {
 $manager = app(ExportManager::class);
 try {
 $ids = $ids->merge($manager->getDependenciesOfType(Screen::class, $process));
 } catch (\Exception $e) {
 $ids = collect([]);
 }
 }

 // Get columns from screens
 $columns = collect([]);
 $screens = Screen::whereIn('id', $ids->unique())->where('type', '!=', 'DISPLAY')->get();
 foreach ($screens as $screen) {
 $screenColumns = $screen->fields->map(function ($item) {
 $item->field = "data.{$item->field}";

 return $item;
 });

 $columns = $columns->merge($screenColumns);
 }

 // Paginate the result
 $page = request()->get('page', 1);
 $total = $columns->count();
 $items = $columns->forPage($page, $perPage);

 return new LengthAwarePaginator($items, $total, $perPage, $page);
 }
}

90 changes: 90 additions & 0 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,58 @@ public function test_can_get_process_variables_with_pagination(): void
 $this->assertEquals(30, $responseData['meta']['total']);
 }

 /**
 * Test successful variables retrieval with pagination
 */
 public function test_can_get_process_variables_from_process_screens_with_pagination(): void
 {
 $bpmn = file_get_contents(base_path('tests/Feature/Api/bpmnPatterns/SimpleTaskProcess.bpmn'));
 ProcessVariableController::mock(false);
 $screen1 = $this->createScreenWithFields(1, 10);
 $screen2 = $this->createScreenWithFields(2, 10);
 $screen3 = $this->createScreenWithFields(3, 10);
 Process::factory()->create(['id' => 1, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen1->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 2, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen2->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 3, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen3->id . '"', $bpmn)]);

 // Make request to the endpoint
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2,3&page=1&per_page=15');

 // Assert response structure and status
 $response->assertStatus(200)
 ->assertJsonStructure([
 'data' => [
 '*' => [
 //'id',
 //'process_id',
 'format',
 'label',
 'field',
 'default',
 //'created_at',
 //'updated_at',
 ]
 ],
 'meta' => [
 'current_page',
 'from',
 'last_page',
 'path',
 'per_page',
 'to',
 'total',
 ]
 ]);

 // Assert pagination works correctly
 $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']);
 }

 private function mockVariableFinder(array $processIds, $excludeSavedSearch)
 {
 // Create a cache key based on process IDs
Expand DownExpand Up@@ -281,4 +333,42 @@ public function test_saved_search_id_filtering(): void
 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }

 /**
 * Create a screen with a given number of fields
 *
 * @param int $processId
 * @param int $fieldsCount
 *
 * @return Screen
 */
 private function createScreenWithFields(int $processId, int $fieldsCount)
 {
 $items = [];
 for ($i = 1; $i <= $fieldsCount; $i++) {
 $items[] = [
 'component' => 'FormInput',
 'config' => [
 'name' => "var_{$processId}_{$i}",
 'type' => 'text',
 'label' => "Variable {$i} for Process {$processId}",
 'helper' => null,
 'dataFormat' => 'string',
 'validation' => null,
 'placeholder' => null,
 ],
 ];
 }

 return Screen::factory()->create([
 'config' => [
 [
 [
 'name' => 'screen name',
 'items' => $items,
 ],
 ]
 ],
 ]);
 }
}

, '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-21522 Fix Get variable list without VarFinder package was not implemented#7912

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 3 commits into

from

Jan 17, 2025
 Merged


FOUR-21522 Fix Get variable list without VarFinder package was not implemented
#7912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


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

Add test for retrieving process variables from screens with pagination


caleeli Jan 16, 2025
db815ec

Implement retrieval of process variables from screens and enhance pag…


caleeli Jan 16, 2025
2d419d1

Add validation for processIds input and ensure pagination parameters …


caleeli Jan 17, 2025

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


60 changes: 56 additions & 4 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use ProcessMaker\Managers\ExportManager;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\Screen;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use ProcessMaker\Package\VariableFinder\Models\ProcessVariable;

Expand DownExpand Up@@ -202,7 +205,7 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 {
 // If the classes or tables do not exist, fallback to a saved search approach.
 if (!class_exists(ProcessVariable::class) || !Schema::hasTable('process_variables')) {
 return $this->getProcessesVariablesFromSavedSearch($processIds);
 return $this->getProcessesVariablesFrom($processIds);
 }

 // Determine which columns to exclude based on the saved search
Expand All@@ -219,7 +222,8 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 $query = DB::table('var_finder_variables AS vfv')
 ->join('asset_variables AS av', 'vfv.asset_variable_id', '=', 'av.id')
 ->join('process_variables AS pv', 'av.id', '=', 'pv.asset_variable_id')
 ->whereIn('pv.process_id', $processIds);
 ->whereIn('pv.process_id', $processIds)
 ->orderBy('vfv.id');

 if (!empty($activeColumns)) {
 $query->whereNotIn('vfv.field', $activeColumns);
Expand All@@ -243,8 +247,56 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 *
 * @return void
 */
 public static function mock()
 public static function mock(bool $value = true)
 {
 static::$mockData = true;
 static::$mockData = $value;
 }

 /**
 * Retrieve process variables from its screens.
 *
 * @param array $processIds
 *
 * @return LengthAwarePaginator
 */
 private function getProcessesVariablesFrom(array $processIds)
 {
 $perPage = request()->get('per_page', 20);
 // Validate processIds input is required
 if (empty($processIds)) {
 return new LengthAwarePaginator([], 0, $perPage, 1);
 }

 // Get screens used in the processes
 $processes = Process::whereIn('id', $processIds)->get();
Comment thread
rodriquelca marked this conversation as resolved.

 $ids = collect([]);
 foreach ($processes as $process) {
 $manager = app(ExportManager::class);
 try {
 $ids = $ids->merge($manager->getDependenciesOfType(Screen::class, $process));
 } catch (\Exception $e) {
 $ids = collect([]);
 }
 }

 // Get columns from screens
 $columns = collect([]);
 $screens = Screen::whereIn('id', $ids->unique())->where('type', '!=', 'DISPLAY')->get();
 foreach ($screens as $screen) {
 $screenColumns = $screen->fields->map(function ($item) {
 $item->field = "data.{$item->field}";

 return $item;
 });

 $columns = $columns->merge($screenColumns);
 }

 // Paginate the result
 $page = request()->get('page', 1);
 $total = $columns->count();
 $items = $columns->forPage($page, $perPage);

 return new LengthAwarePaginator($items, $total, $perPage, $page);
 }
}

90 changes: 90 additions & 0 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,58 @@ public function test_can_get_process_variables_with_pagination(): void
 $this->assertEquals(30, $responseData['meta']['total']);
 }

 /**
 * Test successful variables retrieval with pagination
 */
 public function test_can_get_process_variables_from_process_screens_with_pagination(): void
 {
 $bpmn = file_get_contents(base_path('tests/Feature/Api/bpmnPatterns/SimpleTaskProcess.bpmn'));
 ProcessVariableController::mock(false);
 $screen1 = $this->createScreenWithFields(1, 10);
 $screen2 = $this->createScreenWithFields(2, 10);
 $screen3 = $this->createScreenWithFields(3, 10);
 Process::factory()->create(['id' => 1, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen1->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 2, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen2->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 3, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen3->id . '"', $bpmn)]);

 // Make request to the endpoint
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2,3&page=1&per_page=15');

 // Assert response structure and status
 $response->assertStatus(200)
 ->assertJsonStructure([
 'data' => [
 '*' => [
 //'id',
 //'process_id',
 'format',
 'label',
 'field',
 'default',
 //'created_at',
 //'updated_at',
 ]
 ],
 'meta' => [
 'current_page',
 'from',
 'last_page',
 'path',
 'per_page',
 'to',
 'total',
 ]
 ]);

 // Assert pagination works correctly
 $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']);
 }

 private function mockVariableFinder(array $processIds, $excludeSavedSearch)
 {
 // Create a cache key based on process IDs
Expand DownExpand Up@@ -281,4 +333,42 @@ public function test_saved_search_id_filtering(): void
 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }

 /**
 * Create a screen with a given number of fields
 *
 * @param int $processId
 * @param int $fieldsCount
 *
 * @return Screen
 */
 private function createScreenWithFields(int $processId, int $fieldsCount)
 {
 $items = [];
 for ($i = 1; $i <= $fieldsCount; $i++) {
 $items[] = [
 'component' => 'FormInput',
 'config' => [
 'name' => "var_{$processId}_{$i}",
 'type' => 'text',
 'label' => "Variable {$i} for Process {$processId}",
 'helper' => null,
 'dataFormat' => 'string',
 'validation' => null,
 'placeholder' => null,
 ],
 ];
 }

 return Screen::factory()->create([
 'config' => [
 [
 [
 'name' => 'screen name',
 'items' => $items,
 ],
 ]
 ],
 ]);
 }
}

, '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-21522 Fix Get variable list without VarFinder package was not implemented#7912

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 3 commits into

from

Jan 17, 2025
 Merged


FOUR-21522 Fix Get variable list without VarFinder package was not implemented
#7912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


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

Add test for retrieving process variables from screens with pagination


caleeli Jan 16, 2025
db815ec

Implement retrieval of process variables from screens and enhance pag…


caleeli Jan 16, 2025
2d419d1

Add validation for processIds input and ensure pagination parameters …


caleeli Jan 17, 2025

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


60 changes: 56 additions & 4 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use ProcessMaker\Managers\ExportManager;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\Screen;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use ProcessMaker\Package\VariableFinder\Models\ProcessVariable;

Expand DownExpand Up@@ -202,7 +205,7 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 {
 // If the classes or tables do not exist, fallback to a saved search approach.
 if (!class_exists(ProcessVariable::class) || !Schema::hasTable('process_variables')) {
 return $this->getProcessesVariablesFromSavedSearch($processIds);
 return $this->getProcessesVariablesFrom($processIds);
 }

 // Determine which columns to exclude based on the saved search
Expand All@@ -219,7 +222,8 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 $query = DB::table('var_finder_variables AS vfv')
 ->join('asset_variables AS av', 'vfv.asset_variable_id', '=', 'av.id')
 ->join('process_variables AS pv', 'av.id', '=', 'pv.asset_variable_id')
 ->whereIn('pv.process_id', $processIds);
 ->whereIn('pv.process_id', $processIds)
 ->orderBy('vfv.id');

 if (!empty($activeColumns)) {
 $query->whereNotIn('vfv.field', $activeColumns);
Expand All@@ -243,8 +247,56 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 *
 * @return void
 */
 public static function mock()
 public static function mock(bool $value = true)
 {
 static::$mockData = true;
 static::$mockData = $value;
 }

 /**
 * Retrieve process variables from its screens.
 *
 * @param array $processIds
 *
 * @return LengthAwarePaginator
 */
 private function getProcessesVariablesFrom(array $processIds)
 {
 $perPage = request()->get('per_page', 20);
 // Validate processIds input is required
 if (empty($processIds)) {
 return new LengthAwarePaginator([], 0, $perPage, 1);
 }

 // Get screens used in the processes
 $processes = Process::whereIn('id', $processIds)->get();
Comment thread
rodriquelca marked this conversation as resolved.

 $ids = collect([]);
 foreach ($processes as $process) {
 $manager = app(ExportManager::class);
 try {
 $ids = $ids->merge($manager->getDependenciesOfType(Screen::class, $process));
 } catch (\Exception $e) {
 $ids = collect([]);
 }
 }

 // Get columns from screens
 $columns = collect([]);
 $screens = Screen::whereIn('id', $ids->unique())->where('type', '!=', 'DISPLAY')->get();
 foreach ($screens as $screen) {
 $screenColumns = $screen->fields->map(function ($item) {
 $item->field = "data.{$item->field}";

 return $item;
 });

 $columns = $columns->merge($screenColumns);
 }

 // Paginate the result
 $page = request()->get('page', 1);
 $total = $columns->count();
 $items = $columns->forPage($page, $perPage);

 return new LengthAwarePaginator($items, $total, $perPage, $page);
 }
}

90 changes: 90 additions & 0 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,58 @@ public function test_can_get_process_variables_with_pagination(): void
 $this->assertEquals(30, $responseData['meta']['total']);
 }

 /**
 * Test successful variables retrieval with pagination
 */
 public function test_can_get_process_variables_from_process_screens_with_pagination(): void
 {
 $bpmn = file_get_contents(base_path('tests/Feature/Api/bpmnPatterns/SimpleTaskProcess.bpmn'));
 ProcessVariableController::mock(false);
 $screen1 = $this->createScreenWithFields(1, 10);
 $screen2 = $this->createScreenWithFields(2, 10);
 $screen3 = $this->createScreenWithFields(3, 10);
 Process::factory()->create(['id' => 1, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen1->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 2, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen2->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 3, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen3->id . '"', $bpmn)]);

 // Make request to the endpoint
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2,3&page=1&per_page=15');

 // Assert response structure and status
 $response->assertStatus(200)
 ->assertJsonStructure([
 'data' => [
 '*' => [
 //'id',
 //'process_id',
 'format',
 'label',
 'field',
 'default',
 //'created_at',
 //'updated_at',
 ]
 ],
 'meta' => [
 'current_page',
 'from',
 'last_page',
 'path',
 'per_page',
 'to',
 'total',
 ]
 ]);

 // Assert pagination works correctly
 $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']);
 }

 private function mockVariableFinder(array $processIds, $excludeSavedSearch)
 {
 // Create a cache key based on process IDs
Expand DownExpand Up@@ -281,4 +333,42 @@ public function test_saved_search_id_filtering(): void
 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }

 /**
 * Create a screen with a given number of fields
 *
 * @param int $processId
 * @param int $fieldsCount
 *
 * @return Screen
 */
 private function createScreenWithFields(int $processId, int $fieldsCount)
 {
 $items = [];
 for ($i = 1; $i <= $fieldsCount; $i++) {
 $items[] = [
 'component' => 'FormInput',
 'config' => [
 'name' => "var_{$processId}_{$i}",
 'type' => 'text',
 'label' => "Variable {$i} for Process {$processId}",
 'helper' => null,
 'dataFormat' => 'string',
 'validation' => null,
 'placeholder' => null,
 ],
 ];
 }

 return Screen::factory()->create([
 'config' => [
 [
 [
 'name' => 'screen name',
 'items' => $items,
 ],
 ]
 ],
 ]);
 }
}

, '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-21522 Fix Get variable list without VarFinder package was not implemented#7912

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 3 commits into

from

Jan 17, 2025
 Merged


FOUR-21522 Fix Get variable list without VarFinder package was not implemented
#7912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


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

Add test for retrieving process variables from screens with pagination


caleeli Jan 16, 2025
db815ec

Implement retrieval of process variables from screens and enhance pag…


caleeli Jan 16, 2025
2d419d1

Add validation for processIds input and ensure pagination parameters …


caleeli Jan 17, 2025

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


60 changes: 56 additions & 4 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use ProcessMaker\Managers\ExportManager;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\Screen;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use ProcessMaker\Package\VariableFinder\Models\ProcessVariable;

Expand DownExpand Up@@ -202,7 +205,7 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 {
 // If the classes or tables do not exist, fallback to a saved search approach.
 if (!class_exists(ProcessVariable::class) || !Schema::hasTable('process_variables')) {
 return $this->getProcessesVariablesFromSavedSearch($processIds);
 return $this->getProcessesVariablesFrom($processIds);
 }

 // Determine which columns to exclude based on the saved search
Expand All@@ -219,7 +222,8 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 $query = DB::table('var_finder_variables AS vfv')
 ->join('asset_variables AS av', 'vfv.asset_variable_id', '=', 'av.id')
 ->join('process_variables AS pv', 'av.id', '=', 'pv.asset_variable_id')
 ->whereIn('pv.process_id', $processIds);
 ->whereIn('pv.process_id', $processIds)
 ->orderBy('vfv.id');

 if (!empty($activeColumns)) {
 $query->whereNotIn('vfv.field', $activeColumns);
Expand All@@ -243,8 +247,56 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 *
 * @return void
 */
 public static function mock()
 public static function mock(bool $value = true)
 {
 static::$mockData = true;
 static::$mockData = $value;
 }

 /**
 * Retrieve process variables from its screens.
 *
 * @param array $processIds
 *
 * @return LengthAwarePaginator
 */
 private function getProcessesVariablesFrom(array $processIds)
 {
 $perPage = request()->get('per_page', 20);
 // Validate processIds input is required
 if (empty($processIds)) {
 return new LengthAwarePaginator([], 0, $perPage, 1);
 }

 // Get screens used in the processes
 $processes = Process::whereIn('id', $processIds)->get();
Comment thread
rodriquelca marked this conversation as resolved.

 $ids = collect([]);
 foreach ($processes as $process) {
 $manager = app(ExportManager::class);
 try {
 $ids = $ids->merge($manager->getDependenciesOfType(Screen::class, $process));
 } catch (\Exception $e) {
 $ids = collect([]);
 }
 }

 // Get columns from screens
 $columns = collect([]);
 $screens = Screen::whereIn('id', $ids->unique())->where('type', '!=', 'DISPLAY')->get();
 foreach ($screens as $screen) {
 $screenColumns = $screen->fields->map(function ($item) {
 $item->field = "data.{$item->field}";

 return $item;
 });

 $columns = $columns->merge($screenColumns);
 }

 // Paginate the result
 $page = request()->get('page', 1);
 $total = $columns->count();
 $items = $columns->forPage($page, $perPage);

 return new LengthAwarePaginator($items, $total, $perPage, $page);
 }
}

90 changes: 90 additions & 0 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,58 @@ public function test_can_get_process_variables_with_pagination(): void
 $this->assertEquals(30, $responseData['meta']['total']);
 }

 /**
 * Test successful variables retrieval with pagination
 */
 public function test_can_get_process_variables_from_process_screens_with_pagination(): void
 {
 $bpmn = file_get_contents(base_path('tests/Feature/Api/bpmnPatterns/SimpleTaskProcess.bpmn'));
 ProcessVariableController::mock(false);
 $screen1 = $this->createScreenWithFields(1, 10);
 $screen2 = $this->createScreenWithFields(2, 10);
 $screen3 = $this->createScreenWithFields(3, 10);
 Process::factory()->create(['id' => 1, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen1->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 2, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen2->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 3, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen3->id . '"', $bpmn)]);

 // Make request to the endpoint
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2,3&page=1&per_page=15');

 // Assert response structure and status
 $response->assertStatus(200)
 ->assertJsonStructure([
 'data' => [
 '*' => [
 //'id',
 //'process_id',
 'format',
 'label',
 'field',
 'default',
 //'created_at',
 //'updated_at',
 ]
 ],
 'meta' => [
 'current_page',
 'from',
 'last_page',
 'path',
 'per_page',
 'to',
 'total',
 ]
 ]);

 // Assert pagination works correctly
 $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']);
 }

 private function mockVariableFinder(array $processIds, $excludeSavedSearch)
 {
 // Create a cache key based on process IDs
Expand DownExpand Up@@ -281,4 +333,42 @@ public function test_saved_search_id_filtering(): void
 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }

 /**
 * Create a screen with a given number of fields
 *
 * @param int $processId
 * @param int $fieldsCount
 *
 * @return Screen
 */
 private function createScreenWithFields(int $processId, int $fieldsCount)
 {
 $items = [];
 for ($i = 1; $i <= $fieldsCount; $i++) {
 $items[] = [
 'component' => 'FormInput',
 'config' => [
 'name' => "var_{$processId}_{$i}",
 'type' => 'text',
 'label' => "Variable {$i} for Process {$processId}",
 'helper' => null,
 'dataFormat' => 'string',
 'validation' => null,
 'placeholder' => null,
 ],
 ];
 }

 return Screen::factory()->create([
 'config' => [
 [
 [
 'name' => 'screen name',
 'items' => $items,
 ],
 ]
 ],
 ]);
 }
}

, '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-21522 Fix Get variable list without VarFinder package was not implemented#7912

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 3 commits into

from

Jan 17, 2025
 Merged


FOUR-21522 Fix Get variable list without VarFinder package was not implemented
#7912
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


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

Add test for retrieving process variables from screens with pagination


caleeli Jan 16, 2025
db815ec

Implement retrieval of process variables from screens and enhance pag…


caleeli Jan 16, 2025
2d419d1

Add validation for processIds input and ensure pagination parameters …


caleeli Jan 17, 2025

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


60 changes: 56 additions & 4 deletions
ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,9 @@
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use ProcessMaker\Managers\ExportManager;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\Screen;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use ProcessMaker\Package\VariableFinder\Models\ProcessVariable;

Expand DownExpand Up@@ -202,7 +205,7 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 {
 // If the classes or tables do not exist, fallback to a saved search approach.
 if (!class_exists(ProcessVariable::class) || !Schema::hasTable('process_variables')) {
 return $this->getProcessesVariablesFromSavedSearch($processIds);
 return $this->getProcessesVariablesFrom($processIds);
 }

 // Determine which columns to exclude based on the saved search
Expand All@@ -219,7 +222,8 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 $query = DB::table('var_finder_variables AS vfv')
 ->join('asset_variables AS av', 'vfv.asset_variable_id', '=', 'av.id')
 ->join('process_variables AS pv', 'av.id', '=', 'pv.asset_variable_id')
 ->whereIn('pv.process_id', $processIds);
 ->whereIn('pv.process_id', $processIds)
 ->orderBy('vfv.id');

 if (!empty($activeColumns)) {
 $query->whereNotIn('vfv.field', $activeColumns);
Expand All@@ -243,8 +247,56 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
 *
 * @return void
 */
 public static function mock()
 public static function mock(bool $value = true)
 {
 static::$mockData = true;
 static::$mockData = $value;
 }

 /**
 * Retrieve process variables from its screens.
 *
 * @param array $processIds
 *
 * @return LengthAwarePaginator
 */
 private function getProcessesVariablesFrom(array $processIds)
 {
 $perPage = request()->get('per_page', 20);
 // Validate processIds input is required
 if (empty($processIds)) {
 return new LengthAwarePaginator([], 0, $perPage, 1);
 }

 // Get screens used in the processes
 $processes = Process::whereIn('id', $processIds)->get();
Comment thread
rodriquelca marked this conversation as resolved.

 $ids = collect([]);
 foreach ($processes as $process) {
 $manager = app(ExportManager::class);
 try {
 $ids = $ids->merge($manager->getDependenciesOfType(Screen::class, $process));
 } catch (\Exception $e) {
 $ids = collect([]);
 }
 }

 // Get columns from screens
 $columns = collect([]);
 $screens = Screen::whereIn('id', $ids->unique())->where('type', '!=', 'DISPLAY')->get();
 foreach ($screens as $screen) {
 $screenColumns = $screen->fields->map(function ($item) {
 $item->field = "data.{$item->field}";

 return $item;
 });

 $columns = $columns->merge($screenColumns);
 }

 // Paginate the result
 $page = request()->get('page', 1);
 $total = $columns->count();
 $items = $columns->forPage($page, $perPage);

 return new LengthAwarePaginator($items, $total, $perPage, $page);
 }
}

90 changes: 90 additions & 0 deletions
tests/Feature/Api/V1_1/ProcessVariableControllerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,58 @@ public function test_can_get_process_variables_with_pagination(): void
 $this->assertEquals(30, $responseData['meta']['total']);
 }

 /**
 * Test successful variables retrieval with pagination
 */
 public function test_can_get_process_variables_from_process_screens_with_pagination(): void
 {
 $bpmn = file_get_contents(base_path('tests/Feature/Api/bpmnPatterns/SimpleTaskProcess.bpmn'));
 ProcessVariableController::mock(false);
 $screen1 = $this->createScreenWithFields(1, 10);
 $screen2 = $this->createScreenWithFields(2, 10);
 $screen3 = $this->createScreenWithFields(3, 10);
 Process::factory()->create(['id' => 1, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen1->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 2, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen2->id . '"', $bpmn)]);
 Process::factory()->create(['id' => 3, 'bpmn' => str_replace('pm:screenRef="2"', 'pm:screenRef="' . $screen3->id . '"', $bpmn)]);

 // Make request to the endpoint
 $response = $this->apiCall('GET', '/api/1.1/processes/variables?processIds=1,2,3&page=1&per_page=15');

 // Assert response structure and status
 $response->assertStatus(200)
 ->assertJsonStructure([
 'data' => [
 '*' => [
 //'id',
 //'process_id',
 'format',
 'label',
 'field',
 'default',
 //'created_at',
 //'updated_at',
 ]
 ],
 'meta' => [
 'current_page',
 'from',
 'last_page',
 'path',
 'per_page',
 'to',
 'total',
 ]
 ]);

 // Assert pagination works correctly
 $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']);
 }

 private function mockVariableFinder(array $processIds, $excludeSavedSearch)
 {
 // Create a cache key based on process IDs
Expand DownExpand Up@@ -281,4 +333,42 @@ public function test_saved_search_id_filtering(): void
 // Check that the total count is reduced by the number of excluded fields
 $this->assertEquals(8, $responseData['meta']['total']); // 10 total - 2 excluded
 }

 /**
 * Create a screen with a given number of fields
 *
 * @param int $processId
 * @param int $fieldsCount
 *
 * @return Screen
 */
 private function createScreenWithFields(int $processId, int $fieldsCount)
 {
 $items = [];
 for ($i = 1; $i <= $fieldsCount; $i++) {
 $items[] = [
 'component' => 'FormInput',
 'config' => [
 'name' => "var_{$processId}_{$i}",
 'type' => 'text',
 'label' => "Variable {$i} for Process {$processId}",
 'helper' => null,
 'dataFormat' => 'string',
 'validation' => null,
 'placeholder' => null,
 ],
 ];
 }

 return Screen::factory()->create([
 'config' => [
 [
 [
 'name' => 'screen name',
 'items' => $items,
 ],
 ]
 ],
 ]);
 }
}