Merge branch 'develop' into task/FOUR-28803

Author: nolanpro

ProcessMaker/ImportExport/Exporters/ProcessLaunchpadExporter.php

@@ -46,6 +46,8 @@ public function import(): bool
         foreach ($this->getDependents('screen') as $dependent) {
             $properties = json_decode($this->model->properties, true);
             $properties['screen_uuid'] = $dependent->model->uuid;
+            $properties['screen_id'] = $dependent->model->id;
+            $properties['screen_title'] = $dependent->model->title;
             $this->model->properties = json_encode($properties);
         }
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "2026.5.3",
+    "version": "2026.6.1",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
@@ -113,7 +113,7 @@
             "Gmail"
         ],
         "processmaker": {
-            "build": "10c67dca",
+            "build": "a43d5c23",
             "cicd-enabled": true,
             "custom": {
                 "package-ellucian-ethos": "1.19.10",
@@ -158,9 +158,9 @@
                 "package-ab-testing": "1.4.0",
                 "package-actions-by-email": "1.22.11",
                 "package-advanced-user-manager": "1.13.2",
-                "package-ai": "1.16.14",
+                "package-ai": "1.16.15",
                 "package-analytics-reporting": "1.11.3",
-                "package-auth": "1.24.12",
+                "package-auth": "1.24.13",
                 "package-collections": "2.27.3",
                 "package-comments": "1.16.2",
                 "package-conversational-forms": "1.15.0",
@@ -172,20 +172,20 @@
                 "package-googleplaces": "1.12.0",
                 "package-photo-video": "1.6.1",
                 "package-pm-blocks": "1.12.8",
-                "package-process-documenter": "1.12.0",
+                "package-process-documenter": "1.12.1",
                 "package-process-optimization": "1.10.0",
                 "package-product-analytics": "1.5.11",
                 "package-projects": "1.12.7",
                 "package-rpa": "1.1.1",
-                "package-savedsearch": "1.43.8",
+                "package-savedsearch": "1.43.9",
                 "package-slideshow": "1.4.3",
-                "package-smart-extract": "0.0.3",
+                "package-smart-extract": "0.0.4",
                 "package-signature": "1.15.2",
                 "package-testing": "1.8.1",
                 "package-translations": "2.14.5",
                 "package-versions": "1.13.0",
                 "package-vocabularies": "2.17.1",
-                "package-webentry": "2.29.15",
+                "package-webentry": "2.29.16",
                 "package-api-testing": "1.3.1",
                 "package-variable-finder": "1.0.5",
                 "packages": "^0"

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@processmaker/processmaker",
-    "version": "2026.5.3",
+    "version": "2026.6.1",
     "description": "ProcessMaker 4",
     "author": "DevOps <devops@processmaker.com>",
     "license": "ISC",
@@ -61,9 +61,9 @@
         "@fortawesome/free-solid-svg-icons": "^5.15.1",
         "@fortawesome/vue-fontawesome": "^0.1.9",
         "@panter/vue-i18next": "^0.15.2",
-        "@processmaker/modeler": "1.69.34",
+        "@processmaker/modeler": "1.69.35",
         "@processmaker/processmaker-bpmn-moddle": "0.16.0",
-        "@processmaker/screen-builder": "3.8.28",
+        "@processmaker/screen-builder": "3.8.29",
         "@processmaker/vue-form-elements": "0.65.6",
         "@processmaker/vue-multiselect": "2.3.0",
         "@tinymce/tinymce-vue": "2.0.0",

package.json

@@ -116,10 +116,15 @@ public function testImportWithCopy()
         $properties = json_decode($newProcess->launchpad->properties, true);
         $newSavedSearch1Id = Arr::get($properties, 'tabs.0.idSavedSearch');
         $newSavedSearch2Id = Arr::get($properties, 'tabs.1.idSavedSearch');
+        $cancelScreen = $newProcess->cancelScreen;
 
         $this->assertNotEquals($originalSavedSearch1Id, $savedSearch1->id);
         $this->assertEquals($savedSearch1->id, $newSavedSearch1Id);
         $this->assertEquals($savedSearch2->id, $newSavedSearch2Id);
+        $this->assertNotNull($cancelScreen);
+        $this->assertEquals($cancelScreen->id, Arr::get($properties, 'screen_id'));
+        $this->assertEquals($cancelScreen->uuid, Arr::get($properties, 'screen_uuid'));
+        $this->assertEquals($cancelScreen->title, Arr::get($properties, 'screen_title'));
 
         // Re-import the same process.
         $importer = new Importer($payload, $options);