From 700f0ac2a698140f13d4f5e23ec86da1760ebd5b Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Wed, 30 Oct 2024 16:52:16 -0400 Subject: [PATCH 01/31] Test the cases synchronization --- .../Feature/Cases/CaseSyncRepositoryTest.php | 143 ++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 tests/Feature/Cases/CaseSyncRepositoryTest.php diff --git a/tests/Feature/Cases/CaseSyncRepositoryTest.php b/tests/Feature/Cases/CaseSyncRepositoryTest.php new file mode 100644 index 0000000000..c91cd2b4fa --- /dev/null +++ b/tests/Feature/Cases/CaseSyncRepositoryTest.php @@ -0,0 +1,143 @@ +create(); + $processRequest2 = ProcessRequest::factory()->create(['parent_request_id' => $processRequest1->id, 'case_number' => $processRequest1->case_number]); + + // Create some tokens for both ProcessRequest instances + $processRequest1->tokens()->createMany([ + ProcessRequestToken::factory()->make([ + 'element_name' => 'Task 1', + 'element_type' => 'task', + 'status' => 'ACTIVE', + 'element_id' => 'task-1', + 'process_request_id' => $processRequest1->id, + 'process_id' => $processRequest1->process_id + ])->toArray(), + ProcessRequestToken::factory()->make([ + 'element_name' => 'Task 2', + 'element_type' => 'task', + 'status' => 'CLOSED', + 'element_id' => 'task-2', + 'process_request_id' => $processRequest1->id, + 'process_id' => $processRequest1->process_id + ])->toArray(), + ProcessRequestToken::factory()->make([ + 'element_name' => 'Task 3', + 'element_type' => 'callActivity', + 'status' => 'ACTIVE', + 'element_id' => 'call-activity-1', + 'process_request_id' => $processRequest1->id, + 'process_id' => $processRequest1->process_id + ])->toArray(), + ]); + + $processRequest2->tokens()->createMany([ + ProcessRequestToken::factory()->make([ + 'element_name' => 'Task 4', + 'element_type' => 'scriptTask', + 'status' => 'CLOSED', + 'element_id' => 'task-4', + 'process_request_id' => $processRequest2->id, + 'process_id' => $processRequest2->process_id + ])->toArray(), + ProcessRequestToken::factory()->make([ + 'element_name' => 'Task 5', + 'element_type' => 'task', + 'status' => 'ACTIVE', + 'element_id' => 'task-5', + 'process_request_id' => $processRequest2->id, + 'process_id' => $processRequest2->process_id + ])->toArray(), + ]); + + // Call the syncCases method + $result = CaseSyncRepository::syncCases([$processRequest1->id, $processRequest2->id]); + + // Assert that the response contains the correct data + $this->assertArrayHasKey('successes', $result); + $this->assertArrayHasKey('errors', $result); + + // Check that the successes array contains the case numbers + $this->assertContains($processRequest1->case_number, $result['successes']); + $this->assertContains($processRequest2->case_number, $result['successes']); + + // Check that the CaseStarted records were created + $caseStarted = DB::table('cases_started')->where('case_number', $processRequest1->case_number)->first(); + $tasks = json_decode($caseStarted->tasks, true); + $participants = json_decode($caseStarted->participants, true); + + $expectedTasks = [ + [ + 'id' => $processRequest2->tokens()->where('element_id', 'task-5')->first()->id, + 'name' => 'Task 5', + 'status' => 'ACTIVE', + 'element_id' => 'task-5', + 'process_id' => $processRequest2->process_id + ], + [ + 'id' => $processRequest1->tokens()->where('element_id', 'task-2')->first()->id, + 'name' => 'Task 2', + 'status' => 'CLOSED', + 'element_id' => 'task-2', + 'process_id' => $processRequest1->process_id + ], + [ + 'id' => $processRequest1->tokens()->where('element_id', 'task-1')->first()->id, + 'name' => 'Task 1', + 'status' => 'ACTIVE', + 'element_id' => 'task-1', + 'process_id' => $processRequest1->process_id + ], + ]; + $expectedParticipants = [ + $processRequest1->tokens()->where('element_id', 'task-1')->first()->user_id, + $processRequest1->tokens()->where('element_id', 'task-2')->first()->user_id, + $processRequest2->tokens()->where('element_id', 'task-5')->first()->user_id, + ]; + + $this->assertEquals($expectedTasks, $tasks); + $this->assertEquals($expectedParticipants, $participants); + + // There are 3 case_participated records created + $this->assertDatabaseCount('cases_participated', 3); + + // participant assigned to task-1 + $caseParticipated = DB::table('cases_participated') + ->where('case_number', $processRequest1->case_number) + ->where('user_id', $processRequest1->tokens()->where('element_id', 'task-1')->first()->user_id) + ->first(); + $participatedTasks = json_decode($caseParticipated->tasks, true); + $participants = json_decode($caseParticipated->participants, true); + $this->assertEquals($expectedTasks, $participatedTasks); + $this->assertEquals($expectedParticipants, $participants); + + // participant assigned to task-2 + $caseParticipated = DB::table('cases_participated') + ->where('case_number', $processRequest1->case_number) + ->where('user_id', $processRequest1->tokens()->where('element_id', 'task-2')->first()->user_id) + ->first(); + $participatedTasks = json_decode($caseParticipated->tasks, true); + $participants = json_decode($caseParticipated->participants, true); + $this->assertEquals($expectedTasks, $participatedTasks); + $this->assertEquals($expectedParticipants, $participants); + + // participant assigned to task-4 + $caseParticipated = DB::table('cases_participated') + ->where('case_number', $processRequest2->case_number) + ->where('user_id', $processRequest2->tokens()->where('element_id', 'task-4')->first()->user_id) + ->first(); + } +} From ebe54dae4aa47b8b663ce76c363f3454e2875501 Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Wed, 30 Oct 2024 16:52:55 -0400 Subject: [PATCH 02/31] Improve synchronization --- .../Repositories/CaseSyncRepository.php | 94 +++++++++++++------ ProcessMaker/Repositories/CaseUtils.php | 1 + 2 files changed, 65 insertions(+), 30 deletions(-) diff --git a/ProcessMaker/Repositories/CaseSyncRepository.php b/ProcessMaker/Repositories/CaseSyncRepository.php index ba1dd3a9d4..311d68b4d6 100644 --- a/ProcessMaker/Repositories/CaseSyncRepository.php +++ b/ProcessMaker/Repositories/CaseSyncRepository.php @@ -3,6 +3,7 @@ namespace ProcessMaker\Repositories; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\DB; use ProcessMaker\Models\CaseParticipated; use ProcessMaker\Models\CaseStarted; use ProcessMaker\Models\ProcessRequest; @@ -39,7 +40,7 @@ public static function syncCases(array $requestIds): array $caseStartedRequests = CaseUtils::storeRequests(collect(), $requestData); $caseStartedRequestTokens = collect(); $caseStartedTasks = collect(); - $participants = $instance->participants->pluck('id'); + $participants = self::getParticipantsFromInstance($instance); $status = CaseUtils::getStatus($instance->status); $caseParticipatedData = self::prepareCaseStartedData($instance, $status, $participants); @@ -67,6 +68,24 @@ public static function syncCases(array $requestIds): array 'keywords' => CaseUtils::getKeywords($dataKeywords), ], ); + // copy all the columns from cases_started to cases_participated, except for the user_id + $sql = "UPDATE cases_participated AS cp + INNER JOIN cases_started AS cs ON cp.case_number = cs.case_number + SET + cp.case_title = cs.case_title, + cp.case_title_formatted = cs.case_title_formatted, + cp.case_status = cs.case_status, + cp.processes = cs.processes, + cp.requests = cs.requests, + cp.request_tokens = cs.request_tokens, + cp.tasks = cs.tasks, + cp.participants = cs.participants, + cp.initiated_at = cs.initiated_at, + cp.completed_at = cs.completed_at, + cp.keywords = cs.keywords + WHERE cp.case_number = '{$instance->case_number}'; + "; + DB::statement($sql); $successes[] = $caseStarted->case_number; } catch (\Exception $e) { @@ -80,6 +99,19 @@ public static function syncCases(array $requestIds): array ]; } + /** + * Get the participants from the instance. + * + * @param ProcessRequest|\Illuminate\Database\Eloquent\Builder $instance + * @return Collection + */ + private static function getParticipantsFromInstance(ProcessRequest|\Illuminate\Database\Eloquent\Builder $instance) + { + return $instance->participants() + ->whereIn('process_request_tokens.element_type', CaseUtils::ALLOWED_ELEMENT_TYPES) + ->pluck('process_request_tokens.user_id'); + } + /** * Prepare the case started data. * @@ -120,38 +152,39 @@ private static function prepareCaseStartedData($instance, $status, $participants */ private static function processTokens($instance, &$caseParticipatedData, &$caseStartedRequestTokens, &$caseStartedTasks) { - foreach ($instance->tokens as $token) { - if (in_array($token->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) { - $processData = [ - 'id' => $instance->process->id, - 'name' => $instance->process->name, - ]; + $tokens = $instance->tokens()->select('id', 'element_id', 'element_name', 'process_id', 'element_type', 'status', 'user_id') + ->whereIn('element_type', CaseUtils::ALLOWED_ELEMENT_TYPES) + ->get(); + foreach ($tokens as $token) { + $processData = [ + 'id' => $instance->process->id, + 'name' => $instance->process->name, + ]; - $requestData = [ - 'id' => $instance->id, - 'name' => $instance->name, - 'parent_request_id' => $instance?->parentRequest?->id, - ]; + $requestData = [ + 'id' => $instance->id, + 'name' => $instance->name, + 'parent_request_id' => $instance?->parent_request_id, + ]; - $taskData = [ - 'id' => $token->getKey(), - 'element_id' => $token->element_id, - 'name' => $token->element_name, - 'process_id' => $token->process_id, - 'element_type' => $token->element_type, - 'status' => $token->status, - ]; + $taskData = [ + 'id' => $token->getKey(), + 'element_id' => $token->element_id, + 'name' => $token->element_name, + 'process_id' => $token->process_id, + 'element_type' => $token->element_type, + 'status' => $token->status, + ]; - $caseParticipatedData['processes'] = CaseUtils::storeProcesses($caseParticipatedData['processes'], $processData); - $caseParticipatedData['requests'] = CaseUtils::storeRequests($caseParticipatedData['requests'], $requestData); - $caseParticipatedData['request_tokens'] = CaseUtils::storeRequestTokens($caseParticipatedData['request_tokens'], $token->getKey()); - $caseParticipatedData['tasks'] = CaseUtils::storeTasks($caseParticipatedData['tasks'], $taskData); + $caseParticipatedData['processes'] = CaseUtils::storeProcesses($caseParticipatedData['processes'], $processData); + $caseParticipatedData['requests'] = CaseUtils::storeRequests($caseParticipatedData['requests'], $requestData); + $caseParticipatedData['request_tokens'] = CaseUtils::storeRequestTokens($caseParticipatedData['request_tokens'], $token->getKey()); + $caseParticipatedData['tasks'] = CaseUtils::storeTasks($caseParticipatedData['tasks'], $taskData); - $caseStartedRequestTokens = CaseUtils::storeRequestTokens($caseStartedRequestTokens, $token->getKey()); - $caseStartedTasks = CaseUtils::storeTasks($caseStartedTasks, $taskData); + $caseStartedRequestTokens = CaseUtils::storeRequestTokens($caseStartedRequestTokens, $token->getKey()); + $caseStartedTasks = CaseUtils::storeTasks($caseStartedTasks, $taskData); - self::syncCasesParticipated($instance->case_number, $token->user_id, $caseParticipatedData); - } + self::syncCasesParticipated($instance->case_number, $token->user_id, $caseParticipatedData); } } @@ -183,7 +216,7 @@ private static function processChildRequests( $caseStartedRequests = CaseUtils::storeRequests($caseStartedRequests, $requestData); $participants = $participants - ->merge($subProcess->participants->pluck('id')) + ->merge(self::getParticipantsFromInstance($subProcess)) ->unique() ->values(); @@ -194,9 +227,10 @@ private static function processChildRequests( 'name' => $spToken->element_name, 'process_id' => $spToken->process_id, 'element_type' => $spToken->element_type, + 'status' => $spToken->status, ]; - if (in_array($spToken->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) { + if (in_array($spToken->element_type, CaseUtils::ALLOWED_ELEMENT_TYPES)) { $caseParticipatedData['processes'] = CaseUtils::storeProcesses($caseParticipatedData['processes'], $processData); $caseParticipatedData['requests'] = CaseUtils::storeRequests($caseParticipatedData['requests'], $requestData); $caseParticipatedData['request_tokens'] = CaseUtils::storeRequestTokens($caseParticipatedData['request_tokens'], $spToken->getKey()); diff --git a/ProcessMaker/Repositories/CaseUtils.php b/ProcessMaker/Repositories/CaseUtils.php index a7413f7f50..552c994e3b 100644 --- a/ProcessMaker/Repositories/CaseUtils.php +++ b/ProcessMaker/Repositories/CaseUtils.php @@ -152,6 +152,7 @@ public static function storeTasks(Collection $tasks, ?array $taskData = []): Col && in_array($taskData['element_type'], self::ALLOWED_ELEMENT_TYPES) ) { unset($taskData['element_type']); + // This field is converted to string because: The Json_Search in MySQL only works with strings $taskData['id'] = (string)$taskData['id']; $tasks->prepend($taskData); } From 10ae340f1ea5ad7b67a384e37fd2ffd2a90966de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Wed, 30 Oct 2024 16:56:11 -0400 Subject: [PATCH 03/31] Fix edit and delete modal styles --- devhub/pm-font/svg/trash.svg | 3 + resources/fonts/pm-font/index.html | 4 +- resources/fonts/pm-font/processmaker-font.css | 15 +-- resources/fonts/pm-font/processmaker-font.eot | Bin 15660 -> 16132 bytes .../fonts/pm-font/processmaker-font.less | 15 +-- .../pm-font/processmaker-font.module.less | 15 +-- .../fonts/pm-font/processmaker-font.scss | 18 ++-- .../fonts/pm-font/processmaker-font.styl | 15 +-- resources/fonts/pm-font/processmaker-font.svg | 5 +- .../pm-font/processmaker-font.symbol.svg | 2 +- resources/fonts/pm-font/processmaker-font.ttf | Bin 15456 -> 15928 bytes .../fonts/pm-font/processmaker-font.woff | Bin 10232 -> 10556 bytes .../fonts/pm-font/processmaker-font.woff2 | Bin 9076 -> 9344 bytes resources/fonts/pm-font/symbol.html | 9 +- resources/fonts/pm-font/unicode.html | 12 +-- .../admin/devlink/components/BundleModal.vue | 38 ++++--- .../admin/devlink/components/DeleteModal.vue | 97 ++++++++++++++++++ .../js/admin/devlink/components/Index.vue | 28 ++--- .../admin/devlink/components/LocalBundles.vue | 51 ++++++--- resources/lang/en.json | 2 + resources/sass/components/modal.scss | 34 ++++++ 21 files changed, 280 insertions(+), 83 deletions(-) create mode 100644 devhub/pm-font/svg/trash.svg create mode 100644 resources/js/admin/devlink/components/DeleteModal.vue create mode 100644 resources/sass/components/modal.scss diff --git a/devhub/pm-font/svg/trash.svg b/devhub/pm-font/svg/trash.svg new file mode 100644 index 0000000000..163615e4f1 --- /dev/null +++ b/devhub/pm-font/svg/trash.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/fonts/pm-font/index.html b/resources/fonts/pm-font/index.html index ac553e936e..2f24bf8009 100644 --- a/resources/fonts/pm-font/index.html +++ b/resources/fonts/pm-font/index.html @@ -103,7 +103,7 @@
-

ProcessMaker Icons4.12.0+alpha-2

+

ProcessMaker Icons4.12.0+alpha-3

Icons generated with svgtofont. For add new icons, please check the README file
@@ -115,7 +115,7 @@

ProcessMaker Icons4.12.0+alpha-2

    -

  • bpmn-action-by-email

  • bpmn-data-connector

  • bpmn-data-object

  • bpmn-data-store

  • bpmn-docusign

  • bpmn-end-event

  • bpmn-flowgenie

  • bpmn-gateway

  • bpmn-generic-gateway

  • bpmn-idp

  • bpmn-intermediate-event

  • bpmn-pool

  • bpmn-send-email

  • bpmn-start-event

  • bpmn-task

  • bpmn-text-annotation

  • brush-icon

  • close

  • cloud-download-outline

  • copy

  • css-icon

  • desktop

  • eye

  • fields-icon

  • flowgenie-outline

  • folder-outline

  • fullscreen

  • github

  • layout-icon

  • map

  • mobile

  • pdf

  • play-outline

  • plus

  • screen-outline

  • script-outline

  • slack-notification

  • slack

  • slideshow

  • table

  • unlink

    • +

  • bpmn-action-by-email

  • bpmn-data-connector

  • bpmn-data-object

  • bpmn-data-store

  • bpmn-docusign

  • bpmn-end-event

  • bpmn-flowgenie

  • bpmn-gateway

  • bpmn-generic-gateway

  • bpmn-idp

  • bpmn-intermediate-event

  • bpmn-pool

  • bpmn-send-email

  • bpmn-start-event

  • bpmn-task

  • bpmn-text-annotation

  • brush-icon

  • close

  • cloud-download-outline

  • copy

  • css-icon

  • desktop

  • eye

  • fields-icon

  • flowgenie-outline

  • folder-outline

  • fullscreen

  • github

  • layout-icon

  • map

  • mobile

  • pdf

  • play-outline

  • plus

  • screen-outline

  • script-outline

  • slack-notification

  • slack

  • slideshow

  • table

  • trash

  • unlink

diff --git a/resources/fonts/pm-font/processmaker-font.css b/resources/fonts/pm-font/processmaker-font.css index 00e7eab20a..d3db6f824a 100644 --- a/resources/fonts/pm-font/processmaker-font.css +++ b/resources/fonts/pm-font/processmaker-font.css @@ -1,11 +1,11 @@ @font-face { font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1729628848686'); /* IE9*/ - src: url('processmaker-font.eot?t=1729628848686#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1729628848686") format("woff2"), - url("processmaker-font.woff?t=1729628848686") format("woff"), - url('processmaker-font.ttf?t=1729628848686') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1729628848686#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1730300772826'); /* IE9*/ + src: url('processmaker-font.eot?t=1730300772826#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1730300772826") format("woff2"), + url("processmaker-font.woff?t=1730300772826") format("woff"), + url('processmaker-font.ttf?t=1730300772826') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1730300772826#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -56,5 +56,6 @@ .fp-slack:before { content: "\ea26"; } .fp-slideshow:before { content: "\ea27"; } .fp-table:before { content: "\ea28"; } -.fp-unlink:before { content: "\ea29"; } +.fp-trash:before { content: "\ea29"; } +.fp-unlink:before { content: "\ea2a"; } diff --git a/resources/fonts/pm-font/processmaker-font.eot b/resources/fonts/pm-font/processmaker-font.eot index 130947f648399ada8505113d3be8eb913b457200..e25a2fe2148b068ca53fb24cbfd3dfc3d086b97e 100644 GIT binary patch delta 843 zcmXw2T}TvB6h7zPnR{nuXPo_W*IjinO^sFjLwBo{wG!;dC&54{sLh|&a@Eqp3fc-E z!h*8(p$8!$hzO~Nh3cV)daW0c@*yIEdI*U?LL|c7&Tcek&fNKa?su4BX8H2$RiShN z?2gZih_aRMo15SFEPW9GZv()|!Bk@M^}@zy0CpdMKRrEmX(Y7z@hpH?0%%)E4kv~h zp2yyk_X~9-Nrb*3B;CKF-kD5I&pheLf1UAoh~*waiVdscirxGxc0we(QwYxd{&bof!Cf z@XxpZYi0!l*pOMrbGVr~&blz1S!8dzWBKiWUQo%&sT-*kihEQ{1y~}skl#qFQREev zE_###zfL)P5X0FVH_>1kDTO1P^{PM7Tn`r<1q^Uc9_1r}BiRAzYEG;9Z5kKjYtRXO zFbY@T4rQ01ER}SjQ~3NLjG@Qv_Z6xt8Yz^!BkK1>%xI~js;MKl-&aYf z+9owZo@k_vc7~8qoQ*rkUSG$GDQz+>O1*BcM|8mcy1Z6a%`HKpO*-~Yf9Qkh!0QmHCj zmRtIQvpe3)no$Y3^junVr2`7K@ZPS@itBH^Hd87sVR9!jkEw6k9Gy&2wSbp%TM?R% ze-MY;T*z#dNoiJS9CPn-Yeuxn!x6csDr&HPA!xHAq@f#3adUL-I#8k_qi5h19$iS} zoZhKhSYC#=xQJ_Pdr@@;CFe5eRM`;I1jjRa(8^895=$`4#D~&hE1E5Gqi$W*iII5M nGEAXy$R;Bxg}$b>z5NUuv*FlpwAJbJiK(QxFg`XqPCvw7`B0u` delta 363 zcmZpvTT{iRW6QvhU^9`;jHTCVcfmx5_4QQ@42(StK+)vf#Dce4AFeVmFil}#U|x`( zQ<;{Xzi|lz0~=7@;6_GjVv6>{T{%Ft4}jP#11P}xk&O+=-UGxc8M!4D%ensF2b%W= z$X}6@pPcyBW$~O`O3h}43uSHcx=1d07g%~z$nS6HTe}| zA>*&fF--Q1nv>@+9h{uVET*{xte=5l9s@I&r30k7fCesMU||3{4M?(p#9wJnUcj6T zRKhk{kmc881r|0IgkS6SDb_ R%}+*7w$i+u%)D#{1_0V1ULybi diff --git a/resources/fonts/pm-font/processmaker-font.less b/resources/fonts/pm-font/processmaker-font.less index 47c2cef6b6..12fc19f013 100644 --- a/resources/fonts/pm-font/processmaker-font.less +++ b/resources/fonts/pm-font/processmaker-font.less @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1729628848686'); /* IE9*/ - src: url('processmaker-font.eot?t=1729628848686#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1729628848686") format("woff2"), - url("processmaker-font.woff?t=1729628848686") format("woff"), - url('processmaker-font.ttf?t=1729628848686') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1729628848686#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1730300772826'); /* IE9*/ + src: url('processmaker-font.eot?t=1730300772826#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1730300772826") format("woff2"), + url("processmaker-font.woff?t=1730300772826") format("woff"), + url('processmaker-font.ttf?t=1730300772826') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1730300772826#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -54,4 +54,5 @@ .fp-slack:before { content: "\ea26"; } .fp-slideshow:before { content: "\ea27"; } .fp-table:before { content: "\ea28"; } -.fp-unlink:before { content: "\ea29"; } +.fp-trash:before { content: "\ea29"; } +.fp-unlink:before { content: "\ea2a"; } diff --git a/resources/fonts/pm-font/processmaker-font.module.less b/resources/fonts/pm-font/processmaker-font.module.less index d20eedeea1..0d895b683b 100644 --- a/resources/fonts/pm-font/processmaker-font.module.less +++ b/resources/fonts/pm-font/processmaker-font.module.less @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1729628848686'); /* IE9*/ - src: url('processmaker-font.eot?t=1729628848686#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1729628848686") format("woff2"), - url("processmaker-font.woff?t=1729628848686") format("woff"), - url('processmaker-font.ttf?t=1729628848686') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1729628848686#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1730300772826'); /* IE9*/ + src: url('processmaker-font.eot?t=1730300772826#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1730300772826") format("woff2"), + url("processmaker-font.woff?t=1730300772826") format("woff"), + url('processmaker-font.ttf?t=1730300772826') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1730300772826#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -55,6 +55,7 @@ .fp-slack:before { content: "\ea26"; } .fp-slideshow:before { content: "\ea27"; } .fp-table:before { content: "\ea28"; } -.fp-unlink:before { content: "\ea29"; } +.fp-trash:before { content: "\ea29"; } +.fp-unlink:before { content: "\ea2a"; } } \ No newline at end of file diff --git a/resources/fonts/pm-font/processmaker-font.scss b/resources/fonts/pm-font/processmaker-font.scss index 7d8c587761..5e89b0667a 100644 --- a/resources/fonts/pm-font/processmaker-font.scss +++ b/resources/fonts/pm-font/processmaker-font.scss @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1729628848686'); /* IE9*/ - src: url('processmaker-font.eot?t=1729628848686#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1729628848686") format("woff2"), - url("processmaker-font.woff?t=1729628848686") format("woff"), - url('processmaker-font.ttf?t=1729628848686') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1729628848686#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1730300772826'); /* IE9*/ + src: url('processmaker-font.eot?t=1730300772826#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1730300772826") format("woff2"), + url("processmaker-font.woff?t=1730300772826") format("woff"), + url('processmaker-font.ttf?t=1730300772826') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1730300772826#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -54,7 +54,8 @@ .fp-slack:before { content: "\ea26"; } .fp-slideshow:before { content: "\ea27"; } .fp-table:before { content: "\ea28"; } -.fp-unlink:before { content: "\ea29"; } +.fp-trash:before { content: "\ea29"; } +.fp-unlink:before { content: "\ea2a"; } $fp-bpmn-action-by-email: "\ea01"; $fp-bpmn-data-connector: "\ea02"; @@ -96,5 +97,6 @@ $fp-slack-notification: "\ea25"; $fp-slack: "\ea26"; $fp-slideshow: "\ea27"; $fp-table: "\ea28"; -$fp-unlink: "\ea29"; +$fp-trash: "\ea29"; +$fp-unlink: "\ea2a"; diff --git a/resources/fonts/pm-font/processmaker-font.styl b/resources/fonts/pm-font/processmaker-font.styl index 47c2cef6b6..12fc19f013 100644 --- a/resources/fonts/pm-font/processmaker-font.styl +++ b/resources/fonts/pm-font/processmaker-font.styl @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1729628848686'); /* IE9*/ - src: url('processmaker-font.eot?t=1729628848686#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1729628848686") format("woff2"), - url("processmaker-font.woff?t=1729628848686") format("woff"), - url('processmaker-font.ttf?t=1729628848686') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1729628848686#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1730300772826'); /* IE9*/ + src: url('processmaker-font.eot?t=1730300772826#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1730300772826") format("woff2"), + url("processmaker-font.woff?t=1730300772826") format("woff"), + url('processmaker-font.ttf?t=1730300772826') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1730300772826#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -54,4 +54,5 @@ .fp-slack:before { content: "\ea26"; } .fp-slideshow:before { content: "\ea27"; } .fp-table:before { content: "\ea28"; } -.fp-unlink:before { content: "\ea29"; } +.fp-trash:before { content: "\ea29"; } +.fp-unlink:before { content: "\ea2a"; } diff --git a/resources/fonts/pm-font/processmaker-font.svg b/resources/fonts/pm-font/processmaker-font.svg index fa6114b22f..6828ce00f3 100644 --- a/resources/fonts/pm-font/processmaker-font.svg +++ b/resources/fonts/pm-font/processmaker-font.svg @@ -127,8 +127,11 @@ - + diff --git a/resources/fonts/pm-font/processmaker-font.symbol.svg b/resources/fonts/pm-font/processmaker-font.symbol.svg index 7e26d01231..727f3a2e6a 100644 --- a/resources/fonts/pm-font/processmaker-font.symbol.svg +++ b/resources/fonts/pm-font/processmaker-font.symbol.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/fonts/pm-font/processmaker-font.ttf b/resources/fonts/pm-font/processmaker-font.ttf index 1cfedfff36a43356b473161c39d188ea3f24c458..94fcc85595a74fc8453efb1ac03a203bee074abe 100644 GIT binary patch delta 841 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 G#3umEOJSM- delta 9675 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 mj?UFec~F9|coxek2j1{;T02+D%u;9B9UF{ -

ProcessMaker Icons4.12.0+alpha-2

+

ProcessMaker Icons4.12.0+alpha-3

Icons generated with svgtofont. For add new icons, please check the README file
@@ -394,6 +394,13 @@

fp-slideshow

fp-table

+
  • + +

    fp-trash

    +
    • +
  • -

    ProcessMaker Icons4.12.0+alpha-2

    +

    ProcessMaker Icons4.12.0+alpha-3

    Icons generated with svgtofont. For add new icons, please check the README file
    @@ -134,7 +134,7 @@

    ProcessMaker Icons4.12.0+alpha-2

      -

    • bpmn-action-by-email

      &#59905;

    • bpmn-data-connector

      &#59906;

    • bpmn-data-object

      &#59907;

    • bpmn-data-store

      &#59908;

    • bpmn-docusign

      &#59909;

    • bpmn-end-event

      &#59910;

    • bpmn-flowgenie

      &#59911;

    • bpmn-gateway

      &#59912;

    • bpmn-generic-gateway

      &#59913;

    • bpmn-idp

      &#59914;

    • bpmn-intermediate-event

      &#59915;

    • bpmn-pool

      &#59916;

    • bpmn-send-email

      &#59917;

    • bpmn-start-event

      &#59918;

    • bpmn-task

      &#59919;

    • bpmn-text-annotation

      &#59920;

    • brush-icon

      &#59921;

    • close

      &#59922;

    • cloud-download-outline

      &#59923;

    • copy

      &#59924;

    • css-icon

      &#59925;

    • desktop

      &#59926;

    • eye

      &#59927;

    • fields-icon

      &#59928;

    • flowgenie-outline

      &#59929;

    • folder-outline

      &#59930;

    • fullscreen

      &#59931;

    • github

      &#59932;

    • layout-icon

      &#59933;

    • map

      &#59934;

    • mobile

      &#59935;

    • pdf

      &#59936;

    • play-outline

      &#59937;

    • plus

      &#59938;

    • screen-outline

      &#59939;

    • script-outline

      &#59940;

    • slack-notification

      &#59941;

    • slack

      &#59942;

    • slideshow

      &#59943;

    • table

      &#59944;

    • unlink

      &#59945;
      • +

    • bpmn-action-by-email

      &#59905;

    • bpmn-data-connector

      &#59906;

    • bpmn-data-object

      &#59907;

    • bpmn-data-store

      &#59908;

    • bpmn-docusign

      &#59909;

    • bpmn-end-event

      &#59910;

    • bpmn-flowgenie

      &#59911;

    • bpmn-gateway

      &#59912;

    • bpmn-generic-gateway

      &#59913;

    • bpmn-idp

      &#59914;

    • bpmn-intermediate-event

      &#59915;

    • bpmn-pool

      &#59916;

    • bpmn-send-email

      &#59917;

    • bpmn-start-event

      &#59918;

    • bpmn-task

      &#59919;

    • bpmn-text-annotation

      &#59920;

    • brush-icon

      &#59921;

    • close

      &#59922;

    • cloud-download-outline

      &#59923;

    • copy

      &#59924;

    • css-icon

      &#59925;

    • desktop

      &#59926;

    • eye

      &#59927;

    • fields-icon

      &#59928;

    • flowgenie-outline

      &#59929;

    • folder-outline

      &#59930;

    • fullscreen

      &#59931;

    • github

      &#59932;

    • layout-icon

      &#59933;

    • map

      &#59934;

    • mobile

      &#59935;

    • pdf

      &#59936;

    • play-outline

      &#59937;

    • plus

      &#59938;

    • screen-outline

      &#59939;

    • script-outline

      &#59940;

    • slack-notification

      &#59941;

    • slack

      &#59942;

    • slideshow

      &#59943;

    • table

      &#59944;

    • trash

      &#59945;

    • unlink

      &#59946;

    diff --git a/resources/js/admin/devlink/components/BundleModal.vue b/resources/js/admin/devlink/components/BundleModal.vue index f91dce0542..53dab34878 100644 --- a/resources/js/admin/devlink/components/BundleModal.vue +++ b/resources/js/admin/devlink/components/BundleModal.vue @@ -1,13 +1,20 @@ - + - \ No newline at end of file + diff --git a/resources/js/admin/devlink/components/DeleteModal.vue b/resources/js/admin/devlink/components/DeleteModal.vue new file mode 100644 index 0000000000..748331ef89 --- /dev/null +++ b/resources/js/admin/devlink/components/DeleteModal.vue @@ -0,0 +1,97 @@ + + + diff --git a/resources/js/admin/devlink/components/Index.vue b/resources/js/admin/devlink/components/Index.vue index edf82d93ae..d8496118d5 100644 --- a/resources/js/admin/devlink/components/Index.vue +++ b/resources/js/admin/devlink/components/Index.vue @@ -4,6 +4,7 @@ import { useRouter, useRoute } from 'vue-router/composables'; import debounce from 'lodash/debounce'; import Status from './Status.vue'; import EllipsisMenu from '../../../components/shared/EllipsisMenu.vue'; +import DeleteModal from './DeleteModal.vue'; import { store } from '../common'; const vue = getCurrentInstance().proxy; @@ -11,6 +12,8 @@ const router = useRouter(); const route = useRoute(); const devlinks = ref([]); const editModal = ref(null); +const deleteModal = ref(null); +const deleteWarningTitle = ref(vue.$t("Delete Confirmation")); const filter = ref(""); const actions = [ { value: "edit-item", content: "Edit" }, @@ -115,20 +118,17 @@ const updateDevLink = () => { }); }; -const deleteDevLink = async (devlink) => { - selected.value = devlink; - const confirm = await vue.$bvModal.msgBoxConfirm( - vue.$t('Are you sure you want to delete {{name}}?', { - name: selected.value.name - }), { - okTitle: vue.$t('Ok'), - cancelTitle: vue.$t('Cancel') - }); +const deleteWarning = computed(() => { + const name = selected.value?.name; + return vue.$t('Are you sure you want to delete {{name}}? The action is irreversible.', { name }); +}); - if (!confirm) { - return; - } +const deleteDevLink = (devlink) => { + selected.value = { ...devlink }; + deleteModal.value.show(); +}; +const destroyDevLink = async () => { await ProcessMaker.apiClient.delete(`/devlink/${selected.value.id}`); load(); }; @@ -204,6 +204,9 @@ const urlIsValid = computed(() => { + + +

    { router.push({ name: 'bundle-assets', params: { id: bundle.id } }); } -const deleteWaring = computed(() => { +const deleteWarning = computed(() => { const name = selected?.value.name; - return vue.$t('Are you sure you want to delete {{name}}?', { name }); + return vue.$t('Are you sure you want to delete {{name}}? The action is irreversible.', { name }); }); const confirmPublishNewVersionText = computed(() => { @@ -215,15 +217,8 @@ const confirmPublishNewVersionText = computed(() => {
    - -

    {{ deleteWaring }}'

    -     + + @@ -295,6 +290,38 @@ const confirmPublishNewVersionText = computed(() => { } @import "styles/components/table"; +@import "styles/components/modal"; +::v-deep .delete-modal-style .modal-header .delete-icon { + width: 48px; + height: 48px; + background-color: #FEE6E5; + display: flex; + align-items: center; + justify-content: center; + border-radius: 8px; + color: #EC5962; + font-size: 26px; +} +::v-deep .delete-modal-style .modal-body-text { + font-size: 16px; + font-weight: 500; +} +::v-deep .delete-modal-style .modal-footer { + background-color: #FBFBFC; + border-top: 1px solid #E9ECF1; + border-bottom-left-radius: 16px; + border-bottom-right-radius: 16px; +} +::v-deep .delete-modal-style .modal-footer .btn-primary { + border: none; + background-color: #EC5962; + color: #FFFFFF; +} +::v-deep .delete-modal-style .modal-footer .btn-secondary { + border: 1px solid #D7DDE5; + background-color: #FFFFFF; + color: #20242A; +} .local-bundles-card { border-radius: 8px; diff --git a/resources/lang/en.json b/resources/lang/en.json index bfb39d394e..85c07b973f 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -143,6 +143,7 @@ "Are you sure you want to delete {{item}}? Deleting this asset will break any active tasks that are assigned.": "Are you sure you want to delete {{item}}? Deleting this asset will break any active tasks that are assigned.", "Are you sure you want to delete {{item}}?": "Are you sure you want to delete {{item}}?", "Are you sure you want to delete {{item}}": "Are your sure you want to delete {{item}}", + "Are you sure you want to delete {{name}}? The action is irreversible.": "Are you sure you want to delete {{name}}? The action is irreversible.", "Are you sure you want to delete expression {{item}}": "Are you sure you want to delete expression {{item}}", "Are you sure you want to delete the auth client": "Are you sure you want to delete the auth client", "Are you sure you want to delete the environment variable {{ name }} ?": "Are you sure you want to delete the environment variable {{ name }} ?", @@ -486,6 +487,7 @@ "Delete Categories": "Delete Categories", "Delete Category": "Delete Category", "Delete Comments": "Delete Comments", + "Delete Confirmation": "Delete Confirmation", "Delete Control": "Delete Control", "Delete Environment Variables": "Delete Environment Variables", "Delete Files": "Delete Files", diff --git a/resources/sass/components/modal.scss b/resources/sass/components/modal.scss new file mode 100644 index 0000000000..ab2d73f0bd --- /dev/null +++ b/resources/sass/components/modal.scss @@ -0,0 +1,34 @@ +::v-deep .modal-content { + border-radius: 16px; + border: 1px solid #E9ECF1; +} +::v-deep .modal-header { + border-bottom: none; +} +::v-deep .modal-title { + font-size: 24px; + font-weight: 500; +} +::v-deep .modal-body { + font-size: 14px; + font-weight: 400; +} +::v-deep .modal-footer { + border-top: none; + margin-top: 0px !important; +} +::v-deep .modal-footer .btn { + border-radius: 8px; + font-size: 14px; + font-weight: 500; +} +::v-deep .modal-footer .btn-secondary { + background-color: white; + border: none; + color: #20242A; + text-transform: none; +} +::v-deep .modal-footer .btn-primary { + background-color: #2773F3; + text-transform: none; +} \ No newline at end of file From 7f175d61d5cce7f6313b2be86210b3667148b490 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Wed, 30 Oct 2024 14:22:30 -0700 Subject: [PATCH 04/31] Fix header positioning --- resources/js/admin/devlink/components/Header.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/js/admin/devlink/components/Header.vue b/resources/js/admin/devlink/components/Header.vue index 8dc94403fe..6465c80415 100644 --- a/resources/js/admin/devlink/components/Header.vue +++ b/resources/js/admin/devlink/components/Header.vue @@ -31,5 +31,6 @@ const props = defineProps({ \ No newline at end of file From 7350a24cfa148e5b3f0db7a9edc73ef5eb10dc5e Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Wed, 30 Oct 2024 14:22:51 -0700 Subject: [PATCH 05/31] Show loading for instance bundle list --- resources/js/admin/devlink/components/Instance.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/js/admin/devlink/components/Instance.vue b/resources/js/admin/devlink/components/Instance.vue index 7edea5cb19..7a130aa3ec 100644 --- a/resources/js/admin/devlink/components/Instance.vue +++ b/resources/js/admin/devlink/components/Instance.vue @@ -10,6 +10,7 @@ const router = useRouter(); const route = useRoute(); const bundles = ref([]); +const loading = ref(true); const filter = ref(""); const warnings = ref([]); const showInstallModal = ref(false); @@ -66,6 +67,7 @@ const load = () => { .get(`/devlink/${route.params.id}/remote-bundles?filter=${filter.value}`) .then((result) => { bundles.value = result.data.data; + loading.value = false; }); }; @@ -114,7 +116,11 @@ const executeUpdate = (updateType) => {
    +
    + {{ $t("Loading...") }} +
    Date: Wed, 30 Oct 2024 14:23:18 -0700 Subject: [PATCH 06/31] Add open to ellipsis menu --- resources/js/admin/devlink/components/LocalBundles.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/js/admin/devlink/components/LocalBundles.vue b/resources/js/admin/devlink/components/LocalBundles.vue index a6b1d87f32..eba9ee696a 100644 --- a/resources/js/admin/devlink/components/LocalBundles.vue +++ b/resources/js/admin/devlink/components/LocalBundles.vue @@ -22,6 +22,7 @@ const updateBundle = ref(null); const updatesAvailable = reactive({}); const actions = [ + { value: "open-item", content: "Open" }, { value: "increase-item", content: "Publish New Version", conditional: "if(not(dev_link_id), true, false)" }, { value: "update-item", content: "Update Bundle", conditional: "if(update_available, true, false)" }, { value: "reinstall-item", content: "Reinstall Bundle", conditional: "if(dev_link_id, true, false)" }, @@ -100,6 +101,9 @@ const createNewBundle = () => { const onNavigate = (action, data, index) => { switch (action.value) { + case "open-item": + goToBundleAssets(data); + break; case "edit-item": edit(data); break; From 00ba5b1af4d5e6da867803eed30d9335144dfb9b Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Wed, 30 Oct 2024 18:32:06 -0400 Subject: [PATCH 07/31] Adding new component to ScreenComponents.php --- ProcessMaker/Templates/ScreenComponents.php | 1 + 1 file changed, 1 insertion(+) diff --git a/ProcessMaker/Templates/ScreenComponents.php b/ProcessMaker/Templates/ScreenComponents.php index bd1176fbf3..9ac171b60f 100644 --- a/ProcessMaker/Templates/ScreenComponents.php +++ b/ProcessMaker/Templates/ScreenComponents.php @@ -29,6 +29,7 @@ public static function getComponents() 'FormRecordList', 'FormLoop', 'FormNestedScreen', + 'FormCollectionRecordControl', 'FormButton', 'FileUpload', 'FileDownload', From 370df01cb43ff29bb339b618636eb1f795a29534 Mon Sep 17 00:00:00 2001 From: Fabio Date: Thu, 31 Oct 2024 09:51:22 -0400 Subject: [PATCH 08/31] FOUR-19815:UI: The mouse over the links does not show the link --- .../jscomposition/system/table/cell/TruncatedOptionsCell.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/jscomposition/system/table/cell/TruncatedOptionsCell.vue b/resources/jscomposition/system/table/cell/TruncatedOptionsCell.vue index 2dd0e0a5ce..5b5489b160 100644 --- a/resources/jscomposition/system/table/cell/TruncatedOptionsCell.vue +++ b/resources/jscomposition/system/table/cell/TruncatedOptionsCell.vue @@ -44,7 +44,7 @@ {{ getValueOption(option, index) }} From 479bfca82a08f454abc876f840471d6ba60450fc Mon Sep 17 00:00:00 2001 From: Henry Jonas Date: Thu, 31 Oct 2024 11:07:25 -0400 Subject: [PATCH 09/31] FOUR-19924 : Title in cases pages is empty --- resources/views/cases/casesMain.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/cases/casesMain.blade.php b/resources/views/cases/casesMain.blade.php index 5c945a6965..dd56200b0c 100644 --- a/resources/views/cases/casesMain.blade.php +++ b/resources/views/cases/casesMain.blade.php @@ -1,6 +1,7 @@ @extends('layouts.layout',['content_margin' => '', 'overflow-auto' => '']) @section('title') + {{ __('Cases') }} @endsection @section('sidebar') From a53f24756d94aa95ef6bb3bcec061b152feac86e Mon Sep 17 00:00:00 2001 From: Miguel Angel Date: Thu, 31 Oct 2024 15:02:41 -0400 Subject: [PATCH 10/31] feat: ref cases participated population --- .../CaseParticipatedRepository.php | 122 ++++++++---------- ProcessMaker/Repositories/CaseRepository.php | 18 +-- 2 files changed, 60 insertions(+), 80 deletions(-) diff --git a/ProcessMaker/Repositories/CaseParticipatedRepository.php b/ProcessMaker/Repositories/CaseParticipatedRepository.php index 7c50b6fb08..48a3b19f77 100644 --- a/ProcessMaker/Repositories/CaseParticipatedRepository.php +++ b/ProcessMaker/Repositories/CaseParticipatedRepository.php @@ -2,10 +2,10 @@ namespace ProcessMaker\Repositories; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use ProcessMaker\Models\CaseParticipated; use ProcessMaker\Models\CaseStarted; -use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface; class CaseParticipatedRepository { @@ -20,74 +20,72 @@ class CaseParticipatedRepository * Store a new case participated. * * @param CaseStarted $case - * @param TokenInterface $token + * @param int $userId * @return void */ - public function create(CaseStarted $case, TokenInterface $token): void + public function create(CaseStarted $case, int $userId): void { - if ($this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) { - return; - } - try { - $processData = CaseUtils::extractData($token->processRequest->process, 'PROCESS'); - $requestData = CaseUtils::extractData($token->processRequest, 'REQUEST'); - $taskData = CaseUtils::extractData($token, 'TASK'); - - CaseParticipated::create([ - 'user_id' => $token->user->id, - 'case_number' => $case->case_number, - 'case_title' => $case->case_title, - 'case_title_formatted' => $case->case_title_formatted, - 'case_status' => $case->case_status, - 'processes' => CaseUtils::storeProcesses(collect(), $processData), - 'requests' => CaseUtils::storeRequests(collect(), $requestData), - 'request_tokens' => CaseUtils::storeRequestTokens(collect(), $token->getKey()), - 'tasks' => CaseUtils::storeTasks(collect(), $taskData), - 'participants' => $case->participants, - 'initiated_at' => $case->initiated_at, - 'completed_at' => null, - 'keywords' => $case->keywords, - ]); + CaseParticipated::updateOrCreate( + [ + 'case_number' => $case->case_number, + 'user_id' => $userId, + ], + $this->mapCaseToArray($case, $userId) + ); } catch (\Exception $e) { - Log::error('CaseException: ' . $e->getMessage()); - Log::error('CaseException: ' . $e->getTraceAsString()); + $this->logException($e); } } /** - * Update the case participated. + * Update the cases participated. * * @param CaseStarted $case - * @param TokenInterface $token * @return void */ - public function update(CaseStarted $case, TokenInterface $token) + public function update(CaseStarted $case): void { try { - if (!$this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) { - return; - } + CaseParticipated::where('case_number', $case->case_number) + ->update($this->mapCaseToArray($case)); + } catch (\Exception $e) { + $this->logException($e); + } + } - $processData = CaseUtils::extractData($token->processRequest->process, 'PROCESS'); - $requestData = CaseUtils::extractData($token->processRequest, 'REQUEST'); - $taskData = CaseUtils::extractData($token, 'TASK'); + /** + * Maps properties of a `CaseStarted` object to an array, optionally including a user ID. + * + * @param CaseStarted case Takes a `CaseStarted` object and parameter as input and returns an array with specific + * properties mapped from the `CaseStarted` object. + * @param int userId Takes an optional `userId` parameter. + * + * @return array An array containing various properties of a CaseStarted object. If a userId is + * provided, it will also include the user_id in the returned array. + */ + private function mapCaseToArray(CaseStarted $case, int $userId = null): array + { + $data = [ + 'case_number' => $case->case_number, + 'case_title' => $case->case_title, + 'case_title_formatted' => $case->case_title_formatted, + 'case_status' => $case->case_status, + 'processes' => $case->processes, + 'requests' => $case->requests, + 'request_tokens' => $case->request_tokens, + 'tasks' => $case->tasks, + 'participants' => $case->participants, + 'initiated_at' => $case->initiated_at, + 'completed_at' => $case->completed_at, + 'keywords' => $case->keywords, + ]; - $this->caseParticipated->updateOrFail([ - 'case_title' => $case->case_title, - 'case_title_formatted' => $case->case_title_formatted, - 'case_status' => $case->case_status, - 'processes' => CaseUtils::storeProcesses($this->caseParticipated->processes, $processData), - 'requests' => CaseUtils::storeRequests($this->caseParticipated->requests, $requestData), - 'request_tokens' => CaseUtils::storeRequestTokens($this->caseParticipated->request_tokens, $token->getKey()), - 'tasks' => CaseUtils::storeTasks($this->caseParticipated->tasks, $taskData), - 'participants' => $case->participants, - 'keywords' => $case->keywords, - ]); - } catch (\Exception $e) { - Log::error('CaseException: ' . $e->getMessage()); - Log::error('CaseException: ' . $e->getTraceAsString()); + if ($userId !== null) { + $data['user_id'] = $userId; } + + return $data; } /** @@ -103,27 +101,13 @@ public function updateStatus(int $caseNumber, array $statusData) CaseParticipated::where('case_number', $caseNumber) ->update($statusData); } catch (\Exception $e) { - Log::error('CaseException: ' . $e->getMessage()); - Log::error('CaseException: ' . $e->getTraceAsString()); + $this->logException($e); } } - /** - * Check if a case participated exists. - * If it exists, store the instance in the property. - * The property is used to update the JSON fields of the case participated. - * - * @param int $userId - * @param int $caseNumber - * - * @return bool - */ - private function checkIfCaseParticipatedExist(int $userId, int $caseNumber): bool + private function logException(\Exception $e): void { - $this->caseParticipated = CaseParticipated::where('user_id', $userId) - ->where('case_number', $caseNumber) - ->first(); - - return !is_null($this->caseParticipated); + Log::error('CaseException: ' . $e->getMessage()); + Log::error('CaseException: ' . $e->getTraceAsString()); } } diff --git a/ProcessMaker/Repositories/CaseRepository.php b/ProcessMaker/Repositories/CaseRepository.php index 21233a6111..48f758f182 100644 --- a/ProcessMaker/Repositories/CaseRepository.php +++ b/ProcessMaker/Repositories/CaseRepository.php @@ -131,7 +131,7 @@ public function updateStatus(ExecutionInstanceInterface $instance): void ]; if ($caseStatus === CaseStatusConstants::COMPLETED) { - $data['completed_at'] = Carbon::now(); + $data['completed_at'] = $instance->completed_at; } // Update the case started and case participated @@ -153,19 +153,13 @@ private function updateParticipants(TokenInterface $token): void { $user = $token->user; - if (!$user) { - return; - } - - $participantExists = $this->case->participants->contains($user->id); + $this->case->participants = CaseUtils::storeParticipants($this->case->participants, $user?->id); - if (!$participantExists) { - $this->case->participants->push($user->id); - - $this->caseParticipatedRepository->create($this->case, $token); + if (!is_null($user?->id)) { + $this->caseParticipatedRepository->create($this->case, $user->id); } - $this->caseParticipatedRepository->update($this->case, $token); + $this->caseParticipatedRepository->update($this->case); } /** @@ -206,6 +200,8 @@ private function updateSubProcesses(ExecutionInstanceInterface $instance): void $this->case->requests = CaseUtils::storeRequests($this->case->requests, $requestData); $this->case->saveOrFail(); + + $this->caseParticipatedRepository->update($this->case); } catch (\Exception $e) { Log::error('CaseException: ' . $e->getMessage()); Log::error('CaseException: ' . $e->getTraceAsString()); From b6d4362bd989d5c6155e1fd12cd4402abd8bc3c0 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Thu, 31 Oct 2024 15:48:03 -0400 Subject: [PATCH 11/31] FOUR-19949 --- .../Commands/UpdateCommentsCaseNumber.php | 32 +++++++++++++------ ...8_113301_populate_comments_case_number.php | 32 +++++++++++++------ 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/ProcessMaker/Console/Commands/UpdateCommentsCaseNumber.php b/ProcessMaker/Console/Commands/UpdateCommentsCaseNumber.php index ca848f2433..544ba16a74 100644 --- a/ProcessMaker/Console/Commands/UpdateCommentsCaseNumber.php +++ b/ProcessMaker/Console/Commands/UpdateCommentsCaseNumber.php @@ -42,11 +42,17 @@ public function handle() ->select('comments.id', 'process_requests.case_number') ->orderBy('comments.id', 'asc') ->chunk($chunkSize, function ($comments) { - foreach ($comments as $comment) { - // Update the comments.case_number with ptrocess_requests.case_number - DB::table('comments') - ->where('id', $comment->id) - ->update(['case_number' => $comment->case_number]); + $updates = $comments->mapWithKeys(function ($comment) { + return [$comment->id => ['case_number' => $comment->case_number]]; + })->toArray(); + // Execute in bath the update + if (!empty($updates)) { + $query = 'UPDATE comments SET case_number = CASE id'; + foreach ($updates as $id => $data) { + $query .= " WHEN {$id} THEN '{$data['case_number']}'"; + } + $query .= ' END WHERE id IN (' . implode(',', array_keys($updates)) . ')'; + DB::statement($query); } }); // Update the comments related to ProcessRequest @@ -57,11 +63,17 @@ public function handle() ->select('comments.id', 'process_requests.case_number') ->orderBy('comments.id', 'asc') ->chunk($chunkSize, function ($comments) { - foreach ($comments as $comment) { - // Update the comments.case_number with ptrocess_requests.case_number - DB::table('comments') - ->where('id', $comment->id) - ->update(['case_number' => $comment->case_number]); + $updates = $comments->mapWithKeys(function ($comment) { + return [$comment->id => ['case_number' => $comment->case_number]]; + })->toArray(); + // Execute in bath the update + if (!empty($updates)) { + $query = 'UPDATE comments SET case_number = CASE id'; + foreach ($updates as $id => $data) { + $query .= " WHEN {$id} THEN '{$data['case_number']}'"; + } + $query .= ' END WHERE id IN (' . implode(',', array_keys($updates)) . ')'; + DB::statement($query); } }); diff --git a/upgrades/2024_10_08_113301_populate_comments_case_number.php b/upgrades/2024_10_08_113301_populate_comments_case_number.php index ae4da17747..cb58995a21 100644 --- a/upgrades/2024_10_08_113301_populate_comments_case_number.php +++ b/upgrades/2024_10_08_113301_populate_comments_case_number.php @@ -43,11 +43,17 @@ public function up(): void ->select('comments.id', 'process_requests.case_number') ->orderBy('comments.id', 'asc') ->chunk($chunkSize, function ($comments) { - foreach ($comments as $comment) { - // Update the comments.case_number with ptrocess_requests.case_number - DB::table('comments') - ->where('id', $comment->id) - ->update(['case_number' => $comment->case_number]); + $updates = $comments->mapWithKeys(function ($comment) { + return [$comment->id => ['case_number' => $comment->case_number]]; + })->toArray(); + // Execute in bath the update + if (!empty($updates)) { + $query = 'UPDATE comments SET case_number = CASE id'; + foreach ($updates as $id => $data) { + $query .= " WHEN {$id} THEN '{$data['case_number']}'"; + } + $query .= ' END WHERE id IN (' . implode(',', array_keys($updates)) . ')'; + DB::statement($query); } }); // Update the comments related to ProcessRequest @@ -58,11 +64,17 @@ public function up(): void ->select('comments.id', 'process_requests.case_number') ->orderBy('comments.id', 'asc') ->chunk($chunkSize, function ($comments) { - foreach ($comments as $comment) { - // Update the comments.case_number with ptrocess_requests.case_number - DB::table('comments') - ->where('id', $comment->id) - ->update(['case_number' => $comment->case_number]); + $updates = $comments->mapWithKeys(function ($comment) { + return [$comment->id => ['case_number' => $comment->case_number]]; + })->toArray(); + // Execute in bath the update + if (!empty($updates)) { + $query = 'UPDATE comments SET case_number = CASE id'; + foreach ($updates as $id => $data) { + $query .= " WHEN {$id} THEN '{$data['case_number']}'"; + } + $query .= ' END WHERE id IN (' . implode(',', array_keys($updates)) . ')'; + DB::statement($query); } }); } From 73a059dfabaaf0b8431fee261195491ff1ff10fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Thu, 31 Oct 2024 16:25:22 -0400 Subject: [PATCH 12/31] fix the edit modal styles --- resources/js/admin/devlink/components/BundleModal.vue | 2 +- resources/js/admin/devlink/components/DeleteModal.vue | 3 +++ resources/sass/components/modal.scss | 8 +++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/resources/js/admin/devlink/components/BundleModal.vue b/resources/js/admin/devlink/components/BundleModal.vue index 53dab34878..abc1c3ae41 100644 --- a/resources/js/admin/devlink/components/BundleModal.vue +++ b/resources/js/admin/devlink/components/BundleModal.vue @@ -36,7 +36,7 @@ }); const canEdit = (bundle) => { - return bundle.dev_link === null; + return bundle.dev_link_id === null; }; const onOk = () => { diff --git a/resources/js/admin/devlink/components/DeleteModal.vue b/resources/js/admin/devlink/components/DeleteModal.vue index 748331ef89..2513bca087 100644 --- a/resources/js/admin/devlink/components/DeleteModal.vue +++ b/resources/js/admin/devlink/components/DeleteModal.vue @@ -89,6 +89,9 @@ export default { background-color: #EC5962; color: #FFFFFF; } +::v-deep .modal-footer .btn-primary:hover { + background-color: #c74a51; /* Color más oscuro para el hover */ +} ::v-deep .modal-footer .btn-secondary { border: 1px solid #D7DDE5; background-color: #FFFFFF; diff --git a/resources/sass/components/modal.scss b/resources/sass/components/modal.scss index ab2d73f0bd..91b412377a 100644 --- a/resources/sass/components/modal.scss +++ b/resources/sass/components/modal.scss @@ -28,7 +28,13 @@ color: #20242A; text-transform: none; } +::v-deep .modal-footer .btn-secondary:hover { + background-color: #E9ECF1; +} ::v-deep .modal-footer .btn-primary { background-color: #2773F3; text-transform: none; -} \ No newline at end of file +} +::v-deep .modal-footer .btn-primary:hover { + background-color: #1E5AC7; +} From 5f025b8764463c1e86421a15688090e2f4c020ba Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Thu, 31 Oct 2024 16:46:39 -0400 Subject: [PATCH 13/31] adding some validations --- .../Commands/UpdateCommentsCaseNumber.php | 17 +++++++++++++---- ..._08_113301_populate_comments_case_number.php | 11 +++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ProcessMaker/Console/Commands/UpdateCommentsCaseNumber.php b/ProcessMaker/Console/Commands/UpdateCommentsCaseNumber.php index 544ba16a74..4f0ae7f986 100644 --- a/ProcessMaker/Console/Commands/UpdateCommentsCaseNumber.php +++ b/ProcessMaker/Console/Commands/UpdateCommentsCaseNumber.php @@ -4,11 +4,10 @@ use Illuminate\Console\Command; use Illuminate\Support\Facades\DB; -use ProcessMaker\Models\Comment; class UpdateCommentsCaseNumber extends Command { - const CHUNK_SIZE = 5000; + const CHUNK_SIZE = 2000; /** * The name and signature of the console command. @@ -43,7 +42,11 @@ public function handle() ->orderBy('comments.id', 'asc') ->chunk($chunkSize, function ($comments) { $updates = $comments->mapWithKeys(function ($comment) { - return [$comment->id => ['case_number' => $comment->case_number]]; + if (!is_null($comment->case_number) && !empty($comment->case_number)) { + return [$comment->id => ['case_number' => $comment->case_number]]; + } + + return []; })->toArray(); // Execute in bath the update if (!empty($updates)) { @@ -53,6 +56,7 @@ public function handle() } $query .= ' END WHERE id IN (' . implode(',', array_keys($updates)) . ')'; DB::statement($query); + $this->info(count($updates) . ' comments updated in this chunk related to ProcessRequestToken'); } }); // Update the comments related to ProcessRequest @@ -64,7 +68,11 @@ public function handle() ->orderBy('comments.id', 'asc') ->chunk($chunkSize, function ($comments) { $updates = $comments->mapWithKeys(function ($comment) { - return [$comment->id => ['case_number' => $comment->case_number]]; + if (!is_null($comment->case_number) && !empty($comment->case_number)) { + return [$comment->id => ['case_number' => $comment->case_number]]; + } + + return []; })->toArray(); // Execute in bath the update if (!empty($updates)) { @@ -74,6 +82,7 @@ public function handle() } $query .= ' END WHERE id IN (' . implode(',', array_keys($updates)) . ')'; DB::statement($query); + $this->info(count($updates) . ' comments updated in this chunk related to ProcessRequest'); } }); diff --git a/upgrades/2024_10_08_113301_populate_comments_case_number.php b/upgrades/2024_10_08_113301_populate_comments_case_number.php index cb58995a21..55cfca4b53 100644 --- a/upgrades/2024_10_08_113301_populate_comments_case_number.php +++ b/upgrades/2024_10_08_113301_populate_comments_case_number.php @@ -1,11 +1,12 @@ orderBy('comments.id', 'asc') ->chunk($chunkSize, function ($comments) { $updates = $comments->mapWithKeys(function ($comment) { - return [$comment->id => ['case_number' => $comment->case_number]]; + if (!is_null($comment->case_number) && !empty($comment->case_number)) { + return [$comment->id => ['case_number' => $comment->case_number]]; + } + + return []; })->toArray(); // Execute in bath the update if (!empty($updates)) { @@ -54,6 +59,7 @@ public function up(): void } $query .= ' END WHERE id IN (' . implode(',', array_keys($updates)) . ')'; DB::statement($query); + Log::info(count($updates) . ' comments updated in this chunk related to ProcessRequestToken'); } }); // Update the comments related to ProcessRequest @@ -75,6 +81,7 @@ public function up(): void } $query .= ' END WHERE id IN (' . implode(',', array_keys($updates)) . ')'; DB::statement($query); + Log::info(count($updates) . ' comments updated in this chunk related to ProcessRequest'); } }); } From 017a4bfa1497905acddf4c5b8814131b64d7f1fc Mon Sep 17 00:00:00 2001 From: Miguel Angel Date: Thu, 31 Oct 2024 17:41:04 -0400 Subject: [PATCH 14/31] fix: refactor cases participated upgrade --- ..._09_152947_populate_cases_participated.php | 126 ++++++++++++++---- 1 file changed, 99 insertions(+), 27 deletions(-) diff --git a/upgrades/2024_10_09_152947_populate_cases_participated.php b/upgrades/2024_10_09_152947_populate_cases_participated.php index 4363a834a8..a2b63d838d 100644 --- a/upgrades/2024_10_09_152947_populate_cases_participated.php +++ b/upgrades/2024_10_09_152947_populate_cases_participated.php @@ -18,6 +18,10 @@ public function up() try { DB::table('cases_participated')->truncate(); + $this->createProcessRequestsTempTable(); + $this->createProcessRequestTokensTempTable(); + $this->process_request_participants_temp(); + $this->getProcessRequests() ->chunk(1000, function ($rows) { $casesParticipated = []; @@ -73,45 +77,113 @@ public function down() DB::table('cases_participated')->truncate(); } + protected function createProcessRequestsTempTable(): void + { + DB::statement('DROP TEMPORARY TABLE IF EXISTS process_requests_temp'); + + $query = DB::table('process_requests as pr') + ->select( + 'pr.id', + 'pr.name', + 'pr.case_number', + 'pr.case_title', + 'pr.case_title_formatted', + 'pr.status', + 'pr.parent_request_id', + 'pr.initiated_at', + 'pr.completed_at', + 'pr.created_at', + 'pr.updated_at', + 'pc.id as process_id', + 'pc.name as process_name' + ) + ->join('processes as pc', 'pr.process_id', '=', 'pc.id') + ->whereIn('pr.status', ['ACTIVE', 'COMPLETED']) + ->whereNotNull('pr.case_number'); + + DB::statement("CREATE TEMPORARY TABLE IF NOT EXISTS process_requests_temp AS ({$query->toSql()})", $query->getBindings()); + } + + protected function createProcessRequestTokensTempTable(): void + { + DB::statement('DROP TEMPORARY TABLE IF EXISTS process_request_tokens_temp'); + + $query = DB::table('process_request_tokens as prt') + ->select([ + 'prt.id', + DB::raw('CAST(prt.id AS CHAR(50)) as task_id'), + 'prt.element_name', + 'prt.element_id', + 'prt.element_type', + 'prt.process_id', + 'prt.status', + 'prt.user_id', + 'prt.process_request_id', + ]) + ->join('process_requests_temp as prt2', 'prt.process_request_id', '=', 'prt2.id') + ->whereIn('prt.element_type', ['task', 'callActivity', 'scriptTask']) + ->whereNotNull('prt.user_id'); + + DB::statement("CREATE TEMPORARY TABLE IF NOT EXISTS process_request_tokens_temp AS ({$query->toSql()})", $query->getBindings()); + } + + protected function process_request_participants_temp(): void + { + DB::statement('DROP TEMPORARY TABLE IF EXISTS process_request_participants_temp'); + + $query = DB::table('process_request_tokens_temp as prt2') + ->select([ + DB::raw('JSON_ARRAYAGG(prt2.user_id) as participants'), + 'pr2.case_number' + ]) + ->join('process_requests_temp as pr2', 'prt2.process_request_id', '=', 'pr2.id') + ->groupBy('pr2.case_number'); + + DB::statement("CREATE TEMPORARY TABLE IF NOT EXISTS process_request_participants_temp AS ({$query->toSql()})", $query->getBindings()); + } + protected function getProcessRequests(): Builder { - return DB::table('process_requests as pr') + return DB::table('process_requests_temp as pr') ->select([ - 'u.id as user_id', + 'prt.user_id', 'pr.case_number', 'pr.case_title', 'pr.case_title_formatted', DB::raw("IF(pr.status = 'ACTIVE', 'IN_PROGRESS', pr.status) as case_status"), - DB::raw('JSON_ARRAYAGG(JSON_OBJECT("id", pc.id, "name", pc.name)) as processes'), - DB::raw('JSON_ARRAYAGG(JSON_OBJECT("id", pr.id, "name", pc.name, "parent_request_id", pr.parent_request_id)) as requests'), - DB::raw('JSON_ARRAYAGG(prt.id) as request_tokens'), - DB::raw('JSON_ARRAYAGG(IF(prt.element_type != "callActivity", JSON_OBJECT("id", prt.id, "name", prt.element_name, "element_id", prt.element_id, "process_id", prt.process_id), NULL)) as tasks'), + DB::raw("JSON_ARRAYAGG(JSON_OBJECT('id', pr.process_id, 'name', pr.process_name)) as processes"), + DB::raw("JSON_ARRAYAGG(JSON_OBJECT('id', pr.id, 'name', pr.name, 'parent_request_id', pr.parent_request_id)) as requests"), + DB::raw("JSON_ARRAYAGG(prt.id) as request_tokens"), + DB::raw("JSON_ARRAYAGG( + IF(prt.element_type != 'callActivity', + JSON_OBJECT( + 'id', prt.task_id, + 'name', prt.element_name, + 'element_id', prt.element_id, + 'process_id', prt.process_id, + 'status', prt.status + ), JSON_OBJECT()) + ) as tasks"), 'par.participants', 'pr.initiated_at', 'pr.completed_at', 'pr.created_at', - 'pr.updated_at', + 'pr.updated_at' ]) - ->join('process_request_tokens as prt', 'pr.id', '=', 'prt.process_request_id') - ->join('users as u', 'prt.user_id', '=', 'u.id') - ->join('processes as pc', 'pr.process_id', '=', 'pc.id') - ->joinSub( - DB::table('users as u2') - ->selectRaw('JSON_ARRAYAGG(u2.id) as participants, pr2.case_number') - ->join('process_request_tokens as prt2', 'u2.id', '=', 'prt2.user_id') - ->join('process_requests as pr2', 'prt2.process_request_id', '=', 'pr2.id') - ->whereNotNull('pr2.case_number') - ->groupBy('pr2.case_number'), - 'par', - 'par.case_number', - '=', - 'pr.case_number' + ->join('process_request_tokens_temp as prt', 'pr.id', '=', 'prt.process_request_id') + ->join('process_request_participants_temp as par', 'pr.case_number', '=', 'par.case_number') + ->groupBy( + 'prt.user_id', + 'pr.case_number', + 'pr.case_title', + 'pr.case_title_formatted', + DB::raw("IF(pr.status = 'ACTIVE', 'IN_PROGRESS', pr.status)"), + 'par.participants', + 'pr.initiated_at', + 'pr.completed_at', + 'pr.created_at', + 'pr.updated_at' ) - ->whereIn('pr.status', ['ACTIVE', 'COMPLETED']) - ->whereIn('prt.element_type', ['task', 'callActivity', 'scriptTask']) - ->whereNotNull('pr.case_number') - ->groupBy('u.id', 'pr.id') - ->orderBy('pr.id') - ->orderBy('u.id'); + ->orderBy('pr.case_number'); } } From ecdb1c7c665bf66a1c4c8fee77a3e32d6c94f43a Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Thu, 31 Oct 2024 18:09:04 -0400 Subject: [PATCH 15/31] solving issue #2 --- .../2024_10_08_113301_populate_comments_case_number.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/upgrades/2024_10_08_113301_populate_comments_case_number.php b/upgrades/2024_10_08_113301_populate_comments_case_number.php index 55cfca4b53..ff17af603c 100644 --- a/upgrades/2024_10_08_113301_populate_comments_case_number.php +++ b/upgrades/2024_10_08_113301_populate_comments_case_number.php @@ -71,7 +71,11 @@ public function up(): void ->orderBy('comments.id', 'asc') ->chunk($chunkSize, function ($comments) { $updates = $comments->mapWithKeys(function ($comment) { - return [$comment->id => ['case_number' => $comment->case_number]]; + if (!is_null($comment->case_number) && !empty($comment->case_number)) { + return [$comment->id => ['case_number' => $comment->case_number]]; + } + + return []; })->toArray(); // Execute in bath the update if (!empty($updates)) { From 1910c2a48b54889fb4062ef608236c6fd83b6a16 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Thu, 31 Oct 2024 19:21:24 -0400 Subject: [PATCH 16/31] FOUR-19937 `Reassignment field` does not have the correct UI --- .../components/ProcessesPermissions.vue | 42 +++++++++++++++---- resources/views/processes/edit.blade.php | 1 + 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/resources/js/processes/components/ProcessesPermissions.vue b/resources/js/processes/components/ProcessesPermissions.vue index 16403e6aa3..5167a70d56 100644 --- a/resources/js/processes/components/ProcessesPermissions.vue +++ b/resources/js/processes/components/ProcessesPermissions.vue @@ -1,7 +1,7 @@