mirror of
https://github.com/linkwarden/linkwarden.git
synced 2026-03-03 00:37:00 +00:00
* build(deps): bump the npm_and_yarn group across 5 directories with 22 updates Bumps the npm_and_yarn group with 18 updates in the / directory: | Package | From | To | | --- | --- | --- | | [axios](https://github.com/axios/axios) | `1.5.1` | `1.12.0` | | [dompurify](https://github.com/cure53/DOMPurify) | `3.0.6` | `3.2.4` | | [formidable](https://github.com/node-formidable/formidable) | `3.5.1` | `3.5.4` | | [next](https://github.com/vercel/next.js) | `13.4.12` | `14.2.35` | | [next-auth](https://github.com/nextauthjs/next-auth) | `4.22.1` | `4.24.12` | | [playwright](https://github.com/microsoft/playwright) | `1.55.0` | `1.55.1` | | [@mozilla/readability](https://github.com/mozilla/readability) | `0.4.4` | `0.6.0` | | [ai](https://github.com/vercel/ai) | `4.3.9` | `5.0.52` | | [nodemailer](https://github.com/nodemailer/nodemailer) | `6.9.3` | `7.0.11` | | [brace-expansion](https://github.com/juliangruber/brace-expansion) | `1.1.11` | `1.1.12` | | [braces](https://github.com/micromatch/braces) | `3.0.2` | `3.0.3` | | [form-data](https://github.com/form-data/form-data) | `3.0.3` | `3.0.4` | | [js-yaml](https://github.com/nodeca/js-yaml) | `3.14.1` | `3.14.2` | | [micromatch](https://github.com/micromatch/micromatch) | `4.0.5` | `4.0.8` | | [min-document](https://github.com/Raynos/min-document) | `2.19.0` | `2.19.2` | | [nanoid](https://github.com/ai/nanoid) | `3.3.6` | `3.3.8` | | [node-forge](https://github.com/digitalbazaar/forge) | `1.3.1` | `1.3.3` | | [tar](https://github.com/isaacs/node-tar) | `6.1.13` | `6.2.1` | Bumps the npm_and_yarn group with 1 update in the /apps/web directory: [next](https://github.com/vercel/next.js). Bumps the npm_and_yarn group with 2 updates in the /apps/worker directory: [@mozilla/readability](https://github.com/mozilla/readability) and [ai](https://github.com/vercel/ai). Bumps the npm_and_yarn group with 1 update in the /packages/lib directory: [nodemailer](https://github.com/nodemailer/nodemailer). Bumps the npm_and_yarn group with 1 update in the /packages/router directory: [next](https://github.com/vercel/next.js). Updates `axios` from 1.5.1 to 1.12.0 - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.5.1...v1.12.0) Updates `dompurify` from 3.0.6 to 3.2.4 - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/3.0.6...3.2.4) Updates `formidable` from 3.5.1 to 3.5.4 - [Release notes](https://github.com/node-formidable/formidable/releases) - [Changelog](https://github.com/node-formidable/formidable/blob/master/CHANGELOG.md) - [Commits](https://github.com/node-formidable/formidable/commits) Updates `next` from 13.4.12 to 14.2.35 - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v13.4.12...v14.2.35) Updates `next-auth` from 4.22.1 to 4.24.12 - [Release notes](https://github.com/nextauthjs/next-auth/releases) - [Commits](https://github.com/nextauthjs/next-auth/compare/next-auth@4.22.1...next-auth@4.24.12) Updates `playwright` from 1.55.0 to 1.55.1 - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](https://github.com/microsoft/playwright/compare/v1.55.0...v1.55.1) Updates `postcss` from 8.4.26 to 8.5.3 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.26...8.5.3) Updates `@mozilla/readability` from 0.4.4 to 0.6.0 - [Changelog](https://github.com/mozilla/readability/blob/main/CHANGELOG.md) - [Commits](https://github.com/mozilla/readability/compare/0.4.4...0.6.0) Updates `ai` from 4.3.9 to 5.0.52 - [Release notes](https://github.com/vercel/ai/releases) - [Changelog](https://github.com/vercel/ai/blob/main/CHANGELOG.md) - [Commits](https://github.com/vercel/ai/compare/ai@4.3.9...ai@5.0.52) Updates `nodemailer` from 6.9.3 to 7.0.11 - [Release notes](https://github.com/nodemailer/nodemailer/releases) - [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodemailer/nodemailer/compare/v6.9.3...v7.0.11) Updates `@babel/runtime` from 7.21.5 to 7.27.0 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.27.0/packages/babel-runtime) Updates `brace-expansion` from 1.1.11 to 1.1.12 - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12) Updates `braces` from 3.0.2 to 3.0.3 - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) Updates `follow-redirects` from 1.15.3 to 1.15.11 - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.3...v1.15.11) Updates `form-data` from 3.0.3 to 3.0.4 - [Release notes](https://github.com/form-data/form-data/releases) - [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md) - [Commits](https://github.com/form-data/form-data/compare/v3.0.3...v3.0.4) Updates `jose` from 4.14.4 to 4.15.9 - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v4.15.9/CHANGELOG.md) - [Commits](https://github.com/panva/jose/compare/v4.14.4...v4.15.9) Updates `js-yaml` from 3.14.1 to 3.14.2 - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/3.14.1...3.14.2) Updates `micromatch` from 4.0.5 to 4.0.8 - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8) Updates `min-document` from 2.19.0 to 2.19.2 - [Commits](https://github.com/Raynos/min-document/compare/v2.19.0...v2.19.2) Updates `nanoid` from 3.3.6 to 3.3.8 - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.6...3.3.8) Updates `node-forge` from 1.3.1 to 1.3.3 - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](https://github.com/digitalbazaar/forge/compare/v1.3.1...v1.3.3) Updates `tar` from 6.1.13 to 6.2.1 - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-tar/compare/v6.1.13...v6.2.1) Updates `next` from 13.4.12 to 14.2.35 - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v13.4.12...v14.2.35) Updates `@mozilla/readability` from 0.4.4 to 0.6.0 - [Changelog](https://github.com/mozilla/readability/blob/main/CHANGELOG.md) - [Commits](https://github.com/mozilla/readability/compare/0.4.4...0.6.0) Updates `ai` from 4.3.19 to 5.0.113 - [Release notes](https://github.com/vercel/ai/releases) - [Changelog](https://github.com/vercel/ai/blob/main/CHANGELOG.md) - [Commits](https://github.com/vercel/ai/compare/ai@4.3.9...ai@5.0.52) Updates `nodemailer` from 6.10.1 to 7.0.11 - [Release notes](https://github.com/nodemailer/nodemailer/releases) - [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodemailer/nodemailer/compare/v6.9.3...v7.0.11) Updates `next` from 13.4.12 to 14.2.35 - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v13.4.12...v14.2.35) --- updated-dependencies: - dependency-name: axios dependency-version: 1.12.0 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: dompurify dependency-version: 3.2.4 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: formidable dependency-version: 3.5.4 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: next dependency-version: 14.2.35 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: next-auth dependency-version: 4.24.12 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: playwright dependency-version: 1.55.1 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: postcss dependency-version: 8.5.3 dependency-type: direct:development dependency-group: npm_and_yarn - dependency-name: "@mozilla/readability" dependency-version: 0.6.0 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: ai dependency-version: 5.0.52 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: nodemailer dependency-version: 7.0.11 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: "@babel/runtime" dependency-version: 7.27.0 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: brace-expansion dependency-version: 1.1.12 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: braces dependency-version: 3.0.3 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: follow-redirects dependency-version: 1.15.11 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: form-data dependency-version: 3.0.4 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: jose dependency-version: 4.15.9 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: js-yaml dependency-version: 3.14.2 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: micromatch dependency-version: 4.0.8 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: min-document dependency-version: 2.19.2 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: nanoid dependency-version: 3.3.8 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: node-forge dependency-version: 1.3.3 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: tar dependency-version: 6.2.1 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: next dependency-version: 14.2.35 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: "@mozilla/readability" dependency-version: 0.6.0 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: ai dependency-version: 5.0.113 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: nodemailer dependency-version: 7.0.11 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: next dependency-version: 14.2.35 dependency-type: direct:production dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> * bug fixes and improvements * always show navbar in reader view * bug fix and small performance improvement * minor fix * Refactor link selection management and bulk actions - Replaced the use of selectedLinks with selectedIds in the link store for better performance and clarity. - Updated LinkListOptions, BulkDeleteLinksModal, and BulkEditLinksModal components to utilize the new selection management. - Modified LinkCard, LinkMasonry, and LinkList components to handle selection state through props. - Enhanced updateLinks API to support bulk updates with improved tag management. - Cleaned up unused imports and code related to previous selection methods. * move refetching logic to Links component * move disableDraggable and user hook out of each card to improve efficiency * cleaner code * memoize components and increase performance * fix: update announcement links to use the correct domain * feat: add favicon field to Link model + update packages + bug fix * feat: implement favicon fetching API and update Link model for favicon support * feat: add priority attribute to Image components in Sidebar * Refactor pages to use consistent layout handling (yes, I forgot to do that until now :P) * bump version * Refactor setting pages to use consistent layout handling * upgrade yarn to 4.12.0 * fix DnD bug * Enhance announcement handling by adding support for announcement messages * slimmed down the docker image size * update Node and yarn versions in playwright tests workflow * small fix * fix attempt 2 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
277 lines
7.6 KiB
TypeScript
277 lines
7.6 KiB
TypeScript
import {
|
|
DndContext,
|
|
DragEndEvent,
|
|
DragOverlay,
|
|
DragStartEvent,
|
|
MouseSensor,
|
|
SensorDescriptor,
|
|
SensorOptions,
|
|
TouchSensor,
|
|
useSensor,
|
|
useSensors,
|
|
} from "@dnd-kit/core";
|
|
import LinkIcon from "./LinkViews/LinkComponents/LinkIcon";
|
|
import { LinkIncludingShortenedCollectionAndTags } from "@linkwarden/types";
|
|
import toast from "react-hot-toast";
|
|
import { useUpdateLink } from "@linkwarden/router/links";
|
|
import { useTranslation } from "react-i18next";
|
|
import { snapCenterToCursor } from "@dnd-kit/modifiers";
|
|
import { customCollisionDetectionAlgorithm } from "@/lib/utils";
|
|
import usePinLink from "@/lib/client/pinLink";
|
|
import { useQueryClient } from "@tanstack/react-query";
|
|
import { useUser } from "@linkwarden/router/user";
|
|
|
|
interface DragNDropProps {
|
|
children: React.ReactNode;
|
|
/**
|
|
* The currently active link being dragged
|
|
*/
|
|
activeLink: LinkIncludingShortenedCollectionAndTags | null;
|
|
/**
|
|
* All links available for drag and drop
|
|
*/
|
|
setActiveLink: (link: LinkIncludingShortenedCollectionAndTags | null) => void;
|
|
/**
|
|
* Override the default sensors used for drag and drop.
|
|
*/
|
|
sensors?: SensorDescriptor<SensorOptions>[];
|
|
|
|
/**
|
|
* Override onDragEnd function.
|
|
*/
|
|
onDragEnd?: (event: DragEndEvent) => void;
|
|
}
|
|
|
|
/**
|
|
* Wrapper component for drag and drop functionality.
|
|
*/
|
|
export default function DragNDrop({
|
|
children,
|
|
activeLink,
|
|
setActiveLink,
|
|
sensors: sensorProp,
|
|
onDragEnd: onDragEndProp,
|
|
}: DragNDropProps) {
|
|
const { t } = useTranslation();
|
|
const updateLink = useUpdateLink();
|
|
const pinLink = usePinLink();
|
|
const { data: user } = useUser();
|
|
const queryClient = useQueryClient();
|
|
const mouseSensor = useSensor(MouseSensor, {
|
|
// Require the mouse to move by 10 pixels before activating
|
|
activationConstraint: {
|
|
distance: 10,
|
|
},
|
|
});
|
|
const touchSensor = useSensor(TouchSensor, {
|
|
// Press delay of 250ms, with tolerance of 5px of movement
|
|
activationConstraint: {
|
|
delay: 200,
|
|
tolerance: 5,
|
|
},
|
|
});
|
|
|
|
const sensors = useSensors(mouseSensor, touchSensor);
|
|
|
|
const handleDragStart = (event: DragStartEvent) => {
|
|
setActiveLink(
|
|
(event.active.data.current
|
|
?.link as LinkIncludingShortenedCollectionAndTags) ?? null
|
|
);
|
|
};
|
|
|
|
const handleDragOverCancel = () => {
|
|
setActiveLink(null);
|
|
};
|
|
|
|
const handleDragEnd = async (event: DragEndEvent) => {
|
|
if (onDragEndProp) {
|
|
onDragEndProp(event);
|
|
return;
|
|
}
|
|
|
|
const { over, active } = event;
|
|
if (!over || !activeLink) return;
|
|
|
|
const overData = over.data.current;
|
|
const targetId = String(over.id);
|
|
|
|
const isFromRecentSection = active.data.current?.dashboardType === "recent";
|
|
|
|
setActiveLink(null);
|
|
|
|
const mutateWithToast = async (
|
|
updatedLink: LinkIncludingShortenedCollectionAndTags,
|
|
opts?: { invalidateDashboardOnError?: boolean }
|
|
) => {
|
|
const load = toast.loading(t("updating"));
|
|
await updateLink.mutateAsync(updatedLink, {
|
|
onSettled: async (_, error) => {
|
|
toast.dismiss(load);
|
|
if (error) {
|
|
if (
|
|
opts?.invalidateDashboardOnError &&
|
|
typeof queryClient !== "undefined"
|
|
) {
|
|
await queryClient.invalidateQueries({
|
|
queryKey: ["dashboardData"],
|
|
});
|
|
}
|
|
toast.error(error.message);
|
|
} else {
|
|
toast.success(t("updated"));
|
|
}
|
|
},
|
|
});
|
|
};
|
|
|
|
// DROP ON TAG
|
|
if (overData?.type === "tag") {
|
|
const tagName = overData?.name as string | undefined;
|
|
if (!tagName) return;
|
|
|
|
const isTagAlreadyExists = activeLink.tags?.some(
|
|
(tag) => tag.name === tagName
|
|
);
|
|
if (isTagAlreadyExists) {
|
|
toast.error(t("tag_already_added"));
|
|
return;
|
|
}
|
|
|
|
const allTags: { name: string }[] = (activeLink.tags ?? []).map(
|
|
(tag) => ({
|
|
name: tag.name,
|
|
})
|
|
);
|
|
|
|
const updatedLink: LinkIncludingShortenedCollectionAndTags = {
|
|
...activeLink,
|
|
tags: [...allTags, { name: tagName }] as any,
|
|
};
|
|
|
|
await mutateWithToast(updatedLink, {
|
|
invalidateDashboardOnError: typeof queryClient !== "undefined",
|
|
});
|
|
return;
|
|
}
|
|
|
|
// DROP ON DASHBOARD "PINNED" SECTION
|
|
const isPinnedSection = targetId === "pinned-links-section";
|
|
|
|
const canPin =
|
|
typeof pinLink === "function" &&
|
|
typeof user !== "undefined" &&
|
|
typeof user?.id !== "undefined";
|
|
|
|
if (isPinnedSection && canPin) {
|
|
if (Array.isArray(activeLink.pinnedBy) && !activeLink.pinnedBy.length) {
|
|
if (typeof queryClient !== "undefined") {
|
|
const optimisticallyPinned = {
|
|
...activeLink,
|
|
pinnedBy: [user!.id],
|
|
};
|
|
|
|
queryClient.setQueryData(["dashboardData"], (oldData: any) => {
|
|
if (!oldData?.links) return oldData;
|
|
return {
|
|
...oldData,
|
|
links: oldData.links.map((l: any) =>
|
|
l.id === optimisticallyPinned.id ? optimisticallyPinned : l
|
|
),
|
|
};
|
|
});
|
|
}
|
|
|
|
pinLink(activeLink);
|
|
}
|
|
return;
|
|
}
|
|
|
|
// DROP ON COLLECTION (dashboard + sidebar)
|
|
const collectionId = overData?.id as number | undefined;
|
|
const collectionName = overData?.name as string | undefined;
|
|
const ownerId = overData?.ownerId as number | undefined;
|
|
|
|
if (!collectionId || !collectionName || typeof ownerId === "undefined")
|
|
return;
|
|
|
|
const isSameCollection = activeLink.collection?.id === collectionId;
|
|
if (isSameCollection) {
|
|
if (isFromRecentSection) toast.error(t("link_already_in_collection"));
|
|
return;
|
|
}
|
|
|
|
const updatedLink: LinkIncludingShortenedCollectionAndTags = {
|
|
...activeLink,
|
|
collection: {
|
|
id: collectionId,
|
|
name: collectionName,
|
|
ownerId,
|
|
},
|
|
};
|
|
|
|
if (typeof queryClient !== "undefined") {
|
|
queryClient.setQueryData(["dashboardData"], (oldData: any) => {
|
|
if (!oldData?.links) return oldData;
|
|
return {
|
|
...oldData,
|
|
links: oldData.links.map((l: any) =>
|
|
l.id === updatedLink.id ? updatedLink : l
|
|
),
|
|
};
|
|
});
|
|
|
|
queryClient.setQueryData(["dashboardData"], (oldData: any) => {
|
|
if (!oldData?.collectionLinks) return oldData;
|
|
|
|
const oldCollectionId = activeLink.collection?.id;
|
|
if (!oldCollectionId) return oldData;
|
|
|
|
return {
|
|
...oldData,
|
|
collectionLinks: {
|
|
...oldData.collectionLinks,
|
|
[oldCollectionId]: (
|
|
oldData.collectionLinks[oldCollectionId] || []
|
|
).filter((l: any) => l.id !== updatedLink.id),
|
|
[collectionId]: [
|
|
...(oldData.collectionLinks[collectionId] || []),
|
|
updatedLink,
|
|
],
|
|
},
|
|
};
|
|
});
|
|
}
|
|
|
|
await mutateWithToast(updatedLink, {
|
|
invalidateDashboardOnError: typeof queryClient !== "undefined",
|
|
});
|
|
};
|
|
|
|
return (
|
|
<DndContext
|
|
onDragStart={handleDragStart}
|
|
onDragEnd={handleDragEnd}
|
|
onDragCancel={handleDragOverCancel}
|
|
modifiers={[snapCenterToCursor]}
|
|
sensors={sensorProp ? sensorProp : sensors}
|
|
collisionDetection={customCollisionDetectionAlgorithm}
|
|
>
|
|
{!!activeLink && (
|
|
// when drag end, immediately hide the overlay
|
|
<DragOverlay
|
|
style={{
|
|
zIndex: 100,
|
|
pointerEvents: "none",
|
|
}}
|
|
>
|
|
<div className="w-fit h-fit">
|
|
<LinkIcon link={activeLink} />
|
|
</div>
|
|
</DragOverlay>
|
|
)}
|
|
{children}
|
|
</DndContext>
|
|
);
|
|
}
|