Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 15:09:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: removing note from one topic removes it from all

Browse Source 
(fixes streetwriters/notesnook#767)
This commit is contained in:
thecodrr
2022-08-05 07:46:09 +05:00
parent 45dd757703
commit d070f085e8
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/web/src/components/note/index.js
View File

@@ -3,7 +3,11 @@ import { Button, Flex, Text } from "rebass";
import * as Icon from "../icons"; import * as Icon from "../icons";
import TimeAgo from "../time-ago"; import TimeAgo from "../time-ago";
import ListItem from "../list-item"; import ListItem from "../list-item";
import { confirm, showMoveNoteDialog } from "../../common/dialog-controller"; import {
confirm,
showError,
showMoveNoteDialog,
} from "../../common/dialog-controller";
import { store, useStore } from "../../stores/note-store"; import { store, useStore } from "../../stores/note-store";
import { store as userstore } from "../../stores/user-store"; import { store as userstore } from "../../stores/user-store";
import { useStore as useAttachmentStore } from "../../stores/attachment-store"; import { useStore as useAttachmentStore } from "../../stores/attachment-store";
@@ -209,7 +213,8 @@ export default React.memo(Note, function (prevProps, nextProps) {
prevItem.conflicted === nextItem.conflicted && prevItem.conflicted === nextItem.conflicted &&
prevItem.color === nextItem.color && prevItem.color === nextItem.color &&
prevProps.notebook?.dateEdited === nextProps.notebook?.dateEdited && prevProps.notebook?.dateEdited === nextProps.notebook?.dateEdited &&
JSON.stringify(prevProps.tags) === JSON.stringify(nextProps.tags) JSON.stringify(prevProps.tags) === JSON.stringify(nextProps.tags) &&
JSON.stringify(prevProps.context) === JSON.stringify(nextProps.context)
); );
}); });
@@ -420,11 +425,22 @@ const topicNoteMenuItems = [
color: "error", color: "error",
iconColor: "error", iconColor: "error",
onClick: async ({ items, context }) => { onClick: async ({ items, context }) => {
await db.notebooks try {
if (!context.value?.topic || !context.value?.id)
throw new Error("context is missing");
const ids = items.map((i) => i.id);
const topic = db.notebooks
.notebook(context.value.id) .notebook(context.value.id)
.topics.topic(context.value.topic) ?.topics?.topic(context.value.topic);
.delete(...items.map((i) => i.id)); if (!topic) throw new Error("topic not found");
await topic.delete(...ids);
store.refresh(); store.refresh();
showToast("success", "Note removed from topic.");
} catch (e) {
showToast("error", `Failed to remove note from topic: ${e.message}.`);
}
}, },
multiSelect: true, multiSelect: true,
}, },