fix merge conflicts

Author: rodriquelca

.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

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 Illuminate\Support\Str;
 use PDOException;
 use ProcessMaker\Facades\WorkflowManager;
@@ -203,10 +204,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;
@@ -888,6 +890,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,
@@ -904,6 +909,36 @@ 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');
+        }
+
+        // Must use "interval" so nextDate(TimeDate) picks up the target datetime (same shape as BPMN timer tasks).
+        $configuration = [
+            'type' => 'TimeDate',
+            ...$config,
+            'interval' => $datetime,
+        ];
+
+        $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

composer.json

@@ -177,7 +177,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": "1.0.0",
                 "package-signature": "1.15.5",

config/filesystems.php

@@ -136,6 +136,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',
+        ],
     ],
 
     /*