Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 6 additions & 49 deletions ProcessMaker/Models/Process.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)) {
Expand All @@ -1512,51 +1501,19 @@ public function convertFromExternalBPM()
];
}
if ($conversions) {
$this->ensurePmNamespaceOnDefinitions($document);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Embedded subprocess remains non-executable

High Severity

Removing the subProcess to callActivity rewrite leaves embedded bpmn:subProcess in stored BPMN, but runtime still only implements subprocess via callActivity. WorkflowServiceProvider never maps subProcess, DefinitionsRepository has no subprocess factory, and unimplemented elements are skipped. Tokens that hit an inline subProcess can stall, skip inner tasks, or fail after save, so grouped processes will not run the way converted child processes did.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 705f2fa. Configure here.

$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;
}

/**
Expand Down
12 changes: 9 additions & 3 deletions tests/Feature/Api/ConvertBPMNTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,22 @@ 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()
{
$process = Process::factory()->create([
'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);
}

/**
Expand Down
Loading