4.0.0-beta.420.6 #6171

andrasbacsai · 2025-07-12T12:43:49Z

feat(code): Add Mr. Jean-Claude markdown file.
feat(scheduling): introduce ScheduledJobManager and ServerResourceManager for enhanced job scheduling and resource management
feat(deployment): add pull request filtering and pagination to deployment and backup execution components
feat(horizon): update queue configuration to use environment variable for dynamic queue management
feat(ui): add frequency filter option for manual execution of scheduled jobs
feat(previews): implement soft delete and cleanup for ApplicationPreview, enhancing resource management in DeleteResourceJob
fix(previews): refine preview domain generation for Docker Compose applications, ensuring correct method usage based on build pack type
fix(previews): enhance domain generation logic for application previews, ensuring unique domains are created when none are set
refactor(previews): move preview domain generation logic to ApplicationPreview model for better encapsulation and consistency across webhook handlers

Issues

fix [Bug]: domains dissappeared, preview deployments broke #6186

… scheduled jobs

…sk scheduling with cron checks

…nstants.php to 4.0.0-beta.420.6 and 4.0.0-beta.420.7

…pport hourly, daily, weekly, and monthly job views

…layout for improved UI consistency

…for dynamic queue management

sentry-io · 2025-07-12T12:44:08Z

🔍 Existing Issues For Review

Your pull request is modifying functions with the following pre-existing issues:

📄 File: app/Console/Kernel.php

Function	Unhandled Issue
`App\Console\Kernel::checkScheduledBackups`	Error: Class "App\Console\CronExpression" not found /app/Console/Kernel.php in App\Console\Kernel::checkScheduledBack... `Event Count:` 4

_{Did you find this useful? React with a 👍 or 👎}

…ager for enhanced job scheduling and resource management

…Manager and ServerResourceManager for improved scheduling efficiency

…ment and backup execution components fix(ui): make them more stylish yeah

…sure original names are stored in docker compose domains

…reviews

…nding order

…es based on pull request ID

…ws, ensuring unique domains are created when none are set

…plications, ensuring correct method usage based on build pack type

…onPreview model for better encapsulation and consistency across webhook handlers

…iew, enhancing resource management in DeleteResourceJob

coderabbitai · 2025-07-14T19:51:29Z

📝 Walkthrough

Summary by CodeRabbit

New Features
- Added a command to view scheduled backup and task logs with advanced filtering options.
- Introduced paginated navigation for backup executions and deployment lists.
- Added soft delete and asynchronous cleanup for application previews.
- Enhanced support for deleting preview deployments and managing their resources.
- Added new log channels for scheduled tasks and errors.
- Improved UI for backup and deployment management, including status indicators and filtering.
Improvements
- Unified preview domain generation and handling for all build pack types.
- Consolidated and optimized scheduled job management for backups and tasks.
- Improved form handling for service names with special characters.
- Enhanced validation and filtering for pull request deployments.
- Updated job and event classes to reduce noise in job monitoring.
Bug Fixes
- Fixed issues with preview domain generation and deletion for non-docker-compose apps.
- Addressed UI inconsistencies and improved Livewire reactivity with unique keys.
Documentation
- Added a comprehensive project overview and development guide.
Chores
- Updated version numbers and configuration for better environment flexibility.
- Added soft delete support to the database for application previews.

Walkthrough

This update introduces significant refactoring and fixes for preview deployment domains, soft deletion, and cleanup of preview resources. It adds new job managers for scheduled tasks and server resources, improves pagination and filtering in UI components, and enhances logging and configuration. Several methods and event signatures are updated for consistency and maintainability. Hasta la vista, bugs!

Changes

Files/Group	Change Summary
`app/Models/ApplicationPreview.php`, `database/migrations/..._add_deleted_at...`	Adds soft delete support to `ApplicationPreview` (trait, migration), refactors cleanup logic on force delete, adds persistent storage relation and improved preview domain generation.
`app/Models/Application.php`	Removes `generate_preview_fqdn`, updates `deployments` to support pull request filtering, and ensures preview ordering.
`app/Livewire/Project/Application/Previews.php`, `app/Jobs/DeleteResourceJob.php`	Refactors preview deletion to use soft delete and async job cleanup, removes direct container stopping, unifies preview FQDN generation on preview model.
`app/Livewire/Project/Application/PreviewsCompose.php`	Improves fallback logic for preview domain generation when main domain is missing.
`app/Livewire/Project/Application/Deployment/Index.php`, `resources/views/livewire/project/application/deployment/index.blade.php`	Refactors property/method names to camelCase, adds pull request filter validation, explicit pagination, page indicators, and clear filter button.
`app/Livewire/Project/Application/General.php`, `resources/views/livewire/project/application/general.blade.php`	Slugifies service names for HTML IDs and form binding, ensures original names are used in storage, updates validation accordingly.
`app/Livewire/Project/Database/BackupExecutions.php`, `resources/views/livewire/project/database/backup-executions.blade.php`	Adds paginated loading, navigation, and cleanup for backup executions, updates UI for execution counts and controls.
`app/Models/ScheduledDatabaseBackup.php`	Adds paginated executions retrieval method for scheduled backups.
`resources/views/livewire/project/application/previews.blade.php`	Adds Livewire keys for improved reactivity, adjusts UI padding.
`resources/views/livewire/project/database/scheduled-backups.blade.php`	Refactors UI for backup status, dynamic styling, and statistics.
`resources/views/livewire/project/shared/scheduled-task/show.blade.php`	Removes unnecessary padding for cleaner UI.
`app/Console/Commands/RunScheduledJobsManually.php`	Adds `--frequency` option to filter scheduled jobs by frequency, updates queries and log messages.
`app/Console/Commands/ViewScheduledLogs.php`	Adds new command to view scheduled backup/task logs with advanced filtering (by frequency, task/backup name/ID, date, etc).
`config/logging.php`	Adds new daily log channels for scheduled jobs and errors.
`config/horizon.php`	Makes queue worker's queue list configurable via environment variable.
`config/constants.php`, `versions.json`	Bumps version from `4.0.0-beta.420.5` to `4.0.0-beta.420.6` (and nightly to `.7`).
`CLAUDE.md`	Adds high-level project documentation for Claude AI.
`app/Console/Kernel.php`, `app/Jobs/ServerResourceManager.php`, `app/Jobs/ScheduledJobManager.php`	Refactors scheduler: removes granular job scheduling logic, adds two manager jobs for server resources and scheduled jobs, each using queue middleware for overlap prevention.
`app/Events/BackupCreated.php`, `app/Events/ServiceChecked.php`, `app/Jobs/PushServerUpdateJob.php`, `app/Jobs/ServerStorageCheckJob.php`	Marks events/jobs as `Silenced` for Horizon.
`app/Http/Controllers/Webhook/Bitbucket.php`, `app/Http/Controllers/Webhook/Gitea.php`, `app/Http/Controllers/Webhook/Github.php`, `app/Http/Controllers/Webhook/Gitlab.php`, `app/Jobs/ApplicationDeploymentJob.php`	Ensures preview FQDN is generated for PR deployments, both for dockercompose and other build packs, aligning logic across VCS providers.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant LivewirePreviews
    participant ApplicationPreview
    participant DeleteResourceJob
    participant DockerServer

    User->>LivewirePreviews: Requests preview deletion (PR ID)
    LivewirePreviews->>ApplicationPreview: Soft delete preview
    LivewirePreviews->>DeleteResourceJob: Dispatch async cleanup job
    DeleteResourceJob->>ApplicationPreview: Force delete (if not trashed)
    DeleteResourceJob->>DockerServer: Remove containers/stack/networks/volumes
    DeleteResourceJob->>ApplicationPreview: Final cleanup and force delete

sequenceDiagram
    participant Scheduler
    participant ServerResourceManager
    participant ScheduledJobManager
    participant Server
    participant DatabaseBackupJob
    participant ScheduledTaskJob

    Scheduler->>ServerResourceManager: Run every minute
    ServerResourceManager->>Server: Check resources, cleanup, patch, sentinel restart

    Scheduler->>ScheduledJobManager: Run every minute
    ScheduledJobManager->>DatabaseBackupJob: Dispatch if due (per schedule)
    ScheduledJobManager->>ScheduledTaskJob: Dispatch if due (per schedule)

sequenceDiagram
    participant User
    participant LivewireDeploymentIndex
    participant Application
    participant Deployment

    User->>LivewireDeploymentIndex: Filter by PR ID, paginate
    LivewireDeploymentIndex->>Application: deployments(skip, take, pullRequestId)
    Application->>Deployment: Query with optional PR ID filter, return paged results
    LivewireDeploymentIndex->>User: Show deployments, page controls, filter state

Assessment against linked issues

Objective	Addressed	Explanation
Fix preview deployments so that preview FQDNs/domains are correctly generated and displayed (#6186)	✅
Restore and persist preview domain configuration for PR deployments (#6186)	✅
Ensure preview deployments work for both dockercompose and other build packs (#6186)	✅
Handle missing or empty main domains gracefully in preview domain generation (#6186)	✅

Assessment against linked issues: Out-of-scope changes

Code Change	Explanation
Addition of new job managers for server resources and scheduled jobs (`app/Jobs/ServerResourceManager.php`, `app/Jobs/ScheduledJobManager.php`, `app/Console/Kernel.php`)	These changes are a refactor of the scheduler and not directly related to the preview deployment/domain bug in #6186.
Addition of new log channels and log viewing command (`config/logging.php`, `app/Console/Commands/ViewScheduledLogs.php`)	These logging enhancements are unrelated to the preview deployment/domain issue in #6186.
Addition of CLAUDE.md documentation file	Project documentation for Claude is not related to the preview deployment/domain bug in #6186.

✨ Finishing Touches

📝 Generate Docstrings

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch next

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

‼️ IMPORTANT
Auto-reply has been disabled for this repository in the CodeRabbit settings. The CodeRabbit bot will not respond to your replies unless it is explicitly tagged.

Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai explain this code block.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai auto-generate unit tests to generate unit tests for this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

coderabbitai

Actionable comments posted: 6

🔭 Outside diff range comments (1)

app/Models/ApplicationPreview.php (1)

17-47: Judgment Day cleanup logic needs a refactor

The cleanup logic is solid, but that else clause at line 35 is making my CPU hurt more than gluten makes my stomach hurt. Static analysis caught it too - we can simplify this.

Apply this diff to eliminate the else clause and make the code cleaner:

 static::forceDeleting(function ($preview) {
     $server = $preview->application->destination->server;
     $application = $preview->application;

-    if (data_get($preview, 'application.build_pack') === 'dockercompose') {
-        // Docker Compose volume and network cleanup
-        $composeFile = $application->parse(pull_request_id: $preview->pull_request_id);
-        $volumes = data_get($composeFile, 'volumes');
-        $networks = data_get($composeFile, 'networks');
-        $networkKeys = collect($networks)->keys();
-        $volumeKeys = collect($volumes)->keys();
-        $volumeKeys->each(function ($key) use ($server) {
-            instant_remote_process(["docker volume rm -f $key"], $server, false);
-        });
-        $networkKeys->each(function ($key) use ($server) {
-            instant_remote_process(["docker network disconnect $key coolify-proxy"], $server, false);
-            instant_remote_process(["docker network rm $key"], $server, false);
-        });
-    } else {
-        // Regular application volume cleanup
-        $persistentStorages = $preview->persistentStorages()->get() ?? collect();
-        if ($persistentStorages->count() > 0) {
-            foreach ($persistentStorages as $storage) {
-                instant_remote_process(["docker volume rm -f $storage->name"], $server, false);
-            }
-        }
-    }
+    if (data_get($preview, 'application.build_pack') === 'dockercompose') {
+        // Docker Compose volume and network cleanup
+        $composeFile = $application->parse(pull_request_id: $preview->pull_request_id);
+        $volumes = data_get($composeFile, 'volumes');
+        $networks = data_get($composeFile, 'networks');
+        $networkKeys = collect($networks)->keys();
+        $volumeKeys = collect($volumes)->keys();
+        $volumeKeys->each(function ($key) use ($server) {
+            instant_remote_process(["docker volume rm -f $key"], $server, false);
+        });
+        $networkKeys->each(function ($key) use ($server) {
+            instant_remote_process(["docker network disconnect $key coolify-proxy"], $server, false);
+            instant_remote_process(["docker network rm $key"], $server, false);
+        });
+    }
+    
+    if (data_get($preview, 'application.build_pack') !== 'dockercompose') {
+        // Regular application volume cleanup
+        $persistentStorages = $preview->persistentStorages()->get() ?? collect();
+        if ($persistentStorages->count() > 0) {
+            foreach ($persistentStorages as $storage) {
+                instant_remote_process(["docker volume rm -f $storage->name"], $server, false);
+            }
+        }
+    }

     // Clean up persistent storage records
     $preview->persistentStorages()->delete();
 });

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between f59a689 and 13f1002.

📒 Files selected for processing (35)

CLAUDE.md (1 hunks)
app/Console/Commands/RunScheduledJobsManually.php (7 hunks)
app/Console/Commands/ViewScheduledLogs.php (1 hunks)
app/Console/Kernel.php (3 hunks)
app/Events/BackupCreated.php (1 hunks)
app/Events/ServiceChecked.php (1 hunks)
app/Http/Controllers/Webhook/Bitbucket.php (1 hunks)
app/Http/Controllers/Webhook/Gitea.php (1 hunks)
app/Http/Controllers/Webhook/Github.php (1 hunks)
app/Http/Controllers/Webhook/Gitlab.php (1 hunks)
app/Jobs/ApplicationDeploymentJob.php (1 hunks)
app/Jobs/DeleteResourceJob.php (4 hunks)
app/Jobs/PushServerUpdateJob.php (1 hunks)
app/Jobs/ScheduledJobManager.php (1 hunks)
app/Jobs/ServerResourceManager.php (1 hunks)
app/Jobs/ServerStorageCheckJob.php (1 hunks)
app/Livewire/Project/Application/Deployment/Index.php (2 hunks)
app/Livewire/Project/Application/General.php (3 hunks)
app/Livewire/Project/Application/Previews.php (4 hunks)
app/Livewire/Project/Application/PreviewsCompose.php (2 hunks)
app/Livewire/Project/Database/BackupExecutions.php (4 hunks)
app/Models/Application.php (2 hunks)
app/Models/ApplicationPreview.php (4 hunks)
app/Models/ScheduledDatabaseBackup.php (1 hunks)
config/constants.php (1 hunks)
config/horizon.php (1 hunks)
config/logging.php (1 hunks)
database/migrations/2025_07_14_191016_add_deleted_at_to_application_previews_table.php (1 hunks)
resources/views/livewire/project/application/deployment/index.blade.php (1 hunks)
resources/views/livewire/project/application/general.blade.php (1 hunks)
resources/views/livewire/project/application/previews.blade.php (3 hunks)
resources/views/livewire/project/database/backup-executions.blade.php (1 hunks)
resources/views/livewire/project/database/scheduled-backups.blade.php (1 hunks)
resources/views/livewire/project/shared/scheduled-task/show.blade.php (1 hunks)
versions.json (1 hunks)

🧰 Additional context used

📓 Path-based instructions (20)

**/*.php

Instructions used from: