From ea25406d0094f13742d99b178e6d388fe5d693e9 Mon Sep 17 00:00:00 2001
From: Joe Pavitt <joepavitt@flowforge.com>
Date: Tue, 15 Apr 2025 14:26:47 +0100
Subject: [PATCH] Sort by downloads when doing a search of modules

---
 .../editor-client/locales/en-US/editor.json   |  2 +-
 .../editor-client/src/js/ui/palette-editor.js | 22 +++++++++----------
 .../src/sass/palette-editor.scss              |  5 ++++-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 5a35135ee..b14e13b2f 100644
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -647,7 +647,7 @@
             "tab-nodes": "Nodes",
             "tab-install": "Install",
             "sort": "sort:",
-            "sortRelevance": "relevance",
+            "sortDownloads": "downloads",
             "sortAZ": "a-z",
             "sortRecent": "recent",
             "more": "+ __count__ more",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
index 3926ca430..20729d5ff 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
@@ -583,7 +583,9 @@ RED.palette.editor = (function() {
             packageList.editableList('addItem',{count:loadedList.length})
             return;
         }
+        // sort the filtered modules
         filteredList.sort(activeSort);
+        // render the items in the package list
         for (var i=0;i<Math.min(10,filteredList.length);i++) {
             packageList.editableList('addItem',filteredList[i]);
         }
@@ -595,15 +597,10 @@ RED.palette.editor = (function() {
         }
     }
     function sortModulesRelevance(A,B) {
-        var currentFilter = searchInput.searchBox('value').trim();
-        if (currentFilter === "") {
-            return sortModulesAZ(A,B);
-        }
-        var i = A.info.index.indexOf(currentFilter) - B.info.index.indexOf(currentFilter);
-        if (i === 0) {
-            return sortModulesAZ(A,B);
-        }
-        return i;
+        return sortModulesDownloads(A,B);
+    }
+    function sortModulesDownloads(A,B) {
+        return B.info.downloads.week - A.info.downloads.week;
     }
     function sortModulesAZ(A,B) {
         return A.info.id.localeCompare(B.info.id);
@@ -1053,7 +1050,7 @@ RED.palette.editor = (function() {
         const sortRelevance = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle selected"><i class="fa fa-sort-amount-desc"></i></a>').appendTo(sortGroup);
         const sortAZ = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle"><i class="fa fa-sort-alpha-asc"></i></a>').appendTo(sortGroup);
         const sortRecent = $('<a href="#" class="red-ui-palette-editor-install-sort-option red-ui-sidebar-header-button-toggle"><i class="fa fa-calendar"></i></a>').appendTo(sortGroup);
-        RED.popover.tooltip(sortRelevance,RED._("palette.editor.sortRelevance"));
+        RED.popover.tooltip(sortRelevance,RED._("palette.editor.sortDownloads"));
         RED.popover.tooltip(sortAZ,RED._("palette.editor.sortAZ"));
         RED.popover.tooltip(sortRecent,RED._("palette.editor.sortRecent"));
 
@@ -1120,8 +1117,9 @@ RED.palette.editor = (function() {
                     var descRow = $('<div class="red-ui-palette-module-meta"></div>').appendTo(headerRow);
                     $('<div>',{class:"red-ui-palette-module-description"}).text(entry.description).appendTo(descRow);
                     var metaRow = $('<div class="red-ui-palette-module-meta"></div>').appendTo(headerRow);
-                    $('<span class="red-ui-palette-module-version"><i class="fa fa-tag"></i> '+entry.version+'</span>').appendTo(metaRow);
-                    $('<span class="red-ui-palette-module-updated"><i class="fa fa-calendar"></i> '+formatUpdatedAt(entry.updated_at)+'</span>').appendTo(metaRow);
+                    $('<span class="red-ui-palette-module-version" title="Latest Version"><i class="fa fa-tag"></i> '+entry.version+'</span>').appendTo(metaRow);
+                    $('<span class="red-ui-palette-module-updated" title="Last Updated"><i class="fa fa-calendar"></i> '+formatUpdatedAt(entry.updated_at)+'</span>').appendTo(metaRow);
+                    $('<span class="red-ui-palette-module-downloads" title="Downloads - Last 7 Days"><i class="fa fa-download"></i> '+(new Intl.NumberFormat().format(entry.downloads.week))+'</span>').appendTo(metaRow);
                     if (loadedCatalogs.length > 1) {
                         $('<span class="red-ui-palette-module-updated"><i class="fa fa-cubes"></i>' + (entry.catalog.name || entry.catalog.url) + '</span>').appendTo(metaRow);
                     }
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/palette-editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/palette-editor.scss
index 48706bda8..cdbfa406b 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/palette-editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/palette-editor.scss
@@ -119,6 +119,9 @@
     .red-ui-palette-module-updated {
         margin-left: 10px;
     }
+    .red-ui-palette-module-downloads {
+        margin-left: 10px;
+    }
     .red-ui-palette-module-link {
         margin-left: 5px;
     }
@@ -230,7 +233,7 @@
     white-space: nowrap;
     @include mixins.enable-selection;
 }
-.red-ui-palette-module-version, .red-ui-palette-module-updated, .red-ui-palette-module-link {
+.red-ui-palette-module-version, .red-ui-palette-module-updated, .red-ui-palette-module-link, .red-ui-palette-module-downloads {
     font-style:italic;
     font-size: 0.8em;
     @include mixins.enable-selection;