review(front): refacto url-manager #8861
Merged
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
Renamed `lastAuthenticateWorkspaceState` to `workspaceDomainState` for clearer context and consistency across modules. Updated imports, variable references, and renamed related files. This change improves code readability by aligning state names with their purpose.
Replaced workspaceDomainState with lastAuthenticateWorkspaceDomainState to consolidate domain management logic. Updated all references to use the new hook for improved clarity and consistency. Adjusted import paths for domain configuration state to a more consistent naming convention.
Removed unused `useRecoilValue` and `domainConfigurationState` imports to streamline the code. Introduced `isMultiWorkspaceEnabledState` management in useAuth, aligning with clientConfig changes. Also added a zod schema for structured cookie attribute validation in recoil-effects.
Refactored the validation logic for custom cookie attributes by adding a helper function, `isCustomCookiesAttributesValue`, to improve code readability and maintainability. This refactor removes redundant parsing logic and ensures correct type checking, streamlining the existing recoil effect utility.
![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 URL management system by introducing a new domain-manager module that replaces the centralized url-manager with more focused, specialized hooks for handling workspace and domain-related functionality.
- Added new
domain-managermodule with specialized hooks likeuseBuildWorkspaceUrl,useDefaultDomain, anduseDomainBackToWorkspacefor better separation of concerns - Replaced
urlManagerStatewithdomainConfigurationStatefor managing domain configuration across the application - Introduced
lastAuthenticateWorkspaceDomainStatewith cookie persistence for tracking authenticated workspace domains - Added Zod validation schema for cookie attributes in
recoil-effects.tsto improve type safety - Simplified workspace navigation by replacing
redirectToWorkspacewithbackToWorkspacefunction in sign-in and workspace creation flows
22 file(s) reviewed, 24 comment(s)
Edit PR Review Bot Settings | Greptile
packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx
Outdated
Show resolved
Hide resolved
| onPage?: string, | ||
| searchParams?: Record<string, string>, | ||
| ) => { | ||
| const url = new URL(window.location.href); |
There was a problem hiding this comment.
logic: Using window.location.href as base URL could cause issues if current URL is malformed. Consider using a default base URL as fallback.
Comment on lines
+15
to
+17
| if (isDefined(subdomain) && subdomain.length !== 0) { | ||
| url.hostname = `${subdomain}.${domainConfiguration.frontDomain}`; | ||
| } |
There was a problem hiding this comment.
logic: Missing validation for domainConfiguration.frontDomain - could throw if undefined. Add check before string interpolation.
Comment on lines
9
to
11
| const defaultDomain = isMultiWorkspaceEnabled | ||
| ? `${domainConfiguration.defaultSubdomain}.${domainConfiguration.frontDomain}` | ||
| : domainConfiguration.frontDomain; |
There was a problem hiding this comment.
logic: Missing validation for domainConfiguration.defaultSubdomain - could be undefined in multi-workspace mode causing invalid domain string
Comment on lines
39
to
41
| if (isDefined(errors) || !isDefined(data?.switchWorkspace.subdomain)) { | ||
| return redirectToHome(); | ||
| return backToDefaultSubdomain(); | ||
| } |
There was a problem hiding this comment.
style: Consider adding error details to the snackbar when redirecting to default subdomain due to errors
Comment on lines
28
to
29
| workspacePublicData.subdomain !== workspaceSubdomain() | ||
| ) { |
There was a problem hiding this comment.
logic: workspaceSubdomain() is called in render and dependency array but result isn't cached - could cause unnecessary re-renders
| const isMultiWorkspaceEnabled = useRecoilValue(isMultiWorkspaceEnabledState); | ||
|
|
||
| const signInUpForm = useMemo(() => { | ||
| if (isTwentyHomePage && isMultiWorkspaceEnabled) { | ||
| if (loading) return null; |
There was a problem hiding this comment.
style: returning null during loading could cause a flash of no content - consider showing a loading state instead
Reorganize imports in useSignInUpForm.ts for better readability and fix indentation in workspace-invitation.service.ts for code consistency. These changes enhance code maintainability without altering functionality.
packages/twenty-front/src/modules/domain-manager/hooks/useWorkspaceSubdomain.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useWorkspaceSubdomain.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useWorkspaceSubdomain.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useDefaultDomain.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useDefaultDomain.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useBuildWorkspaceUrl.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useBuildWorkspaceUrl.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useDomainBackToDefaultSubdomain.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useDomainBackToWorkspace.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useLastAuthenticateWorkspaceDomain.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useLastAuthenticateWorkspaceDomain.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useLastAuthenticateWorkspaceDomain.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/hooks/useLastAuthenticateWorkspaceDomain.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/states/lastAuthenticateWorkspaceDomainState.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/domain-manager/states/lastAuthenticateWorkspaceDomainState.ts
Outdated
Show resolved
Hide resolved
AMoreaux
force-pushed
the
review/refacto-url-manager
branch
from
11e296d to
1509e45
Compare
AMoreaux
force-pushed
the
review/refacto-url-manager
branch
from
640c1dd to
4e15b72
Compare
# Conflicts: # packages/twenty-front/vite.config.ts
…nager # Conflicts: # packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx # packages/twenty-front/src/pages/auth/SignInUp.tsx
|
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.
Replace #8855