diff --git a/app/lib/frontend/handlers.dart b/app/lib/frontend/handlers.dart index a98716e79c..6f2ab45d88 100644 --- a/app/lib/frontend/handlers.dart +++ b/app/lib/frontend/handlers.dart @@ -372,13 +372,15 @@ SearchQuery _parseSearchQuery(shelf.Request request, String platform) { final SearchOrder sortOrder = (sortParam == null || sortParam.isEmpty) ? null : parseSearchOrder(sortParam); - + final isApiEnabled = request.requestedUri.queryParameters['api'] != '0'; return new SearchQuery.parse( - query: queryText, - platform: platform, - order: sortOrder, - offset: offset, - limit: PackageLinks.resultsPerPage); + query: queryText, + platform: platform, + order: sortOrder, + offset: offset, + limit: PackageLinks.resultsPerPage, + apiEnabled: isApiEnabled, + ); } /// Handles requests for /packages/... - multiplexes to HTML/JSON handlers diff --git a/app/lib/frontend/templates.dart b/app/lib/frontend/templates.dart index 1243c5fc8c..714c5c9f3c 100644 --- a/app/lib/frontend/templates.dart +++ b/app/lib/frontend/templates.dart @@ -723,6 +723,7 @@ class TemplateService { 'search_query_placeholder': 'Search ${platformDict.name} packages', 'search_sort_param': searchSort, 'platform_tabs_html': platformTabs, + 'api_search_enabled': searchQuery?.isApiEnabled ?? true, 'landing_blurb_html': platformDict.landingBlurb, // This is not escaped as it is already escaped by the caller. 'content_html': contentHtml, diff --git a/app/lib/search/index_simple.dart b/app/lib/search/index_simple.dart index b44e419a5f..4ba82fac52 100644 --- a/app/lib/search/index_simple.dart +++ b/app/lib/search/index_simple.dart @@ -184,8 +184,11 @@ class SimplePackageIndex implements PackageIndex { } // do text matching - final textResults = _searchText(packages, query.parsedQuery.text, - _apiSearchEnabled || query.parsedQuery.isApiEnabled); + final isApiEnabled = query.isApiEnabled || + _apiSearchEnabled || + query.parsedQuery.isApiEnabled; + final textResults = + _searchText(packages, query.parsedQuery.text, isApiEnabled); // filter packages that doesn't match text query if (textResults != null) { diff --git a/app/lib/shared/search_service.dart b/app/lib/shared/search_service.dart index 4cd8369100..1f2e2dd081 100644 --- a/app/lib/shared/search_service.dart +++ b/app/lib/shared/search_service.dart @@ -207,6 +207,7 @@ class SearchQuery { final int offset; final int limit; final bool isAd; + final bool isApiEnabled; SearchQuery._({ this.query, @@ -215,6 +216,7 @@ class SearchQuery { this.offset, this.limit, this.isAd, + this.isApiEnabled, }) : parsedQuery = new ParsedQuery._parse(query), platform = (platform == null || platform.isEmpty) ? null : platform; @@ -225,6 +227,7 @@ class SearchQuery { int offset: 0, int limit: 10, bool isAd, + bool apiEnabled, }) { final String q = query != null && query.trim().isNotEmpty ? query.trim() : null; @@ -235,6 +238,7 @@ class SearchQuery { offset: offset, limit: limit, isAd: isAd ?? false, + isApiEnabled: apiEnabled ?? true, ); } @@ -252,6 +256,7 @@ class SearchQuery { limit = max(_minSearchLimit, limit); final isAd = (uri.queryParameters['ad'] ?? '0') == '1'; + final apiEnabled = uri.queryParameters['api'] != '0'; return new SearchQuery.parse( query: q, @@ -260,6 +265,7 @@ class SearchQuery { offset: offset, limit: limit, isAd: isAd, + apiEnabled: apiEnabled, ); } @@ -270,6 +276,7 @@ class SearchQuery { int offset, int limit, bool isAd, + bool apiEnabled, }) { return new SearchQuery._( query: query ?? this.query, @@ -278,6 +285,7 @@ class SearchQuery { offset: offset ?? this.offset, limit: limit ?? this.limit, isAd: isAd ?? this.isAd, + isApiEnabled: apiEnabled ?? this.isApiEnabled, ); } @@ -289,13 +297,9 @@ class SearchQuery { 'limit': limit?.toString(), 'order': serializeSearchOrder(order), 'ad': isAd ? '1' : null, + 'api': isApiEnabled ? null : '0', }; - - for (var key in map.keys.toList()) { - if (map[key] == null) { - map.remove(key); - } - } + map.removeWhere((k, v) => v == null); return map; } @@ -329,6 +333,9 @@ class SearchQuery { final String paramName = 'sort'; params[paramName] = serializeSearchOrder(order); } + if (!isApiEnabled) { + params['api'] = '0'; + } if (page != null) { params['page'] = page.toString(); } diff --git a/app/test/frontend/golden/pkg_index_page.html b/app/test/frontend/golden/pkg_index_page.html index 30014dbf23..3b44b62fc6 100644 --- a/app/test/frontend/golden/pkg_index_page.html +++ b/app/test/frontend/golden/pkg_index_page.html @@ -67,12 +67,18 @@

Dart pub

+ -
+
+
Flutter Web All
+
+ Include API results +
+
diff --git a/app/test/frontend/golden/search_page.html b/app/test/frontend/golden/search_page.html index d622a634a7..be4d390de6 100644 --- a/app/test/frontend/golden/search_page.html +++ b/app/test/frontend/golden/search_page.html @@ -67,12 +67,18 @@

Dart pub

+ -
+
+
Flutter Web All
+
+ Include API results +
+
diff --git a/app/test/frontend/golden/search_supported_qualifier.html b/app/test/frontend/golden/search_supported_qualifier.html index 73738a33cc..5cd39722f5 100644 --- a/app/test/frontend/golden/search_supported_qualifier.html +++ b/app/test/frontend/golden/search_supported_qualifier.html @@ -67,12 +67,18 @@

Dart pub

+ -
+
+
Flutter Web All
+
+ Include API results +
+
diff --git a/app/test/frontend/golden/search_unsupported_qualifier.html b/app/test/frontend/golden/search_unsupported_qualifier.html index 7ded345029..5e911fbea8 100644 --- a/app/test/frontend/golden/search_unsupported_qualifier.html +++ b/app/test/frontend/golden/search_unsupported_qualifier.html @@ -67,12 +67,18 @@

Dart pub

+ -
+
+
Flutter Web All
+
+ Include API results +
+
diff --git a/app/views/layout.mustache b/app/views/layout.mustache index 450e733888..8bd0726313 100644 --- a/app/views/layout.mustache +++ b/app/views/layout.mustache @@ -91,8 +91,14 @@ {{#search_sort_param}}{{/search_sort_param}} + - {{& platform_tabs_html }} +
+ {{& platform_tabs_html }} +
+ Include API results +
+
{{/listing_banner}} diff --git a/static/css/style.css b/static/css/style.css index a34206d5fe..d3dfabfe71 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1209,4 +1209,21 @@ pre > code { transform: scale(1.02) } +.search-bar-details { + position: relative; + max-width: 550px; +} + +.search-bar-options { + font-size: 14px; +} + +@media (min-width: 600px) { + .search-bar-options { + position: absolute; + top: 16px; + right: 0px; + } +} + /*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/static/js/script.dart b/static/js/script.dart index eb1c6acd5e..3f604721be 100644 --- a/static/js/script.dart +++ b/static/js/script.dart @@ -20,6 +20,7 @@ void main() { _setEventForSearchInput(); _fixIssueLinks(); _setEventForSortControl(); + _setEventForCheckboxChanges(); _updateDartdocStatus(); } @@ -255,6 +256,22 @@ void _setEventForSortControl() { sortControl.append(select); } +void _setEventForCheckboxChanges() { + final hiddenApiField = + document.getElementById('search-api-field') as InputElement; + final visibleApiCheckbox = + document.getElementById('search-api-checkbox') as CheckboxInputElement; + if (hiddenApiField == null || visibleApiCheckbox == null) { + return; + } + final formElement = hiddenApiField.form; + visibleApiCheckbox.onChange.listen((_) { + hiddenApiField.disabled = visibleApiCheckbox.checked; + // TODO: instead of submitting, compose the URL here (also removing the single `?`) + formElement.submit(); + }); +} + void _fixIssueLinks() { for (AnchorElement bugLink in document.querySelectorAll('a.github_issue')) { var url = Uri.parse(bugLink.href);