Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(web): create the table form when accept responses is turned on

tianma-if9aee900040a8
diff --git a/apps/web/src/components/dialogs/TableFormDialog.tsx b/apps/web/src/components/dialogs/TableFormDialog.tsx
index 61c9ebd8..7997acd0 100644
--- a/apps/web/src/components/dialogs/TableFormDialog.tsx
+++ b/apps/web/src/components/dialogs/TableFormDialog.tsx
@@ -1,8 +1,8 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { Check, Copy, Form } from "lucide-react";
-import { useEffect, useState } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { Check, Copy, LoaderCircle } from "lucide-react";
+import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
-import type { TableField, TableFormFieldSetting, TableFormUpdateInput } from "@edgeever/shared";
+import type { TableField, TableFormFieldSetting, TableFormSettings, TableFormUpdateInput } from "@edgeever/shared";
import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
@@ -10,6 +10,8 @@ import { Switch } from "@/components/ui/switch";
import { api, getConfiguredDesktopApiBaseUrl } from "@/lib/api";
import { copyTextToClipboard } from "@/lib/clipboard";
+const TEXT_SAVE_MS = 400;
+
const formUrl = (token: string) => {
const baseUrl = getConfiguredDesktopApiBaseUrl() || window.location.origin;
return `${baseUrl.replace(/\/$/, "")}/form/${encodeURIComponent(token)}`;
@@ -34,6 +36,36 @@ const writePassword = (memoId: string, token: string, password: string) => {
}
};
+type FormDraft = {
+ enabled: boolean;
+ passwordProtected: boolean;
+ title: string;
+ description: string;
+ submitLabel: string;
+ selected: TableFormFieldSetting[];
+};
+
+const draftFromSaved = (saved: TableFormSettings | null, fields: TableField[], memoTitle: string): FormDraft => ({
+ enabled: saved?.enabled ?? false,
+ passwordProtected: saved?.passwordProtected ?? false,
+ title: saved?.title || memoTitle,
+ description: saved?.description ?? "",
+ submitLabel: saved?.submitLabel ?? "",
+ selected: saved?.fields.length
+ ? saved.fields.filter((field) => fields.some((item) => item.id === field.fieldId))
+ : fields.map((field) => ({ fieldId: field.id, required: false })),
+});
+
+const toPayload = (draft: FormDraft, rotatePassword = false): TableFormUpdateInput => ({
+ enabled: draft.enabled,
+ passwordProtected: draft.passwordProtected,
+ rotatePassword,
+ title: draft.title.trim(),
+ description: draft.description.trim(),
+ submitLabel: draft.submitLabel.trim(),
+ fields: draft.selected,
+});
+
export const TableFormDialog = ({
memoId,
memoTitle,
@@ -55,77 +87,209 @@ export const TableFormDialog = ({
queryFn: () => api.getTableForm(memoId),
enabled: open,
retry: false,
+ refetchOnWindowFocus: false,
});
const saved = formQuery.data?.form ?? null;
- const [enabled, setEnabled] = useState(false);
- const [passwordProtected, setPasswordProtected] = useState(false);
- const [title, setTitle] = useState("");
- const [description, setDescription] = useState("");
- const [submitLabel, setSubmitLabel] = useState("");
- const [selected, setSelected] = useState<TableFormFieldSetting[]>([]);
+ const [draft, setDraft] = useState<FormDraft | null>(null);
const [password, setPassword] = useState("");
const [copied, setCopied] = useState(false);
const [error, setError] = useState<string | null>(null);
+ const [saving, setSaving] = useState(false);
+ const [confirmed, setConfirmed] = useState(false);
+ const draftRef = useRef<FormDraft | null>(null);
+ const publishedRef = useRef(false);
+ const serverEnabledRef = useRef(false);
+ const serverPasswordRef = useRef(false);
+ const hydratedFor = useRef("");
+ const draftMemoIdRef = useRef(memoId);
+ const fieldsRef = useRef(fields);
+ const memoTitleRef = useRef(memoTitle);
+ const textTimer = useRef<number | null>(null);
+ const saveQueue = useRef(Promise.resolve());
+ const pendingSaves = useRef(0);
+ const saveGeneration = useRef(0);
+ const persistRef = useRef<(next: FormDraft, rotatePassword?: boolean) => void>(() => {});
+ fieldsRef.current = fields;
+ memoTitleRef.current = memoTitle;
- useEffect(() => {
- if (!open) return;
- const nextFields = saved?.fields.length
- ? saved.fields.filter((field) => fields.some((item) => item.id === field.fieldId))
- : fields.map((field) => ({ fieldId: field.id, required: false }));
- setEnabled(saved?.enabled ?? false);
- setPasswordProtected(saved?.passwordProtected ?? false);
- setTitle(saved?.title || memoTitle);
- setDescription(saved?.description ?? "");
- setSubmitLabel(saved?.submitLabel ?? "");
- setSelected(nextFields);
- setPassword(saved?.token ? readPassword(memoId, saved.token) : "");
- setError(null);
- }, [fields, memoId, memoTitle, open, saved]);
+ const applyDraft = (next: FormDraft) => {
+ draftRef.current = next;
+ setDraft(next);
+ };
- const saveMutation = useMutation({
- mutationFn: (payload: TableFormUpdateInput) => api.updateTableForm(memoId, payload),
- onSuccess: (data) => {
- queryClient.setQueryData(queryKey, { form: { ...data.form, password: undefined } });
+ const persistNow = (next: FormDraft, rotatePassword = false) => {
+ if (next.enabled && next.selected.length === 0) {
+ setError(t("structuredTable.form.needField"));
+ const reverted = { ...next, enabled: false };
+ applyDraft(reverted);
+ return;
+ }
+ const targetMemoId = draftMemoIdRef.current;
+ const generation = ++saveGeneration.current;
+ const key = ["table-form", targetMemoId] as const;
+ pendingSaves.current += 1;
+ setSaving(true);
+ setError(null);
+ setConfirmed(false);
+ const job = saveQueue.current.then(async () => {
+ const data = await api.updateTableForm(targetMemoId, toPayload(next, rotatePassword));
+ queryClient.setQueryData(key, { form: { ...data.form, password: undefined } });
+ if (targetMemoId !== draftMemoIdRef.current) return;
+ publishedRef.current = true;
+ serverEnabledRef.current = data.form.enabled;
+ serverPasswordRef.current = data.form.passwordProtected;
if (data.form.password) {
- writePassword(memoId, data.form.token, data.form.password);
+ writePassword(targetMemoId, data.form.token, data.form.password);
setPassword(data.form.password);
- } else if (!data.form.passwordProtected) {
+ } else if (!data.form.passwordProtected && generation === saveGeneration.current) {
setPassword("");
}
- setError(null);
- },
- onError: (reason: Error) => setError(reason.message),
- });
+ if (generation === saveGeneration.current && textTimer.current === null) setConfirmed(true);
+ });
+ saveQueue.current = job.then(() => undefined, () => undefined);
+ void job.catch((reason: unknown) => {
+ if (generation !== saveGeneration.current || targetMemoId !== draftMemoIdRef.current) return;
+ const current = draftRef.current;
+ if (!current) return;
+ applyDraft({
+ ...current,
+ enabled: serverEnabledRef.current,
+ passwordProtected: serverPasswordRef.current,
+ });
+ setConfirmed(false);
+ setError(reason instanceof Error ? reason.message : t("structuredTable.form.needField"));
+ }).finally(() => {
+ pendingSaves.current = Math.max(0, pendingSaves.current - 1);
+ if (pendingSaves.current === 0) setSaving(false);
+ });
+ };
+ persistRef.current = persistNow;
- const payload = (rotatePassword = false): TableFormUpdateInput => ({
- enabled,
- passwordProtected,
- rotatePassword,
- title: title.trim(),
- description: description.trim(),
- submitLabel: submitLabel.trim(),
- fields: selected,
- });
+ const cancelTextTimer = () => {
+ if (textTimer.current === null) return;
+ window.clearTimeout(textTimer.current);
+ textTimer.current = null;
+ };
+
+ const flushTextSave = () => {
+ if (textTimer.current === null) return;
+ cancelTextTimer();
+ const current = draftRef.current;
+ if (current && (publishedRef.current || current.enabled)) persistRef.current(current);
+ };
+
+ const scheduleTextSave = () => {
+ cancelTextTimer();
+ textTimer.current = window.setTimeout(() => {
+ textTimer.current = null;
+ const current = draftRef.current;
+ if (current && (publishedRef.current || current.enabled)) persistRef.current(current);
+ }, TEXT_SAVE_MS);
+ };
- const save = (rotatePassword = false) => {
- if (enabled && selected.length === 0) {
+ useEffect(() => {
+ if (!open) {
+ flushTextSave();
+ return;
+ }
+ if (hydratedFor.current && hydratedFor.current !== memoId) {
+ flushTextSave();
+ hydratedFor.current = "";
+ draftRef.current = null;
+ setDraft(null);
+ publishedRef.current = false;
+ }
+ if (!formQuery.isFetched || hydratedFor.current === memoId) return;
+ hydratedFor.current = memoId;
+ draftMemoIdRef.current = memoId;
+ const nextSaved = formQuery.data?.form ?? null;
+ const next = draftFromSaved(nextSaved, fieldsRef.current, memoTitleRef.current);
+ publishedRef.current = Boolean(nextSaved);
+ serverEnabledRef.current = nextSaved?.enabled ?? false;
+ serverPasswordRef.current = nextSaved?.passwordProtected ?? false;
+ applyDraft(next);
+ setPassword(nextSaved?.token ? readPassword(memoId, nextSaved.token) : "");
+ setError(formQuery.error instanceof Error ? formQuery.error.message : null);
+ setSaving(pendingSaves.current > 0);
+ setConfirmed(false);
+ setCopied(false);
+ }, [open, formQuery.isFetched, formQuery.data, formQuery.error, memoId]);
+
+ useEffect(() => () => {
+ if (textTimer.current === null) return;
+ window.clearTimeout(textTimer.current);
+ textTimer.current = null;
+ const current = draftRef.current;
+ if (current && (publishedRef.current || current.enabled)) persistRef.current(current);
+ }, []);
+
+ const changeEnabled = (checked: boolean) => {
+ const current = draftRef.current;
+ if (!current) return;
+ if (checked && current.selected.length === 0) {
setError(t("structuredTable.form.needField"));
return;
}
- saveMutation.mutate(payload(rotatePassword));
+ const next = { ...current, enabled: checked };
+ applyDraft(next);
+ setError(null);
+ if (!checked && !publishedRef.current) return;
+ cancelTextTimer();
+ persistNow(next);
+ };
+
+ const changePassword = (checked: boolean) => {
+ const current = draftRef.current;
+ if (!current) return;
+ const next = { ...current, passwordProtected: checked };
+ applyDraft(next);
+ if (!publishedRef.current && !next.enabled) return;
+ cancelTextTimer();
+ persistNow(next);
+ };
+
+ const changeText = (patch: Partial<Pick<FormDraft, "title" | "description" | "submitLabel">>) => {
+ const current = draftRef.current;
+ if (!current) return;
+ const next = { ...current, ...patch };
+ applyDraft(next);
+ setConfirmed(false);
+ if (publishedRef.current || next.enabled) scheduleTextSave();
};
const toggleField = (fieldId: string, included: boolean) => {
- setSelected((current) => included
- ? [...current.filter((field) => field.fieldId !== fieldId), { fieldId, required: false }]
- : current.filter((field) => field.fieldId !== fieldId));
+ const current = draftRef.current;
+ if (!current) return;
+ const selected = included
+ ? [...current.selected.filter((field) => field.fieldId !== fieldId), { fieldId, required: false }]
+ : current.selected.filter((field) => field.fieldId !== fieldId);
+ if (!included && selected.length === 0 && current.enabled) {
+ setError(t("structuredTable.form.needField"));
+ return;
+ }
+ const next = { ...current, selected };
+ applyDraft(next);
+ setError(null);
+ if (!publishedRef.current && !next.enabled) return;
+ cancelTextTimer();
+ persistNow(next);
};
const toggleRequired = (fieldId: string, required: boolean) => {
- setSelected((current) => current.map((field) => field.fieldId === fieldId ? { ...field, required } : field));
+ const current = draftRef.current;
+ if (!current) return;
+ const next = {
+ ...current,
+ selected: current.selected.map((field) => field.fieldId === fieldId ? { ...field, required } : field),
+ };
+ applyDraft(next);
+ if (!publishedRef.current && !next.enabled) return;
+ cancelTextTimer();
+ persistNow(next);
};
- const link = saved?.token ? formUrl(saved.token) : "";
+ const link = saved?.token && saved.enabled && draft?.enabled ? formUrl(saved.token) : "";
+ const showCreating = Boolean(draft?.enabled && !link && saving);
return (
<Dialog open={open} onOpenChange={onOpenChange}>
@@ -134,100 +298,124 @@ export const TableFormDialog = ({
<DialogTitle>{t("structuredTable.form.title")}</DialogTitle>
<DialogDescription>{t("structuredTable.form.description")}</DialogDescription>
</DialogHeader>
- <label className="flex items-center justify-between gap-3 text-sm">
- <span>{t("structuredTable.form.enabled")}</span>
- <Switch checked={enabled} onCheckedChange={setEnabled} aria-label={t("structuredTable.form.enabled")} />
- </label>
- {link && saved?.enabled ? (
- <div className="space-y-2">
- <span className="text-xs text-slate-500">{t("structuredTable.form.link")}</span>
- <div className="flex gap-2">
- <Input readOnly value={link} aria-label={t("structuredTable.form.link")} />
+ {!draft ? (
+ <div className="flex min-h-20 items-center justify-center text-slate-500" role="status">
+ <LoaderCircle className="h-5 w-5 animate-spin" />
+ </div>
+ ) : (
+ <>
+ <label className="flex items-center justify-between gap-3 text-sm">
+ <span>{t("structuredTable.form.enabled")}</span>
+ <Switch checked={draft.enabled} onCheckedChange={changeEnabled} aria-label={t("structuredTable.form.enabled")} />
+ </label>
+ {link ? (
+ <div className="space-y-2">
+ <span className="text-xs text-slate-500">{t("structuredTable.form.link")}</span>
+ <div className="flex gap-2">
+ <Input readOnly value={link} aria-label={t("structuredTable.form.link")} />
+ <Button
+ type="button"
+ variant="outline"
+ onClick={() => {
+ void copyTextToClipboard(link).then(() => {
+ setCopied(true);
+ window.setTimeout(() => setCopied(false), 1500);
+ });
+ }}
+ >
+ {copied ? <Check className="h-4 w-4" /> : <Copy className="h-4 w-4" />}
+ {copied ? t("structuredTable.form.copied") : t("structuredTable.form.copy")}
+ </Button>
+ </div>
+ </div>
+ ) : showCreating ? (
+ <p className="flex items-center gap-2 text-xs text-slate-500" role="status">
+ <LoaderCircle className="h-3.5 w-3.5 animate-spin" />
+ {t("structuredTable.form.saving")}
+ </p>
+ ) : null}
+ <label className="flex items-center justify-between gap-3 text-sm">
+ <span>{t("structuredTable.form.password")}</span>
+ <Switch checked={draft.passwordProtected} onCheckedChange={changePassword} aria-label={t("structuredTable.form.password")} />
+ </label>
+ <p className="text-xs text-slate-500">{t("structuredTable.form.passwordHint")}</p>
+ {draft.passwordProtected && password ? <Input readOnly value={password} aria-label={t("structuredTable.form.password")} /> : null}
+ {draft.passwordProtected && saved?.passwordProtected ? (
<Button
type="button"
variant="outline"
+ size="sm"
onClick={() => {
- void copyTextToClipboard(link).then(() => {
- setCopied(true);
- window.setTimeout(() => setCopied(false), 1500);
- });
+ cancelTextTimer();
+ const current = draftRef.current;
+ if (current) persistNow(current, true);
}}
+ disabled={saving}
>
- {copied ? <Check className="h-4 w-4" /> : <Copy className="h-4 w-4" />}
- {copied ? t("structuredTable.form.copied") : t("structuredTable.form.copy")}
+ {t("structuredTable.form.regenerate")}
</Button>
+ ) : null}
+ <label className="block space-y-1 text-sm">
+ <span>{t("structuredTable.form.formTitle")}</span>
+ <Input
+ value={draft.title}
+ onChange={(event) => changeText({ title: event.target.value })}
+ aria-label={t("structuredTable.form.formTitle")}
+ />
+ </label>
+ <label className="block space-y-1 text-sm">
+ <span>{t("structuredTable.form.formDescription")}</span>
+ <textarea
+ className="min-h-20 w-full rounded-md border border-slate-200 px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/70"
+ value={draft.description}
+ onChange={(event) => changeText({ description: event.target.value })}
+ aria-label={t("structuredTable.form.formDescription")}
+ />
+ </label>
+ <label className="block space-y-1 text-sm">
+ <span>{t("structuredTable.form.submitLabel")}</span>
+ <Input
+ value={draft.submitLabel}
+ placeholder={t("structuredTable.form.submitDefault")}
+ onChange={(event) => changeText({ submitLabel: event.target.value })}
+ aria-label={t("structuredTable.form.submitLabel")}
+ />
+ </label>
+ <div className="space-y-2">
+ <p className="text-sm">{t("structuredTable.form.fields")}</p>
+ {fields.map((field) => {
+ const setting = draft.selected.find((item) => item.fieldId === field.id);
+ return (
+ <div key={field.id} className="flex items-center justify-between gap-3 text-sm">
+ <label className="flex items-center gap-2">
+ <input
+ type="checkbox"
+ checked={Boolean(setting)}
+ aria-label={field.name}
+ onChange={(event) => toggleField(field.id, event.target.checked)}
+ />
+ <span>{field.name}</span>
+ <span className="text-xs text-slate-400">{t(`structuredTable.types.${field.type}`)}</span>
+ </label>
+ <label className="flex items-center gap-2 text-xs text-slate-500">
+ <input
+ type="checkbox"
+ checked={Boolean(setting?.required)}
+ disabled={!setting}
+ aria-label={`${field.name} ${t("structuredTable.form.required")}`}
+ onChange={(event) => toggleRequired(field.id, event.target.checked)}
+ />
+ {t("structuredTable.form.required")}
+ </label>
+ </div>
+ );
+ })}
</div>
- </div>
- ) : null}
- <label className="flex items-center justify-between gap-3 text-sm">
- <span>{t("structuredTable.form.password")}</span>
- <Switch checked={passwordProtected} onCheckedChange={setPasswordProtected} aria-label={t("structuredTable.form.password")} />
- </label>
- <p className="text-xs text-slate-500">{t("structuredTable.form.passwordHint")}</p>
- {password ? <Input readOnly value={password} aria-label={t("structuredTable.form.password")} /> : null}
- {saved?.passwordProtected ? (
- <Button type="button" variant="outline" size="sm" onClick={() => save(true)} disabled={saveMutation.isPending}>
- {t("structuredTable.form.regenerate")}
- </Button>
- ) : null}
- <label className="block space-y-1 text-sm">
- <span>{t("structuredTable.form.formTitle")}</span>
- <Input value={title} onChange={(event) => setTitle(event.target.value)} aria-label={t("structuredTable.form.formTitle")} />
- </label>
- <label className="block space-y-1 text-sm">
- <span>{t("structuredTable.form.formDescription")}</span>
- <textarea
- className="min-h-20 w-full rounded-md border border-slate-200 px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/70"
- value={description}
- onChange={(event) => setDescription(event.target.value)}
- aria-label={t("structuredTable.form.formDescription")}
- />
- </label>
- <label className="block space-y-1 text-sm">
- <span>{t("structuredTable.form.submitLabel")}</span>
- <Input
- value={submitLabel}
- placeholder={t("structuredTable.form.submitDefault")}
- onChange={(event) => setSubmitLabel(event.target.value)}
- aria-label={t("structuredTable.form.submitLabel")}
- />
- </label>
- <div className="space-y-2">
- <p className="text-sm">{t("structuredTable.form.fields")}</p>
- {fields.map((field) => {
- const setting = selected.find((item) => item.fieldId === field.id);
- return (
- <div key={field.id} className="flex items-center justify-between gap-3 text-sm">
- <label className="flex items-center gap-2">
- <input
- type="checkbox"
- checked={Boolean(setting)}
- aria-label={field.name}
- onChange={(event) => toggleField(field.id, event.target.checked)}
- />
- <span>{field.name}</span>
- <span className="text-xs text-slate-400">{t(`structuredTable.types.${field.type}`)}</span>
- </label>
- <label className="flex items-center gap-2 text-xs text-slate-500">
- <input
- type="checkbox"
- checked={Boolean(setting?.required)}
- disabled={!setting}
- aria-label={`${field.name} ${t("structuredTable.form.required")}`}
- onChange={(event) => toggleRequired(field.id, event.target.checked)}
- />
- {t("structuredTable.form.required")}
- </label>
- </div>
- );
- })}
- </div>
- {error ? <p className="text-sm text-rose-600">{error}</p> : null}
- {saveMutation.isSuccess && !error ? <p className="text-sm text-emerald-700">{t("structuredTable.form.saved")}</p> : null}
- <Button type="button" onClick={() => save(false)} disabled={saveMutation.isPending || formQuery.isLoading}>
- <Form className="h-4 w-4" />
- {saveMutation.isPending ? t("structuredTable.form.saving") : t("structuredTable.form.save")}
- </Button>
+ {error ? <p className="text-sm text-rose-600" role="alert">{error}</p> : null}
+ {!error && saving && link ? <p className="text-sm text-slate-500" role="status">{t("structuredTable.form.saving")}</p> : null}
+ {!error && !saving && confirmed ? <p className="text-sm text-emerald-700" role="status">{t("structuredTable.form.saved")}</p> : null}
+ </>
+ )}
</DialogContent>
</Dialog>
);
diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts
index 9271d62f..02209866 100644
--- a/packages/shared/src/i18n/en-US.ts
+++ b/packages/shared/src/i18n/en-US.ts
@@ -329,7 +329,6 @@ export const enUS = {
submitDefault: "Submit",
fields: "Fields on the form",
required: "Required",
- save: "Save form",
saving: "Saving",
saved: "Form saved",
needField: "Choose at least one field",
diff --git a/packages/shared/src/i18n/ja.ts b/packages/shared/src/i18n/ja.ts
index 66a1d1ec..edd7f188 100644
--- a/packages/shared/src/i18n/ja.ts
+++ b/packages/shared/src/i18n/ja.ts
@@ -329,7 +329,6 @@ export const ja = {
submitDefault: "送信",
fields: "フォームに表示するフィールド",
required: "必須",
- save: "フォームを保存",
saving: "保存中",
saved: "フォームを保存しました",
needField: "フィールドを1つ以上選んでください",
diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts
index 1c3b4efb..9484eb5f 100644
--- a/packages/shared/src/i18n/zh-CN.ts
+++ b/packages/shared/src/i18n/zh-CN.ts
@@ -329,7 +329,6 @@ export const zhCN = {
submitDefault: "提交",
fields: "出现在表单里的字段",
required: "必填",
- save: "保存表单",
saving: "保存中",
saved: "表单已保存",
needField: "至少选择一个字段",