refactor(workspace, users, billing): remove default workspace + rename #9360
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
Replaced user-based parameterization with workspace-focused logic across seed scripts, mocks, and billing services. Removed redundant `user` references and standardized to `workspace` to align with updated business rules. Adjusted mock data and tests to reflect these changes.
![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 codebase to standardize workspace terminology and remove user-based parameterization in favor of workspace-focused logic.
- Renamed
mockDefaultWorkspacetomockCurrentWorkspaceacross front-end components and tests for consistent terminology - Removed
workspaceIdparameter fromseedUsersfunction and updated user deletion logic to use workspace associations - Modified
BillingSubscriptionServiceto acceptWorkspaceinstead ofUserparameter inapplyBillingSubscriptionmethod - Updated billing resolver methods to use workspace-focused logic, removing unnecessary user parameters
- Simplified user-workspace relationship handling in database operations by removing direct workspace references
11 file(s) reviewed, 2 comment(s)
Edit PR Review Bot Settings | Greptile
Comment on lines
+32
to
35
| setCurrentWorkspace(mockCurrentWorkspace); | ||
| setCurrentWorkspaceMember(mockedWorkspaceMemberData); | ||
| setCurrentUser(mockedUserData); | ||
| setSupportChat({ supportDriver: 'front', supportFrontChatId: '1234' }); |
There was a problem hiding this comment.
style: setCurrentWorkspace, setCurrentWorkspaceMember, and setCurrentUser are called in a potentially unsafe order. Consider wrapping these state updates in a useEffect to ensure consistent state updates across re-renders
packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts
Outdated
Show resolved
Hide resolved
Removed UserAuthGuard from the billingPortalSession query to fix improper authorization logic. WorkspaceAuthGuard alone ensures the correct level of access in this context.
|
Great! Spotted one error: |
Removed the unused workspaceId parameter from the seedUsers function call. This change aligns the function call with its definition and prevents potential issues caused by passing extraneous arguments.
FelixMalfait
approved these changes
Jan 6, 2025
Log |
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.
Replaced user-based parameterization with workspace-focused logic across seed scripts, mocks, and billing services. Removed redundant
userreferences and standardized toworkspaceto align with updated business rules. Adjusted mock data and tests to reflect these changes.Fix #9295