Skip to content

Studio 645 instance sign in fixes #1201

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

Merged
dawsontoth merged 2 commits into from
May 15, 2026
+19 −7
Merged

Studio 645 instance sign in fixes #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b29875
fix: Instance sign in overlapped by the breadcrumbs
dawsontoth May 15, 2026
5f70aad
fix: Turn off fabric connect flag when direct signing in
dawsontoth May 15, 2026
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
10 changes: 8 additions & 2 deletions src/features/auth/ClusterInstanceSignIn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { getOperationsUrlForInstance } from '@/lib/urls/getOperationsUrlForInsta
import { zodResolver } from '@hookform/resolvers/zod';
import { useQuery } from '@tanstack/react-query';
import { Link, Navigate, useParams } from '@tanstack/react-router';
import { cx } from 'class-variance-authority';
import { useMemo } from 'react';
import { useForm } from 'react-hook-form';

Expand Down Expand Up @@ -100,8 +101,13 @@ export function ClusterInstanceSignIn() {
<Breadcrumbs />
</nav>
)}
<div className="h-screen items-center justify-center flex">
<div className="text-white w-xs">
<div
className={cx(
isLocalStudio ? 'min-h-screen' : 'mt-32 min-h-[calc(100vh-(--spacing(32)))]',
'items-center justify-center flex',
)}
>
<div className="text-white w-xs py-8">
<h2 className="text-2xl font-light">
Sign in to Harper {properNoun}
</h2>
Expand Down
10 changes: 5 additions & 5 deletions src/features/clusters/components/ClusterCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ export function ClusterCard({ cluster }: { cluster: Cluster }) {
</DropdownMenuItem>
</Link>
),
isActive && view && !!operationsUrl && !auth.isLoading && isDirectConnect && (
<DropdownMenuItem key="direct-sign-out" onClick={onSignOutClick} disabled={signingOut}>
Direct Sign Out
</DropdownMenuItem>
),
isActive && update && (
<Link key="edit" to={`${cluster.id}/edit`} disabled={signingOut}>
<DropdownMenuItem>
Expand Down Expand Up @@ -186,11 +191,6 @@ export function ClusterCard({ cluster }: { cluster: Cluster }) {
</DropdownMenuItem>
),

isActive && view && !!operationsUrl && !auth.isLoading && isDirectConnect && (
<DropdownMenuItem key="direct-sign-out" onClick={onSignOutClick} disabled={signingOut}>
Direct Sign Out
</DropdownMenuItem>
),
clusterHasFailed && create && (
<DropdownMenuItem key="try-again" className="focus:bg-green/70 focus:text-white" onClick={onTryAgainClick}>
Try Again
Expand Down
6 changes: 6 additions & 0 deletions src/features/clusters/components/ClusterCardAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ import { Cluster } from '@/integrations/api/api.patch';
import { clusterIsSelfManaged } from '@/integrations/api/clusterIsSelfManaged';
import { Link } from '@tanstack/react-router';
import { ArrowRight } from 'lucide-react';
import { useCallback } from 'react';

export function ClusterCardAction({ cluster }: { cluster: Cluster }) {
const auth = useInstanceAuth(cluster.id);
const { view, update } = useOrganizationClusterPermissions(cluster.organizationId, cluster.id);
const isFabricConnect = authStore.checkForFabricConnect(cluster.id);
const isDirectConnect = !isFabricConnect && !!auth.user;
const prepareForDirectSignIn = useCallback(() => {
authStore.setUserForEntity(cluster, null);
authStore.flagForFabricConnect(cluster.id, false);
}, [cluster]);

if (!view) {
return undefined;
Expand Down Expand Up @@ -95,6 +100,7 @@ export function ClusterCardAction({ cluster }: { cluster: Cluster }) {
className="text-sm text-nowrap"
aria-label={`Sign In to ${cluster.name}`}
title={`Sign In to ${cluster.name}`}
onClick={prepareForDirectSignIn}
>
<span className="py-2 hover:border-b-2">
Direct Sign In <ArrowRight className="inline-block" />
Expand Down