Merge branch 'develop' into FOUR-26245-b

Author: nolanpro

ProcessMaker/Jobs/RefreshArtisanCaches.php

@@ -6,6 +6,7 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Support\Facades\Artisan;
 
 class RefreshArtisanCaches implements ShouldQueue
@@ -24,6 +25,16 @@ public function __construct()
         //
     }
 
+    /**
+     * Debounce when multiple Settings are saved at the same time
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping('refresh_artisan_caches'))->dontRelease()];
+    }
+
     /**
      * Execute the job.
      *
@@ -38,12 +49,7 @@ public function handle()
 
         if (app()->configurationIsCached()) {
             Artisan::call('config:cache', $options);
-        } else {
-            Artisan::call('queue:restart', $options);
-
-            // We call this manually here since this job is dispatched
-            // automatically when the config *is* cached
-            RestartMessageConsumers::dispatchSync();
         }
+        Artisan::call('queue:restart', $options);
     }
 }

ProcessMaker/Models/Process.php

@@ -773,8 +773,8 @@ private function getNextUserFromProcessVariable($activity, $token)
         $dataManager = new DataManager();
         $instanceData = $dataManager->getData($token);
 
-        $assignedUsers = $usersVariable ? Arr::get($instanceData, $usersVariable) : [];
-        $assignedGroups = $groupsVariable ? Arr::get($instanceData, $groupsVariable) : [];
+        $assignedUsers = $usersVariable ? feelExpression($usersVariable, $instanceData) : [];
+        $assignedGroups = $groupsVariable ? feelExpression($groupsVariable, $instanceData) : [];
 
         if (!is_array($assignedUsers)) {
             $assignedUsers = [$assignedUsers];

ProcessMaker/Multitenancy/SwitchTenant.php

@@ -123,6 +123,9 @@ public function makeCurrent(IsTenant $tenant): void
         }
         config($config);
 
+        // The previous app key was saved in the singleton, so we need to forget it.
+        $app->forgetInstance('encrypter');
+
         // Extend BroadcastManager to our custom implementation that prefixes the channel names with the tenant id.
         $app->extend(BroadcastManager::class, function ($manager, $app) use ($tenant) {
             return new TenantAwareBroadcastManager($app, $tenant->id);

ProcessMaker/Observers/SettingObserver.php

@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Support\Facades\Log;
 use ProcessMaker\Cache\Settings\SettingCacheFactory;
+use ProcessMaker\Jobs\RefreshArtisanCaches;
 use ProcessMaker\Models\Setting;
 
 class SettingObserver
@@ -89,5 +90,7 @@ private function invalidateSettingCache(Setting $setting)
         // Invalidate the setting cache
         $key = $settingCache->createKey(['key' => $setting->key]);
         $settingCache->invalidate(['key' => $key]);
+
+        RefreshArtisanCaches::dispatch();
     }
 }

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "4.15.7+beta-3",
+    "version": "4.15.7-patch-a",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
@@ -106,7 +106,7 @@
             "Gmail"
         ],
         "processmaker": {
-            "build": "17e2d8f1",
+            "build": "b6d43709",
             "cicd-enabled": true,
             "custom": {
                 "package-ellucian-ethos": "1.19.7",
@@ -139,7 +139,8 @@
                 "package-accessibility": "1.0.0",
                 "package-zj-birmingham": "dev-main",
                 "package-tce": "dev-master",
-                "package-case-overview": "dev-main"
+                "package-case-overview": "dev-main",
+                "package-sis-integration": "1.0.0"
             },
             "enterprise": {
                 "connector-docusign": "1.11.0",
@@ -151,16 +152,16 @@
                 "package-ab-testing": "1.4.0",
                 "package-actions-by-email": "1.22.6",
                 "package-advanced-user-manager": "1.13.0",
-                "package-ai": "1.16.7",
+                "package-ai": "1.16.8",
                 "package-analytics-reporting": "1.11.1",
                 "package-auth": "1.24.9",
                 "package-collections": "2.27.0",
                 "package-comments": "1.16.0",
                 "package-conversational-forms": "1.15.0",
-                "package-data-sources": "1.34.1",
+                "package-data-sources": "1.34.2",
                 "package-decision-engine": "1.16.1",
                 "package-dynamic-ui": "1.28.2",
-                "package-email-start-event": "1.0.5",
+                "package-email-start-event": "1.0.6",
                 "package-files": "1.23.0",
                 "package-googleplaces": "1.12.0",
                 "package-photo-video": "1.6.1",
@@ -172,13 +173,12 @@
                 "package-rpa": "1.1.1",
                 "package-savedsearch": "1.43.4",
                 "package-slideshow": "1.4.3",
-                "package-sentry": "1.12.0",
-                "package-signature": "1.15.1",
+                "package-signature": "1.15.2",
                 "package-testing": "1.8.1",
                 "package-translations": "2.14.4",
                 "package-versions": "1.13.0",
                 "package-vocabularies": "2.17.0",
-                "package-webentry": "2.29.6",
+                "package-webentry": "2.29.7",
                 "package-api-testing": "1.3.1",
                 "package-variable-finder": "1.0.3",
                 "packages": "^0"

composer.lock

@@ -3,6 +3,7 @@
 use Illuminate\Support\Facades\Auth;
 use Laravel\Horizon\Repositories\RedisJobRepository;
 use ProcessMaker\Events\MarkArtisanCachesAsInvalid;
+use ProcessMaker\Models\FormalExpression;
 use ProcessMaker\Models\Setting;
 use ProcessMaker\SanitizeHelper;
 use ProcessMaker\Support\JsonOptimizer;
@@ -359,3 +360,20 @@ function json_optimize_decode(string $json, bool $assoc = false, int $depth = 51
         return JsonOptimizer::decode($json, $assoc, $depth, $options);
     }
 }
+
+if (!function_exists('feelExpression')) {
+    /**
+     * Evaluate a BPMN FEEL expression
+     *
+     * @param string $expression
+     * @param array $data
+     * @return mixed
+     */
+    function feelExpression(string $expression, array $data)
+    {
+        $formalExp = new FormalExpression();
+        $formalExp->setLanguage('FEEL');
+        $formalExp->setBody($expression);
+        return $formalExp($data);
+    }
+}

helpers.php

@@ -1,6 +1,6 @@
 {
     "name": "@processmaker/processmaker",
-    "version": "4.15.7",
+    "version": "4.15.7-patch-a",
     "description": "ProcessMaker 4",
     "author": "DevOps <devops@processmaker.com>",
     "license": "ISC",