Skip to content

Commit 1b9b75b

Browse files
authored
Cleanup after enabling experiments. (#8560)
1 parent 90fe26f commit 1b9b75b

File tree

7 files changed

+10
-39
lines changed

7 files changed

+10
-39
lines changed

app/lib/frontend/handlers/experimental.dart

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,7 @@ import '../../shared/cookie_utils.dart';
99
typedef PublicFlag = ({String name, String description});
1010

1111
const _publicFlags = <PublicFlag>{
12-
(name: 'dark', description: 'Dark mode'),
13-
(name: 'search-completion', description: 'Completions for the search bar'),
1412
(name: 'search-topics', description: 'Show matching topics when searching'),
15-
(
16-
name: 'download-counts-version-chart',
17-
description: 'Show downloads counts version chart'
18-
),
1913
};
2014

2115
final _allFlags = <String>{
@@ -92,14 +86,10 @@ class ExperimentalFlags {
9286
return params;
9387
}
9488

95-
bool get isSearchCompletionEnabled => true;
9689
bool get isSearchTopicsEnabled => isEnabled('search-topics');
9790

98-
bool get isDarkModeEnabled => true;
9991
bool get isDarkModeDefault => isEnabled('dark-as-default');
10092

101-
bool get showDownloadCountsVersionChart => true;
102-
10393
String encodedAsCookie() => _enabled.join(':');
10494

10595
@override

app/lib/frontend/templates/views/pkg/score_tab.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import 'package:pub_dev/shared/utils.dart';
1414
import '../../../../scorecard/models.dart' hide ReportStatus;
1515
import '../../../../shared/urls.dart' as urls;
1616
import '../../../dom/dom.dart' as d;
17-
import '../../../request_context.dart';
1817
import '../../../static_files.dart';
1918

2019
/// Renders the score page content.
@@ -95,8 +94,7 @@ d.Node scoreTabNode({
9594
d.text(' for details.'),
9695
],
9796
),
98-
if (card.weeklyVersionDownloads != null &&
99-
requestContext.experimentalFlags.showDownloadCountsVersionChart)
97+
if (card.weeklyVersionDownloads != null)
10098
_downloadsChart(card.weeklyVersionDownloads!),
10199
]);
102100
}

app/lib/frontend/templates/views/shared/search_banner.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import 'dart:convert';
66

77
import 'package:_pub_shared/data/completion.dart';
8-
import 'package:pub_dev/frontend/request_context.dart';
98

109
import '../../../dom/dom.dart' as d;
1110
import '../../../static_files.dart' show staticUrls;
@@ -36,8 +35,7 @@ d.Node searchBannerNode({
3635
value: queryText,
3736
attributes: {
3837
'title': 'Search',
39-
if (requestContext.experimentalFlags.isSearchCompletionEnabled)
40-
'data-widget': 'completion',
38+
'data-widget': 'completion',
4139
'data-completion-src': '/api/search-input-completion-data',
4240
'data-completion-class': 'search-completion',
4341
},

app/lib/frontend/templates/views/shared/site_header.dart

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:pub_dev/frontend/request_context.dart';
6-
75
import '../../../../account/models.dart' show SessionData;
86
import '../../../../shared/urls.dart' as urls;
97
import '../../../dom/dom.dart' as d;
@@ -116,24 +114,17 @@ d.Node siteHeaderNode({
116114
_userBlock(userSession),
117115
],
118116
),
119-
_themeSwitcher(),
117+
// TODO: consider using Material symbols similar to dartdoc:
118+
// <span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
119+
// <span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
120+
d.button(
121+
classes: ['-pub-theme-toggle'],
122+
ariaLabel: 'light/dark theme toggle',
123+
),
120124
],
121125
);
122126
}
123127

124-
d.Node _themeSwitcher() {
125-
// <span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
126-
// <span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
127-
if (requestContext.experimentalFlags.isDarkModeEnabled) {
128-
return d.fragment([
129-
d.button(
130-
classes: ['-pub-theme-toggle'], ariaLabel: 'light/dark theme toggle'),
131-
]);
132-
} else {
133-
return d.fragment([]);
134-
}
135-
}
136-
137128
d.Node _userBlock(SessionData userSession) {
138129
return d.div(
139130
classes: ['nav-container', 'nav-profile-container', 'hoverable'],

app/test/search/backend_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void main() {
1717
final descr = await searchBackend.fetchSdkLibraryDescriptions(
1818
baseUri: index.baseUri,
1919
libraryRelativeUrls: {
20-
'dart:async': 'dart-async/dart-async-library.html',
20+
'dart:async': 'dart-async/index.html',
2121
},
2222
);
2323
expect(descr, {

pkg/pub_integration/test/search_completition_test.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ void main() {
4444
final user = await fakeTestScenario.createAnonymousTestUser();
4545

4646
await user.withBrowserPage((page) async {
47-
await page.gotoOrigin('/experimental?search-completion=1');
48-
4947
await page.gotoOrigin('/');
5048
await page.keyboard.type('is:un');
5149
await Future.delayed(Duration(milliseconds: 200));
@@ -59,8 +57,6 @@ void main() {
5957
});
6058

6159
await user.withBrowserPage((page) async {
62-
await page.gotoOrigin('/experimental?search-completion=1');
63-
6460
await page.gotoOrigin('/packages?q=abc');
6561
await page.focus('input[name="q"]');
6662
// go to the end of the input field and start typing

pkg/pub_integration/test/theme_switch_test.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ void main() {
4141

4242
// test keyboard navigation
4343
await user.withBrowserPage((page) async {
44-
await page.gotoOrigin('/experimental?dark=1');
45-
4644
Future<void> expectDarkTheme() async {
4745
expect(await page.$OrNull('body.light-theme'), isNull);
4846
expect(await page.$OrNull('body.dark-theme'), isNotNull);

0 commit comments

Comments
 (0)