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
25 changes: 25 additions & 0 deletions ProcessMaker/Http/Controllers/Process/ModelerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use ProcessMaker\Managers\SignalManager;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Package\PackagePmBlocks\Http\Controllers\Api\PmBlockController;
use ProcessMaker\PackageHelper;
use ProcessMaker\Traits\HasControllerAddons;
use ProcessMaker\Traits\ProcessMapTrait;
Expand All @@ -24,6 +25,8 @@ class ModelerController extends Controller
*/
public function show(ModelerManager $manager, Process $process, Request $request)
{
$pmBlockList = $this->getPmBlockList();

/*
* Emit the ModelerStarting event, passing in our ModelerManager instance. This will
* allow packages to add additional javascript for modeler initialization which
Expand All @@ -43,6 +46,7 @@ public function show(ModelerManager $manager, Process $process, Request $request
'autoSaveDelay' => config('versions.delay.process', 5000),
'isVersionsInstalled' => PackageHelper::isPackageInstalled('ProcessMaker\Package\Versions\PluginServiceProvider'),
'isDraft' => $draft !== null,
'pmBlockList' => $pmBlockList,
]);
}

Expand All @@ -51,6 +55,8 @@ public function show(ModelerManager $manager, Process $process, Request $request
*/
public function inflight(ModelerManager $manager, Process $process, ProcessRequest $request)
{
$pmBlockList = $this->getPmBlockList();

event(new ModelerStarting($manager));

$bpmn = $process->bpmn;
Expand Down Expand Up @@ -91,9 +97,28 @@ public function inflight(ModelerManager $manager, Process $process, ProcessReque
'requestInProgressNodes' => $requestInProgressNodes,
'requestIdleNodes' => $requestIdleNodes,
'requestId' => $request->id,
'pmBlockList' => $pmBlockList,
]);
}

/**
* Load PMBlock list
*/
private function getPmBlockList()
{
$pmBlockList = null;
if (hasPackage('package-pm-blocks')) {
$controller = new PmBlockController();
$newRequest = new Request(['per_page' => 10000]);
$response = $controller->index($newRequest);
if ($response->response()->status() === 200) {
$pmBlockList = json_decode($response->response()->content())->data;
}
}

return $pmBlockList;
}

/**
* Invokes the Modeler for In-flight Process Map rendering for ai generative.
*/
Expand Down
1 change: 1 addition & 0 deletions resources/views/processes/modeler/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
'url':''
},
]
window.ProcessMaker.PMBlockList = @json($pmBlockList);
window.ProcessMaker.modeler = {
process: @json($process),
autoSaveDelay: @json($autoSaveDelay),
Expand Down
1 change: 1 addition & 0 deletions resources/views/processes/modeler/inflight.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
@section('js')
<script>
const breadcrumbData = [];
window.ProcessMaker.PMBlockList = @json($pmBlockList);
window.ProcessMaker.modeler = {
xml: @json($bpmn),
configurables: [],
Expand Down