Skip to content

fix: enable organization creation from project selector #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akashcorex wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: enable organization creation from project selector #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/start/src/components/project-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,10 @@ export default function ProjectSelector({
))}
<DropdownMenuSeparator />
<DropdownMenuItem asChild>
<Link to={'/onboarding/project'}>
<Link
search={{ createNewOrg: true }}
to={'/onboarding/project'}
>
New organization
<DropdownMenuShortcut>
<PlusIcon size={16} />
Expand Down
8 changes: 7 additions & 1 deletion apps/start/src/routes/_steps.onboarding.project.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ import { cn } from '@/utils/cn';

const validateSearch = z.object({
inviteId: z.string().optional(),
createNewOrg: z
.preprocess((value) => value === true || value === 'true', z.boolean())
.optional(),
});
export const Route = createFileRoute('/_steps/onboarding/project')({
component: Component,
Expand Down Expand Up @@ -63,6 +66,7 @@ export const Route = createFileRoute('/_steps/onboarding/project')({
type IForm = z.infer<typeof zOnboardingProject>;

function Component() {
const search = Route.useSearch();
const trpc = useTRPC();
const queryClient = useQueryClient();
const { data: organizations } = useQuery(
Expand Down Expand Up @@ -121,7 +125,9 @@ function Component() {
});

const [showCorsInput, setShowCorsInput] = useState(false);
const [createNewOrg, setCreateNewOrg] = useState(false);
const [createNewOrg, setCreateNewOrg] = useState(
() => search.createNewOrg ?? false
);
const canUseExistingWorkspace = organizations.length > 0;
const showCreateForm = createNewOrg || organizations.length === 0;

Expand Down