Skip to content

fix(fe): redirect engine users to connect page when there's no actors #3269

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
merged 1 commit into from
Oct 27, 2025
Merged

fix(fe): redirect engine users to connect page when there's no actors #3269

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
34 changes: 19 additions & 15 deletions ...d/src/routes/_context/_cloud/orgs.$organization/projects.$project/ns.$namespace/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import type { QueryClient } from "@tanstack/react-query";
import {
CatchBoundary,
createFileRoute,
type InferAllContext,
notFound,
redirect,
} from "@tanstack/react-router";
import { Actors } from "@/app/actors";
import { BuildPrefiller } from "@/app/build-prefiller";
import { useDataProvider } from "@/components/actors";
import {
useDataProvider,
type useEngineCompatDataProvider,
} from "@/components/actors";

export const Route = createFileRoute(
"/_context/_cloud/orgs/$organization/projects/$project/ns/$namespace/",
Expand All @@ -18,15 +21,18 @@ export const Route = createFileRoute(
throw notFound();
}

const isVisible = await shouldDisplayActors(context);
const shouldDisplay = await shouldDisplayActors(context);

if (!isVisible) {
if (!shouldDisplay) {
throw redirect({ from: Route.to, replace: true, to: "./connect" });
}
},
});

async function shouldDisplayActors(context: InferAllContext<typeof Route>) {
export async function shouldDisplayActors(context: {
queryClient: QueryClient;
dataProvider: ReturnType<typeof useEngineCompatDataProvider>;
}) {
try {
const infiniteBuilds = await context.queryClient.fetchInfiniteQuery(
context.dataProvider.buildsQueryOptions(),
Expand Down Expand Up @@ -65,16 +71,14 @@ export function RouteComponent() {
}

return (
<>
<CatchBoundary getResetKey={() => actorId ?? "no-actor-id"}>
<Actors actorId={actorId} />
<CatchBoundary
getResetKey={() => n?.join(",") ?? "no-build-name"}
errorComponent={() => null}
>
{!n ? <BuildPrefiller /> : null}
</CatchBoundary>
<CatchBoundary getResetKey={() => actorId ?? "no-actor-id"}>
<Actors actorId={actorId} />
<CatchBoundary
getResetKey={() => n?.join(",") ?? "no-build-name"}
errorComponent={() => null}
>
{!n ? <BuildPrefiller /> : null}
</CatchBoundary>
</>
</CatchBoundary>
);
}
13 changes: 10 additions & 3 deletions frontend/src/routes/_context/_engine/ns.$namespace/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,40 @@
import {
CatchBoundary,
createFileRoute,
redirect,
useSearch,
} from "@tanstack/react-router";
import { Actors } from "@/app/actors";
import { BuildPrefiller } from "@/app/build-prefiller";
import { shouldDisplayActors } from "../../_cloud/orgs.$organization/projects.$project/ns.$namespace/index";

export const Route = createFileRoute("/_context/_engine/ns/$namespace/")({
component: RouteComponent,
beforeLoad: async ({ context }) => {
if (context.__type !== "engine") {
throw new Error("Invalid context type for this route");
}

const shouldDisplay = await shouldDisplayActors(context);

if (!shouldDisplay) {
throw redirect({ from: Route.to, replace: true, to: "./connect" });
}
},
});

export function RouteComponent() {
const { actorId, n } = useSearch({ from: "/_context" });

return (
<>
<CatchBoundary getResetKey={() => actorId ?? "no-actor-id"}>
<Actors actorId={actorId} />

<CatchBoundary
getResetKey={() => n?.join(",") ?? "no-build-name"}
errorComponent={() => null}
>
{!n ? <BuildPrefiller /> : null}
</CatchBoundary>
</>
</CatchBoundary>
);
}
Loading