update lock file

This commit is contained in:
Philipinho
2026-01-20 15:26:45 +00:00
11 changed files with 202 additions and 37 deletions
@@ -5,26 +5,27 @@ import {
Badge, Badge,
Table, Table,
ActionIcon, ActionIcon,
} from '@mantine/core'; } from "@mantine/core";
import {Link} from 'react-router-dom'; import { Link } from "react-router-dom";
import PageListSkeleton from '@/components/ui/page-list-skeleton.tsx'; import PageListSkeleton from "@/components/ui/page-list-skeleton.tsx";
import { buildPageUrl } from '@/features/page/page.utils.ts'; import { buildPageUrl } from "@/features/page/page.utils.ts";
import { formattedDate } from '@/lib/time.ts'; import { formattedDate } from "@/lib/time.ts";
import { useRecentChangesQuery } from '@/features/page/queries/page-query.ts'; import { useRecentChangesQuery } from "@/features/page/queries/page-query.ts";
import { IconFileDescription } from '@tabler/icons-react'; import { IconFileDescription } from "@tabler/icons-react";
import { getSpaceUrl } from '@/lib/config.ts'; import { getSpaceUrl } from "@/lib/config.ts";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { getInitialsColor } from "@/lib/get-initials-color.ts";
interface Props { interface Props {
spaceId?: string; spaceId?: string;
} }
export default function RecentChanges({spaceId}: Props) { export default function RecentChanges({ spaceId }: Props) {
const { t } = useTranslation(); const { t } = useTranslation();
const {data: pages, isLoading, isError} = useRecentChangesQuery(spaceId); const { data: pages, isLoading, isError } = useRecentChangesQuery(spaceId);
if (isLoading) { if (isLoading) {
return <PageListSkeleton/>; return <PageListSkeleton />;
} }
if (isError) { if (isError) {
@@ -44,8 +45,8 @@ export default function RecentChanges({spaceId}: Props) {
> >
<Group wrap="nowrap"> <Group wrap="nowrap">
{page.icon || ( {page.icon || (
<ActionIcon variant='transparent' color='gray' size={18}> <ActionIcon variant="transparent" color="gray" size={18}>
<IconFileDescription size={18}/> <IconFileDescription size={18} />
</ActionIcon> </ActionIcon>
)} )}
@@ -58,18 +59,23 @@ export default function RecentChanges({spaceId}: Props) {
{!spaceId && ( {!spaceId && (
<Table.Td> <Table.Td>
<Badge <Badge
color="blue" color={getInitialsColor(page?.space.name)}
variant="light" variant="light"
component={Link} component={Link}
to={getSpaceUrl(page?.space.slug)} to={getSpaceUrl(page?.space.slug)}
style={{cursor: 'pointer'}} style={{ cursor: "pointer" }}
> >
{page?.space.name} {page?.space.name}
</Badge> </Badge>
</Table.Td> </Table.Td>
)} )}
<Table.Td> <Table.Td>
<Text c="dimmed" style={{whiteSpace: 'nowrap'}} size="xs" fw={500}> <Text
c="dimmed"
style={{ whiteSpace: "nowrap" }}
size="xs"
fw={500}
>
{formattedDate(page.updatedAt)} {formattedDate(page.updatedAt)}
</Text> </Text>
</Table.Td> </Table.Td>
@@ -0,0 +1,49 @@
import { useRef, useState, ReactNode } from "react";
import { Text, TextProps, Tooltip } from "@mantine/core";
type AutoTooltipTextProps = TextProps & {
children: ReactNode;
tooltipLabel?: string;
tooltipProps?: Omit<
React.ComponentProps<typeof Tooltip>,
"children" | "label"
>;
};
export function AutoTooltipText({
children,
tooltipLabel,
tooltipProps,
...textProps
}: AutoTooltipTextProps) {
const textRef = useRef<HTMLParagraphElement>(null);
const [isTruncated, setIsTruncated] = useState(false);
const handleMouseEnter = () => {
const element = textRef.current;
if (element) {
setIsTruncated(element.scrollWidth > element.clientWidth);
}
};
const label = tooltipLabel ?? (typeof children === "string" ? children : "");
return (
<Tooltip
label={label}
disabled={!isTruncated || !label}
multiline
withArrow
{...tooltipProps}
>
<Text
ref={textRef}
truncate
onMouseEnter={handleMouseEnter}
{...textProps}
>
{children}
</Text>
</Tooltip>
);
}
@@ -10,6 +10,7 @@ import Paginate from "@/components/common/paginate.tsx";
import { queryClient } from "@/main.tsx"; import { queryClient } from "@/main.tsx";
import { getSpaces } from "@/features/space/services/space-service.ts"; import { getSpaces } from "@/features/space/services/space-service.ts";
import { getGroupMembers } from "@/features/group/services/group-service.ts"; import { getGroupMembers } from "@/features/group/services/group-service.ts";
import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
export default function GroupList() { export default function GroupList() {
const { t } = useTranslation(); const { t } = useTranslation();
@@ -51,9 +52,9 @@ export default function GroupList() {
<Group gap="sm" wrap="nowrap"> <Group gap="sm" wrap="nowrap">
<IconGroupCircle /> <IconGroupCircle />
<div style={{ minWidth: 0, overflow: "hidden" }}> <div style={{ minWidth: 0, overflow: "hidden" }}>
<Text fz="sm" fw={500} lineClamp={1}> <AutoTooltipText fz="sm" fw={500} lineClamp={1}>
{group.name} {group.name}
</Text> </AutoTooltipText>
<Text fz="xs" c="dimmed" lineClamp={2}> <Text fz="xs" c="dimmed" lineClamp={2}>
{group.description} {group.description}
</Text> </Text>
@@ -8,6 +8,7 @@ import { useTranslation } from "react-i18next";
import Paginate from "@/components/common/paginate.tsx"; import Paginate from "@/components/common/paginate.tsx";
import { CustomAvatar } from "@/components/ui/custom-avatar.tsx"; import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts"; import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";
import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
export default function SpaceList() { export default function SpaceList() {
const { t } = useTranslation(); const { t } = useTranslation();
@@ -49,9 +50,9 @@ export default function SpaceList() {
name={space.name} name={space.name}
/> />
<div style={{ minWidth: 0, overflow: "hidden" }}> <div style={{ minWidth: 0, overflow: "hidden" }}>
<Text fz="sm" fw={500} lineClamp={1}> <AutoTooltipText fz="sm" fw={500} lineClamp={1}>
{space.name} {space.name}
</Text> </AutoTooltipText>
<Text fz="xs" c="dimmed" lineClamp={2}> <Text fz="xs" c="dimmed" lineClamp={2}>
{space.description} {space.description}
</Text> </Text>
@@ -27,6 +27,7 @@ import { useTranslation } from "react-i18next";
import Paginate from "@/components/common/paginate.tsx"; import Paginate from "@/components/common/paginate.tsx";
import { SearchInput } from "@/components/common/search-input.tsx"; import { SearchInput } from "@/components/common/search-input.tsx";
import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search.tsx"; import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search.tsx";
import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
type MemberType = "user" | "group"; type MemberType = "user" | "group";
@@ -138,10 +139,10 @@ export default function SpaceMembersList({
{member.type === "group" && <IconGroupCircle />} {member.type === "group" && <IconGroupCircle />}
<div> <div style={{ minWidth: 0, overflow: "hidden", maxWidth: 260 }}>
<Text fz="sm" fw={500} lineClamp={1}> <AutoTooltipText fz="sm" fw={500}>
{member?.name} {member?.name}
</Text> </AutoTooltipText>
<Text fz="xs" c="dimmed"> <Text fz="xs" c="dimmed">
{member.type == "user" && member?.email} {member.type == "user" && member?.email}
@@ -23,6 +23,7 @@ import SpaceSettingsModal from "@/features/space/components/settings-modal";
import classes from "./all-spaces-list.module.css"; import classes from "./all-spaces-list.module.css";
import { CustomAvatar } from "@/components/ui/custom-avatar.tsx"; import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts"; import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";
import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
interface AllSpacesListProps { interface AllSpacesListProps {
spaces: any[]; spaces: any[];
@@ -96,10 +97,10 @@ export default function AllSpacesList({
variant="filled" variant="filled"
size="md" size="md"
/> />
<div> <div style={{ minWidth: 0, overflow: "hidden", maxWidth: 350 }}>
<Text fz="sm" fw={500} lineClamp={1}> <AutoTooltipText fz="sm" fw={500} lineClamp={1}>
{space.name} {space.name}
</Text> </AutoTooltipText>
{space.description && ( {space.description && (
<Text fz="xs" c="dimmed" lineClamp={2}> <Text fz="xs" c="dimmed" lineClamp={2}>
{space.description} {space.description}
+34
View File
@@ -0,0 +1,34 @@
import { MantineColor } from "@mantine/core";
function hashCode(input: string) {
let hash = 0;
for (let i = 0; i < input.length; i += 1) {
const char = input.charCodeAt(i);
hash = (hash << 5) - hash + char;
hash |= 0;
}
return hash;
}
const defaultColors: MantineColor[] = [
"blue",
"cyan",
"grape",
"green",
"indigo",
"lime",
"orange",
"pink",
"red",
"teal",
"violet",
];
export function getInitialsColor(
name: string,
colors: MantineColor[] = defaultColors,
) {
const hash = hashCode(name);
const index = Math.abs(hash) % colors.length;
return colors[index];
}
@@ -0,0 +1,71 @@
// https://github.com/WebReflection/html-escaper
/**
* Copyright (C) 2017-present by Andrea Giammarchi - @WebReflection
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
const { replace } = '';
// escape
const es = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34);/g;
const ca = /[&<>'"]/g;
const esca = {
'&': '&amp;',
'<': '&lt;',
'>': '&gt;',
"'": '&#39;',
'"': '&quot;',
};
const pe = (m) => esca[m];
/**
* Safely escape HTML entities such as `&`, `<`, `>`, `"`, and `'`.
* @param {string} es the input to safely escape
* @returns {string} the escaped input, and it **throws** an error if
* the input type is unexpected, except for boolean and numbers,
* converted as string.
*/
export const htmlEscape = (es) => replace.call(es, ca, pe);
// unescape
const unes = {
'&amp;': '&',
'&#38;': '&',
'&lt;': '<',
'&#60;': '<',
'&gt;': '>',
'&#62;': '>',
'&apos;': "'",
'&#39;': "'",
'&quot;': '"',
'&#34;': '"',
};
const cape = (m) => unes[m];
/**
* Safely unescape previously escaped entities such as `&`, `<`, `>`, `"`,
* and `'`.
* @param {string} un a previously escaped string
* @returns {string} the unescaped input, and it **throws** an error if
* the input type is unexpected, except for boolean and numbers,
* converted as string.
*/
export const htmlUnescape = (un) => replace.call(un, es, cape);
@@ -7,6 +7,7 @@ import { validate as isValidUUID } from 'uuid';
import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo'; import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
import { EnvironmentService } from '../../integrations/environment/environment.service'; import { EnvironmentService } from '../../integrations/environment/environment.service';
import { Workspace } from '@docmost/db/types/entity.types'; import { Workspace } from '@docmost/db/types/entity.types';
import { htmlEscape } from '../../common/helpers/html-escaper';
@Controller('share') @Controller('share')
export class ShareSeoController { export class ShareSeoController {
@@ -68,7 +69,7 @@ export class ShareSeoController {
return this.sendIndex(indexFilePath, res); return this.sendIndex(indexFilePath, res);
} }
const rawTitle = share.sharedPage.title ?? 'untitled'; const rawTitle = htmlEscape(share?.sharedPage.title ?? 'untitled');
const metaTitle = const metaTitle =
rawTitle.length > 80 ? `${rawTitle.slice(0, 77)}` : rawTitle; rawTitle.length > 80 ? `${rawTitle.slice(0, 77)}` : rawTitle;
+2 -2
View File
@@ -16,11 +16,11 @@
"server:start": "nx run server:start:prod", "server:start": "nx run server:start:prod",
"email:dev": "nx run server:email:dev", "email:dev": "nx run server:email:dev",
"dev": "pnpm concurrently -n \"frontend,backend\" -c \"cyan,green\" \"pnpm run client:dev\" \"pnpm run server:dev\"", "dev": "pnpm concurrently -n \"frontend,backend\" -c \"cyan,green\" \"pnpm run client:dev\" \"pnpm run server:dev\"",
"clean": "rm -rf apps/*/dist packages/*/dist" "clean": "rm -rf apps/*/dist packages/*/dist apps/*/node_modules/.vite"
}, },
"dependencies": { "dependencies": {
"@braintree/sanitize-url": "^7.1.0", "@braintree/sanitize-url": "^7.1.0",
"@casl/ability": "^6.7.5", "@casl/ability": "6.8.0",
"@docmost/editor-ext": "workspace:*", "@docmost/editor-ext": "workspace:*",
"@floating-ui/dom": "^1.7.3", "@floating-ui/dom": "^1.7.3",
"@hocuspocus/extension-redis": "3.4.3", "@hocuspocus/extension-redis": "3.4.3",
+8 -8
View File
@@ -22,8 +22,8 @@ importers:
specifier: ^7.1.0 specifier: ^7.1.0
version: 7.1.0 version: 7.1.0
'@casl/ability': '@casl/ability':
specifier: ^6.7.5 specifier: 6.8.0
version: 6.7.5 version: 6.8.0
'@docmost/editor-ext': '@docmost/editor-ext':
specifier: workspace:* specifier: workspace:*
version: link:packages/editor-ext version: link:packages/editor-ext
@@ -210,7 +210,7 @@ importers:
dependencies: dependencies:
'@casl/react': '@casl/react':
specifier: ^4.0.0 specifier: ^4.0.0
version: 4.0.0(@casl/ability@6.7.5)(react@18.3.1) version: 4.0.0(@casl/ability@6.8.0)(react@18.3.1)
'@docmost/editor-ext': '@docmost/editor-ext':
specifier: workspace:* specifier: workspace:*
version: link:../../packages/editor-ext version: link:../../packages/editor-ext
@@ -1838,8 +1838,8 @@ packages:
'@braintree/sanitize-url@7.1.1': '@braintree/sanitize-url@7.1.1':
resolution: {integrity: sha512-i1L7noDNxtFyL5DmZafWy1wRVhGehQmzZaz1HiN5e7iylJMSZR7ekOV7NsIqa5qBldlLrsKv4HbgFUVlQrz8Mw==} resolution: {integrity: sha512-i1L7noDNxtFyL5DmZafWy1wRVhGehQmzZaz1HiN5e7iylJMSZR7ekOV7NsIqa5qBldlLrsKv4HbgFUVlQrz8Mw==}
'@casl/ability@6.7.5': '@casl/ability@6.8.0':
resolution: {integrity: sha512-NaOHPi9JMn8Kesh+GRkjNKAYkl4q8qMFAlqw7w2yrE+cBQZSbV9GkBGKvgzs3CdzEc5Yl1cn3JwDxxbBN5gjog==} resolution: {integrity: sha512-Ipt4mzI4gSgnomFdaPjaLgY2MWuXqAEZLrU6qqWBB7khGiBBuuEp6ytYDnq09bRXqcjaeeHiaCvCGFbBA2SpvA==}
'@casl/react@4.0.0': '@casl/react@4.0.0':
resolution: {integrity: sha512-ovmI4JfNw7TfVVV+XhAJ//gXgMEkkPJU6YBWFVFZGa8Oikdh8Qxr/sdXcqj71QWEHAGN7aSKMtBE0MZylPUVsg==} resolution: {integrity: sha512-ovmI4JfNw7TfVVV+XhAJ//gXgMEkkPJU6YBWFVFZGa8Oikdh8Qxr/sdXcqj71QWEHAGN7aSKMtBE0MZylPUVsg==}
@@ -12159,13 +12159,13 @@ snapshots:
'@braintree/sanitize-url@7.1.1': {} '@braintree/sanitize-url@7.1.1': {}
'@casl/ability@6.7.5': '@casl/ability@6.8.0':
dependencies: dependencies:
'@ucast/mongo2js': 1.3.4 '@ucast/mongo2js': 1.3.4
'@casl/react@4.0.0(@casl/ability@6.7.5)(react@18.3.1)': '@casl/react@4.0.0(@casl/ability@6.8.0)(react@18.3.1)':
dependencies: dependencies:
'@casl/ability': 6.7.5 '@casl/ability': 6.8.0
react: 18.3.1 react: 18.3.1
'@cfworker/json-schema@4.1.1': {} '@cfworker/json-schema@4.1.1': {}