{__APP_TYPE__ === "engine" ? (
<>
-
+
) : null}
diff --git a/frontend/src/app/dialogs/connect-vercel-frame.tsx b/frontend/src/app/dialogs/connect-vercel-frame.tsx
index 18f9c18975..f191a0092a 100644
--- a/frontend/src/app/dialogs/connect-vercel-frame.tsx
+++ b/frontend/src/app/dialogs/connect-vercel-frame.tsx
@@ -1,11 +1,7 @@
import { faQuestionCircle, faVercel, Icon } from "@rivet-gg/icons";
import * as ConnectVercelForm from "@/app/forms/connect-vercel-form";
import { HelpDropdown } from "@/app/help-dropdown";
-import {
- Button,
- type DialogContentProps,
- Frame,
-} from "@/components";
+import { Button, type DialogContentProps, Frame } from "@/components";
import { defineStepper } from "@/components/ui/stepper";
const { Stepper } = defineStepper(
@@ -40,7 +36,7 @@ export default function CreateProjectFrameContent({
defaultValues={{ plan: "hobby", endpoint: "" }}
>
-
+
Add
Vercel
diff --git a/frontend/src/app/forms/connect-railway-form.tsx b/frontend/src/app/forms/connect-railway-form.tsx
index 7d39d75cdb..b4baf7be9c 100644
--- a/frontend/src/app/forms/connect-railway-form.tsx
+++ b/frontend/src/app/forms/connect-railway-form.tsx
@@ -1,11 +1,14 @@
+import { faCheck, faSpinnerThird, Icon } from "@rivet-gg/icons";
+import { useInfiniteQuery } from "@tanstack/react-query";
+import { motion } from "framer-motion";
+import { useEffect, useRef } from "react";
import type { UseFormReturn } from "react-hook-form";
import z from "zod";
-import * as ConnectVercelForm from "@/app/forms/connect-vercel-form";
-import { createSchemaForm } from "@/components";
+import { cn, createSchemaForm } from "@/components";
+import { useEngineCompatDataProvider } from "@/components/actors";
+import { NeedHelp } from "./connect-vercel-form";
-export const formSchema = z.object({
- endpoint: z.string().url(),
-});
+export const formSchema = z.object({});
export type FormValues = z.infer
;
export type SubmitHandler = (
@@ -16,5 +19,51 @@ export type SubmitHandler = (
const { Form, Submit, SetValue } = createSchemaForm(formSchema);
export { Form, Submit, SetValue };
-export const ConnectionCheck = ConnectVercelForm.ConnectionCheck;
-export const Endpoint = ConnectVercelForm.Endpoint;
+export const ConnectionCheck = function ConnectionCheck() {
+ const { data } = useInfiniteQuery({
+ ...useEngineCompatDataProvider().runnersQueryOptions(),
+ refetchInterval: 1000,
+ maxPages: 9999,
+ select: (data) =>
+ data.pages.reduce((acc, page) => acc + page.runners.length, 0),
+ });
+
+ const lastCount = useRef(data);
+
+ useEffect(() => {
+ lastCount.current = data;
+ }, [data]);
+
+ const success =
+ data !== undefined && data > 0 && data !== lastCount.current;
+
+ return (
+
+ {success ? (
+ <>
+ {" "}
+ Runner successfully connected
+
+ ) : (
+
+
+ {" "}
+ Waiting for Runner to connect...
+
+
+
-
+
Namespaces
: null}
- {__APP_TYPE__ === "engine" ? (
-
+ {["engine", "cloud"].includes(__APP_TYPE__) ? (
+
) : null}
Advanced
- {__APP_TYPE__ === "engine" ? (
+ {["engine", "cloud"].includes(__APP_TYPE__) ? (
<>
-
+
) : null}
diff --git a/frontend/src/components/actors/form/actor-create-form.tsx b/frontend/src/components/actors/form/actor-create-form.tsx
index 813de8b46c..41cfcc84e3 100644
--- a/frontend/src/components/actors/form/actor-create-form.tsx
+++ b/frontend/src/components/actors/form/actor-create-form.tsx
@@ -15,6 +15,7 @@ import {
} from "../../ui/form";
import { BuildSelect } from "../build-select";
import { CrashPolicySelect } from "../crash-policy-select";
+import { useEngineCompatDataProvider } from "../data-provider";
import { CrashPolicy as CrashPolicyEnum } from "../queries";
import { RegionSelect } from "../region-select";
import { RunnerSelect } from "../runner-select";
@@ -153,7 +154,7 @@ export const JsonInput = () => {
);
};
-export const RunnerNameSelector = ({ namespace }: { namespace: string }) => {
+export const RunnerNameSelector = () => {
const { control } = useFormContext();
return (
@@ -165,7 +166,6 @@ export const RunnerNameSelector = ({ namespace }: { namespace: string }) => {
Runner
@@ -212,12 +212,12 @@ export const ActorPreview = () => {
);
};
-export const PrefillRunnerName = ({ namespace }: { namespace: string }) => {
+export const PrefillRunnerName = () => {
const prefilled = useRef(false);
const { watch } = useFormContext();
const { data = [], isSuccess } = useInfiniteQuery(
- runnerNamesQueryOptions({ namespace }),
+ useEngineCompatDataProvider().runnerNamesQueryOptions(),
);
const watchedValue = watch("runnerNameSelector");
diff --git a/frontend/src/components/actors/runner-select.tsx b/frontend/src/components/actors/runner-select.tsx
index d06fda989a..6e7c55798b 100644
--- a/frontend/src/components/actors/runner-select.tsx
+++ b/frontend/src/components/actors/runner-select.tsx
@@ -6,14 +6,9 @@ import { useEngineCompatDataProvider } from "./data-provider";
interface RunnerSelectProps {
onValueChange: (value: string) => void;
value: string;
- namespace: string;
}
-export function RunnerSelect({
- onValueChange,
- value,
- namespace,
-}: RunnerSelectProps) {
+export function RunnerSelect({ onValueChange, value }: RunnerSelectProps) {
const {
data = [],
hasNextPage,
@@ -21,7 +16,7 @@ export function RunnerSelect({
isLoading,
isFetchingNextPage,
} = useInfiniteQuery(
- useEngineCompatDataProvider().runnerNamesQueryOptions({ namespace }),
+ useEngineCompatDataProvider().runnerNamesQueryOptions(),
);
const [newRunner, setNewRunner] = useState(null);
diff --git a/frontend/src/components/docs-sheet.tsx b/frontend/src/components/docs-sheet.tsx
index 875c1d8ef9..cf558bdc05 100644
--- a/frontend/src/components/docs-sheet.tsx
+++ b/frontend/src/components/docs-sheet.tsx
@@ -52,8 +52,8 @@ export function DocsSheet({
rel="noopener noreferrer"
href={
path.startsWith("http")
- ? `${path}?utm_source=engine&embed=true`
- : `https://rivet.gg/${path}?utm_source=engine&embed=true#${hash}`
+ ? `${path}?utm_source=engine`
+ : `https://rivet.gg/${path}?utm_source=engine#${hash}`
}
>
Open in new tab
diff --git a/frontend/src/components/hooks/use-dialog.tsx b/frontend/src/components/hooks/use-dialog.tsx
index cd2086f9fa..1bdf56f401 100644
--- a/frontend/src/components/hooks/use-dialog.tsx
+++ b/frontend/src/components/hooks/use-dialog.tsx
@@ -49,9 +49,9 @@ export const createDialogHook = <