6a1b28bc12
## What & why A single, consistent **workspace-creation step** for both multi-workspace and single-workspace self-host — collecting **name + logo** (and the **subdomain** in multi-workspace) — which **removes the duplicate name/logo prompt** that previously reappeared on the workspace subdomain (reported after #21641). ## Changes **One creation form for both modes** - With 0 workspaces, both multi-workspace and single-workspace route to the shared `SignInUpWorkspaceCreationForm`; `SignInUp` renders it for the `WorkspaceCreation` step regardless of domain/scope. - The subdomain field shows only in multi-workspace; single-workspace keeps its fixed address. **Logo on the creation step** - New scoped `uploadNewWorkspaceLogo(workspaceId, file)` mutation: the creator sets a logo on their just-created `PENDING_CREATION` workspace via the workspace-agnostic token (membership enforced — only the creator is a member at that point), reusing `uploadWorkspacePicture`. Upload size is capped via `settings.storage.maxFileSize` (also applied to the existing logo / profile-picture uploads). - The picked file is held locally (object-URL preview, revoked on unmount) and uploaded right after creation (non-fatal on failure). **Onboarding step → pure activation loader** - The old "Create your workspace" form (name + logo) is removed. The onboarding step now activates the pending workspace on mount and shows the loader, with a **Retry** action on failure. ## Testing - typecheck (front + server) ✅; oxlint + oxfmt clean on changed files ✅ - Unit tests: `auth.resolver.spec`, `useWorkspaceSubdomainField`, `SignInUpWorkspaceCreationForm` (multi + single-workspace), `useAuth` ✅ - Metadata GraphQL + `twenty-client-sdk` schema regenerated. Follow-up to #21641. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01Xw37hR5seiCyWnppG9z4op --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
32 lines
1.1 KiB
TypeScript
32 lines
1.1 KiB
TypeScript
import { useMemo } from 'react';
|
|
|
|
import { useLocation } from 'react-router-dom';
|
|
import { AppPath } from 'twenty-shared/types';
|
|
import { isMatchingLocation } from '~/utils/isMatchingLocation';
|
|
|
|
export const useShowAuthModal = () => {
|
|
const location = useLocation();
|
|
|
|
return useMemo(() => {
|
|
if (
|
|
isMatchingLocation(location, AppPath.Invite) ||
|
|
isMatchingLocation(location, AppPath.InviteTeam) ||
|
|
isMatchingLocation(location, AppPath.CreateProfile) ||
|
|
isMatchingLocation(location, AppPath.SyncEmails) ||
|
|
isMatchingLocation(location, AppPath.ResetPassword) ||
|
|
isMatchingLocation(location, AppPath.VerifyEmail) ||
|
|
isMatchingLocation(location, AppPath.Verify) ||
|
|
isMatchingLocation(location, AppPath.SignInUp) ||
|
|
isMatchingLocation(location, AppPath.WorkspaceActivation) ||
|
|
isMatchingLocation(location, AppPath.PlanRequired) ||
|
|
isMatchingLocation(location, AppPath.PlanRequiredSuccess) ||
|
|
isMatchingLocation(location, AppPath.BookCallDecision) ||
|
|
isMatchingLocation(location, AppPath.BookCall)
|
|
) {
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}, [location]);
|
|
};
|