Merge branch 'next' into develop

Author: ryancooley

.env.example

@@ -36,4 +36,7 @@ HORIZON_PREFIX=horizon:
 DOCKER_SHARED_MEMORY=256m
 PROXIES=*
 LOGOUT_OTHER_DEVICES=false
-BROWSER_CACHE=true
+BROWSER_CACHE=true
+VUE_APP_WEBSOCKET_PROVIDER=socket.io
+VUE_APP_WEBSOCKET_PROVIDER_URL=ws:127.0.0.1:1234
+VUE_APP_COLLABORATIVE_ENABLED=true

.github/workflows/deploy-pm4.yml

@@ -36,6 +36,10 @@ env:
   GITHUB_COMMENT: ${{ secrets.GH_COMMENT }}
   pull_req_id: ${{github.event.pull_request.number}}
   BASE: ${{ contains(github.event.pull_request.body, 'ci:next') && 'ci-base-php82' || 'ci-base' }}
+  CDATA_LICENSE_DOCUSIGN: ${{ secrets.CDATA_LICENSE_DOCUSIGN }}
+  CDATA_LICENSE_EXCEL: ${{ secrets.CDATA_LICENSE_EXCEL }}
+  CDATA_LICENSE_GITHUB: ${{ secrets.CDATA_LICENSE_GITHUB }}
+  CDATA_LICENSE_SLACK: ${{ secrets.CDATA_LICENSE_SLACK }}
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -69,9 +73,9 @@ jobs:
         if: contains(github.event.pull_request.body, 'ci:build-base') || github.event_name == 'schedule'
         run: |
           cd pm4-stm-docker
-          docker-compose build --no-cache base
+          docker-compose build --no-cache base-php82
           docker-compose build --no-cache cache
-          docker push ${REPOSITORY}:ci-base
+          docker push ${REPOSITORY}:ci-base-php82
           docker push ${REPOSITORY}:ci-cache
       - name: Build and Push the image to ECR
         run: |
@@ -206,4 +210,3 @@ jobs:
           cd pm4-stm-docker/deploy-stm
           composer install --no-dev
           php run-delete-instance.php
-      

.gitignore

@@ -42,3 +42,6 @@ cypress/downloads
 .php-cs-fixer.cache
 .phpunit.result.cache
 .editorconfig
+resources/lang/de
+resources/lang/es
+resources/lang/fr

ProcessMaker/Console/Commands/BuildScriptExecutors.php

@@ -110,6 +110,7 @@ public function buildExecutor()
             $success = $this->associateWithExistingImage($scriptExecutor);
             if ($success) {
                 $this->info('Docker Image Associated');
+
                 // we associated with an existing image, no need to build
                 return;
             } else {
@@ -141,7 +142,7 @@ public function buildExecutor()
                 $cmd .= ' --user-id=' . $this->userId;
             }
             $this->artisan($cmd);
-            $this->info("SDK is at ${sdkDir}");
+            $this->info("SDK is at {$sdkDir}");
         }
 
         $dockerfile = ScriptExecutor::initDockerfile($lang) . "\n" . $scriptExecutor->config;
@@ -152,7 +153,7 @@ public function buildExecutor()
         $this->info('Building the docker executor');
 
         $image = $scriptExecutor->dockerImageName();
-        $command = Docker::command() . " build --build-arg SDK_DIR=/sdk -t ${image} -f ${packagePath}/Dockerfile.custom ${packagePath}";
+        $command = Docker::command() . " build --build-arg SDK_DIR=/sdk -t {$image} -f {$packagePath}/Dockerfile.custom {$packagePath}";
 
         if ($this->userId) {
             $this->runProc(

ProcessMaker/Console/Commands/ProcessMakerLicenseRemove.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace ProcessMaker\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class ProcessMakerLicenseRemove extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'processmaker:license-remove';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Remove the license.json file from the system';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        if (Storage::disk('local')->exists('license.json')) {
+            if ($this->confirm('Are you sure you want to remove the license.json file?')) {
+                Storage::disk('local')->delete('license.json');
+                $this->info('license.json removed successfully!');
+            } else {
+                $this->info('Operation cancelled. license.json was not removed.');
+            }
+        } else {
+            $this->error('license.json does not exist on the local disk.');
+        }
+
+        return 0;
+    }
+}

ProcessMaker/Console/Commands/ProcessMakerLicenseUpdate.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace ProcessMaker\Console\Commands;
+
+use Carbon\Carbon;
+use Exception;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Storage;
+
+class ProcessMakerLicenseUpdate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'processmaker:license-update {licenseFile}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update the license from a given URL or local path and store it in local disk';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $input = $this->argument('licenseFile');
+
+        try {
+            $content = file_get_contents($input);
+            if (!$this->isValidLicenseContent($content)) {
+                return 1;
+            }
+
+            Storage::disk('local')->put('license.json', $content);
+
+            Artisan::call('package:discover');
+            $this->info('License updated successfully');
+        } catch (Exception $e) {
+            $this->error('An error occurred: ' . $e->getMessage());
+        }
+
+        return 0;
+    }
+
+    /**
+     * Validates the license content.
+     *
+     * @param string $content
+     * @return bool
+     */
+    protected function isValidLicenseContent(string $content): bool
+    {
+        $data = json_decode($content, true);
+
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            $this->error('The provided license does not have a valid format.');
+
+            return false;
+        }
+
+        if (!isset($data['expires_at']) || !is_string($data['expires_at'])) {
+            $this->error('The provided license does not have a valid "expires_at" property.');
+
+            return false;
+        }
+
+        try {
+            Carbon::parse($data['expires_at']);
+        } catch (Exception $e) {
+            $this->error('The "expires_at" property is not a valid date.');
+            return false;
+        }
+
+        if (!isset($data['packages']) || !is_array($data['packages'])) {
+            $this->error('The provided license does not have a valid "packages" property.');
+
+            return false;
+        }
+
+        return true;
+    }
+}

ProcessMaker/Console/Commands/ProcessMakerTest.php

@@ -99,7 +99,7 @@ private function checkMigrationStatus()
     private function testHorizonService()
     {
         $testDispatchNow = 'Test immediate Jobs';
-        TestStatusJob::dispatchNow($testDispatchNow);
+        TestStatusJob::dispatchSync($testDispatchNow);
         $this->waitTestPassed($testDispatchNow, 5);
 
         $testDelayedWorkers = 'Test dispatch Jobs';

ProcessMaker/Console/Commands/SyncDefaultTemplates.php

@@ -43,7 +43,7 @@ public function handle()
             $randomDelay = random_int(10, 120);
             Job::dispatch()->delay(now()->addMinutes($randomDelay));
         } else {
-            Job::dispatchNow();
+            Job::dispatchSync();
         }
 
         return 0;

ProcessMaker/Contracts/WorkflowManagerInterface.php

@@ -178,11 +178,19 @@ public function existsServiceImplementation($implementation);
     /**
      * Run the service task implementation
      * @param string $implementation
-     * @param array $dat
+     * @param array $data
      * @param array $config
      * @param string $tokenId
      *
      * @return mixed
      */
     public function runServiceImplementation($implementation, array $data, array $config, $tokenId = '');
+
+    /**
+     * Get the service task class implementation
+     *
+     * @param string $implementation
+     * @return string
+     */
+    public function getServiceClassImplementation($implementation);
 }

ProcessMaker/Enums/ExporterMap.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace ProcessMaker\Enums;
+
+enum ExporterMap
+{
+    const TYPES = [
+        'screen' => [\ProcessMaker\Models\Screen::class, \ProcessMaker\ImportExport\Exporters\ScreenExporter::class],
+        'process' => [\ProcessMaker\Models\Process::class, \ProcessMaker\ImportExport\Exporters\ProcessExporter::class],
+        'script' => [\ProcessMaker\Models\Script::class, \ProcessMaker\ImportExport\Exporters\ScriptExporter::class],
+        'process_templates' => [\ProcessMaker\Models\ProcessTemplates::class, \ProcessMaker\ImportExport\Exporters\TemplateExporter::class],
+        'data_source' => [\ProcessMaker\Packages\Connectors\DataSources\Models\DataSource::class, \ProcessMaker\Packages\Connectors\DataSources\ImportExport\DataSourceExporter::class],
+        'decision_table' => [\ProcessMaker\Package\PackageDecisionEngine\Models\DecisionTable::class, \ProcessMaker\Package\PackageDecisionEngine\ImportExport\DecisionTableExporter::class],
+    ];
+
+    public static function getModelClass(string $type): ?string
+    {
+        return self::TYPES[$type][0] ?? null;
+    }
+
+    public static function getExporterClass(string $type): ?string
+    {
+        return self::TYPES[$type][1] ?? null;
+    }
+}