[gold] search-page-sk: Remove link to legacy page.
Bug: skia:9525
Change-Id: I7c31a96ec7effe36de3124a0b77f4e23bcb589c6
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/326952
Commit-Queue: Leandro Lovisolo <lovisolo@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/golden/modules/search-page-sk/search-page-sk.ts b/golden/modules/search-page-sk/search-page-sk.ts
index d9b37d8..3b06ce2 100644
--- a/golden/modules/search-page-sk/search-page-sk.ts
+++ b/golden/modules/search-page-sk/search-page-sk.ts
@@ -76,11 +76,6 @@
@search-controls-sk-change=${el._onSearchControlsChange}>
</search-controls-sk>
<div class="buttons">
- <p>
- <a class="legacy-search-page" href="${el._getLegacySearchPageHref()}">
- Back to the legacy search page
- </a>
- </p>
<button class="bulk-triage" @click=${() => el._bulkTriageDialog?.showModal()}>
Bulk Triage
</button>
@@ -555,20 +550,6 @@
return this.querySelector<HTMLElement>(
`digest-details-sk:nth-child(${this._selectedSearchResultIdx + 1})`);
}
-
- /**
- * Returns a relative path to the legacy search page with the same parameters as this page.
- *
- * TODO(lovisolo): Remove after the legacy search page has been deleted.
- */
- private _getLegacySearchPageHref() {
- const baseUrl = '/oldsearch';
- // The legacy search page uses the same GET parameters as the /json/search endpoint, so we can
- // reuse the logic to build a SearchRequest.
- const searchRequest = this._makeSearchRequest();
- const queryString = fromObject(searchRequest as any);
- return queryString ? `${baseUrl}?${queryString}` : baseUrl;
- }
}
define('search-page-sk', SearchPageSk);
diff --git a/golden/modules/search-page-sk/search-page-sk_po.ts b/golden/modules/search-page-sk/search-page-sk_po.ts
index fb9a61b..7064398 100644
--- a/golden/modules/search-page-sk/search-page-sk_po.ts
+++ b/golden/modules/search-page-sk/search-page-sk_po.ts
@@ -113,9 +113,4 @@
typeKey(key: string) {
return this.element.typeKey(key);
}
-
- // TODO(lovisolo): Remove after the legacy search page has been deleted.
- getLegacySearchPageHref() {
- return this.selectOnePOEThenApplyFn('a.legacy-search-page', (el) => el.getAttribute('href'));
- }
};
diff --git a/golden/modules/search-page-sk/search-page-sk_test.ts b/golden/modules/search-page-sk/search-page-sk_test.ts
index 3dc6d4e..92d3888 100644
--- a/golden/modules/search-page-sk/search-page-sk_test.ts
+++ b/golden/modules/search-page-sk/search-page-sk_test.ts
@@ -860,101 +860,4 @@
});
});
});
-
- describe('back to legacy search page link', () => {
- it('links with default query parameters', async () => {
- await instantiate();
- const expectedHref = [
- '/oldsearch?',
- 'fref=false&',
- 'frgbamax=255&',
- 'frgbamin=0&',
- 'head=true&',
- 'include=false&',
- 'neg=false&',
- 'pos=false&',
- `query=${encodeURIComponent('source_type=infra')}&`,
- `rquery=${encodeURIComponent('source_type=infra')}&`,
- 'sort=desc&',
- 'unt=true'
- ].join('');
- expect(await searchPageSkPO.getLegacySearchPageHref()).to.equal(expectedHref);
- });
-
- it('links with all query parameters set', async () => {
- // Pretend the "blame", "crs" and "issue" parameters are set. We will test that these are also
- // present in the link to the legacy search page.
- await instantiate({
- initialQueryString:
- '?blame=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb&' +
- 'crs=gerrit&issue=123456',
- expectedInitialSearchRequest: {
- ...searchRequestWithCL,
- blame: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
- },
- mockAndWaitForChangelistSummaryRPC: true,
- });
-
- // This test ignores the search response, but we still need to mock the search endpoint
- // because each simulated change to the search controls will trigger a new search request.
- fetchMock.get('glob:/json/v1/search?*', searchResponse);
-
- // Set search controls.
- const searchCriteria: SearchCriteria = {
- corpus: 'infra',
-
- leftHandTraceFilter: {
- 'name': ['gold_dots-sk', 'gold_dots-sk_highlighted'],
- 'ext': ['png'],
- },
-
- rightHandTraceFilter: {
- 'name': ['gold_dots-sk'],
- },
-
- includePositiveDigests: true,
- includeNegativeDigests: true,
- includeUntriagedDigests: true,
- includeDigestsNotAtHead: true,
- includeIgnoredDigests: true,
-
- minRGBADelta: 100,
- maxRGBADelta: 200,
- mustHaveReferenceImage: true,
- sortOrder: 'ascending',
- };
- await searchControlsSkPO.setSearchCriteria(searchCriteria);
-
- // Set changelist controls.
- await changelistControlsSkPO.setPatchSet('PS 2');
- await changelistControlsSkPO.clickShowAllResultsRadio();
-
- const expectedBlame =
- encodeURIComponent('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
- const expectedLeftHandQuery =
- encodeURIComponent(
- 'ext=png&name=gold_dots-sk&name=gold_dots-sk_highlighted&source_type=infra');
- const expectedRightHandQuery = encodeURIComponent('name=gold_dots-sk&source_type=infra');
- const expectedHref = [
- '/oldsearch?',
- `blame=${expectedBlame}&`,
- 'crs=gerrit&',
- 'fref=true&',
- 'frgbamax=200&',
- 'frgbamin=100&',
- 'head=false&',
- 'include=true&',
- 'issue=123456&',
- 'master=true&',
- 'neg=true&',
- 'patchsets=2&',
- 'pos=true&',
- `query=${expectedLeftHandQuery}&`,
- `rquery=${expectedRightHandQuery}&`,
- 'sort=asc&',
- 'unt=true',
- ].join('');
- expect(await searchPageSkPO.getLegacySearchPageHref()).to.equal(expectedHref);
- });
- });
});
