From da47ef159bfc6929d280b6dfb881e4409709160b Mon Sep 17 00:00:00 2001
From: Abdullah Atta <abdullahatta@streetwriters.co>
Date: Fri, 17 Mar 2023 14:40:45 +0500
Subject: [PATCH] web: fix multiselect for notebook actions on note

---
 apps/web/src/components/icons/index.tsx |  6 ++++--
 apps/web/src/components/note/index.js   | 27 ++++++++++++++++---------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/apps/web/src/components/icons/index.tsx b/apps/web/src/components/icons/index.tsx
index eaf864c1e..ad65035fc 100644
--- a/apps/web/src/components/icons/index.tsx
+++ b/apps/web/src/components/icons/index.tsx
@@ -190,7 +190,8 @@ import {
   mdiLightbulbOnOutline,
   mdiNoteMultipleOutline,
   mdiBookMultipleOutline,
-  mdiArrowTopRight
+  mdiArrowTopRight,
+  mdiBookmarkRemoveOutline
 } from "@mdi/js";
 import { useTheme } from "@emotion/react";
 import { Theme } from "@notesnook/theme";
@@ -306,7 +307,8 @@ export const Check = createIcon(mdiCheck);
 export const Cross = createIcon(mdiClose);
 export const MoreVertical = createIcon(mdiDotsVertical);
 export const Trash = createIcon(mdiTrashCanOutline);
-export const TopicRemove = createIcon(mdiBookRemoveOutline);
+export const TopicRemove = createIcon(mdiBookmarkRemoveOutline);
+export const NotebookRemove = createIcon(mdiBookRemoveOutline);
 export const Search = createIcon(mdiMagnify);
 export const Menu = createIcon(mdiMenu);
 export const Login = createIcon(mdiLoginVariant);
diff --git a/apps/web/src/components/note/index.js b/apps/web/src/components/note/index.js
index 193a96931..32f2a5d05 100644
--- a/apps/web/src/components/note/index.js
+++ b/apps/web/src/components/note/index.js
@@ -533,27 +533,32 @@ function colorsToMenuItems() {
   });
 }
 
-function notebooksMenuItems({ note }) {
+function notebooksMenuItems({ items }) {
+  const noteIds = items.map((i) => i.id);
+
   const menuItems = [];
   menuItems.push({
     key: "link-notebooks",
     title: "Link to...",
     icon: Icon.AddToNotebook,
-    onClick: async ({ items }) => {
-      await showMoveNoteDialog(items.map((i) => i.id));
+    onClick: async () => {
+      await showMoveNoteDialog(noteIds);
     }
   });
 
-  const notebooks = db.relations?.to(note, "notebook");
+  const notebooks = items
+    .map((note) => db.relations?.to(note, "notebook"))
+    .flat();
+  const topics = items.map((note) => note.notebooks || []).flat();
 
-  if (note && (note.notebooks?.length > 0 || notebooks?.length > 0)) {
+  if (topics?.length > 0 || notebooks?.length > 0) {
     menuItems.push(
       {
         key: "remove-from-all-notebooks",
         title: "Unlink from all",
         icon: Icon.RemoveShortcutLink,
         onClick: async () => {
-          await db.notes.removeFromAllNotebooks(note.id);
+          await db.notes.removeFromAllNotebooks(...noteIds);
           store.refresh();
         }
       },
@@ -561,6 +566,8 @@ function notebooksMenuItems({ note }) {
     );
 
     notebooks?.forEach((notebook) => {
+      if (menuItems.find((item) => item.key === notebook.id)) return;
+
       menuItems.push({
         key: notebook.id,
         title: notebook.title,
@@ -568,17 +575,19 @@ function notebooksMenuItems({ note }) {
         checked: true,
         tooltip: "Click to remove from this notebook",
         onClick: async () => {
-          await db.notes.removeFromNotebook({ id: notebook.id }, note.id);
+          await db.notes.removeFromNotebook({ id: notebook.id }, ...noteIds);
           store.refresh();
         }
       });
     });
 
-    note.notebooks?.forEach((ref) => {
+    topics?.forEach((ref) => {
       const notebook = db.notebooks?.notebook(ref.id);
       if (!notebook) return;
       for (const topicId of ref.topics) {
         if (!notebook.topics.topic(topicId)) continue;
+        if (menuItems.find((item) => item.key === topicId)) continue;
+
         const topic = notebook.topics.topic(topicId)._topic;
         menuItems.push({
           key: topicId,
@@ -589,7 +598,7 @@ function notebooksMenuItems({ note }) {
           onClick: async () => {
             await db.notes.removeFromNotebook(
               { id: ref.id, topic: topic.id },
-              note.id
+              ...noteIds
             );
             store.refresh();
           }