feat: add parent chain tags when adding a tag

standardnotes · Jun 7, 2021 · 6617362 · 6617362
1 parent c44c734
commit 6617362
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 30 deletions.
diff --git a/app/assets/javascripts/components/NotesOptionsPanel.tsx b/app/assets/javascripts/components/NotesOptionsPanel.tsx
@@ -59,28 +59,28 @@ export const NotesOptionsPanel = observer(({ appState }: Props) => {
         <VisuallyHidden>Actions</VisuallyHidden>
         <Icon type="more" className="block" />
       </DisclosureButton>
-        <DisclosurePanel
-          onKeyDown={(event) => {
-            if (event.key === 'Escape' && !submenuOpen) {
-              setOpen(false);
-              buttonRef.current.focus();
-            }
-          }}
-          ref={panelRef}
-          style={{
-            ...position,
-            maxHeight
-          }}
-          className="sn-dropdown sn-dropdown--animated max-h-120 max-w-xs flex flex-col py-2 overflow-y-scroll fixed"
-        >
-          {open && (
-            <NotesOptions
-              appState={appState}
-              closeOnBlur={closeOnBlur}
-              onSubmenuChange={onSubmenuChange}
-            />
-          )}
-        </DisclosurePanel>
+      <DisclosurePanel
+        onKeyDown={(event) => {
+          if (event.key === 'Escape' && !submenuOpen) {
+            setOpen(false);
+            buttonRef.current.focus();
+          }
+        }}
+        ref={panelRef}
+        style={{
+          ...position,
+          maxHeight,
+        }}
+        className="sn-dropdown sn-dropdown--animated max-h-120 max-w-xs flex flex-col py-2 overflow-y-scroll fixed"
+      >
+        {open && (
+          <NotesOptions
+            appState={appState}
+            closeOnBlur={closeOnBlur}
+            onSubmenuChange={onSubmenuChange}
+          />
+        )}
+      </DisclosurePanel>
     </Disclosure>
   );
 });

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
@@ -181,9 +181,15 @@ export class NoteTagsState {
   async addTagToActiveNote(tag: SNTag): Promise<void> {
     const { activeNote } = this;
     if (activeNote) {
-      await this.application.changeItem(tag.uuid, (mutator) => {
-        mutator.addItemAsRelationship(activeNote);
-      });
+      const parentChainTags = this.application.getTagParentChain(tag);
+      const tagsToAdd = [...parentChainTags, tag];
+      await Promise.all(
+        tagsToAdd.map(async (tag) => {
+          await this.application.changeItem(tag.uuid, (mutator) => {
+            mutator.addItemAsRelationship(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
@@ -330,11 +330,17 @@ export class NotesState {
 
   async addTagToSelectedNotes(tag: SNTag): Promise<void> {
     const selectedNotes = Object.values(this.selectedNotes);
-    await this.application.changeItem(tag.uuid, (mutator) => {
-      for (const note of selectedNotes) {
-        mutator.addItemAsRelationship(note);
-      }
-    });
+    const parentChainTags = this.application.getTagParentChain(tag);
+    const tagsToAdd = [...parentChainTags, tag];
+    await Promise.all(
+      tagsToAdd.map(async (tag) => {
+        await this.application.changeItem(tag.uuid, (mutator) => {
+          for (const note of selectedNotes) {
+            mutator.addItemAsRelationship(note);
+          }
+        });
+      })
+    );
     this.application.sync();
   }