Merge branch 'master' into dartdoc

Author: isoos

CHANGELOG.md

@@ -4,6 +4,8 @@ AppEngine version, listed here to ease deployment and troubleshooting.
 ## Next Release (replace with git tag when deployed)
  * Bump runtimeVersion to `2024.12.30`.
  * Upgraded dartdoc to `8.3.1`.
+ * Note: removed required flag from `isBlocked` fields. 
+ * Note: started deleting `Package.blocked` and `Package.blockedReason`.
 
 ## `20241217t132200-all`
  * Bump runtimeVersion to `2024.12.17`.

app/lib/account/models.dart

@@ -52,7 +52,9 @@ class User extends db.ExpandoModel<String> {
   /// [isBlocked] is set when a user account is blocked (is on administrative hold).
   /// When this happens user-data is preserved, but the user should not be able
   /// to perform any action.
-  @db.BoolProperty(required: true)
+  ///
+  /// TODO: remove after runtime version `2024.12.17` is no longer running.
+  @db.BoolProperty(required: false)
   bool isBlocked = false;
 
   /// `true` if user was moderated (pending moderation or deletion).

app/lib/frontend/handlers/custom_api.dart

@@ -247,7 +247,6 @@ Future<VersionScore> packageVersionScoreHandler(
       maxPoints: card.maxPubPoints,
       likeCount: pkg.likes,
       downloadCount30Days: card.thirtyDaysDownloadCounts,
-      popularityScore: card.popularityScore,
       tags: tags.toList(),
       lastUpdated: updated,
     );

app/lib/frontend/handlers/experimental.dart

@@ -10,7 +10,6 @@ typedef PublicFlag = ({String name, String description});
 
 const _publicFlags = <PublicFlag>{
   (name: 'dark', description: 'Dark mode'),
-  (name: 'download-counts', description: 'Download count metrics'),
   (name: 'search-completion', description: 'Completions for the search bar'),
   (name: 'search-topics', description: 'Show matching topics when searching'),
   (
@@ -101,7 +100,6 @@ class ExperimentalFlags {
 
   bool get showDownloadCountsVersionChart =>
       isEnabled('download-counts-version-chart');
-  bool get showDownloadCounts => true;
 
   String encodedAsCookie() => _enabled.join(':');
 

app/lib/frontend/templates/_consts.dart

@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:_pub_shared/search/tags.dart';
-import 'package:pub_dev/frontend/request_context.dart';
 
 import '../dom/dom.dart' as d;
 
@@ -116,19 +115,14 @@ final _sortDicts = const <SortDict>[
       label: 'most pub points',
       tooltip: 'Packages are sorted by pub points.'),
   SortDict(
-      id: 'popularity',
-      label: 'popularity',
-      tooltip: 'Packages are sorted by their popularity score.'),
+      id: 'downloads',
+      label: 'downloads',
+      tooltip: 'Packages are sorted by their download counts.'),
 ];
 
 List<SortDict> getSortDicts(bool isSearch) {
   final removeId = isSearch ? 'listing_relevance' : 'search_relevance';
   return <SortDict>[
     ..._sortDicts.where((d) => d.id != removeId),
-    if (requestContext.experimentalFlags.showDownloadCounts)
-      SortDict(
-          id: 'downloads',
-          label: 'downloads',
-          tooltip: 'Packages are sorted by their download counts.'),
   ];
 }

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

@@ -4,7 +4,6 @@
 
 import 'package:_pub_shared/format/encoding.dart';
 import 'package:pana/pana.dart';
-import 'package:pub_dev/frontend/request_context.dart';
 import 'package:pub_dev/service/download_counts/download_counts.dart';
 import 'package:pubspec_parse/pubspec_parse.dart' as pubspek;
 
@@ -83,8 +82,7 @@ d.Node packageInfoBoxNode({
         collectionsIcon(),
       ]),
     _publisher(package.publisherId),
-    if (data.weeklyDownloadCounts != null &&
-        requestContext.experimentalFlags.showDownloadCounts)
+    if (data.weeklyDownloadCounts != null)
       _downloadsChart(data.weeklyDownloadCounts!),
     _metadata(
       description: version.pubspec!.description,

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

@@ -3,8 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:_pub_shared/format/number_format.dart';
-import 'package:pub_dev/frontend/request_context.dart';
-import 'package:pub_dev/shared/popularity_storage.dart';
 
 import '../../../dom/dom.dart' as d;
 
@@ -31,30 +29,20 @@ d.Node labeledScoresNode({
         classes: ['packages-score', 'packages-score-health'],
         child: _labeledScore('points', grantedPubPoints?.toString(), sign: ''),
       ),
-      requestContext.experimentalFlags.showDownloadCounts
-          ? d.div(
-              attributes: {
-                'title':
-                    'Number of downloads of this package during the past 30 days'
-              },
-              classes: ['packages-score', 'packages-score-downloads'],
-              child: _labeledScore(
-                'downloads',
-                thirtyDaysDownloads != null
-                    ? '${compactFormat(thirtyDaysDownloads).value}'
-                        '${compactFormat(thirtyDaysDownloads).suffix}'
-                    : null,
-                sign: '',
-              ),
-            )
-          : d.div(
-              classes: ['packages-score', 'packages-score-popularity'],
-              child: _labeledScore(
-                'popularity',
-                popularityStorage.isInvalid ? null : popularity.toString(),
-                sign: popularityStorage.isInvalid ? '' : '%',
-              ),
-            ),
+      d.div(
+        attributes: {
+          'title': 'Number of downloads of this package during the past 30 days'
+        },
+        classes: ['packages-score', 'packages-score-downloads'],
+        child: _labeledScore(
+          'downloads',
+          thirtyDaysDownloads != null
+              ? '${compactFormat(thirtyDaysDownloads).value}'
+                  '${compactFormat(thirtyDaysDownloads).suffix}'
+              : null,
+          sign: '',
+        ),
+      ),
     ],
   );
 }

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

@@ -7,15 +7,13 @@ import 'dart:convert';
 import 'package:_pub_shared/data/download_counts_data.dart';
 import 'package:_pub_shared/format/number_format.dart';
 import 'package:pana/models.dart';
-import 'package:pub_dev/shared/popularity_storage.dart';
 import 'package:pub_dev/shared/utils.dart';
 
 import '../../../../scorecard/models.dart' hide ReportStatus;
 import '../../../../shared/urls.dart' as urls;
 import '../../../dom/dom.dart' as d;
 import '../../../request_context.dart';
 import '../../../static_files.dart';
-import '../../package_misc.dart' show formatScore;
 
 /// Renders the score page content.
 d.Node scoreTabNode({
@@ -45,9 +43,7 @@ d.Node scoreTabNode({
       children: [
         _likeKeyFigureNode(likeCount),
         _pubPointsKeyFigureNode(report, showPending),
-        requestContext.experimentalFlags.showDownloadCounts
-            ? _downloadCountsKeyFigureNode(card.thirtyDaysDownloadCounts)
-            : _popularityKeyFigureNode(card.popularityScore),
+        _downloadCountsKeyFigureNode(card.thirtyDaysDownloadCounts),
       ],
     ),
     if (showPending)
@@ -281,21 +277,6 @@ d.Node _likeKeyFigureNode(int? likeCount) {
   );
 }
 
-d.Node _popularityKeyFigureNode(double? popularity) {
-  if (popularityStorage.isInvalid) {
-    return _keyFigureNode(
-      value: '--',
-      supplemental: '',
-      label: 'popularity',
-    );
-  }
-  return _keyFigureNode(
-    value: formatScore(popularity),
-    supplemental: '%',
-    label: 'popularity',
-  );
-}
-
 d.Node _downloadCountsKeyFigureNode(int? downloadCounts) {
   if (downloadCounts == null) {
     return _keyFigureNode(

app/lib/package/models.dart

@@ -126,17 +126,11 @@ class Package extends db.ExpandoModel<String> {
 
   /// Set to `true` if package should not be displayed anywhere, because of
   /// pending moderation or deletion.
-  @db.BoolProperty(required: true)
+  ///
+  /// TODO: remove after runtime version `2024.12.17` is no longer running.
+  @db.BoolProperty(required: false)
   bool isBlocked = false;
 
-  /// The reason why the package was blocked.
-  @db.StringProperty(indexed: false)
-  String? blockedReason;
-
-  /// The timestamp when the package was blocked.
-  @db.DateTimeProperty()
-  DateTime? blocked;
-
   /// `true` if package was moderated (pending moderation or deletion).
   @db.BoolProperty(required: true)
   bool isModerated = false;

app/lib/publisher/models.dart

@@ -61,7 +61,9 @@ class Publisher extends db.ExpandoModel<String> {
   ///   membership information, or invite new members.
   /// - Administrator roles of the publisher must not be able to publisher a new version
   ///   for packages of the publisher, or change any of the existing package's properties.
-  @db.BoolProperty(required: true)
+  ///
+  /// TODO: remove after runtime version `2024.12.17` is no longer running.
+  @db.BoolProperty(required: false)
   bool isBlocked = false;
 
   /// `true` if publisher was moderated (pending moderation or deletion).