Fix: #368 sidebar sort (#371)

Fix #368
Future-Scholars · Feb 6, 2024 · 55ce4c7 · 55ce4c7
1 parent 30fdf1f
commit 55ce4c7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/app/renderer/services/querysentence-service.ts b/app/renderer/services/querysentence-service.ts
@@ -91,7 +91,9 @@ export class QuerySentenceService {
   )
   parseViewTree(
     data: ICategorizerCollection | IPaperSmartFilterCollection,
-    type: CategorizerType | PaperSmartFilterType
+    type: CategorizerType | PaperSmartFilterType,
+    sortBy: string,
+    sortOrder: string
   ): ViewTreeNode {
     if (data.length === 0) {
       return {
@@ -124,6 +126,10 @@ export class QuerySentenceService {
       this._DAG2Tree(graph, rootID),
       `0-${rootID}`
     );
+
+    // Sort the view tree
+    this._sortViewTree(viewTree, sortBy, sortOrder);
+
     return viewTree;
   }
 
@@ -209,6 +215,23 @@ export class QuerySentenceService {
 
     return { updatedTree, viewTree };
   }
+
+  private _sortViewTree(
+    viewTree: ViewTreeNode,
+    sortBy: string,
+    sortOrder: string
+  ) {
+    viewTree.children.sort((a: ViewTreeNode, b: ViewTreeNode) => {
+      if (sortOrder === "asce") {
+        return a[sortBy] > b[sortBy] ? 1 : -1;
+      } else {
+        return a[sortBy] < b[sortBy] ? 1 : -1;
+      }
+    });
+    viewTree.children.forEach((child) => {
+      this._sortViewTree(child, sortBy, sortOrder);
+    });
+  }
 }
 
 export interface ViewTreeNode {

diff --git a/app/renderer/ui/sidebar-view/sidebar-library-view.vue b/app/renderer/ui/sidebar-view/sidebar-library-view.vue
@@ -37,7 +37,9 @@ const tags = inject<Ref<ICategorizerCollection>>("tags");
 const tagsViewTree = computed(() => {
   return querySentenceService.parseViewTree(
     tags?.value || [],
-    CategorizerType.PaperTag
+    CategorizerType.PaperTag,
+    prefState.sidebarSortBy,
+    prefState.sidebarSortOrder
   );
 });
 
@@ -46,15 +48,19 @@ const foldersViewTree = computed(() => {
   const linked = prefState.pluginLinkedFolder;
   return querySentenceService.parseViewTree(
     folders?.value || [],
-    CategorizerType.PaperFolder
+    CategorizerType.PaperFolder,
+    prefState.sidebarSortBy,
+    prefState.sidebarSortOrder
   );
 });
 
 const smartfilters = inject<Ref<IPaperSmartFilterCollection>>("smartfilters");
 const smartfiltersViewTree = computed(() => {
   return querySentenceService.parseViewTree(
     smartfilters?.value || [],
-    PaperSmartFilterType.smartfilter
+    PaperSmartFilterType.smartfilter,
+    prefState.sidebarSortBy,
+    prefState.sidebarSortOrder
   );
 });