Merge pull request #1525 from rust-lang/compare-no-relevant-results

Display "No relevant results" on compare page where there are filtered non-relevant results

Author: rylev

site/static/compare.html

@@ -314,7 +314,8 @@ <h2>Comparing <span id="stat-header">{{stat}}</span> between <span id="before">{
             </div>
             <test-cases-table
                 title="Primary"
-                :cases="testCases.filter(c => c.category === 'primary')"
+                :cases="primaryCases"
+                :has-non-relevant="testCasesWithNonRelevant.filter(c => c.category === 'primary').length > 0"
                 :show-raw-data="filter.showRawData"
                 :commit-a="data.a"
                 :commit-b="data.b"
@@ -328,7 +329,8 @@ <h2>Comparing <span id="stat-header">{{stat}}</span> between <span id="before">{
             <hr />
             <test-cases-table
                 title="Secondary"
-                :cases="testCases.filter(c => c.category === 'secondary')"
+                :cases="secondaryCases"
+                :has-non-relevant="testCasesWithNonRelevant.filter(c => c.category === 'secondary').length > 0"
                 :show-raw-data="filter.showRawData"
                 :commit-a="data.a"
                 :commit-b="data.b"

site/static/compare/script.js

@@ -152,7 +152,7 @@ const app = Vue.createApp({
         compareLink() {
             return `https://github.com/rust-lang/rust/compare/${this.data.a.commit}...${this.data.b.commit}`;
         },
-        testCases() {
+        testCasesWithNonRelevant() {
             let data = this.data;
             const filter = this.filter;
             const benchmarkMap = this.benchmarkMap;
@@ -197,13 +197,10 @@ const app = Vue.createApp({
                 let nameFilter = filter.name && filter.name.trim();
                 nameFilter = !nameFilter || name.includes(nameFilter);
 
-                const relevanceFilter = filter.nonRelevant ? true : testCase.isRelevant;
-
                 return (
                     profileFilter(testCase.profile) &&
                     scenarioFilter(testCase.scenario) &&
                     categoryFilter(testCase.category) &&
-                    relevanceFilter &&
                     nameFilter
                 );
             }
@@ -237,6 +234,15 @@ const app = Vue.createApp({
 
             return testCases;
         },
+        testCases() {
+            return this.filterNonRelevant(this.testCasesWithNonRelevant);
+        },
+        primaryCases() {
+            return this.testCases.filter(c => c.category === "primary");
+        },
+        secondaryCases() {
+            return this.testCases.filter(c => c.category === "secondary");
+        },
         bootstrapTotals() {
             const a = this.data.a.bootstrap_total / 1e9;
             const b = this.data.b.bootstrap_total / 1e9;
@@ -377,13 +383,20 @@ const app = Vue.createApp({
         },
         exportToMarkdown() {
             exportToMarkdown(this.testCases);
+        },
+        filterNonRelevant(cases) {
+            if (this.filter.nonRelevant) {
+                return cases;
+            }
+            return cases.filter(c => c.isRelevant);
         }
     },
 });
 
 app.component('test-cases-table', {
     props: {
         cases: Array,
+        hasNonRelevant: Boolean,
         showRawData: Boolean,
         commitA: Object,
         commitB: Object,
@@ -433,7 +446,7 @@ app.component('test-cases-table', {
   </span>
 </div>
 <div v-if="cases.length === 0" style="text-align: center;">
-  No results
+  {{ hasNonRelevant ? "No relevant results" : "No results" }}
 </div>
 <table v-else class="benches compare">
     <thead>
@@ -555,7 +568,7 @@ const SummaryCount = {
 `
 };
 
-app.component('summary-table', {
+app.component("summary-table", {
     props: {
         summary: Object,
         withLegend: {