From 33ebad60ba8a729fda81cd65472ff68b430131d4 Mon Sep 17 00:00:00 2001 From: Miguel Angel Date: Wed, 10 Sep 2025 15:21:01 -0400 Subject: [PATCH 1/5] feat: add saved_search_advanced_configuration to filesystem configuration --- .gitignore | 1 + ProcessMaker/Multitenancy/SwitchTenant.php | 2 ++ config/filesystems.php | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index fcf4007765..f375b4a8bc 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ storage/ssl storage/api/* storage/data-sources/logs/* storage/decision-tables/* +storage/saved_search_advanced_configuration/* npm.sh laravel-echo-server.lock public/.htaccess diff --git a/ProcessMaker/Multitenancy/SwitchTenant.php b/ProcessMaker/Multitenancy/SwitchTenant.php index 2ca2efc3ec..dfc5332b35 100644 --- a/ProcessMaker/Multitenancy/SwitchTenant.php +++ b/ProcessMaker/Multitenancy/SwitchTenant.php @@ -76,6 +76,8 @@ public function makeCurrent(IsTenant $tenant): void 'filesystems.disks.samlidp.root' => storage_path('samlidp'), 'filesystems.disks.decision_tables.root' => storage_path('decision-tables'), 'filesystems.disks.decision_tables.url' => $tenant->config['app.url'] . '/storage/decision-tables', + 'filesystems.disks.saved_search_advanced_configuration.root' => storage_path('saved_search_advanced_configuration'), + 'filesystems.disks.decision_tables.url' => $tenant->config['app.url'] . '/storage/saved_search_advanced_configuration', 'filesystems.disks.tenant_translations' => [ 'driver' => 'local', 'root' => storage_path('lang'), diff --git a/config/filesystems.php b/config/filesystems.php index 182dde1afe..a480cecde9 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -131,6 +131,13 @@ // Others declared in packages // - translations - package-translations // - 'filesystems.disks.install' configured on the fly + + 'saved_search_advanced_configuration' => [ + 'driver' => 'local', + 'root' => storage_path('saved_search_advanced_configuration'), + 'url' => env('APP_URL') . '/storage/saved_search_advanced_configuration', + 'visibility' => 'private', + ], ], /* From bf587d1d0eaaffb7e0c20b903bd3ec1b32fa7d0f Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Tue, 16 Sep 2025 18:31:15 -0400 Subject: [PATCH 2/5] Add job validation and new scheduling method `scheduleDateJob` --- .../Managers/TaskSchedulerManager.php | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/ProcessMaker/Managers/TaskSchedulerManager.php b/ProcessMaker/Managers/TaskSchedulerManager.php index d59dc4db80..e459bd2cee 100644 --- a/ProcessMaker/Managers/TaskSchedulerManager.php +++ b/ProcessMaker/Managers/TaskSchedulerManager.php @@ -12,6 +12,7 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Schema; +use InvalidArgumentException; use PDOException; use ProcessMaker\Facades\WorkflowManager; use ProcessMaker\Jobs\StartEventConditional; @@ -574,6 +575,9 @@ public function scheduleCycle( */ public function scheduleCycleJob($interval, array $config): ScheduledTask { + if (!isset($config['job'])) { + throw new InvalidArgumentException('$config["job"] is required'); + } $configuration = [ 'type' => 'TimeCycle', 'interval' => $interval, @@ -590,6 +594,33 @@ public function scheduleCycleJob($interval, array $config): ScheduledTask return $scheduledTask; } + /** + * Schedule a job for a specific datetime + * + * @param string $datetime in ISO-8601 format + * @param array $config configuration + * + * @return ScheduledTask + */ + public function scheduleDateJob($datetime, array $config): ScheduledTask + { + if (!isset($config['job'])) { + throw new InvalidArgumentException('$config["job"] is required'); + } + $configuration = [ + 'type' => 'TimeDate', + 'date' => $datetime, + ...$config, + ]; + $scheduledTask = new ScheduledTask(); + $scheduledTask->configuration = json_encode($configuration); + $scheduledTask->type = 'SCHEDULED_JOB'; + $scheduledTask->last_execution = null; + $scheduledTask->save(); + + return $scheduledTask; + } + /** * Schedule a job execution after a time duration for the given BPMN element, * event definition and an optional Token object From 2b3db57ecbe6fb98786b4258f55991705dd02980 Mon Sep 17 00:00:00 2001 From: Miguel Angel Date: Wed, 6 May 2026 11:57:48 -0400 Subject: [PATCH 3/5] feat: update configuration structure for scheduled jobs --- ProcessMaker/Managers/TaskSchedulerManager.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ProcessMaker/Managers/TaskSchedulerManager.php b/ProcessMaker/Managers/TaskSchedulerManager.php index 5d36c75e28..b12c3049da 100644 --- a/ProcessMaker/Managers/TaskSchedulerManager.php +++ b/ProcessMaker/Managers/TaskSchedulerManager.php @@ -202,10 +202,11 @@ private function processTaskWithAtomicClaim(ScheduledTask $task, DateTime $today { try { $config = json_decode($task->configuration); - $lastExecution = new DateTime($task->last_execution, new DateTimeZone('UTC')); - if ($lastExecution === null) { - return; + // SCHEDULED_JOB rows use last_execution = null until first run; BPMN timers always set last_execution. + $lastExecution = null; + if ($task->last_execution !== null && $task->last_execution !== '') { + $lastExecution = new DateTime($task->last_execution, new DateTimeZone('UTC')); } $owner = $task->processRequestToken ?: $task->processRequest ?: $task->process; @@ -721,11 +722,14 @@ public function scheduleDateJob($datetime, array $config): ScheduledTask if (!isset($config['job'])) { throw new InvalidArgumentException('$config["job"] is required'); } + + // Must use "interval" so nextDate(TimeDate) picks up the target datetime (same shape as BPMN timer tasks). $configuration = [ 'type' => 'TimeDate', - 'date' => $datetime, ...$config, + 'interval' => $datetime, ]; + $scheduledTask = new ScheduledTask(); $scheduledTask->configuration = json_encode($configuration); $scheduledTask->type = 'SCHEDULED_JOB'; From 8d15b575049ad97c7d0fae32c0cbf4b261658e4d Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Wed, 10 Jun 2026 09:34:45 -0700 Subject: [PATCH 4/5] Update dependency --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5fe0d8c2c3..02c3a6260a 100644 --- a/composer.json +++ b/composer.json @@ -176,7 +176,7 @@ "package-product-analytics": "1.5.11", "package-projects": "1.12.9", "package-rpa": "1.1.2", - "package-savedsearch": "1.43.13", + "package-savedsearch": "1.43.12-RC1", "package-slideshow": "1.4.3", "package-smart-extract": "0.0.6", "package-signature": "1.15.5", From 1444838ce5d335b412c1e7e4a337a89482625a46 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Wed, 10 Jun 2026 09:38:26 -0700 Subject: [PATCH 5/5] Version 2026.9.4-RC1 --- composer.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 02c3a6260a..0c89adfb08 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "processmaker/processmaker", - "version": "2026.9.3", + "version": "2026.9.4-RC1", "description": "BPM PHP Software", "keywords": [ "php bpm processmaker" diff --git a/package-lock.json b/package-lock.json index 169b6cc347..f95f9faf2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@processmaker/processmaker", - "version": "2026.9.3", + "version": "2026.9.4-RC1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@processmaker/processmaker", - "version": "2026.9.3", + "version": "2026.9.4-RC1", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index b73db6ff33..abc5983b1c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@processmaker/processmaker", - "version": "2026.9.3", + "version": "2026.9.4-RC1", "description": "ProcessMaker 4", "author": "DevOps ", "license": "ISC",