Merge branch 'next' into epic/FOUR-18042

ProcessMaker · Sep 9, 2024 · cbc76bf · cbc76bf
2 parents f3054bf + b40c8f8
commit cbc76bf
Show file tree

Hide file tree

Showing 16 changed files with 316 additions and 33 deletions.
diff --git a/ProcessMaker/Events/ProcessCompleted.php b/ProcessMaker/Events/ProcessCompleted.php
@@ -28,7 +28,10 @@ public function __construct(ProcessRequest $processRequest)
     {
         $this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
         $this->processRequest = $processRequest;
-        $this->endEventDestination = $processRequest->getElementDestination();
+
+        if ($processRequest->process->asset_type !== 'GUIDED_HELPER_PROCESS') {
+            $this->endEventDestination = $processRequest->getElementDestination();
+        }
     }
 
     /**

diff --git a/ProcessMaker/Events/RedirectToEvent.php b/ProcessMaker/Events/RedirectToEvent.php
@@ -43,8 +43,18 @@ public function broadcastAs()
      */
     public function broadcastOn(): array
     {
-        return [
-            new PrivateChannel('ProcessMaker.Models.ProcessRequest.' . $this->processRequest->getKey()),
+        $channels = [
+            // Current request
+            new PrivateChannel('ProcessMaker.Models.ProcessRequest.' . $this->processRequest->getKey())
         ];
+        // include child requests if any
+        foreach($this->processRequest->childRequests()->pluck('id') as $childRequestId) {
+            $channels[] = new PrivateChannel('ProcessMaker.Models.ProcessRequest.' . $childRequestId);
+        }
+        // include parent request if any
+        if ($this->processRequest->parent_request_id) {
+            $channels[] = new PrivateChannel('ProcessMaker.Models.ProcessRequest.' . $this->processRequest->parent_request_id);
+        }
+        return $channels;
     }
 }
diff --git a/ProcessMaker/Http/Controllers/Api/ScreenController.php b/ProcessMaker/Http/Controllers/Api/ScreenController.php
@@ -419,7 +419,7 @@ public function duplicate(Screen $screen, Request $request)
         $request->validate(Screen::rules());
         $newScreen = new Screen();
 
-        $exclude = ['id', 'uuid', 'created_at', 'updated_at'];
+        $exclude = ['id', 'uuid', 'created_at', 'updated_at', 'key'];
         foreach ($screen->getAttributes() as $attribute => $value) {
             if (!in_array($attribute, $exclude)) {
                 $newScreen->{$attribute} = $screen->{$attribute};

diff --git a/ProcessMaker/ImportExport/Exporters/ProcessExporter.php b/ProcessMaker/ImportExport/Exporters/ProcessExporter.php
@@ -564,7 +564,7 @@ public function importElementDestination(): void
                     // Set the new attribute value at the specified XPath
                     Utils::setAttributeAtXPath(
                         $this->model, $path, self::PM_ELEMENT_DESTINATION,
-                        htmlspecialchars($newElementDestination, ENT_QUOTES)
+                        $newElementDestination
                     );
                 }
             }

diff --git a/ProcessMaker/ImportExport/Exporters/ScreenExporter.php b/ProcessMaker/ImportExport/Exporters/ScreenExporter.php
@@ -66,6 +66,11 @@ public function import() : bool
         $this->associateCategories(ScreenCategory::class, 'screen_category_id');
         $screen->watchers = $watchers;
 
+        // There should only be one default interstitial screen
+        if ($screen->key === 'interstitial') {
+            $screen->key = null;
+        }
+
         $success = $screen->saveOrFail();
 
         return $success;

diff --git a/ProcessMaker/Jobs/SyncGuidedTemplates.php b/ProcessMaker/Jobs/SyncGuidedTemplates.php
@@ -8,6 +8,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Str;
 use Log;
@@ -208,6 +209,10 @@ private function importProcess($payload, $assetType)
                 'Collections', 'DataConnector', 'ProcessTemplates'])) {
                 $payload['export'][$key]['attributes']['asset_type'] = $assetType;
             }
+
+            if (Arr::get($asset, 'type') === 'Screen' && Arr::get($asset, 'attributes.key') === 'interstitial') {
+                Arr::set($payload, "export.{$key}.attributes.key", null);
+            }
         }
 
         $options = new Options($postOptions);

diff --git a/ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php b/ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php
@@ -6,7 +6,6 @@
 
 class HandleActivityAssignedInterstitialRedirect extends HandleRedirectListener
 {
-
     /**
      * Handle the event.
      */
@@ -23,14 +22,16 @@ public function handle(ActivityAssigned $event): void
         } else {
             $payloadUrl = route('requests.show', [
                 'request' => $event->getProcessRequestToken()
-                    ->getAttribute('process_request_id')
+                    ->getAttribute('process_request_id'),
             ]);
         }
         $this->setRedirectTo($request,
             'redirectToTask',
             [
                 'payloadUrl' => $payloadUrl,
                 'tokenId' => $event->getProcessRequestToken()->id,
+                'nodeId' => $event->getProcessRequestToken()->element_id,
+                'userId' => $event->getProcessRequestToken()->user_id,
                 'allowInterstitial' => $event->getProcessRequestToken()->getInterstitial()['allow_interstitial'],
             ]
         );

diff --git a/ProcessMaker/Listeners/HandleEndEventRedirect.php b/ProcessMaker/Listeners/HandleEndEventRedirect.php
@@ -17,9 +17,13 @@ public function handle(ProcessCompleted $event): void
         if (empty($request)) {
             return;
         }
+        // Do not redirect to child request summary if there is a previous redirect
+        if ($request->parent_request_id && self::$redirectionMethod !== '') {
+            return;
+        }
 
         $userId = Auth::id();
-        $requestId = $event->getProcessRequest()->id;
+        $requestId = $request->id;
         $this->setRedirectTo($request, 'processCompletedRedirect', $event, $userId, $requestId);
     }
 }
diff --git a/ProcessMaker/Listeners/HandleRedirectListener.php b/ProcessMaker/Listeners/HandleRedirectListener.php
@@ -9,7 +9,7 @@ class HandleRedirectListener
 {
     private static $processRequest = null;
 
-    private static $redirectionMethod = '';
+    protected static $redirectionMethod = '';
 
     private static $redirectionParams = [];
 

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "4.11.0-RC1",
+    "version": "4.11.1",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
@@ -104,7 +104,7 @@
             "Gmail"
         ],
         "processmaker": {
-            "build": "bb755bdb",
+            "build": "e0f2413d",
             "custom": {
                 "package-ellucian-ethos": "1.16.0",
                 "package-plaid": "1.6.0",
@@ -146,7 +146,7 @@
                 "package-ab-testing": "1.3.0",
                 "package-actions-by-email": "1.19.0",
                 "package-advanced-user-manager": "1.11.0",
-                "package-ai": "1.11.0",
+                "package-ai": "1.11.1",
                 "package-analytics-reporting": "1.9.0",
                 "package-auth": "1.21.0",
                 "package-cdata": "1.4.5",
@@ -173,7 +173,7 @@
                 "package-translations": "2.11.0",
                 "package-versions": "1.12.0",
                 "package-vocabularies": "2.16.0",
-                "package-webentry": "2.23.0",
+                "package-webentry": "2.24.0",
                 "package-api-testing": "1.0.1",
                 "packages": "^0"
             },

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/js/processes/modeler/components/inspector/ScreenSelect.vue b/resources/js/processes/modeler/components/inspector/ScreenSelect.vue
@@ -183,7 +183,12 @@ export default {
       }
 
       ProcessMaker.apiClient
-        .get("screens", { params: { key: this.defaultKey } })
+        .get("screens", { params: { 
+          key: this.defaultKey,
+          order_by: "id",
+          order_direction: "ASC",
+          per_page: 1,
+        }})
         .then(({ data }) => {
           this.content = data.data[0];
         });