Updating feature/plugins-poc-4 with last changes in develop

.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
@@ -51,4 +52,7 @@ devhub/pm-font/dist
 test-db-snapshot.db
 snapshot_*.db
 storage/transitions
-.envrc
+.envrc
+**/caddy
+frankenphp
+frankenphp-worker.php

ProcessMaker/Assets/DataSourcesInProcess.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace ProcessMaker\Assets;
+
+use DOMXPath;
+use ProcessMaker\Models\Process;
+use ProcessMaker\Providers\WorkflowServiceProvider;
+
+class DataSourcesInProcess
+{
+    public $type = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSource';
+
+    public $owner = Process::class;
+
+    /**
+     * Get the data sources used in a process
+     *
+     * @param Process $process
+     * @param array $dataSources
+     *
+     * @return array
+     */
+    public function referencesToExport(Process $process, array $dataSources = [])
+    {
+        // Data Sources used in BPMN Service Tasks
+        $xpath = new DOMXPath($process->getDefinitions());
+        $xpath->registerNamespace('pm', WorkflowServiceProvider::PROCESS_MAKER_NS);
+
+        // Find all nodes with pm:config
+        $nodes = $xpath->query("//*[@pm:config!='']");
+        foreach ($nodes as $node) {
+            $configString = $node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'config');
+            $config = json_decode($configString, true);
+            if (isset($config['dataSource']) && is_numeric($config['dataSource'])) {
+                $dataSources[] = [$this->type, (int) $config['dataSource']];
+            }
+        }
+
+        return $dataSources;
+    }
+
+    /**
+     * Update references used in an imported process
+     *
+     * @param Process $process
+     * @param array $references
+     *
+     * @return void
+     */
+    public function updateReferences(Process $process, array $references = [])
+    {
+        $definitions = $process->getDefinitions();
+        $xpath = new DOMXPath($definitions);
+        $xpath->registerNamespace('pm', WorkflowServiceProvider::PROCESS_MAKER_NS);
+
+        $nodes = $xpath->query("//*[@pm:config!='']");
+        foreach ($nodes as $node) {
+            $configString = $node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'config');
+            $config = json_decode($configString, true);
+            if (isset($config['dataSource']) && is_numeric($config['dataSource'])) {
+                $oldRef = $config['dataSource'];
+                if (isset($references[$this->type][$oldRef])) {
+                    $newRef = $references[$this->type][$oldRef]->getKey();
+                    $config['dataSource'] = $newRef;
+                    $node->setAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'config', json_encode($config));
+                }
+            }
+        }
+        $process->bpmn = $definitions->saveXML();
+        $process->save();
+    }
+}

ProcessMaker/Assets/DataSourcesInScreen.php

@@ -0,0 +1,131 @@
+<?php
+
+namespace ProcessMaker\Assets;
+
+use ProcessMaker\Managers\ExportManager;
+use ProcessMaker\Models\Screen;
+use Illuminate\Support\Arr;
+
+class DataSourcesInScreen
+{
+    public $type = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSource';
+
+    public $owner = Screen::class;
+
+    /**
+     * Get the data sources (ex. watchers) used in a screen
+     *
+     * @param Screen $screen
+     * @param array $dataSources
+     *
+     * @return array
+     */
+    public function referencesToExport(Screen $screen, array $dataSources = [])
+    {
+        $watchers = $screen->watchers;
+        if (is_array($watchers)) {
+            $this->findInArray($watchers, function ($item) use (&$dataSources) {
+                if (is_array($item)) {
+                    $scriptId = (string) ($item['script_id'] ?? '');
+                    $id = (string) ($item['script']['id'] ?? '');
+                    if (str_starts_with($scriptId, 'data_source-') || str_starts_with($id, 'data_source-')) {
+                        $numericId = str_replace('data_source-', '', str_starts_with($scriptId, 'data_source-') ? $scriptId : $id);
+                        if (is_numeric($numericId)) {
+                            $dataSources[] = [$this->type, (int) $numericId];
+                        }
+                    }
+                }
+            });
+        }
+
+        $config = $screen->versionFor(null)->config;
+        if (is_array($config)) {
+            $this->findInArray($config, function ($item) use (&$dataSources) {
+                if (is_array($item) && isset($item['component']) && $item['component'] === 'FormSelectList' && !empty($item['config']['options']['selectedDataSource'])) {
+                    $dataSources[] = [$this->type, (int) $item['config']['options']['selectedDataSource']];
+                }
+            });
+        }
+
+        return $dataSources;
+    }
+
+    /**
+     * Update references used in an imported screen
+     *
+     * @param Screen $screen
+     * @param array $references
+     * @param ExportManager $exportManager
+     *
+     * @return void
+     */
+    public function updateReferences(Screen $screen, array $references, ExportManager $exportManager)
+    {
+        $watches = $screen->watchers;
+        if (is_array($watches)) {
+            foreach ($watches as &$watcher) {
+                $id = (string) ($watcher['script']['id'] ?? '');
+                if (str_starts_with($id, 'data_source-')) {
+                    $oldRef = str_replace('data_source-', '', $id);
+                    if (isset($references[$this->type][$oldRef])) {
+                        $newRef = $references[$this->type][$oldRef]->getKey();
+                    } else {
+                        $newRef = null;
+                        $exportManager->addLogMessage(
+                            'DataSourcesInScreen:references',
+                            __(
+                                'Imported file does not contain the data source #:dataSource assigned to a watcher',
+                                ['dataSource' => $oldRef]
+                            ),
+                            false,
+                            __("Missing watcher's data source")
+                        );
+                    }
+                    if ($newRef) {
+                        $watcher['script_id'] = $newRef;
+                        $watcher['script']['id'] = "data_source-$newRef";
+                        $watcher['script']['title'] = $references[$this->type][$oldRef]->name;
+                    }
+                }
+            }
+        }
+        $screen->watchers = $watches;
+
+        $config = $screen->config;
+        if (is_array($config)) {
+            $this->findInArray($config, function ($item, $keyDotNotation) use ($references, &$config) {
+                if (is_array($item) && isset($item['component']) && $item['component'] === 'FormSelectList' && !empty($item['config']['options']['selectedDataSource'])) {
+                    $oldRef = $item['config']['options']['selectedDataSource'];
+                    if (isset($references[$this->type][$oldRef])) {
+                        $newRef = $references[$this->type][$oldRef]->getKey();
+                        Arr::set($config, "$keyDotNotation.config.options.selectedDataSource", $newRef);
+                    }
+                }
+            });
+            $screen->config = $config;
+        }
+
+        $screen->save();
+    }
+
+    /**
+     * Find recursively in an array
+     *
+     * @param array $array
+     * @param callable $callback
+     * @param array $path
+     *
+     * @return void
+     */
+    private function findInArray(array $array, callable $callback, array $path = [])
+    {
+        call_user_func($callback, $array, implode('.', $path));
+        foreach ($array as $key => $item) {
+            if (is_array($item)) {
+                $this->findInArray($item, $callback, array_merge($path, [$key]));
+            } else {
+                call_user_func($callback, $item, implode('.', array_merge($path, [$key])));
+            }
+        }
+    }
+}

ProcessMaker/Assets/ScriptsInProcess.php

@@ -30,7 +30,10 @@ public function referencesToExport(Process $process, array $scripts = [])
         // Used in scriptRef
         $nodes = $xpath->query("//*[@pm:scriptRef!='']");
         foreach ($nodes as $node) {
-            $scripts[] = [Script::class, $node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'scriptRef')];
+            $scriptId = $node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'scriptRef');
+            if (!str_starts_with((string) $scriptId, 'data_source-')) {
+                $scripts[] = [Script::class, $scriptId];
+            }
         }
 
         return $scripts;
@@ -54,6 +57,9 @@ public function updateReferences(Process $process, array $references = [])
         $nodes = $xpath->query("//*[@pm:scriptRef!='']");
         foreach ($nodes as $node) {
             $oldRef = $node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'scriptRef');
+            if (str_starts_with((string) $oldRef, 'data_source-')) {
+                continue;
+            }
             $newRef = $references[Script::class][$oldRef]->getKey();
             $node->setAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'scriptRef', $newRef);
         }

ProcessMaker/Assets/ScriptsInScreen.php

@@ -26,7 +26,11 @@ public function referencesToExport(Screen $screen, array $scripts = [])
         if (is_array($config)) {
             $this->findInArray($config, function ($item) use (&$scripts) {
                 if (is_array($item) && !empty($item['script_id'])) {
-                    $scripts[] = [Script::class, $item['script_id']];
+                    $scriptId = (string) $item['script_id'];
+                    $id = (string) ($item['script']['id'] ?? '');
+                    if (!str_starts_with($scriptId, 'data_source-') && !str_starts_with($id, 'data_source-')) {
+                        $scripts[] = [Script::class, $item['script_id']];
+                    }
                 }
             });
         }
@@ -47,11 +51,12 @@ public function updateReferences(Screen $screen, array $references, ExportManage
         $watches = $screen->watchers;
         if (is_array($watches)) {
             foreach ($watches as &$watcher) {
-                $refParts = explode('-', $watcher['script_id']);
-                if ($refParts[0] === 'data_source') {
+                $scriptId = (string) ($watcher['script_id'] ?? '');
+                $id = (string) ($watcher['script']['id'] ?? '');
+                if (str_starts_with($scriptId, 'data_source-') || str_starts_with($id, 'data_source-')) {
                     continue;
                 }
-                $oldRef = $refParts[1];
+                $oldRef = $scriptId;
                 if (isset($references[Script::class][$oldRef])) {
                     $newRef = $references[Script::class][$oldRef]->getKey();
                 } else {
@@ -82,17 +87,18 @@ public function updateReferences(Screen $screen, array $references, ExportManage
      *
      * @param array $array
      * @param callable $callback
+     * @param array $path
      *
      * @return void
      */
-    private function findInArray(array $array, callable $callback)
+    private function findInArray(array $array, callable $callback, array $path = [])
     {
-        call_user_func($callback, $array);
-        foreach ($array as $item) {
+        call_user_func($callback, $array, implode('.', $path));
+        foreach ($array as $key => $item) {
             if (is_array($item)) {
-                $this->findInArray($item, $callback);
+                $this->findInArray($item, $callback, array_merge($path, [$key]));
             } else {
-                call_user_func($callback, $item);
+                call_user_func($callback, $item, implode('.', array_merge($path, [$key])));
             }
         }
     }

ProcessMaker/Console/Commands/UpdateAnonymousUserTimezone.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace ProcessMaker\Console\Commands;
+
+use Illuminate\Console\Command;
+use ProcessMaker\Models\AnonymousUser;
+use ProcessMaker\Models\User;
+
+class UpdateAnonymousUserTimezone extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'processmaker:update-anonymous-user-timezone
+                            {--timezone= : Timezone to assign. Defaults to config app.anonymous_user_timezone}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update the anonymous user timezone from config (safe to run multiple times)';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $timezone = $this->option('timezone') ?: config('app.anonymous_user_timezone', 'UTC');
+
+        $user = User::where('username', AnonymousUser::ANONYMOUS_USERNAME)->first();
+
+        if (!$user) {
+            $this->error('Anonymous user not found.');
+
+            return self::FAILURE;
+        }
+
+        if ($user->timezone === $timezone) {
+            $this->info("Anonymous user timezone is already set to [{$timezone}].");
+
+            return self::SUCCESS;
+        }
+
+        $previousTimezone = $user->timezone;
+        $user->timezone = $timezone;
+        $user->save();
+
+        $this->info("Anonymous user timezone updated from [{$previousTimezone}] to [{$timezone}].");
+
+        return self::SUCCESS;
+    }
+}