From b036174d11b4d0a903b538abf858c5f4fc710bd5 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <antonella@standardnotes.org>
Date: Mon, 14 Jun 2021 14:11:54 -0300
Subject: [PATCH] feat: when removing a tag, remove descendants as well

---
 .../ui_models/app_state/note_tags_state.ts      | 12 +++++++++---
 .../ui_models/app_state/notes_state.ts          | 17 +++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/ui_models/app_state/note_tags_state.ts b/app/assets/javascripts/ui_models/app_state/note_tags_state.ts
index 80b5273f8..f263fcb7d 100644
--- a/app/assets/javascripts/ui_models/app_state/note_tags_state.ts
+++ b/app/assets/javascripts/ui_models/app_state/note_tags_state.ts
@@ -198,9 +198,15 @@ export class NoteTagsState {
   async removeTagFromActiveNote(tag: SNTag): Promise<void> {
     const { activeNote } = this;
     if (activeNote) {
-      await this.application.changeItem(tag.uuid, (mutator) => {
-        mutator.removeItemAsRelationship(activeNote);
-      });
+      const descendantTags = this.application.getTagDescendants(tag);
+      const tagsToRemove = [...descendantTags, tag];
+      await Promise.all(
+        tagsToRemove.map(async (tag) => {
+          await this.application.changeItem(tag.uuid, (mutator) => {
+            mutator.removeItemAsRelationship(activeNote);
+          });
+        })
+      );
       this.application.sync();
       this.reloadTags();
     }
diff --git a/app/assets/javascripts/ui_models/app_state/notes_state.ts b/app/assets/javascripts/ui_models/app_state/notes_state.ts
index 46f2ab65e..daa9881aa 100644
--- a/app/assets/javascripts/ui_models/app_state/notes_state.ts
+++ b/app/assets/javascripts/ui_models/app_state/notes_state.ts
@@ -346,13 +346,18 @@ export class NotesState {
 
   async removeTagFromSelectedNotes(tag: SNTag): Promise<void> {
     const selectedNotes = Object.values(this.selectedNotes);
-    await this.application.changeItem(tag.uuid, (mutator) => {
-      for (const note of selectedNotes) {
-        mutator.removeItemAsRelationship(note);
-      }
-    });
+    const descendantTags = this.application.getTagDescendants(tag);
+    const tagsToRemove = [...descendantTags, tag];
+    await Promise.all(
+      tagsToRemove.map(async (tag) => {
+        await this.application.changeItem(tag.uuid, (mutator) => {
+          for (const note of selectedNotes) {
+            mutator.removeItemAsRelationship(note);
+          }
+        });
+      })
+    );
     this.application.sync();
-
   }
 
   isTagInSelectedNotes(tag: SNTag): boolean {