From 9d5395d02a3e5bf26c56dfed94fb6ff1c5214be8 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Fri, 22 Nov 2024 09:26:38 -0400 Subject: [PATCH 01/23] FOUR-20443 --- .../RenameRequestsToCasesPermissionSeeder.php | 25 -------- ...permission_view_all_cases_all_requests.php | 64 +++++++++++++++++++ 2 files changed, 64 insertions(+), 25 deletions(-) delete mode 100644 database/seeders/RenameRequestsToCasesPermissionSeeder.php create mode 100644 upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php diff --git a/database/seeders/RenameRequestsToCasesPermissionSeeder.php b/database/seeders/RenameRequestsToCasesPermissionSeeder.php deleted file mode 100644 index 2b2429ee2d..0000000000 --- a/database/seeders/RenameRequestsToCasesPermissionSeeder.php +++ /dev/null @@ -1,25 +0,0 @@ -where('group', 'Requests') - ->update(['group' => 'Cases']); - // Update the title of group - $permission = Permission::where('name', 'view-all_requests')->first(); - - if ($permission) { - $permission->title = 'View All Cases'; - $permission->save(); - } - } -} diff --git a/upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php b/upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php new file mode 100644 index 0000000000..af6f196bf0 --- /dev/null +++ b/upgrades/2024_11_19_161132_create_permission_view_all_cases_all_requests.php @@ -0,0 +1,64 @@ + 'view-all_cases', + 'title' => 'View All Cases', + ], + [ + 'name' => 'view-my_requests', + 'title' => 'View My Requests', + ], + ]; + + /** + * Run the migrations. + */ + public function up(): void + { + // Update the group Requests to Cases and Requests + DB::table('permissions') + ->where('group', 'Requests') + ->update(['group' => self::NEW_NAME_GROUP]); + // Update the group Cases to Cases and Requests + DB::table('permissions') + ->where('group', 'Cases') + ->update(['group' => self::NEW_NAME_GROUP]); + // Create new permissions view-all_cases view-all_requests + $this->createPermissions(); + } + + /** + * Create new permissions + * + * @return void + */ + private function createPermissions(): void + { + foreach (self::PERMISSIONS as $permission) { + Permission::updateOrCreate([ + 'name' => $permission['name'], + ], [ + 'title' => $permission['title'], + 'name' => $permission['name'], + 'group' => self::NEW_NAME_GROUP, + ]); + } + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Permission::where('name', 'view-all_cases')->delete(); + Permission::where('name', 'view-my_requests')->delete(); + } +} From 7339f2b5d43f0858844b2139dd49da64c5a5f28c Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Fri, 22 Nov 2024 13:59:24 -0400 Subject: [PATCH 02/23] The card needs to hide if the data is null --- resources/jscomposition/cases/casesMain/utils/counters.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/jscomposition/cases/casesMain/utils/counters.js b/resources/jscomposition/cases/casesMain/utils/counters.js index ac017b1e6c..273edf9428 100644 --- a/resources/jscomposition/cases/casesMain/utils/counters.js +++ b/resources/jscomposition/cases/casesMain/utils/counters.js @@ -27,7 +27,7 @@ export const formatCounters = (data) => { }, ]; - if (data.totalAllCases) { + if (data.totalAllCases !== null) { counters.push({ header: t("All cases"), body: data.totalAllCases.toString(), @@ -37,7 +37,7 @@ export const formatCounters = (data) => { }); } - if (data.totalMyRequest) { + if (data.totalMyRequest !== null) { counters.push({ header: t("My requests"), body: data.totalMyRequest.toString(), From 8a902c61493b1be59d7daba9d694905ed4cb6475 Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Fri, 22 Nov 2024 17:09:51 -0400 Subject: [PATCH 03/23] Add method to create Process instance from JSON file --- tests/TestCase.php | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 1ffdfd9633..7532d59031 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -3,18 +3,15 @@ namespace Tests; use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts; -use Illuminate\Database\DatabaseManager; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Bus; use PDOException; +use ProcessMaker\ImportExport\Importer; +use ProcessMaker\ImportExport\Options; use ProcessMaker\Jobs\RefreshArtisanCaches; use ProcessMaker\Models\Process; -use ProcessMaker\Models\ProcessRequest; -use ProcessMaker\Models\ProcessRequestLock; -use ProcessMaker\Models\SecurityLog; -use ProcessMaker\Models\Setting; abstract class TestCase extends BaseTestCase { @@ -127,6 +124,30 @@ protected function createProcessFromBPMN(string $bpmnFile, array $attributes = [ return Process::factory()->create(array_merge($data, $attributes)); } + /** + * Creates a Process instance from a JSON file. + * + * This method reads the specified JSON file, merges the provided attributes, + * and creates a new Process instance. + * + * @param string $jsonFile The path to the JSON file containing the process definition. + * @param array $attributes Additional attributes to merge into the process definition. + * @return Process The created Process instance. + */ + protected function createProcessFromJSON(string $jsonFile, array $attributes = []): Process + { + $payload = json_decode(file_get_contents($jsonFile), true); + $options = new Options([]); + $importer = new Importer($payload, $options); + $importer->previewImport(); + $manifest = $importer->doImport(); + $processId = $manifest[$payload['root']]->log['newId']; + $process = Process::find($processId); + $process->update($attributes); + + return $process; + } + /** * Connections transacts * From 389b1c34b384d45459e1dc164cc9b533f00e0462 Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Fri, 22 Nov 2024 17:10:45 -0400 Subject: [PATCH 04/23] Improve modifying exception messages in RunServiceTask --- ProcessMaker/Jobs/RunServiceTask.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ProcessMaker/Jobs/RunServiceTask.php b/ProcessMaker/Jobs/RunServiceTask.php index e9a6fcad57..76ce0c9746 100644 --- a/ProcessMaker/Jobs/RunServiceTask.php +++ b/ProcessMaker/Jobs/RunServiceTask.php @@ -2,6 +2,7 @@ namespace ProcessMaker\Jobs; +use Exception; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Support\Facades\Log; use ProcessMaker\Exception\ConfigurationException; @@ -127,8 +128,11 @@ public function action(ProcessRequestToken $token = null, ServiceTaskInterface $ $error->setName($message); $token->setProperty('error', $error); - $exceptionClass = get_class($exception); - $modifiedException = new $exceptionClass($message); + if ($message !== $exception->getMessage()) { + $modifiedException = new Exception($message, $exception->getCode(), $exception); + } else { + $modifiedException = $exception; + } $token->logError($modifiedException, $element); Log::error('Service task failed: ' . $implementation . ' - ' . $message); From 85737532c78904fa8ba988f0e2314fb270e50946 Mon Sep 17 00:00:00 2001 From: Henry Jonas Date: Mon, 25 Nov 2024 11:36:25 -0400 Subject: [PATCH 05/23] FOUR-20281 : S2: Remove fades --- resources/views/admin/users/index.blade.php | 4 ++-- .../components/categorized_resource.blade.php | 12 ++++++------ resources/views/processes/edit.blade.php | 6 +++--- .../views/processes/screens/edit.blade.php | 4 ++-- .../views/processes/scripts/edit.blade.php | 4 ++-- .../views/processes/signals/edit.blade.php | 4 ++-- resources/views/requests/index.blade.php | 2 +- resources/views/requests/show.blade.php | 18 +++++++++--------- resources/views/requests/showMobile.blade.php | 4 ++-- resources/views/tasks/edit.blade.php | 4 ++-- resources/views/tasks/index.blade.php | 2 +- resources/views/templates/configure.blade.php | 4 ++-- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php index bd9b477397..2697745d22 100644 --- a/resources/views/admin/users/index.blade.php +++ b/resources/views/admin/users/index.blade.php @@ -33,13 +33,13 @@
-