From 705f2fae32e73461652414bc40219557e4198175 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Thu, 12 Nov 2026 13:25:55 -0400 Subject: [PATCH] feat(FOUR-34380):Subprocess Inline to group task to reduce the visualizacion of BPMN - FE --- ProcessMaker/Models/Process.php | 55 +++------------------------ tests/Feature/Api/ConvertBPMNTest.php | 12 ++++-- 2 files changed, 15 insertions(+), 52 deletions(-) diff --git a/ProcessMaker/Models/Process.php b/ProcessMaker/Models/Process.php index f7390f1aaa..aab6f6393c 100644 --- a/ProcessMaker/Models/Process.php +++ b/ProcessMaker/Models/Process.php @@ -32,6 +32,7 @@ use ProcessMaker\Nayra\Managers\WorkflowManagerDefault; use ProcessMaker\Nayra\Storage\BpmnDocument; use ProcessMaker\Package\WebEntry\Models\WebentryRoute; +use ProcessMaker\Providers\WorkflowServiceProvider; use ProcessMaker\Repositories\ProcessExecutionRawRepository; use ProcessMaker\Rules\BPMNValidation; use ProcessMaker\Traits\Exportable; @@ -1487,18 +1488,6 @@ public function convertFromExternalBPM() $document = new BpmnDocument(); $document->loadXML($this->bpmn); $conversions = 0; - // Replace subProcess by callActivity - $subProcesses = $document->getElementsByTagNameNS(BpmnDocument::BPMN_MODEL, 'subProcess'); - while ($subProcess = $subProcesses->item(0)) { - $conversions++; - $name = $subProcess->getAttribute('name'); - $callActivity = $this->createCallActivityFrom($subProcess); - $subProcess->parentNode->replaceChild($callActivity, $subProcess); - $warnings[] = [ - 'title' => __('Element conversion'), - 'text' => __('SubProcess Conversion', ['name' => $name]), - ]; - } // Replace sendTask to scriptTask $sendTasks = $document->getElementsByTagNameNS(BpmnDocument::BPMN_MODEL, 'sendTask'); while ($sendTask = $sendTasks->item(0)) { @@ -1512,51 +1501,19 @@ public function convertFromExternalBPM() ]; } if ($conversions) { + $this->ensurePmNamespaceOnDefinitions($document); $this->bpmn = $document->saveXml(); $this->bpmnDefinitions = null; } $this->warnings = $warnings; } - /** - * Convert a subProcess into a callActivity - * - * @param BPMNElement $subProcess - * @return void - */ - private function createCallActivityFrom($subProcess) + private function ensurePmNamespaceOnDefinitions(BpmnDocument $document): void { - $element = $this->cloneNodeAs($subProcess, 'callActivity', ['outgoing', 'incoming'], [], ['triggeredByEvent']); - - $definitions = $subProcess->ownerDocument->firstChild->cloneNode(false); - $diagram = $subProcess->ownerDocument->getElementsByTagName('BPMNDiagram')->item(0)->cloneNode(true); - $subProcessClone = $this->cloneNodeAs($subProcess, 'process', [], ['outgoing', 'incoming'], ['triggeredByEvent']); - $definitions->appendChild($subProcessClone); - $definitions->appendChild($diagram); - - $subProcessBpmn = $subProcessClone->ownerDocument->saveXml($definitions); - - $name = $subProcessClone->getAttribute('name'); - $duplicated = self::where('name', 'like', $name . '%') - ->orderBy(DB::raw('LENGTH(name), name')) - ->get(); - if ($duplicated->count()) { - $duplicated = $duplicated->last(); - $number = intval(substr($duplicated->name, strlen($name))) + 1; - $name = $name . ' (' . $number . ')'; + $root = $document->documentElement; + if ($root && !$root->hasAttribute('xmlns:pm')) { + $root->setAttribute('xmlns:pm', WorkflowServiceProvider::PROCESS_MAKER_NS); } - $process = new self([ - 'name' => $name, - 'bpmn' => $subProcessBpmn, - 'description' => $subProcessClone->getAttribute('name'), - ]); - $process->user_id = $this->user_id; - $process->process_category_id = $this->process_category_id; - $process->save(); - $bpmnProcess = $process->getDefinitions()->getElementsByTagNameNS(BpmnDocument::BPMN_MODEL, 'process')->item(0); - $element->setAttribute('calledElement', $bpmnProcess->getAttribute('id') . '-' . $process->id); - - return $element; } /** diff --git a/tests/Feature/Api/ConvertBPMNTest.php b/tests/Feature/Api/ConvertBPMNTest.php index 4dd36be1ea..2c23a64c3e 100644 --- a/tests/Feature/Api/ConvertBPMNTest.php +++ b/tests/Feature/Api/ConvertBPMNTest.php @@ -24,7 +24,7 @@ class ConvertBPMNTest extends TestCase public $withPermissions = true; /** - * Test convert subProcess to callActivity + * Embedded subProcess BPMN is persisted as-is on save (no callActivity conversion). */ public function testConvertSubProcess() { @@ -32,8 +32,14 @@ public function testConvertSubProcess() 'status' => 'ACTIVE', 'bpmn' => file_get_contents(__DIR__ . '/processes/CP.01.00 Create new customer.bpmn'), ]); - $this->assertStringNotContainsString('subProcess', $process->bpmn); - $this->assertEquals(2, Process::count()); + $this->assertEquals(1, Process::count()); + + $document = new BpmnDocument(); + $document->loadXML($process->bpmn); + $subProcesses = $document->getElementsByTagNameNS(BpmnDocument::BPMN_MODEL, 'subProcess'); + $this->assertGreaterThan(0, $subProcesses->length); + $callActivities = $document->getElementsByTagNameNS(BpmnDocument::BPMN_MODEL, 'callActivity'); + $this->assertSame(0, $callActivities->length); } /**