sort parent relationships so that clones in search notes appear last, fixes #1686

src/public/app/entities/note_short.js

@@ -158,6 +158,26 @@ class NoteShort {
         return this.treeCache.getNotesFromCache(this.parents);
     }
 
+    // will sort the parents so that non-search & non-archived are first and archived at the end
+    // this is done so that non-search & non-archived paths are always explored as first when looking for note path
+    resortParents() {
+        this.parents.sort((aNoteId, bNoteId) => {
+            const aBranchId = this.parentToBranch[aNoteId];
+
+            if (aBranchId && aBranchId.startsWith('virt-')) {
+                return 1;
+            }
+
+            const aNote = this.treeCache.getNoteFromCache([aNoteId]);
+
+            if (aNote.hasLabel('archived')) {
+                return 1;
+            }
+
+            return -1;
+        });
+    }
+
     /** @returns {string[]} */
     getChildNoteIds() {
         return this.children;

src/public/app/services/tree.js

@@ -56,6 +56,8 @@ async function resolveNotePathToSegments(notePath, logErrors = true) {
                 return;
             }
 
+            child.resortParents();
+
             const parents = child.getParentNotes();
 
             if (!parents.length) {

src/services/note_cache/entities/note.js

@@ -180,10 +180,14 @@ class Note {
         return !!this.ownedAttributes.find(attr => attr.type === 'label' && attr.name === 'archived' && attr.isInheritable);
     }
 
-    // will sort the parents so that non-archived are first and archived at the end
+    // will sort the parents so that non-search & non-archived are first and archived at the end
-    // this is done so that non-archived paths are always explored as first when searching for note path
+    // this is done so that non-search & non-archived paths are always explored as first when looking for note path
     resortParents() {
-        this.parents.sort((a, b) => a.hasInheritableOwnedArchivedLabel ? 1 : -1);
+        this.parentBranches.sort((a, b) =>
+            a.branchId.startsWith('virt-')
+            || a.parentNote.hasInheritableOwnedArchivedLabel ? 1 : -1);
+
+        this.parents = this.parentBranches.map(branch => branch.parentNote);
     }
 
     /**