fix: always sort report (sub-)categories in lexicographical order

snakemake · Sep 18, 2023 · 7feaef0 · 7feaef0
1 parent 13519c7
commit 7feaef0
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/snakemake/report/template/components/abstract_menu.js b/snakemake/report/template/components/abstract_menu.js
@@ -9,7 +9,6 @@ class AbstractMenu extends React.Component {
     }
 
     getMenuItem(label, iconName, onClick) {
-        console.log(label, onClick);
         return e(
             "li",
             { key: label },

diff --git a/snakemake/report/template/components/abstract_results.js b/snakemake/report/template/components/abstract_results.js
@@ -40,9 +40,7 @@ class AbstractResults extends React.Component {
 
     getLabels() {
         let first_index = {};
-        console.log(this.getResults());
         this.getResults().map(function ([path, result]) {
-            console.log(path, result);
             let i = 0;
             for (let key in result.labels) {
                 if (!(key in first_index)) {
@@ -56,7 +54,6 @@ class AbstractResults extends React.Component {
         return labels.sort(function (a, b) {
             return first_index[a] - first_index[b];
         });
-        //return Array.from(new Set(this.getResults().map(function ([path, result]) { return Object.keys(result.labels) }).flat())).sort();
     }
 
     isLabelled() {

diff --git a/snakemake/report/template/components/category.js b/snakemake/report/template/components/category.js
@@ -15,8 +15,9 @@ class Category extends AbstractMenu {
 
     getSubcategoryMenuitems() {
         let _this = this
-        return Object.keys(categories[this.props.category]).map(function (subcategory) {
+        let items = Object.keys(categories[this.props.category]).sort().map(function (subcategory) {
             return _this.getMenuItem(subcategory, "folder", () => _this.showSubcategory(subcategory));
         });
+        return items;
     }
 }
diff --git a/snakemake/report/template/components/common.js b/snakemake/report/template/components/common.js
@@ -13,6 +13,5 @@ function isSingleDefaultCategory() {
 }
 
 function isSingleSubcategory(category) {
-    console.log(categories, category);
     return Object.keys(categories[category]).length == 1;
 }
diff --git a/snakemake/report/template/components/menu.js b/snakemake/report/template/components/menu.js
@@ -52,7 +52,7 @@ class Menu extends AbstractMenu {
                 { key: "Results", text: "Result" }
             )];
 
-            items.push(...Object.keys(categories).map(function (category) {
+            items.push(...Object.keys(categories).sort().map(function (category) {
                 return _this.getMenuItem(category, "folder", () => app.showCategory(category));
             }));