Merge branch 'develop' into bugfix/FOUR-27812

mcraeteisha · mcraeteisha · commit 2e0ed4da6850 · 2025-11-18T11:12:52.000-05:00
diff --git a/ProcessMaker/Application.php b/ProcessMaker/Application.php
@@ -3,6 +3,7 @@
 namespace ProcessMaker;
 
 use Igaster\LaravelTheme\Facades\Theme;
+use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Application as IlluminateApplication;
 use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables;
@@ -12,6 +13,7 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
+use ProcessMaker\Console\Kernel;
 use ProcessMaker\Multitenancy\Tenant;
 use ProcessMaker\Multitenancy\TenantBootstrapper;
 
@@ -112,4 +114,11 @@ public function bootstrapWith(array $bootstrappers)
 
         return parent::bootstrapWith($bootstrappers);
     }
+
+    public function reactivateConsoleApp()
+    {
+        Container::setInstance($this);
+        $this->hasBeenBootstrapped = false;
+        $this->make(Kernel::class)->bootstrap();
+    }
 }
diff --git a/ProcessMaker/Http/Controllers/Api/TaskController.php b/ProcessMaker/Http/Controllers/Api/TaskController.php
@@ -142,16 +142,17 @@ public function index(Request $request, $getTotal = false, User $user = null)
 
         $this->applyStatusFilter($query, $request);
 
-        $this->applyPmql($query, $request, $user);
-
-        $this->applyAdvancedFilter($query, $request);
-
+        // Apply process manager filter BEFORE PMQL to avoid conflicts with is_self_service filtering
         if ($request->input('processesIManage') === 'true') {
             $this->applyProcessManager($query, $user);
         } else {
             $this->applyForCurrentUser($query, $user);
         }
 
+        $this->applyPmql($query, $request, $user);
+
+        $this->applyAdvancedFilter($query, $request);
+
         // Apply filter overdue
         $query->overdue($request->input('overdue'));
 
diff --git a/ProcessMaker/Http/Controllers/ProcessController.php b/ProcessMaker/Http/Controllers/ProcessController.php
@@ -113,6 +113,13 @@ public function edit(Process $process)
             $isDraft = $lastDraftOrPublishedVersion->draft;
         }
 
+        // search if user  exists
+        $user = User::where('id', $process->user_id)->exists();
+        if (!$user) {
+            // if user not exists, set the first administrator as the process owner
+            $process->user_id = User::where('is_administrator', true)->where('status', 'ACTIVE')->first()->id;
+        }
+
         return view('processes.edit', compact([
             'process',
             'categories',
diff --git a/ProcessMaker/Multitenancy/TenantBootstrapper.php b/ProcessMaker/Multitenancy/TenantBootstrapper.php
@@ -26,21 +26,6 @@ class TenantBootstrapper
 
     private $app = null;
 
-    public static $landlordKeysToSave = [
-        'APP_URL',
-        'APP_KEY',
-        'LOG_PATH',
-        'DB_USERNAME',
-        'DB_PASSWORD',
-        'DB_HOSTNAME',
-        'DB_PORT',
-        'LANDLORD_DB_DATABASE',
-        'REDIS_PREFIX',
-        'CACHE_SETTING_PREFIX',
-        'SCRIPT_MICROSERVICE_CALLBACK',
-        'CACHE_PREFIX',
-    ];
-
     public function bootstrap(Application $app)
     {
         try {
@@ -116,6 +101,14 @@ private function setTenantEnvironmentVariables($tenantData)
         $this->set('LOG_PATH', $this->app->storagePath('logs/processmaker.log'));
     }
 
+    // Used for debugging
+    public static function log($message)
+    {
+        $message = '[TenantBootstrapper] ' . $message;
+        $today = date('Y-m-d');
+        file_put_contents(base_path('storage/logs/processmaker-' . $today . '.log'), date('Y-m-d H:i:s') . ' ' . $message . PHP_EOL, FILE_APPEND);
+    }
+
     private function getOriginalValue($key, $default = '')
     {
         if (self::$landlordValues === []) {
diff --git a/ProcessMaker/Providers/ProcessMakerServiceProvider.php b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
@@ -258,51 +258,19 @@ private static function bootstrapTenantApp(JobProcessing|JobRetryRequested $even
                 return;
             }
 
-            // Save the landlord's config values so we can reset them later
-            if (self::$landlordValues === null) {
-                foreach (TenantBootstrapper::$landlordKeysToSave as $key) {
-                    self::$landlordValues[$key] = $_SERVER[$key] ?? '';
-                }
-            }
-
             // Create a new tenant app instance
             $_SERVER['TENANT'] = $tenantId;
-            $_ENV['TENANT'] = $tenantId;
 
             if (!isset(self::$tenantAppContainers[$tenantId])) {
-                $tenantApp = require app()->bootstrapPath('app.php');
-                $tenantApp->instance('landlordValues', self::$landlordValues);
-                $tenantApp->make(\Illuminate\Contracts\Console\Kernel::class)->bootstrap();
-                self::$tenantAppContainers[$tenantId] = $tenantApp;
+                self::$tenantAppContainers[$tenantId] = require base_path('bootstrap/app.php');
             }
+            self::$tenantAppContainers[$tenantId]->reactivateConsoleApp();
 
             // Change the job's app service container to the tenant app
             $event->job->getRedisQueue()->setContainer(self::$tenantAppContainers[$tenantId]);
         }
     }
 
-    private static function resetTenantApp($event): void
-    {
-        if (!method_exists($event->job, 'getRedisQueue')) {
-            // Not a redis job
-            return;
-        }
-
-        unset($_SERVER['TENANT']);
-        unset($_ENV['TENANT']);
-
-        if (!self::$landlordValues) {
-            return;
-        }
-
-        // Restore the original values since the tenant boostrapper modified them
-        foreach (self::$landlordValues as $key => $value) {
-            $_SERVER[$key] = $value;
-            $_ENV[$key] = $value;
-            putenv("$key=$value");
-        }
-    }
-
     /**
      * Register app-level events.
      */
@@ -316,10 +284,6 @@ protected static function registerEvents(): void
             self::bootstrapTenantApp($event);
         });
 
-        Facades\Event::listen(JobAttempted::class, function (JobAttempted $event) {
-            self::resetTenantApp($event);
-        });
-
         // Listen to the events for our core screen
         // types and add our javascript
         Facades\Event::listen(ScreenBuilderStarting::class, function ($event) {
diff --git a/ProcessMaker/Traits/TaskControllerIndexMethods.php b/ProcessMaker/Traits/TaskControllerIndexMethods.php
@@ -289,6 +289,20 @@ private function applyPmql($query, $request, $user)
             } catch (SyntaxError $e) {
                 abort('Your PMQL contains invalid syntax.', 400);
             }
+
+            // After PMQL is applied, if processesIManage is active, add self-service tasks
+            // This is done after PMQL to avoid the is_self_service = 0 filter that PMQL might add
+            if ($request->input('processesIManage') === 'true' && isset($query->getQuery()->processManagerIds)) {
+                $ids = $query->getQuery()->processManagerIds;
+                $selfServiceTaskIds = ProcessRequestToken::select(['id'])
+                    ->whereIn('process_id', $ids)
+                    ->where('is_self_service', 1)
+                    ->whereNull('user_id')
+                    ->where('status', 'ACTIVE');
+
+                // Add self-service tasks using orWhereIn to override PMQL's is_self_service = 0 filter
+                $query->orWhereIn('process_request_tokens.id', $selfServiceTaskIds);
+            }
         }
     }
 
@@ -340,11 +354,26 @@ public function applyProcessManager($query, $user)
                     ->orWhereRaw("JSON_CONTAINS(JSON_EXTRACT(properties, '$.manager_id'), CAST(? AS JSON))", [$user->id]);
             })
             ->where('status', 'ACTIVE')
-            ->get()
+            ->pluck('id')
             ->toArray();
 
+        if (empty($ids)) {
+            // If user is not a manager of any process, return no results
+            $query->whereRaw('1 = 0');
+
+            return;
+        }
+
+        // Show tasks from processes the user manages that are ACTIVE
+        // OR show self-service tasks from those processes
+        // Store the process IDs in the query so we can use them later to add self-service tasks
+        // We'll add self-service tasks after PMQL is applied to avoid the is_self_service = 0 filter
+        $query->getQuery()->processManagerIds = $ids;
+
+        // Apply condition for regular tasks from managed processes
+        // Self-service tasks will be added after PMQL to avoid conflicts
         $query->where(function ($query) use ($ids) {
-            $query->whereIn('process_request_tokens.process_id', array_column($ids, 'id'))
+            $query->whereIn('process_request_tokens.process_id', $ids)
                 ->where('process_request_tokens.status', 'ACTIVE');
         });
     }
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "4.15.10+beta-2",
+    "version": "4.15.10+beta-3",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
@@ -23,7 +23,7 @@
         "guzzlehttp/guzzle": "^7.9",
         "igaster/laravel-theme": "^2.0",
         "jenssegers/agent": "^2.6",
-        "laravel/framework": "^11.0",
+        "laravel/framework": "^11.44.1",
         "laravel/horizon": "^5.30",
         "laravel/pail": "^1.2",
         "laravel/passport": "^12.3",
@@ -33,6 +33,7 @@
         "laravel/ui": "^4.6",
         "lavary/laravel-menu": "^1.8",
         "lcobucci/jwt": "^4.2",
+        "league/commonmark": "^2.7",
         "league/flysystem-aws-s3-v3": "^3.29",
         "mateusjunges/laravel-kafka": "^2.4",
         "mittwald/vault-php": "^2.1",
@@ -63,6 +64,7 @@
         "spatie/laravel-multitenancy": "^4.0",
         "spomky-labs/otphp": "^11.3",
         "symfony/expression-language": "^7.2",
+        "symfony/http-foundation": "^7.3",
         "teamtnt/laravel-scout-tntsearch-driver": "^14.0",
         "twilio/sdk": "^8.3",
         "typo3/class-alias-loader": "^1.2",
@@ -106,7 +108,7 @@
             "Gmail"
         ],
         "processmaker": {
-            "build": "83cb4a38",
+            "build": "f9daa2ac",
             "cicd-enabled": true,
             "custom": {
                 "package-ellucian-ethos": "1.19.7",
@@ -146,11 +148,11 @@
                 "connector-docusign": "1.11.0",
                 "connector-idp": "1.14.0",
                 "connector-pdf-print": "1.23.1",
-                "connector-send-email": "1.32.9",
+                "connector-send-email": "1.32.10",
                 "connector-slack": "1.9.3",
                 "docker-executor-node-ssr": "1.7.2",
                 "package-ab-testing": "1.4.0",
-                "package-actions-by-email": "1.22.8",
+                "package-actions-by-email": "1.22.9",
                 "package-advanced-user-manager": "1.13.1",
                 "package-ai": "1.16.10",
                 "package-analytics-reporting": "1.11.1",
@@ -160,7 +162,7 @@
                 "package-conversational-forms": "1.15.0",
                 "package-data-sources": "1.34.3",
                 "package-decision-engine": "1.16.1",
-                "package-dynamic-ui": "1.28.2",
+                "package-dynamic-ui": "1.28.3",
                 "package-email-start-event": "1.0.8",
                 "package-files": "1.23.1",
                 "package-googleplaces": "1.12.0",
diff --git a/composer.lock b/composer.lock
diff --git a/resources/js/next/layout/navbar.js b/resources/js/next/layout/navbar.js
diff --git a/resources/sass/tailwind.css b/resources/sass/tailwind.css
