mirror of
https://github.com/docmost/docmost.git
synced 2026-08-26 00:07:04 +08:00
feat: page history diff (#1891)
* Show actual history changes * V2 - WIP * feat: page history diff * fix: exclude content from history listing --------- Co-authored-by: Jason Norwood-Young <jason@10layer.com>
This commit is contained in:
co-authored by
Jason Norwood-Young
parent
f32bb298e0
commit
5506eb194b
@@ -0,0 +1,208 @@
|
||||
import {
|
||||
ActionIcon,
|
||||
Box,
|
||||
Button,
|
||||
Group,
|
||||
Paper,
|
||||
ScrollArea,
|
||||
Select,
|
||||
Switch,
|
||||
Text,
|
||||
} from "@mantine/core";
|
||||
import { useAtom, useAtomValue, useSetAtom } from "jotai";
|
||||
import {
|
||||
activeHistoryIdAtom,
|
||||
activeHistoryPrevIdAtom,
|
||||
diffCountsAtom,
|
||||
highlightChangesAtom,
|
||||
historyAtoms,
|
||||
} from "@/features/page-history/atoms/history-atoms";
|
||||
import HistoryView from "@/features/page-history/components/history-view";
|
||||
import { useCallback, useEffect, useMemo, useRef } from "react";
|
||||
import { IconCheck, IconChevronDown, IconChevronUp } from "@tabler/icons-react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { usePageHistoryListQuery } from "@/features/page-history/queries/page-history-query";
|
||||
import { formattedDate } from "@/lib/time";
|
||||
import {
|
||||
useDiffNavigation,
|
||||
useHistoryReset,
|
||||
useHistoryRestore,
|
||||
} from "@/features/page-history/hooks";
|
||||
import classes from "./css/history-mobile.module.css";
|
||||
|
||||
interface Props {
|
||||
pageId: string;
|
||||
pageTitle?: string;
|
||||
}
|
||||
|
||||
export default function HistoryModalMobile({ pageId, pageTitle }: Props) {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
|
||||
const setActiveHistoryPrevId = useSetAtom(activeHistoryPrevIdAtom);
|
||||
const [highlightChanges, setHighlightChanges] = useAtom(highlightChangesAtom);
|
||||
const diffCounts = useAtomValue(diffCountsAtom);
|
||||
const setHistoryModalOpen = useSetAtom(historyAtoms);
|
||||
|
||||
const scrollViewportRef = useRef<HTMLDivElement>(null);
|
||||
const dropdownViewportRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const {
|
||||
data: pageHistoryData,
|
||||
isLoading,
|
||||
fetchNextPage,
|
||||
hasNextPage,
|
||||
isFetchingNextPage,
|
||||
} = usePageHistoryListQuery(pageId);
|
||||
|
||||
const historyItems = useMemo(
|
||||
() => pageHistoryData?.pages.flatMap((page) => page.items) ?? [],
|
||||
[pageHistoryData],
|
||||
);
|
||||
|
||||
const selectData = useMemo(
|
||||
() =>
|
||||
historyItems.map((item) => ({
|
||||
value: item.id,
|
||||
label: formattedDate(new Date(item.createdAt)),
|
||||
userName: item.lastUpdatedBy?.name,
|
||||
})),
|
||||
[historyItems],
|
||||
);
|
||||
|
||||
useHistoryReset(pageId);
|
||||
const { canRestore, confirmRestore } = useHistoryRestore();
|
||||
const { currentChangeIndex, handlePrevChange, handleNextChange } =
|
||||
useDiffNavigation(scrollViewportRef);
|
||||
|
||||
useEffect(() => {
|
||||
if (historyItems.length > 0 && !activeHistoryId) {
|
||||
setActiveHistoryId(historyItems[0].id);
|
||||
setActiveHistoryPrevId(historyItems[1]?.id ?? "");
|
||||
}
|
||||
}, [
|
||||
historyItems,
|
||||
activeHistoryId,
|
||||
setActiveHistoryId,
|
||||
setActiveHistoryPrevId,
|
||||
]);
|
||||
|
||||
const handleDropdownScroll = useCallback(() => {
|
||||
const viewport = dropdownViewportRef.current;
|
||||
if (!viewport || !hasNextPage || isFetchingNextPage) return;
|
||||
|
||||
const { scrollTop, scrollHeight, clientHeight } = viewport;
|
||||
const isNearBottom = scrollTop + clientHeight >= scrollHeight - 50;
|
||||
|
||||
if (isNearBottom) {
|
||||
fetchNextPage();
|
||||
}
|
||||
}, [fetchNextPage, hasNextPage, isFetchingNextPage]);
|
||||
|
||||
const handleSelectVersion = useCallback(
|
||||
(value: string | null) => {
|
||||
if (!value) return;
|
||||
const index = historyItems.findIndex((item) => item.id === value);
|
||||
if (index >= 0) {
|
||||
setActiveHistoryId(value);
|
||||
setActiveHistoryPrevId(historyItems[index + 1]?.id ?? "");
|
||||
}
|
||||
},
|
||||
[historyItems, setActiveHistoryId, setActiveHistoryPrevId],
|
||||
);
|
||||
|
||||
if (isLoading) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<Box className={classes.container}>
|
||||
<Box className={classes.selectorWrapper}>
|
||||
<Select
|
||||
data={selectData}
|
||||
value={activeHistoryId}
|
||||
onChange={handleSelectVersion}
|
||||
placeholder={t("Select version")}
|
||||
checkIconPosition="right"
|
||||
maxDropdownHeight={300}
|
||||
renderOption={({ option, checked }) => (
|
||||
<Group justify="space-between" wrap="nowrap" w="100%">
|
||||
<div>
|
||||
<Text size="sm">{option.label}</Text>
|
||||
<Text size="xs" c="dimmed">
|
||||
{(option as { userName?: string }).userName}
|
||||
</Text>
|
||||
</div>
|
||||
{checked && <IconCheck size={16} />}
|
||||
</Group>
|
||||
)}
|
||||
comboboxProps={{ withinPortal: false }}
|
||||
scrollAreaProps={{
|
||||
viewportRef: dropdownViewportRef,
|
||||
onScrollPositionChange: handleDropdownScroll,
|
||||
}}
|
||||
/>
|
||||
</Box>
|
||||
|
||||
<ScrollArea
|
||||
className={classes.editorArea}
|
||||
viewportRef={scrollViewportRef}
|
||||
scrollbarSize={5}
|
||||
>
|
||||
<Box className={classes.editorContent}>
|
||||
{activeHistoryId && <HistoryView />}
|
||||
</Box>
|
||||
</ScrollArea>
|
||||
|
||||
{canRestore && (
|
||||
<Group className={classes.actionButtons} justify="flex-end" gap="sm">
|
||||
<Button variant="default" onClick={() => setHistoryModalOpen(false)}>
|
||||
{t("Close")}
|
||||
</Button>
|
||||
<Button onClick={confirmRestore}>{t("Restore")}</Button>
|
||||
</Group>
|
||||
)}
|
||||
|
||||
{activeHistoryId && (
|
||||
<Paper
|
||||
shadow="sm"
|
||||
radius="xl"
|
||||
px="md"
|
||||
py="xs"
|
||||
className={classes.floatingBar}
|
||||
>
|
||||
<Group gap="sm" wrap="nowrap">
|
||||
<Switch
|
||||
label={t("Highlight changes")}
|
||||
checked={highlightChanges}
|
||||
onChange={(e) => setHighlightChanges(e.currentTarget.checked)}
|
||||
size="sm"
|
||||
styles={{ label: { userSelect: "none", whiteSpace: "nowrap" } }}
|
||||
/>
|
||||
{highlightChanges && diffCounts && diffCounts.total > 0 && (
|
||||
<Group gap={4} wrap="nowrap">
|
||||
<Text size="sm" c="dimmed" style={{ whiteSpace: "nowrap" }}>
|
||||
{currentChangeIndex} of {diffCounts.total}
|
||||
</Text>
|
||||
<ActionIcon
|
||||
variant="subtle"
|
||||
size="sm"
|
||||
onClick={handlePrevChange}
|
||||
>
|
||||
<IconChevronUp size={16} />
|
||||
</ActionIcon>
|
||||
<ActionIcon
|
||||
variant="subtle"
|
||||
size="sm"
|
||||
onClick={handleNextChange}
|
||||
>
|
||||
<IconChevronDown size={16} />
|
||||
</ActionIcon>
|
||||
</Group>
|
||||
)}
|
||||
</Group>
|
||||
</Paper>
|
||||
)}
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user