3f7e1bdc7b
Page/space export (Markdown & HTML, both via jsonToHtml -> generateHTML) crashed with "Export failed:undefined" on any page carrying a `comment` mark. Root cause: comment.renderHTML returned a LIVE DOM node (document.createElement + a click listener) whenever a global `document` existed — and the in-process MCP module injects a jsdom global.window+global.document into the Node server, defeating the old `typeof document === "undefined"` guard. The server export runs happy-dom's DOMSerializer, which crashes appending the foreign jsdom node (NodeUtility.isInclusiveAncestor -> "Cannot read properties of undefined (reading 'length')"). comment is the only extension returning a live node. Fix: widen the guard with an isNodeRuntime check (process.versions.node) so on any Node runtime renderHTML returns the plain, serializable spec array — even when MCP injected jsdom globals. The browser branch (createElement + click -> ACTIVE_COMMENT_EVENT) is untouched, so in-editor comment interactivity is preserved (Vite defines only process.env as a member-expression substitution, no `process` object in the browser bundle, so isNodeRuntime is false there). The mcp schema mirror already returns a spec array and is not on the export path (tiptapExtensions imports Comment from @docmost/editor-ext), so no mirror change is needed. Also: export-modal now reads the real error text from the response Blob (responseType:'blob' made err.response.data.message always undefined) so a failed export shows the server's message instead of "undefined". Adds a regression test that runs the real jsonToHtml on a comment-marked doc with jsdom globals injected (reproduces the crash on the unpatched code, passes after). closes #298 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
194 lines
5.4 KiB
TypeScript
194 lines
5.4 KiB
TypeScript
import {
|
|
Modal,
|
|
Button,
|
|
Group,
|
|
Text,
|
|
Select,
|
|
Switch,
|
|
Divider,
|
|
} from "@mantine/core";
|
|
import { exportPage } from "@/features/page/services/page-service.ts";
|
|
import { useState } from "react";
|
|
import { ExportFormat } from "@/features/page/types/page.types.ts";
|
|
import { notifications } from "@mantine/notifications";
|
|
import { exportSpace } from "@/features/space/services/space-service";
|
|
import { useTranslation } from "react-i18next";
|
|
|
|
// The export request uses `responseType: "blob"`, so a server error body arrives
|
|
// as a Blob rather than parsed JSON — `err.response?.data.message` is therefore
|
|
// always undefined. Read and parse the blob to surface the real error message.
|
|
async function extractExportError(err: any): Promise<string> {
|
|
const data = err?.response?.data;
|
|
if (data instanceof Blob) {
|
|
try {
|
|
const json = JSON.parse(await data.text());
|
|
return json?.message ?? "";
|
|
} catch {
|
|
return "";
|
|
}
|
|
}
|
|
return data?.message ?? err?.message ?? "";
|
|
}
|
|
|
|
interface ExportModalProps {
|
|
id: string;
|
|
type: "space" | "page";
|
|
open: boolean;
|
|
onClose: () => void;
|
|
}
|
|
|
|
export default function ExportModal({
|
|
id,
|
|
type,
|
|
open,
|
|
onClose,
|
|
}: ExportModalProps) {
|
|
const [format, setFormat] = useState<ExportFormat>(ExportFormat.Markdown);
|
|
const [includeChildren, setIncludeChildren] = useState<boolean>(false);
|
|
const [includeAttachments, setIncludeAttachments] = useState<boolean>(false);
|
|
const [isExporting, setIsExporting] = useState<boolean>(false);
|
|
const { t } = useTranslation();
|
|
|
|
const handleExport = async () => {
|
|
setIsExporting(true);
|
|
try {
|
|
if (type === "page") {
|
|
await exportPage({
|
|
pageId: id,
|
|
format,
|
|
includeChildren,
|
|
includeAttachments,
|
|
});
|
|
}
|
|
if (type === "space") {
|
|
await exportSpace({ spaceId: id, format, includeAttachments });
|
|
}
|
|
notifications.show({
|
|
message: t("Export successful"),
|
|
});
|
|
onClose();
|
|
} catch (err) {
|
|
const message = await extractExportError(err);
|
|
notifications.show({
|
|
message: t("Export failed") + (message ? `: ${message}` : ""),
|
|
color: "red",
|
|
});
|
|
console.error("export error", err);
|
|
} finally {
|
|
setIsExporting(false);
|
|
}
|
|
};
|
|
|
|
const handleChange = (format: ExportFormat) => {
|
|
setFormat(format);
|
|
};
|
|
|
|
return (
|
|
<Modal.Root
|
|
opened={open}
|
|
onClose={onClose}
|
|
size={500}
|
|
padding="xl"
|
|
yOffset="10vh"
|
|
xOffset={0}
|
|
mah={400}
|
|
onClick={(e) => e.stopPropagation()}
|
|
>
|
|
<Modal.Overlay />
|
|
<Modal.Content style={{ overflow: "hidden" }}>
|
|
<Modal.Header py={0}>
|
|
<Modal.Title fw={500}>{t(`Export ${type}`)}</Modal.Title>
|
|
<Modal.CloseButton aria-label={t("Close")} />
|
|
</Modal.Header>
|
|
<Modal.Body>
|
|
<Group justify="space-between" wrap="nowrap">
|
|
<div>
|
|
<Text size="md">{t("Format")}</Text>
|
|
</div>
|
|
<ExportFormatSelection format={format} onChange={handleChange} />
|
|
</Group>
|
|
|
|
{type === "page" && (
|
|
<>
|
|
<Divider my="sm" />
|
|
|
|
<Group justify="space-between" wrap="nowrap">
|
|
<div>
|
|
<Text size="md">{t("Include subpages")}</Text>
|
|
</div>
|
|
<Switch
|
|
onChange={(event) =>
|
|
setIncludeChildren(event.currentTarget.checked)
|
|
}
|
|
checked={includeChildren}
|
|
/>
|
|
</Group>
|
|
|
|
<Group justify="space-between" wrap="nowrap" mt="md">
|
|
<div>
|
|
<Text size="md">{t("Include attachments")}</Text>
|
|
</div>
|
|
<Switch
|
|
onChange={(event) =>
|
|
setIncludeAttachments(event.currentTarget.checked)
|
|
}
|
|
checked={includeAttachments}
|
|
/>
|
|
</Group>
|
|
</>
|
|
)}
|
|
|
|
{type === "space" && (
|
|
<>
|
|
<Divider my="sm" />
|
|
|
|
<Group justify="space-between" wrap="nowrap">
|
|
<div>
|
|
<Text size="md">{t("Include attachments")}</Text>
|
|
</div>
|
|
<Switch
|
|
onChange={(event) =>
|
|
setIncludeAttachments(event.currentTarget.checked)
|
|
}
|
|
checked={includeAttachments}
|
|
/>
|
|
</Group>
|
|
</>
|
|
)}
|
|
|
|
<Group justify="center" mt="md">
|
|
<Button onClick={onClose} variant="default">
|
|
{t("Cancel")}
|
|
</Button>
|
|
<Button onClick={handleExport} loading={isExporting}>{t("Export")}</Button>
|
|
</Group>
|
|
</Modal.Body>
|
|
</Modal.Content>
|
|
</Modal.Root>
|
|
);
|
|
}
|
|
|
|
interface ExportFormatSelection {
|
|
format: ExportFormat;
|
|
onChange: (value: string) => void;
|
|
}
|
|
function ExportFormatSelection({ format, onChange }: ExportFormatSelection) {
|
|
const { t } = useTranslation();
|
|
|
|
return (
|
|
<Select
|
|
data={[
|
|
{ value: "markdown", label: "Markdown" },
|
|
{ value: "html", label: "HTML" },
|
|
]}
|
|
defaultValue={format}
|
|
onChange={onChange}
|
|
styles={{ wrapper: { maxWidth: 120 } }}
|
|
comboboxProps={{ width: "120" }}
|
|
allowDeselect={false}
|
|
withCheckIcon={false}
|
|
aria-label={t("Select export format")}
|
|
/>
|
|
);
|
|
}
|