Leaderboard show all compared values for exclude

rilldata · Sep 13, 2023 · 3a34971 · 3a34971
1 parent 0e0ef2f
commit 3a34971
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/web-common/src/features/dashboards/leaderboard/Leaderboard.svelte b/web-common/src/features/dashboards/leaderboard/Leaderboard.svelte
@@ -138,9 +138,24 @@
       })) ?? [];
   }
 
+  let valuesComparedInExcludeMode = [];
+  $: if (isBeingCompared && filterExcludeMode) {
+    let count = 0;
+    valuesComparedInExcludeMode = values
+      .filter((value) => {
+        if (!activeValues.includes(value.label) && count < 3) {
+          count++;
+          return true;
+        }
+        return false;
+      })
+      .map((value) => value.label);
+  }
+
   // get all values that are selected but not visible.
   // we'll put these at the bottom w/ a divider.
   $: selectedValuesThatAreBelowTheFold = activeValues
+    ?.concat(valuesComparedInExcludeMode)
     ?.filter((label) => {
       return (
         // the value is visible within the fold.
@@ -227,11 +242,16 @@
     filterExcludeMode
   );
 
+  $: defaultComparisonsPresentInAboveFold =
+    aboveTheFoldItems?.filter((item) => item.defaultComparedIndex >= 0)
+      ?.length || 0;
+
   $: belowTheFoldItems = prepareLeaderboardItemData(
     selectedValuesThatAreBelowTheFold,
     activeValues,
     comparisonMap,
-    filterExcludeMode
+    filterExcludeMode,
+    defaultComparisonsPresentInAboveFold
   );
 </script>
 

diff --git a/web-common/src/features/dashboards/leaderboard/leaderboard-utils.ts b/web-common/src/features/dashboards/leaderboard/leaderboard-utils.ts
@@ -35,9 +35,10 @@ export function prepareLeaderboardItemData(
   values: { value: number; label: string | number }[],
   selectedValues: (string | number)[],
   comparisonMap: Map<string | number, number>,
-  excludeMode: boolean
+  excludeMode: boolean,
+  initalCount = 0
 ): LeaderboardItemData[] {
-  let count = 0;
+  let count = initalCount;
 
   return values.map((v) => {
     const selectedIndex = selectedValues.findIndex(
@@ -47,6 +48,7 @@ export function prepareLeaderboardItemData(
 
     // Tag values which will be compared by default
     let defaultComparedIndex = -1;
+
     if (!excludeMode && count < 3 && !selectedValues.length) {
       defaultComparedIndex = count;
       count = count + 1;