Multitenancy

.github/workflows/deploy-pm4.yml

@@ -9,5 +9,5 @@ on:
 jobs:
   run:
     name: Run PM4-workflow
-    uses: processmaker/.github/.github/workflows/deploy-pm4.yml@main
+    uses: processmaker/.github/.github/workflows/deploy-pm4.yml@multitenancy
     secrets: inherit

.gitignore

@@ -5,6 +5,7 @@
 /public/css
 /storage/*.key
 /storage/*.index
+/storage/tenant_*
 /vendor
 /.idea
 /.vscode
@@ -44,5 +45,9 @@ coverage
 resources/lang/de
 resources/lang/es
 resources/lang/fr
+resources/sass/tenant_*
+resources/sass/_variables_bk.scss
 devhub/pm-font/dist
-test-db-snapshot.db
+test-db-snapshot.db
+snapshot_*.db
+storage/transitions

ProcessMaker/Application.php

@@ -77,4 +77,14 @@ public function path($path = '')
     {
         return $this->basePath . DIRECTORY_SEPARATOR . 'ProcessMaker' . ($path ? DIRECTORY_SEPARATOR . $path : $path);
     }
+
+    public function setStoragePath($path)
+    {
+        $this->storagePath = $path;
+    }
+
+    public function getStoragePath()
+    {
+        return $this->storagePath;
+    }
 }

ProcessMaker/Cache/Monitoring/PrometheusMetricsManager.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\Redis;
 use ProcessMaker\Facades\Metrics;
+use ProcessMaker\Services\MetricsService;
 use Prometheus\CollectorRegistry;
 
 class PrometheusMetricsManager implements CacheMetricsInterface
@@ -25,7 +26,7 @@ class PrometheusMetricsManager implements CacheMetricsInterface
      */
     public function __construct(string $namespace = 'cache')
     {
-        $this->metrics = Metrics::getFacadeRoot();
+        $this->metrics = app(MetricsService::class);
         $this->namespace = $namespace;
     }
 

ProcessMaker/Console/Commands/GenerateSdk.php

@@ -40,7 +40,7 @@ public function __construct()
      */
     public function handle()
     {
-        $jsonPath = base_path('storage/api-docs/api-docs.json');
+        $jsonPath = storage_path('api-docs/api-docs.json');
         $builder = new BuildSdk($jsonPath, $this->argument('output'));
 
         $userId = $this->options()['user-id'];

ProcessMaker/Console/Commands/RegenerateCss.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Log;
 use ProcessMaker\Jobs\CompileSass;
+use ProcessMaker\Jobs\CompileUI;
 use ProcessMaker\Models\Setting;
 use ProcessMaker\PackageChecker;
 
@@ -44,75 +45,7 @@ public function __construct()
     public function handle()
     {
         $this->info("\nStarting CSS compiling...");
-
-        $setting = Setting::byKey('css-override');
-
-        if ($setting) {
-            $this->writeColors(json_decode($setting->attributesToArray()['config']['variables'], true));
-            $this->writeFonts(json_decode($setting->attributesToArray()['config']['sansSerifFont']));
-        }
-
-        // Compile the Sass files
-        CompileSass::dispatch([
-            'tag' => 'sidebar',
-            'origin' => 'resources/sass/sidebar/sidebar.scss',
-            'target' => 'public/css/sidebar.css',
-            'user' => null,
-        ]);
-
-        CompileSass::dispatch([
-            'tag' => 'app',
-            'origin' => 'resources/sass/app.scss',
-            'target' => 'public/css/app.css',
-            'user' => null,
-        ]);
-
-        CompileSass::dispatch([
-            'tag' => 'queues',
-            'origin' => 'resources/sass/admin/queues.scss',
-            'target' => 'public/css/admin/queues.css',
-            'user' => null,
-        ]);
-
+        (new CompileUI())->handle();
         $this->info("\nCSS files have been generated.");
     }
-
-    /**
-     * Write variables in file
-     *
-     * @param $request
-     */
-    private function writeColors($data)
-    {
-        // Now generate the _colors.scss file
-        $contents = "// Changed theme colors\n";
-        foreach ($data as $key => $value) {
-            $contents .= $value['id'] . ': ' . $value['value'] . ";\n";
-        }
-        File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
-    }
-
-    /**
-     * Write variables font in file
-     *
-     * @param $sansSerif
-     * @param $serif
-     */
-    private function writeFonts($sansSerif)
-    {
-        $sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
-        // Generate the _fonts.scss file
-        $contents = "// Changed theme fonts\n";
-        $contents .= '$font-family-sans-serif: ' . $sansSerif->id . " !default;\n";
-        File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
-    }
-
-    private function sansSerifFontDefault()
-    {
-        $data = new \stdClass();
-        $data->id = "'Open Sans'";
-        $data->title = "'Open Sans'";
-
-        return $data;
-    }
 }

ProcessMaker/Console/Commands/TenantStorageLink.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace ProcessMaker\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
+
+class TenantStorageLink extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'tenants:storage-link';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create the symbolic link for the current tenant storage directory';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $tenant = app('currentTenant');
+
+        if (!$tenant) {
+            $this->error('This command must be run within a tenant context using tenants:artisan');
+
+            return 1;
+        }
+
+        $this->createStorageLink($tenant->id);
+    }
+
+    /**
+     * Create symbolic link for the current tenant
+     *
+     * @param int $tenantId
+     * @return void
+     */
+    protected function createStorageLink($tenantId)
+    {
+        $this->info('Creating storage link for tenant ' . $tenantId . '...');
+
+        // Define paths
+        $tenantStoragePath = storage_path('/app/public');
+        $publicPath = public_path('storage/tenant_' . $tenantId);
+
+        // Create tenant storage directory if it doesn't exist
+        if (!File::exists($tenantStoragePath)) {
+            $this->info('Creating tenant storage directory: ' . $tenantStoragePath);
+            File::makeDirectory($tenantStoragePath, 0755, true);
+        }
+
+        // Create parent directory for the symbolic link if it doesn't exist
+        $parentDir = dirname($publicPath);
+        if (!File::exists($parentDir)) {
+            $this->info('Creating parent directory: ' . $parentDir);
+            File::makeDirectory($parentDir, 0755, true);
+        }
+
+        // Remove existing link or directory if it exists
+        if (File::exists($publicPath)) {
+            // We can't use `confirm` here because this command will be run without any user interaction
+            // if (!$this->confirm('The symbolic link for tenant ' . $tenantId . ' already exists. Do you want to recreate it?')) {
+            //     return;
+            // }
+            if (is_link($publicPath)) {
+                File::delete($publicPath);
+            } else {
+                File::deleteDirectory($publicPath);
+            }
+        }
+
+        try {
+            // Create the symbolic link
+            $this->info('Creating symbolic link from ' . $tenantStoragePath . ' to ' . $publicPath);
+
+            // Use absolute paths for symlink
+            $absoluteStoragePath = realpath($tenantStoragePath);
+            if (!$absoluteStoragePath) {
+                throw new \Exception('Could not resolve absolute path for: ' . $tenantStoragePath);
+            }
+
+            if (!symlink($absoluteStoragePath, $publicPath)) {
+                throw new \Exception('Failed to create symbolic link. Check permissions and paths.');
+            }
+
+            $this->info("Symbolic link for tenant {$tenantId} created successfully.");
+        } catch (\Exception $e) {
+            $this->error('Could not create symbolic link for tenant ' . $tenantId . ': ' . $e->getMessage());
+            $this->error('Source path: ' . $tenantStoragePath);
+            $this->error('Target path: ' . $publicPath);
+
+            // Additional debugging information
+            $this->info("\nDebugging information:");
+            $this->info('Source exists: ' . (File::exists($tenantStoragePath) ? 'Yes' : 'No'));
+            $this->info('Source is readable: ' . (is_readable($tenantStoragePath) ? 'Yes' : 'No'));
+            $this->info('Parent directory exists: ' . (File::exists($parentDir) ? 'Yes' : 'No'));
+            $this->info('Parent directory is writable: ' . (is_writable($parentDir) ? 'Yes' : 'No'));
+        }
+    }
+}

ProcessMaker/Console/Commands/TenantsAddScheduleTask.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace ProcessMaker\Console\Commands;
+
+use Illuminate\Console\Command;
+use ProcessMaker\Multitenancy\Tenant;
+
+class TenantsAddScheduleTask extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'tenants:add-schedule-task 
+                           {--tenant= : The ID of the tenant}
+                           {--command= : The command to schedule}
+                           {--frequency=daily : The frequency to run the command (e.g., everyMinute, hourly, daily, weekly, monthly, custom)}
+                           {--cron= : Custom cron expression (required if frequency is custom)}
+                           {--options= : Comma-separated list of options (withoutOverlapping, onOneServer)}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Add a scheduled task to a tenant configuration';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $tenantId = $this->option('tenant');
+        $command = $this->option('command');
+        $frequency = $this->option('frequency');
+        $cron = $this->option('cron');
+        $optionsString = $this->option('options');
+
+        // Validate required parameters
+        if (!$tenantId) {
+            $this->error('Tenant ID is required.');
+
+            return 1;
+        }
+
+        if (!$command) {
+            $this->error('Command is required.');
+
+            return 1;
+        }
+
+        if ($frequency === 'custom' && !$cron) {
+            $this->error('Cron expression is required when frequency is custom.');
+
+            return 1;
+        }
+
+        // Find the tenant
+        $tenant = Tenant::find($tenantId);
+        if (!$tenant) {
+            $this->error("Tenant with ID {$tenantId} not found.");
+
+            return 1;
+        }
+
+        // Get current config or initialize empty array
+        $config = $tenant->config ?? [];
+
+        // Initialize schedule config if not exists
+        if (!isset($config['schedule'])) {
+            $config['schedule'] = [];
+        }
+
+        // Set up the task configuration
+        $taskConfig = [
+            'frequency' => $frequency,
+        ];
+
+        // Add cron expression if using custom frequency
+        if ($frequency === 'custom') {
+            $taskConfig['cron'] = $cron;
+        }
+
+        // Process options
+        if ($optionsString) {
+            $options = explode(',', $optionsString);
+            foreach ($options as $option) {
+                $option = trim($option);
+                if ($option === 'withoutOverlapping' || $option === 'onOneServer') {
+                    $taskConfig[$option] = true;
+                }
+            }
+        }
+
+        // Add or update the command in the tenant's schedule config
+        $config['schedule'][$command] = $taskConfig;
+
+        // Save the updated configuration
+        $tenant->config = $config;
+        $tenant->save();
+
+        $this->info("Scheduled task '{$command}' added to tenant {$tenantId} with frequency '{$frequency}'.");
+
+        return 0;
+    }
+}