commit 1093c4dde5b423760b0a1609ea93ac790406c706
author Leandro Lovisolo <lovisolo@google.com> Tue May 04 00:05:31 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue May 04 11:32:09 2021 +0000
tree b69aae93d9830ac3735eed50676577e0d97f720e
parent 77fca4453e5720a7510f0f9364ffa41ce895cc6f

[gold] list-page-sk: Address TODOs.

Change-Id: I82ddf5565922ed6529077ef635f2a39fb46f087a
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/403736
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Auto-Submit: Leandro Lovisolo <lovisolo@google.com>

golden/modules/list-page-sk/list-page-sk.js

diff --git a/golden/modules/list-page-sk/list-page-sk.js b/golden/modules/list-page-sk/list-page-sk.js
index 5d1c481..0d3f503 100644
--- a/golden/modules/list-page-sk/list-page-sk.js
+++ b/golden/modules/list-page-sk/list-page-sk.js
@@ -69,20 +69,8 @@
 `;
 
 const testRow = (row, ele) => {
-  // Returns a HintableObject for building the GET parameters to the legacy search page.
-  //
-  // TODO(lovisolo): Delete after the legacy search page has been removed.
-  const makeOldSearchCriteria = (opts) => ({
-    query: {'name': [row.name], 'source_type': [ele._currentCorpus]},
-    pos: opts.positive,
-    neg: opts.negative,
-    unt: opts.untriaged,
-    head: ele._showAllDigests ? 'false' : 'true',
-    include: ele._disregardIgnoreRules ? 'true' : 'false',
-  });
-
-  // Returns a HintableObject for building the GET parameters to the lit-html search page.
-  const makeNewSearchCriteria = (opts) => SearchCriteriaToHintableObject({
+  // Returns a HintableObject for building the GET parameters to the search page.
+  const makeSearchCriteria = (opts) => SearchCriteriaToHintableObject({
     corpus: ele._currentCorpus,
     leftHandTraceFilter: {'name': [row.name]},
     includePositiveDigests: opts.positive,
@@ -93,22 +81,14 @@
   });
 
   const searchPageHref = (opts) => {
-    const oldSearchCriteria = makeOldSearchCriteria(opts);
-
-    const newSearchCriteria = makeNewSearchCriteria(opts);
-    // Delete the "sort" parameter, which the legacy and lit-html versions of the search page read
-    // in incompatible ways: asc/desc vs. ascending/descending, respectively. Will default to
-    // descending if absent.
-    delete newSearchCriteria['sort'];
-
-    const oldQueryParameters = fromObject(oldSearchCriteria);
-    const newQueryParameters = fromObject(newSearchCriteria);
-    return `/search?${newQueryParameters}&${oldQueryParameters}`;
+    const searchCriteria = makeSearchCriteria(opts);
+    const queryParameters = fromObject(searchCriteria);
+    return `/search?${queryParameters}`;
   };
 
   const clusterPageHref = () => {
     const hintableObject = {
-      ...makeNewSearchCriteria({positive: true, negative: true, untriaged: true}),
+      ...makeSearchCriteria({positive: true, negative: true, untriaged: true}),
       left_filter: '',
       grouping: row.name,
     };

golden/modules/list-page-sk/list-page-sk_test.js

diff --git a/golden/modules/list-page-sk/list-page-sk_test.js b/golden/modules/list-page-sk/list-page-sk_test.js
index 3b9969e..1cd503b 100644
--- a/golden/modules/list-page-sk/list-page-sk_test.js
+++ b/golden/modules/list-page-sk/list-page-sk_test.js
@@ -76,15 +76,8 @@
         `positive=${opts.positive}`,
         'reference_image_required=false',
         'right_filter=',
+        'sort=descending',
         `untriaged=${opts.untriaged}`,
-
-        // Parameters for the legacy search page. TODO(lovisolo): Remove.
-        `head=${!opts.showAllDigests}`,
-        `include=${opts.disregardIgnoreRules}`,
-        `neg=${opts.negative}`,
-        `pos=${opts.positive}`,
-        'query=name%3Dthis_is_another_test%26source_type%3Dgm',
-        `unt=${opts.untriaged}`,
       ].join('&');
     };