refactor(domain-manager): improve default workspace resolution #10282
Conversation
This file contains 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
Refactor logic for determining the default workspace in single-workspace mode. Added fallback to Apple workspace when multiple workspaces are found and updated validations to ensure a workspace is always returned. Simplified handling of scenarios where multi-workspace mode is enabled.
Updated the log message for single-workspace mode to improve clarity. The warning now explicitly states the number of workspaces found and specifies that the Apple workspace will be used as fallback.
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR refactors the workspace resolution logic in single-workspace mode to improve reliability and simplify the codebase, focusing on better default workspace handling and fallback mechanisms.
- Added fallback to Apple workspace (SEED_APPLE_WORKSPACE_ID) when multiple workspaces are found in
/packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.ts - Removed complex DEFAULT_SUBDOMAIN lookup logic in favor of a more straightforward approach
- Enhanced validation to ensure a workspace is always returned in single-workspace mode
- Improved error handling for multi-workspace mode scenarios with clearer validation checks
1 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings | Greptile
...ages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.ts
Outdated
Show resolved
Hide resolved
Fixed a punctuation issue in the log message for single-workspace mode. Improved readability by adding proper sentence structure and clarity.
…services/domain-manager.service.ts Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
guillim
approved these changes
Feb 18, 2025
…kspace-in-single-workspace-mode
|
I think the help of @Weiko or @charlesBochet is necessary to merge this PR since integration CI might be blocking your merge |
AMoreaux
deleted the
fix/manage-multiworkspace-in-single-workspace-mode
branch
|
Thanks @AMoreaux for your contribution! |
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.
Refactor logic for determining the default workspace in single-workspace mode. Added fallback to Apple workspace when multiple workspaces are found and updated validations to ensure a workspace is always returned. Simplified handling of scenarios where multi-workspace mode is enabled.