refactor(settings): migrate user settings to webServerSettings schema… #3327
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… and update related components
…ServerSettings schema and improve code clarity
There was a problem hiding this comment.
Pull request overview
This PR refactors user settings to use a new webServerSettings schema, separating web server configuration from user data. The changes migrate settings like server IP, SSL certificates, Docker cleanup, and metrics configuration from the user table to a dedicated web server settings singleton.
Key Changes:
- Created new
webServerSettingstable with dedicated service layer - Migrated web server configuration fields from user table to new schema
- Updated all references throughout codebase to use new settings service
Reviewed changes
Copilot reviewed 28 out of 29 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| packages/server/src/db/schema/web-server-settings.ts | New schema defining web server settings with all configuration fields |
| packages/server/src/services/web-server-settings.ts | New service layer for web server settings operations |
| packages/server/src/db/schema/user.ts | Removed web server fields from user schema |
| apps/dokploy/drizzle/0133_striped_the_order.sql | Migration script to create new table and transfer data |
| packages/server/src/utils/traefik/web-server.ts | Updated to use webServerSettings type |
| packages/server/src/utils/backups/index.ts | Updated to fetch settings from new service |
| packages/server/src/utils/access-log/handler.ts | Updated log cleanup to use web server settings |
| packages/server/src/setup/monitoring-setup.ts | Updated monitoring setup to use new settings |
| packages/server/src/services/preview-deployment.ts | Updated to use web server settings service |
| packages/server/src/services/domain.ts | Updated domain generation to use new settings |
| packages/server/src/services/ai.ts | Updated AI service to use web server settings |
| packages/server/src/services/admin.ts | Updated admin service to use web server settings |
| packages/server/src/lib/auth.ts | Updated auth configuration to use web server settings |
| apps/dokploy/server/api/routers/* | Updated API routers to use new settings endpoints |
| apps/dokploy/components/dashboard/settings/* | Updated UI components to use new settings queries |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+378
to
+379
| // For Dokploy server type, we don't have a specific organizationId | ||
| // This might need to be adjusted based on your business logic |
There was a problem hiding this comment.
The comment indicates uncertainty about the business logic for organizationId assignment. Either implement the proper logic or clarify in the comment what the expected behavior should be.
Suggested change
| // For Dokploy server type, we don't have a specific organizationId | |
| // This might need to be adjusted based on your business logic | |
| // For Dokploy server type, notifications are not scoped to a specific organization. | |
| // An empty organizationId explicitly represents a global / unscoped notification. |
Comment on lines
+37
to
+39
| } as { | ||
| enableDockerCleanup: boolean; | ||
| serverId?: string; |
There was a problem hiding this comment.
Using type assertion with as bypasses TypeScript's type checking. Consider defining the proper input type or restructuring the code to avoid the type assertion.
Suggested change
| } as { | |
| enableDockerCleanup: boolean; | |
| serverId?: string; |
…ttings and streamline IP retrieval logic
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…ance log cleanup status retrieval
…n update function
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
… and update related components
What is this PR about?
Please describe in a short paragraph what this PR is about.
Checklist
Before submitting this PR, please make sure that:
canarybranch.Issues related (if applicable)
closes
Screenshots (if applicable)