rank mode dynamic with filters and sorting

frontend/leaderboard.html

@@ -723,7 +723,7 @@
                         <div
                             class="tooltip-content invisible opacity-0 absolute bottom-full left-1/2 -translate-x-1/2 mb-2 w-48 p-2 bg-slate-800 text-white text-xs rounded shadow-lg transition-all z-50 text-left pointer-events-none">
                             <p>
-                                <strong>Overall Rank:</strong> shows the rank based on the global average across all benchmarks.<br>
+                                <strong>Global Rank:</strong> shows the rank based on the global average across all benchmarks.<br>
                                 <strong>Current View Rank:</strong> updates the rank based on the current sort and filters.
                             </p>
                             <div
@@ -735,7 +735,7 @@
                 </h4>
                 <div class="flex flex-wrap gap-1.5">
                     <button onclick="window.setRankMode('static')" id="rankBtnStatic"
-                        class="px-3 py-1.5 rounded-lg border text-xs font-medium cursor-pointer transition-all select-none bg-indigo-50 border-indigo-400 text-indigo-600 dark:bg-indigo-900/30 dark:border-indigo-500 dark:text-indigo-300">Overall Rank</button>
+                        class="px-3 py-1.5 rounded-lg border text-xs font-medium cursor-pointer transition-all select-none bg-indigo-50 border-indigo-400 text-indigo-600 dark:bg-indigo-900/30 dark:border-indigo-500 dark:text-indigo-300">Global Rank</button>
                     <button onclick="window.setRankMode('dynamic')" id="rankBtnDynamic"
                         class="px-3 py-1.5 rounded-lg border text-xs font-medium cursor-pointer transition-all select-none bg-white border-slate-200 text-slate-500 hover:bg-slate-50 dark:bg-slate-700 dark:border-slate-600 dark:text-slate-300 dark:hover:bg-slate-600">Current View Rank</button>
                 </div>
@@ -1168,6 +1168,7 @@ taskTypes: [],        // [] = All; otherwise selected subset
                     tableOptions.avgMode = 'all';
                     tableOptions.taskTypes = [];
                     tableOptions.domains = [];
+                    currentSort = { colId: null, dir: 'none' };
                     // Restore all benchmark columns that were hidden by filters
                     tableColumns.forEach(col => {
                         if (EVAL_COLUMNS.includes(col.id)) col.hidden = false;
@@ -1250,7 +1251,9 @@ setupFilterPills();
                             tableOptions.taskTypes = [];
                     }
                     const hasFilters = tableOptions.taskTypes.length > 0 || tableOptions.domains.length > 0;
-                    tableOptions.avgMode = hasFilters ? 'visible' : 'all';
+                    tableOptions.avgMode  = hasFilters ? 'visible' : 'all';
+                    tableOptions.rankMode = hasFilters ? 'dynamic' : 'static';
+                    if (hasFilters) currentSort = { colId: 'Average', dir: 'asc' };
                     applyColumnFilters();
                     updateOptionUI();
                     prepareColumns(lbData);
@@ -1268,7 +1271,9 @@ setupFilterPills();
                             tableOptions.domains = [];
                     }
                     const hasFilters = tableOptions.taskTypes.length > 0 || tableOptions.domains.length > 0;
-                    tableOptions.avgMode = hasFilters ? 'visible' : 'all';
+                    tableOptions.avgMode  = hasFilters ? 'visible' : 'all';
+                    tableOptions.rankMode = hasFilters ? 'dynamic' : 'static';
+                    if (hasFilters) currentSort = { colId: 'Average', dir: 'asc' };
                     applyColumnFilters();
                     updateOptionUI();
                     prepareColumns(lbData);
@@ -1884,9 +1889,11 @@ window.toggleExpandText = function (idBase, btn) {
 
                     // 4. Handle Ranking Mode
                     if (tableOptions.rankMode === 'dynamic') {
-                        filtered.forEach((row, index) => {
-                            row['Rank'] = index + 1;
-                        });
+                        // Rank is always quality-based (rank 1 = best Average),
+                        // independent of display sort direction.
+                        const byQuality = [...filtered].sort((a, b) => parseFloat(b['Average']) - parseFloat(a['Average']));
+                        const rankMap = new Map(byQuality.map((row, i) => [row, i + 1]));
+                        filtered.forEach(row => { row['Rank'] = rankMap.get(row) ?? filtered.length; });
                     }
 
                     // 5. Update Grid