mirror of
https://github.com/docmost/docmost.git
synced 2026-05-17 06:44:05 +08:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cb0aeedabf | |||
| 784a30b5a2 | |||
| f18b29b45a | |||
| d6af26d81b | |||
| 1260d60d38 | |||
| bf1ddd8320 |
@@ -361,8 +361,6 @@
|
|||||||
"Create block quote.": "Create block quote.",
|
"Create block quote.": "Create block quote.",
|
||||||
"Insert code snippet.": "Insert code snippet.",
|
"Insert code snippet.": "Insert code snippet.",
|
||||||
"Insert horizontal rule divider": "Insert horizontal rule divider",
|
"Insert horizontal rule divider": "Insert horizontal rule divider",
|
||||||
"Page break": "Page break",
|
|
||||||
"Insert a page break for printing.": "Insert a page break for printing.",
|
|
||||||
"Upload any image from your device.": "Upload any image from your device.",
|
"Upload any image from your device.": "Upload any image from your device.",
|
||||||
"Upload any video from your device.": "Upload any video from your device.",
|
"Upload any video from your device.": "Upload any video from your device.",
|
||||||
"Upload any audio from your device.": "Upload any audio from your device.",
|
"Upload any audio from your device.": "Upload any audio from your device.",
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useRef, useState } from "react";
|
import { useState } from "react";
|
||||||
import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts";
|
import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts";
|
||||||
import { Button, Divider, Stack } from "@mantine/core";
|
import { Button, Divider, Stack } from "@mantine/core";
|
||||||
import { IconLock, IconServer } from "@tabler/icons-react";
|
import { IconLock, IconServer } from "@tabler/icons-react";
|
||||||
@@ -7,37 +7,15 @@ import { buildSsoLoginUrl } from "@/ee/security/sso.utils.ts";
|
|||||||
import { SSO_PROVIDER } from "@/ee/security/contants.ts";
|
import { SSO_PROVIDER } from "@/ee/security/contants.ts";
|
||||||
import { GoogleIcon } from "@/components/icons/google-icon.tsx";
|
import { GoogleIcon } from "@/components/icons/google-icon.tsx";
|
||||||
import { LdapLoginModal } from "@/ee/components/ldap-login-modal.tsx";
|
import { LdapLoginModal } from "@/ee/components/ldap-login-modal.tsx";
|
||||||
import { getRedirectParam } from "@/lib/app-route.ts";
|
|
||||||
import useCurrentUser from "@/features/user/hooks/use-current-user.ts";
|
|
||||||
|
|
||||||
const SSO_AUTO_ATTEMPT_KEY = "docmost:ssoAutoAttempt";
|
|
||||||
const SSO_AUTO_ATTEMPT_TTL_MS = 5 * 60_000;
|
|
||||||
|
|
||||||
function recentAutoAttempt(): boolean {
|
|
||||||
try {
|
|
||||||
const raw = window.sessionStorage.getItem(SSO_AUTO_ATTEMPT_KEY);
|
|
||||||
if (!raw) return false;
|
|
||||||
const ts = Number(raw);
|
|
||||||
return Number.isFinite(ts) && Date.now() - ts < SSO_AUTO_ATTEMPT_TTL_MS;
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function markAutoAttempt(): void {
|
|
||||||
try {
|
|
||||||
window.sessionStorage.setItem(SSO_AUTO_ATTEMPT_KEY, String(Date.now()));
|
|
||||||
} catch {
|
|
||||||
/* sessionStorage unavailable (private mode, etc.) — best effort */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function SsoLogin() {
|
export default function SsoLogin() {
|
||||||
const { data, isLoading } = useWorkspacePublicDataQuery();
|
const { data, isLoading } = useWorkspacePublicDataQuery();
|
||||||
const { data: currentUser } = useCurrentUser();
|
|
||||||
const [ldapModalOpened, setLdapModalOpened] = useState(false);
|
const [ldapModalOpened, setLdapModalOpened] = useState(false);
|
||||||
const [selectedLdapProvider, setSelectedLdapProvider] = useState<IAuthProvider | null>(null);
|
const [selectedLdapProvider, setSelectedLdapProvider] = useState<IAuthProvider | null>(null);
|
||||||
const autoRedirectedRef = useRef(false);
|
|
||||||
|
if (!data?.authProviders || data?.authProviders?.length === 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
const handleSsoLogin = (provider: IAuthProvider) => {
|
const handleSsoLogin = (provider: IAuthProvider) => {
|
||||||
if (provider.type === SSO_PROVIDER.LDAP) {
|
if (provider.type === SSO_PROVIDER.LDAP) {
|
||||||
@@ -50,47 +28,10 @@ export default function SsoLogin() {
|
|||||||
providerId: provider.id,
|
providerId: provider.id,
|
||||||
type: provider.type,
|
type: provider.type,
|
||||||
workspaceId: data.id,
|
workspaceId: data.id,
|
||||||
redirect: getRedirectParam() ?? undefined,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Auto-redirect when SSO is enforced and there is exactly one non-LDAP
|
|
||||||
// provider. The user has no other option, so skip the extra click.
|
|
||||||
useEffect(() => {
|
|
||||||
if (autoRedirectedRef.current) return;
|
|
||||||
if (!data?.enforceSso) return;
|
|
||||||
if (!data.authProviders || data.authProviders.length !== 1) return;
|
|
||||||
const onlyProvider = data.authProviders[0];
|
|
||||||
if (onlyProvider.type === SSO_PROVIDER.LDAP) return;
|
|
||||||
|
|
||||||
// Already signed in: let useRedirectIfAuthenticated handle navigation
|
|
||||||
// instead of racing it through the IdP.
|
|
||||||
if (currentUser?.user) return;
|
|
||||||
|
|
||||||
// Explicit logout: don't immediately bounce them back to the IdP.
|
|
||||||
const params = new URLSearchParams(window.location.search);
|
|
||||||
if (params.has("logout")) return;
|
|
||||||
|
|
||||||
// Circuit-breaker: if we already auto-redirected within the TTL, the
|
|
||||||
// user came back (likely from an IdP failure). Show the page so they
|
|
||||||
// can read errors or pick a different account.
|
|
||||||
if (recentAutoAttempt()) return;
|
|
||||||
|
|
||||||
autoRedirectedRef.current = true;
|
|
||||||
markAutoAttempt();
|
|
||||||
window.location.href = buildSsoLoginUrl({
|
|
||||||
providerId: onlyProvider.id,
|
|
||||||
type: onlyProvider.type,
|
|
||||||
workspaceId: data.id,
|
|
||||||
redirect: getRedirectParam() ?? undefined,
|
|
||||||
});
|
|
||||||
}, [data, currentUser]);
|
|
||||||
|
|
||||||
if (!data?.authProviders || data?.authProviders?.length === 0) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const getProviderIcon = (provider: IAuthProvider) => {
|
const getProviderIcon = (provider: IAuthProvider) => {
|
||||||
if (provider.type === SSO_PROVIDER.GOOGLE) {
|
if (provider.type === SSO_PROVIDER.GOOGLE) {
|
||||||
return <GoogleIcon size={16} />;
|
return <GoogleIcon size={16} />;
|
||||||
|
|||||||
@@ -18,21 +18,14 @@ export function buildSsoLoginUrl(opts: {
|
|||||||
providerId: string;
|
providerId: string;
|
||||||
type: SSO_PROVIDER;
|
type: SSO_PROVIDER;
|
||||||
workspaceId?: string;
|
workspaceId?: string;
|
||||||
redirect?: string;
|
|
||||||
}): string {
|
}): string {
|
||||||
const { providerId, type, workspaceId, redirect } = opts;
|
const { providerId, type, workspaceId } = opts;
|
||||||
const domain = getAppUrl();
|
const domain = getAppUrl();
|
||||||
|
|
||||||
const params = new URLSearchParams();
|
|
||||||
if (redirect) params.set("redirect", redirect);
|
|
||||||
|
|
||||||
if (type === SSO_PROVIDER.GOOGLE) {
|
if (type === SSO_PROVIDER.GOOGLE) {
|
||||||
if (workspaceId) params.set("workspaceId", workspaceId);
|
return `${getServerAppUrl()}/api/sso/${type}/login?workspaceId=${workspaceId}`;
|
||||||
return `${getServerAppUrl()}/api/sso/${type}/login?${params.toString()}`;
|
|
||||||
}
|
}
|
||||||
const query = params.toString();
|
return `${domain}/api/sso/${type}/${providerId}/login`;
|
||||||
const base = `${domain}/api/sso/${type}/${providerId}/login`;
|
|
||||||
return query ? `${base}?${query}` : base;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getGoogleSignupUrl(): string {
|
export function getGoogleSignupUrl(): string {
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ export default function useAuth() {
|
|||||||
const handleLogout = async () => {
|
const handleLogout = async () => {
|
||||||
setCurrentUser(RESET);
|
setCurrentUser(RESET);
|
||||||
await logout();
|
await logout();
|
||||||
window.location.replace(`${APP_ROUTE.AUTH.LOGIN}?logout=1`);
|
window.location.replace(APP_ROUTE.AUTH.LOGIN);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleForgotPassword = async (data: IForgotPassword) => {
|
const handleForgotPassword = async (data: IForgotPassword) => {
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import {
|
|||||||
IconH2,
|
IconH2,
|
||||||
IconH3,
|
IconH3,
|
||||||
IconMenu4,
|
IconMenu4,
|
||||||
IconPageBreak,
|
|
||||||
IconTypography,
|
IconTypography,
|
||||||
} from "@tabler/icons-react";
|
} from "@tabler/icons-react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
@@ -103,12 +102,6 @@ export const BlockTypeGroup: FC<Props> = ({ editor }) => {
|
|||||||
>
|
>
|
||||||
{t("Divider")}
|
{t("Divider")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item
|
|
||||||
leftSection={<IconPageBreak size={16} />}
|
|
||||||
onClick={() => editor.chain().focus().setPageBreak().run()}
|
|
||||||
>
|
|
||||||
{t("Page break")}
|
|
||||||
</Menu.Item>
|
|
||||||
</Menu.Dropdown>
|
</Menu.Dropdown>
|
||||||
</Menu>
|
</Menu>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ import {
|
|||||||
IconTable,
|
IconTable,
|
||||||
IconTypography,
|
IconTypography,
|
||||||
IconMenu4,
|
IconMenu4,
|
||||||
IconPageBreak,
|
|
||||||
IconCalendar,
|
IconCalendar,
|
||||||
IconAppWindow,
|
IconAppWindow,
|
||||||
IconSitemap,
|
IconSitemap,
|
||||||
@@ -165,14 +164,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
|
|||||||
command: ({ editor, range }: CommandProps) =>
|
command: ({ editor, range }: CommandProps) =>
|
||||||
editor.chain().focus().deleteRange(range).setHorizontalRule().run(),
|
editor.chain().focus().deleteRange(range).setHorizontalRule().run(),
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: "Page break",
|
|
||||||
description: "Insert a page break for printing.",
|
|
||||||
searchTerms: ["page", "break", "pagebreak", "print"],
|
|
||||||
icon: IconPageBreak,
|
|
||||||
command: ({ editor, range }: CommandProps) =>
|
|
||||||
editor.chain().focus().deleteRange(range).setPageBreak().run(),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: "Image",
|
title: "Image",
|
||||||
description: "Upload any image from your device.",
|
description: "Upload any image from your device.",
|
||||||
|
|||||||
-1
@@ -35,7 +35,6 @@ export default function TransclusionReferenceView(props: NodeViewProps) {
|
|||||||
return (
|
return (
|
||||||
<NodeViewWrapper
|
<NodeViewWrapper
|
||||||
className={classes.includeWrap}
|
className={classes.includeWrap}
|
||||||
data-editable={isEditable ? "true" : "false"}
|
|
||||||
data-focused={isEditable && props.selected ? "true" : "false"}
|
data-focused={isEditable && props.selected ? "true" : "false"}
|
||||||
data-menu-open={openMenus > 0 ? "true" : "false"}
|
data-menu-open={openMenus > 0 ? "true" : "false"}
|
||||||
contentEditable={false}
|
contentEditable={false}
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ export default function TransclusionView(props: NodeViewProps) {
|
|||||||
return (
|
return (
|
||||||
<NodeViewWrapper
|
<NodeViewWrapper
|
||||||
className={classes.transclusionWrap}
|
className={classes.transclusionWrap}
|
||||||
data-editable={isEditable ? "true" : "false"}
|
|
||||||
data-menu-open={openMenus > 0 ? "true" : "false"}
|
data-menu-open={openMenus > 0 ? "true" : "false"}
|
||||||
data-id={transclusionId ?? undefined}
|
data-id={transclusionId ?? undefined}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -44,29 +44,8 @@
|
|||||||
transition: border 0.3s;
|
transition: border 0.3s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.transclusionWrap[data-editable="false"],
|
.transclusionWrap:hover,
|
||||||
.includeWrap[data-editable="false"] {
|
.transclusionWrap:focus-within {
|
||||||
margin-left: 0;
|
|
||||||
margin-right: 0;
|
|
||||||
width: 100%;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Cancel the wrapping .react-renderer's vertical spacing in read-only mode
|
|
||||||
so the synced block sits flush with surrounding paragraphs (whose own
|
|
||||||
margins already provide the right rhythm). */
|
|
||||||
:global(.react-renderer.node-transclusionSource):has(
|
|
||||||
.transclusionWrap[data-editable="false"]
|
|
||||||
),
|
|
||||||
:global(.react-renderer.node-transclusionReference):has(
|
|
||||||
.includeWrap[data-editable="false"]
|
|
||||||
) {
|
|
||||||
margin-top: 0;
|
|
||||||
margin-bottom: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.transclusionWrap[data-editable="true"]:hover,
|
|
||||||
.transclusionWrap[data-editable="true"]:focus-within {
|
|
||||||
border: 2px solid
|
border: 2px solid
|
||||||
light-dark(
|
light-dark(
|
||||||
var(--mantine-color-orange-2),
|
var(--mantine-color-orange-2),
|
||||||
@@ -135,9 +114,9 @@
|
|||||||
transition: border 0.3s;
|
transition: border 0.3s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.includeWrap[data-editable="true"]:hover,
|
.includeWrap:hover,
|
||||||
.includeWrap[data-editable="true"][data-focused="true"],
|
.includeWrap[data-focused="true"],
|
||||||
.includeWrap[data-editable="true"][data-menu-open="true"] {
|
.includeWrap[data-menu-open="true"] {
|
||||||
border: 2px solid
|
border: 2px solid
|
||||||
light-dark(
|
light-dark(
|
||||||
var(--mantine-color-orange-2),
|
var(--mantine-color-orange-2),
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ import {
|
|||||||
Excalidraw,
|
Excalidraw,
|
||||||
Embed,
|
Embed,
|
||||||
TiptapPdf,
|
TiptapPdf,
|
||||||
PageBreak,
|
|
||||||
SearchAndReplace,
|
SearchAndReplace,
|
||||||
Mention,
|
Mention,
|
||||||
TableDndExtension,
|
TableDndExtension,
|
||||||
@@ -367,7 +366,6 @@ export const mainExtensions = [
|
|||||||
TiptapPdf.configure({
|
TiptapPdf.configure({
|
||||||
view: PdfView,
|
view: PdfView,
|
||||||
}),
|
}),
|
||||||
PageBreak,
|
|
||||||
Subpages.configure({
|
Subpages.configure({
|
||||||
view: SubpagesView,
|
view: SubpagesView,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
@import "./media.css";
|
@import "./media.css";
|
||||||
@import "./code.css";
|
@import "./code.css";
|
||||||
@import "./print.css";
|
@import "./print.css";
|
||||||
@import "./page-break.css";
|
|
||||||
@import "./find.css";
|
@import "./find.css";
|
||||||
@import "./mention.css";
|
@import "./mention.css";
|
||||||
@import "./ordered-list.css";
|
@import "./ordered-list.css";
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
.ProseMirror .page-break {
|
|
||||||
position: relative;
|
|
||||||
margin: 1.5rem 0;
|
|
||||||
border-top: 1px dashed var(--mantine-color-default-border);
|
|
||||||
height: 0;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ProseMirror[contenteditable="false"] .page-break {
|
|
||||||
margin: 0;
|
|
||||||
border: none;
|
|
||||||
height: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ProseMirror[contenteditable="false"] .page-break::after {
|
|
||||||
content: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ProseMirror .page-break::after {
|
|
||||||
content: "Page break";
|
|
||||||
position: absolute;
|
|
||||||
top: 50%;
|
|
||||||
left: 50%;
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
padding: 0 0.5rem;
|
|
||||||
background: var(--mantine-color-body);
|
|
||||||
color: var(--mantine-color-dimmed);
|
|
||||||
font-size: 0.75rem;
|
|
||||||
line-height: 1;
|
|
||||||
letter-spacing: 0.02em;
|
|
||||||
text-transform: uppercase;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ProseMirror .page-break.ProseMirror-selectednode {
|
|
||||||
border-top-color: var(--mantine-primary-color-filled);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media print {
|
|
||||||
.ProseMirror .page-break {
|
|
||||||
break-before: always;
|
|
||||||
page-break-before: always;
|
|
||||||
visibility: hidden;
|
|
||||||
border: none;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ProseMirror .page-break::after {
|
|
||||||
content: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +1,6 @@
|
|||||||
import { atom } from "jotai";
|
import { atom } from "jotai";
|
||||||
import { atomWithStorage } from "jotai/utils";
|
|
||||||
import { ISharedPageTree } from "@/features/share/types/share.types";
|
import { ISharedPageTree } from "@/features/share/types/share.types";
|
||||||
import { SharedPageTreeNode } from "@/features/share/utils";
|
import { SharedPageTreeNode } from "@/features/share/utils";
|
||||||
|
|
||||||
export const sharedPageTreeAtom = atom<ISharedPageTree | null>(null);
|
export const sharedPageTreeAtom = atom<ISharedPageTree | null>(null);
|
||||||
export const sharedTreeDataAtom = atom<SharedPageTreeNode[] | null>(null);
|
export const sharedTreeDataAtom = atom<SharedPageTreeNode[] | null>(null);
|
||||||
export const sharedPageFullWidthAtom = atomWithStorage<boolean>(
|
|
||||||
"sharedPageFullWidth",
|
|
||||||
false,
|
|
||||||
);
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
import React, { useEffect, useMemo } from "react";
|
||||||
import {
|
import {
|
||||||
ActionIcon,
|
ActionIcon,
|
||||||
AppShell,
|
AppShell,
|
||||||
@@ -14,16 +14,11 @@ import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
|
|||||||
import { ThemeToggle } from "@/components/theme-toggle.tsx";
|
import { ThemeToggle } from "@/components/theme-toggle.tsx";
|
||||||
import { useAtomValue, useSetAtom } from "jotai";
|
import { useAtomValue, useSetAtom } from "jotai";
|
||||||
import { useAtom } from "jotai";
|
import { useAtom } from "jotai";
|
||||||
import {
|
import { sharedPageTreeAtom, sharedTreeDataAtom } from "@/features/share/atoms/shared-page-atom";
|
||||||
sharedPageFullWidthAtom,
|
|
||||||
sharedPageTreeAtom,
|
|
||||||
sharedTreeDataAtom,
|
|
||||||
} from "@/features/share/atoms/shared-page-atom";
|
|
||||||
import { buildSharedPageTree } from "@/features/share/utils";
|
import { buildSharedPageTree } from "@/features/share/utils";
|
||||||
import {
|
import {
|
||||||
desktopSidebarAtom,
|
desktopSidebarAtom,
|
||||||
mobileSidebarAtom,
|
mobileSidebarAtom,
|
||||||
sidebarWidthAtom,
|
|
||||||
} from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
|
} from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
|
||||||
import SidebarToggle from "@/components/ui/sidebar-toggle-button.tsx";
|
import SidebarToggle from "@/components/ui/sidebar-toggle-button.tsx";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
@@ -32,7 +27,7 @@ import {
|
|||||||
mobileTableOfContentAsideAtom,
|
mobileTableOfContentAsideAtom,
|
||||||
tableOfContentAsideAtom,
|
tableOfContentAsideAtom,
|
||||||
} from "@/features/share/atoms/sidebar-atom.ts";
|
} from "@/features/share/atoms/sidebar-atom.ts";
|
||||||
import { IconArrowsHorizontal, IconList } from "@tabler/icons-react";
|
import { IconList } from "@tabler/icons-react";
|
||||||
import { useToggleToc } from "@/features/share/hooks/use-toggle-toc.ts";
|
import { useToggleToc } from "@/features/share/hooks/use-toggle-toc.ts";
|
||||||
import classes from "./share.module.css";
|
import classes from "./share.module.css";
|
||||||
import {
|
import {
|
||||||
@@ -60,46 +55,6 @@ export default function ShareShell({
|
|||||||
const [mobileTocOpened] = useAtom(mobileTableOfContentAsideAtom);
|
const [mobileTocOpened] = useAtom(mobileTableOfContentAsideAtom);
|
||||||
const toggleTocMobile = useToggleToc(mobileTableOfContentAsideAtom);
|
const toggleTocMobile = useToggleToc(mobileTableOfContentAsideAtom);
|
||||||
const toggleToc = useToggleToc(tableOfContentAsideAtom);
|
const toggleToc = useToggleToc(tableOfContentAsideAtom);
|
||||||
const [fullWidth, setFullWidth] = useAtom(sharedPageFullWidthAtom);
|
|
||||||
const [sidebarWidth, setSidebarWidth] = useAtom(sidebarWidthAtom);
|
|
||||||
const [isResizing, setIsResizing] = useState(false);
|
|
||||||
const sidebarRef = useRef<HTMLElement | null>(null);
|
|
||||||
|
|
||||||
const startResizing = useCallback((e: React.MouseEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
setIsResizing(true);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const stopResizing = useCallback(() => {
|
|
||||||
setIsResizing(false);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const resize = useCallback(
|
|
||||||
(e: MouseEvent) => {
|
|
||||||
if (!isResizing || !sidebarRef.current) return;
|
|
||||||
const newWidth =
|
|
||||||
e.clientX - sidebarRef.current.getBoundingClientRect().left;
|
|
||||||
if (newWidth < 220) {
|
|
||||||
setSidebarWidth(220);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (newWidth > 600) {
|
|
||||||
setSidebarWidth(600);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
setSidebarWidth(newWidth);
|
|
||||||
},
|
|
||||||
[isResizing, setSidebarWidth],
|
|
||||||
);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
window.addEventListener("mousemove", resize);
|
|
||||||
window.addEventListener("mouseup", stopResizing);
|
|
||||||
return () => {
|
|
||||||
window.removeEventListener("mousemove", resize);
|
|
||||||
window.removeEventListener("mouseup", stopResizing);
|
|
||||||
};
|
|
||||||
}, [resize, stopResizing]);
|
|
||||||
|
|
||||||
const { shareId } = useParams();
|
const { shareId } = useParams();
|
||||||
const { data } = useGetSharedPageTreeQuery(shareId);
|
const { data } = useGetSharedPageTreeQuery(shareId);
|
||||||
@@ -126,7 +81,7 @@ export default function ShareShell({
|
|||||||
header={{ height: 50 }}
|
header={{ height: 50 }}
|
||||||
{...(data?.pageTree?.length > 1 && {
|
{...(data?.pageTree?.length > 1 && {
|
||||||
navbar: {
|
navbar: {
|
||||||
width: sidebarWidth,
|
width: 300,
|
||||||
breakpoint: "sm",
|
breakpoint: "sm",
|
||||||
collapsed: {
|
collapsed: {
|
||||||
mobile: !mobileOpened,
|
mobile: !mobileOpened,
|
||||||
@@ -211,20 +166,6 @@ export default function ShareShell({
|
|||||||
<IconList size={20} stroke={2} />
|
<IconList size={20} stroke={2} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|
||||||
<Tooltip label={t("Full width")} withArrow>
|
|
||||||
<ActionIcon
|
|
||||||
variant={fullWidth ? "light" : "default"}
|
|
||||||
style={fullWidth ? undefined : { border: "none" }}
|
|
||||||
aria-label={t("Full width")}
|
|
||||||
aria-pressed={fullWidth}
|
|
||||||
onClick={() => setFullWidth((v) => !v)}
|
|
||||||
visibleFrom="sm"
|
|
||||||
size="sm"
|
|
||||||
>
|
|
||||||
<IconArrowsHorizontal size={20} stroke={2} />
|
|
||||||
</ActionIcon>
|
|
||||||
</Tooltip>
|
|
||||||
</>
|
</>
|
||||||
|
|
||||||
<ThemeToggle />
|
<ThemeToggle />
|
||||||
@@ -233,11 +174,7 @@ export default function ShareShell({
|
|||||||
</AppShell.Header>
|
</AppShell.Header>
|
||||||
|
|
||||||
{data?.pageTree?.length > 1 && (
|
{data?.pageTree?.length > 1 && (
|
||||||
<AppShell.Navbar p="md" className={classes.navbar} ref={sidebarRef}>
|
<AppShell.Navbar p="md" className={classes.navbar}>
|
||||||
<div
|
|
||||||
className={classes.resizeHandle}
|
|
||||||
onMouseDown={startResizing}
|
|
||||||
/>
|
|
||||||
<MemoizedSharedTree sharedPageTree={data} />
|
<MemoizedSharedTree sharedPageTree={data} />
|
||||||
</AppShell.Navbar>
|
</AppShell.Navbar>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
.treeNode {
|
.treeNode {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
padding-bottom: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar,
|
.navbar,
|
||||||
@@ -19,26 +18,3 @@
|
|||||||
width: 350px;
|
width: 350px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.resizeHandle {
|
|
||||||
width: 3px;
|
|
||||||
cursor: col-resize;
|
|
||||||
position: absolute;
|
|
||||||
right: 0;
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
z-index: 1;
|
|
||||||
|
|
||||||
&:hover,
|
|
||||||
&:active {
|
|
||||||
width: 5px;
|
|
||||||
background: light-dark(
|
|
||||||
var(--mantine-color-gray-4),
|
|
||||||
var(--mantine-color-dark-5)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: $mantine-breakpoint-sm) {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -31,38 +31,20 @@ const APP_ROUTE = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export function safeRedirectPath(input: unknown): string | null {
|
|
||||||
if (typeof input !== "string") return null;
|
|
||||||
if (input.length === 0 || input.length > 2048) return null;
|
|
||||||
// Reject whitespace, backslash, and any Unicode "Other" category char
|
|
||||||
// (ASCII controls, zero-width space, BOM, bidi marks, etc).
|
|
||||||
if (/[\s\\]|\p{C}/u.test(input)) return null;
|
|
||||||
if (!input.startsWith("/") || input.startsWith("//")) return null;
|
|
||||||
if (input.toLowerCase().includes("://")) return null;
|
|
||||||
if (/^\/[a-z][a-z0-9+\-.]*:/i.test(input)) return null;
|
|
||||||
try {
|
|
||||||
const resolved = new URL(input, window.location.origin);
|
|
||||||
if (resolved.origin !== window.location.origin) return null;
|
|
||||||
return resolved.pathname + resolved.search + resolved.hash;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getPostLoginRedirect(): string {
|
export function getPostLoginRedirect(): string {
|
||||||
const params = new URLSearchParams(window.location.search);
|
const params = new URLSearchParams(window.location.search);
|
||||||
return safeRedirectPath(params.get("redirect")) ?? APP_ROUTE.HOME;
|
const redirect = params.get("redirect");
|
||||||
}
|
if (redirect) {
|
||||||
|
try {
|
||||||
/**
|
const resolved = new URL(redirect, window.location.origin);
|
||||||
* Returns the `?redirect=` value from the current URL only when it is a safe
|
if (resolved.origin === window.location.origin) {
|
||||||
* same-origin path. Unlike {@link getPostLoginRedirect} this returns `null`
|
return resolved.pathname + resolved.search + resolved.hash;
|
||||||
* (not `/home`) when no redirect is present, so callers can distinguish
|
}
|
||||||
* "user came here directly" from "user was bounced from a deep link".
|
} catch {
|
||||||
*/
|
// malformed URL, fall through to default
|
||||||
export function getRedirectParam(): string | null {
|
}
|
||||||
const params = new URLSearchParams(window.location.search);
|
}
|
||||||
return safeRedirectPath(params.get("redirect"));
|
return APP_ROUTE.HOME;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default APP_ROUTE;
|
export default APP_ROUTE;
|
||||||
|
|||||||
@@ -9,10 +9,7 @@ import { extractPageSlugId } from "@/lib";
|
|||||||
import { Error404 } from "@/components/ui/error-404.tsx";
|
import { Error404 } from "@/components/ui/error-404.tsx";
|
||||||
import ShareBranding from "@/features/share/components/share-branding.tsx";
|
import ShareBranding from "@/features/share/components/share-branding.tsx";
|
||||||
import { useAtomValue } from "jotai";
|
import { useAtomValue } from "jotai";
|
||||||
import {
|
import { sharedTreeDataAtom } from "@/features/share/atoms/shared-page-atom.ts";
|
||||||
sharedPageFullWidthAtom,
|
|
||||||
sharedTreeDataAtom,
|
|
||||||
} from "@/features/share/atoms/shared-page-atom.ts";
|
|
||||||
import { isPageInTree } from "@/features/share/utils.ts";
|
import { isPageInTree } from "@/features/share/utils.ts";
|
||||||
|
|
||||||
export default function SharedPage() {
|
export default function SharedPage() {
|
||||||
@@ -26,7 +23,6 @@ export default function SharedPage() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const sharedTreeData = useAtomValue(sharedTreeDataAtom);
|
const sharedTreeData = useAtomValue(sharedTreeDataAtom);
|
||||||
const fullWidth = useAtomValue(sharedPageFullWidthAtom);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (shareId && data) {
|
if (shareId && data) {
|
||||||
@@ -63,7 +59,7 @@ export default function SharedPage() {
|
|||||||
)}
|
)}
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<Container fluid={fullWidth} size={fullWidth ? undefined : 900} p={0}>
|
<Container size={900} p={0}>
|
||||||
<ReadonlyPageEditor
|
<ReadonlyPageEditor
|
||||||
key={data.page.id}
|
key={data.page.id}
|
||||||
title={data.page.title}
|
title={data.page.title}
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
"@fastify/multipart": "^10.0.0",
|
"@fastify/multipart": "^10.0.0",
|
||||||
"@fastify/static": "^9.1.3",
|
"@fastify/static": "^9.1.3",
|
||||||
"@keyv/redis": "^5.1.6",
|
"@keyv/redis": "^5.1.6",
|
||||||
"@langchain/core": "1.1.46",
|
"@langchain/core": "1.1.39",
|
||||||
"@langchain/textsplitters": "1.0.1",
|
"@langchain/textsplitters": "1.0.1",
|
||||||
"@modelcontextprotocol/sdk": "^1.29.0",
|
"@modelcontextprotocol/sdk": "^1.29.0",
|
||||||
"@nest-lab/throttler-storage-redis": "^1.2.0",
|
"@nest-lab/throttler-storage-redis": "^1.2.0",
|
||||||
@@ -81,7 +81,7 @@
|
|||||||
"ioredis": "^5.10.1",
|
"ioredis": "^5.10.1",
|
||||||
"js-tiktoken": "^1.0.21",
|
"js-tiktoken": "^1.0.21",
|
||||||
"jsonwebtoken": "^9.0.3",
|
"jsonwebtoken": "^9.0.3",
|
||||||
"kysely": "^0.28.17",
|
"kysely": "^0.28.14",
|
||||||
"kysely-migration-cli": "^0.4.2",
|
"kysely-migration-cli": "^0.4.2",
|
||||||
"kysely-postgres-js": "^3.0.0",
|
"kysely-postgres-js": "^3.0.0",
|
||||||
"ldapts": "^8.1.7",
|
"ldapts": "^8.1.7",
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ import {
|
|||||||
TiptapVideo,
|
TiptapVideo,
|
||||||
TiptapAudio,
|
TiptapAudio,
|
||||||
TiptapPdf,
|
TiptapPdf,
|
||||||
PageBreak,
|
|
||||||
TrailingNode,
|
TrailingNode,
|
||||||
Attachment,
|
Attachment,
|
||||||
Drawio,
|
Drawio,
|
||||||
@@ -95,7 +94,6 @@ export const tiptapExtensions = [
|
|||||||
TiptapVideo,
|
TiptapVideo,
|
||||||
TiptapAudio,
|
TiptapAudio,
|
||||||
TiptapPdf,
|
TiptapPdf,
|
||||||
PageBreak,
|
|
||||||
Callout,
|
Callout,
|
||||||
Attachment,
|
Attachment,
|
||||||
CustomCodeBlock,
|
CustomCodeBlock,
|
||||||
|
|||||||
+1
-1
Submodule apps/server/src/ee updated: b30e92f6a0...326df8c154
+4
-5
@@ -104,8 +104,8 @@
|
|||||||
"ws": "8.20.0",
|
"ws": "8.20.0",
|
||||||
"dompurify": "3.4.1",
|
"dompurify": "3.4.1",
|
||||||
"tmp": "0.2.5",
|
"tmp": "0.2.5",
|
||||||
"hono": "4.12.18",
|
"hono": "4.12.14",
|
||||||
"mermaid": "11.15.0",
|
"mermaid": "11.13.0",
|
||||||
"nanoid@^3": "3.3.8",
|
"nanoid@^3": "3.3.8",
|
||||||
"socket.io-parser": "4.2.6",
|
"socket.io-parser": "4.2.6",
|
||||||
"serialize-javascript": "7.0.3",
|
"serialize-javascript": "7.0.3",
|
||||||
@@ -131,10 +131,9 @@
|
|||||||
"@xmldom/xmldom": "0.8.13",
|
"@xmldom/xmldom": "0.8.13",
|
||||||
"handlebars": "4.7.9",
|
"handlebars": "4.7.9",
|
||||||
"axios": "1.16.0",
|
"axios": "1.16.0",
|
||||||
"langsmith": "0.7.0",
|
"langsmith": "0.5.19",
|
||||||
"follow-redirects": "1.16.0",
|
"follow-redirects": "1.16.0",
|
||||||
"protobufjs": "7.5.6",
|
"protobufjs": "7.5.5"
|
||||||
"ip-address": "10.1.1"
|
|
||||||
},
|
},
|
||||||
"neverBuiltDependencies": []
|
"neverBuiltDependencies": []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,5 @@ export * from "./lib/recreate-transform";
|
|||||||
export * from "./lib/columns";
|
export * from "./lib/columns";
|
||||||
export * from "./lib/status";
|
export * from "./lib/status";
|
||||||
export * from "./lib/pdf";
|
export * from "./lib/pdf";
|
||||||
export * from "./lib/page-break";
|
|
||||||
export * from "./lib/resizable-nodeview";
|
export * from "./lib/resizable-nodeview";
|
||||||
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
export * from "./page-break";
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
import { mergeAttributes, Node } from "@tiptap/core";
|
|
||||||
|
|
||||||
export interface PageBreakOptions {
|
|
||||||
HTMLAttributes: Record<string, any>;
|
|
||||||
}
|
|
||||||
|
|
||||||
declare module "@tiptap/core" {
|
|
||||||
interface Commands<ReturnType> {
|
|
||||||
pageBreak: {
|
|
||||||
setPageBreak: () => ReturnType;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const PageBreak = Node.create<PageBreakOptions>({
|
|
||||||
name: "pageBreak",
|
|
||||||
|
|
||||||
group: "block",
|
|
||||||
|
|
||||||
atom: true,
|
|
||||||
|
|
||||||
selectable: true,
|
|
||||||
|
|
||||||
addOptions() {
|
|
||||||
return {
|
|
||||||
HTMLAttributes: {},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
parseHTML() {
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
tag: `div[data-type="${this.name}"]`,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
},
|
|
||||||
|
|
||||||
renderHTML({ HTMLAttributes }) {
|
|
||||||
return [
|
|
||||||
"div",
|
|
||||||
mergeAttributes(
|
|
||||||
{ "data-type": this.name, class: "page-break" },
|
|
||||||
this.options.HTMLAttributes,
|
|
||||||
HTMLAttributes,
|
|
||||||
),
|
|
||||||
];
|
|
||||||
},
|
|
||||||
|
|
||||||
addCommands() {
|
|
||||||
return {
|
|
||||||
setPageBreak:
|
|
||||||
() =>
|
|
||||||
({ chain }) =>
|
|
||||||
chain()
|
|
||||||
.insertContent({ type: this.name })
|
|
||||||
.focus()
|
|
||||||
.run(),
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
|
||||||
Generated
+782
-452
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user