Skip to content

fix(webapp): use useFetcher for env var edits to preserve scroll/toggle state #2847

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
ericallam merged 1 commit into from
Jan 8, 2026
Merged

fix(webapp): use useFetcher for env var edits to preserve scroll/toggle state #2847

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
41 changes: 16 additions & 25 deletions ...gs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ import {
PlusIcon,
TrashIcon,
} from "@heroicons/react/20/solid";
import { Form, type MetaFunction, Outlet, useActionData, useNavigation } from "@remix-run/react";
import { Form, type MetaFunction, Outlet, useActionData, useFetcher, useNavigation } from "@remix-run/react";
import {
type ActionFunctionArgs,
type LoaderFunctionArgs,
json,
redirectDocument,
} from "@remix-run/server-runtime";
import { useMemo, useState } from "react";
import { useEffect, useMemo, useState } from "react";
import { typedjson, useTypedLoaderData } from "remix-typedjson";
import { z } from "zod";
import { EnvironmentCombo } from "~/components/environments/EnvironmentLabel";
Expand Down Expand Up @@ -159,19 +158,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
return json(submission);
}

//use redirectDocument because it reloads the page
return redirectDocument(
v3EnvironmentVariablesPath(
{ slug: organizationSlug },
{ slug: projectParam },
{ slug: envParam }
),
{
headers: {
refresh: "true",
},
}
);
return json({ ...submission, success: true });
}
case "delete": {
const repository = new EnvironmentVariablesRepository(prisma);
Expand Down Expand Up @@ -417,16 +404,20 @@ function EditEnvironmentVariablePanel({
revealAll: boolean;
}) {
const [isOpen, setIsOpen] = useState(false);
const lastSubmission = useActionData();
const navigation = useNavigation();
const fetcher = useFetcher<typeof action>();
const lastSubmission = fetcher.data as any;

const isLoading =
navigation.state !== "idle" &&
navigation.formMethod === "post" &&
navigation.formData?.get("action") === "edit";
const isLoading = fetcher.state !== "idle";

// Close dialog on successful submission
useEffect(() => {
if (lastSubmission?.success && fetcher.state === "idle") {
setIsOpen(false);
}
}, [lastSubmission?.success, fetcher.state]);

const [form, { id, environmentId, value }] = useForm({
id: "edit-environment-variable",
id: `edit-environment-variable-${variable.id}-${variable.environment.id}`,
// TODO: type this
lastSubmission: lastSubmission as any,
onValidate({ formData }) {
Expand All @@ -444,7 +435,7 @@ function EditEnvironmentVariablePanel({
</DialogTrigger>
<DialogContent>
<DialogHeader>Edit environment variable</DialogHeader>
<Form method="post" {...form.props}>
<fetcher.Form method="post" {...form.props}>
<input type="hidden" name="action" value="edit" />
<input {...conform.input(id, { type: "hidden" })} value={variable.id} />
<input
Expand Down Expand Up @@ -490,7 +481,7 @@ function EditEnvironmentVariablePanel({
}
/>
</Fieldset>
</Form>
</fetcher.Form>
</DialogContent>
</Dialog>
);
Expand Down