Rename to versions-downloads-chart to downloads-chart (#8364)

Author: szakarias

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

@@ -79,8 +79,8 @@ d.Node scoreTabNode({
           ],
         ),
         _reportNode(report),
-        if (card.weeklyVersionsDownloads != null)
-          _versionDownloadsChart(card.weeklyVersionsDownloads!),
+        if (card.weeklyVersionDownloads != null)
+          _downloadsChart(card.weeklyVersionDownloads!),
         if (toolEnvInfo != null) toolEnvInfo,
       ]),
     if (!showPending)
@@ -177,20 +177,18 @@ d.Node _section(ReportSection section) {
   ]);
 }
 
-d.Node _versionDownloadsChart(
-    WeeklyVersionsDownloadCounts weeklyVersionsDownloads) {
+d.Node _downloadsChart(WeeklyVersionDownloadCounts weeklyVersionDownloads) {
   return d.div(
-    classes: ['versions-downloads-chart'],
-    id: '-versions-downloads-chart',
+    classes: ['downloads-chart'],
+    id: '-downloads-chart',
     attributes: {
-      'data-widget': 'versions-downloads-chart',
-      'data-versions-downloads-chart':
-          _encodeForVersionsChart(weeklyVersionsDownloads)
+      'data-widget': 'downloads-chart',
+      'data-downloads-chart': _encodeForDownloadsChart(weeklyVersionDownloads)
     },
   );
 }
 
-String _encodeForVersionsChart(WeeklyVersionsDownloadCounts wvcd) {
+String _encodeForDownloadsChart(WeeklyVersionDownloadCounts wvcd) {
   final date = wvcd.newestDate.toUtc().millisecondsSinceEpoch ~/ 1000;
 
   final allCounts = <int>[];

app/lib/scorecard/backend.dart

@@ -163,8 +163,7 @@ class ScoreCardBackend {
       taskStatus = PackageVersionStatus.pending;
     }
 
-    final weeklyVersionsDownloads =
-        await getWeeklyVersionsDownloads(packageName);
+    final weeklyVersionDownloads = await getWeeklyVersionDownloads(packageName);
 
     final data = ScoreCardData(
       packageName: packageName,
@@ -177,7 +176,7 @@ class ScoreCardBackend {
       ),
       panaReport: PanaReport.fromSummary(summary, packageStatus: status),
       taskStatus: taskStatus,
-      weeklyVersionsDownloads: weeklyVersionsDownloads,
+      weeklyVersionDownloads: weeklyVersionDownloads,
     );
     await cacheEntry.set(data);
     return data;

app/lib/scorecard/models.dart

@@ -34,7 +34,7 @@ class ScoreCardData {
   final DartdocReport? dartdocReport;
   final PanaReport? panaReport;
   final PackageVersionStatus? taskStatus;
-  final WeeklyVersionsDownloadCounts? weeklyVersionsDownloads;
+  final WeeklyVersionDownloadCounts? weeklyVersionDownloads;
 
   ScoreCardData({
     this.packageName,
@@ -44,7 +44,7 @@ class ScoreCardData {
     this.dartdocReport,
     this.panaReport,
     this.taskStatus,
-    this.weeklyVersionsDownloads,
+    this.weeklyVersionDownloads,
   });
 
   factory ScoreCardData.fromJson(Map<String, dynamic> json) =>

app/lib/scorecard/models.g.dart

@@ -52,10 +52,10 @@ Future<WeeklyDownloadCounts?> getWeeklyTotalDownloads(String package) async {
   }));
 }
 
-Future<WeeklyVersionsDownloadCounts?> getWeeklyVersionsDownloads(
+Future<WeeklyVersionDownloadCounts?> getWeeklyVersionDownloads(
     String package) async {
-  return (await cache.weeklyVersionsDownloadCounts(package).get(() async {
-    return computeWeeklyVersionsDownloads(package);
+  return (await cache.weeklyVersionDownloadCounts(package).get(() async {
+    return computeWeeklyVersionDownloads(package);
   }));
 }
 
@@ -81,7 +81,7 @@ Future<WeeklyDownloadCounts?> computeWeeklyTotalDownloads(
 /// Computes weekly downloads starting from `newestDate` for [package] and 52
 /// weeks back for all stored major, minor, and patch version ranges and total
 /// downloads.
-Future<WeeklyVersionsDownloadCounts?> computeWeeklyVersionsDownloads(
+Future<WeeklyVersionDownloadCounts?> computeWeeklyVersionDownloads(
     String package) async {
   final countData =
       await downloadCountsBackend.lookupDownloadCountData(package);
@@ -111,7 +111,7 @@ Future<WeeklyVersionsDownloadCounts?> computeWeeklyVersionsDownloads(
 
   final weeklyTotalCounts = _computeWeeklyCounts(countData.totalCounts);
 
-  return WeeklyVersionsDownloadCounts(
+  return WeeklyVersionDownloadCounts(
       newestDate: countData.newestDate!,
       majorRangeWeeklyDownloads: majorRangeWeeklyCounts,
       minorRangeWeeklyDownloads: minorRangeWeeklyCounts,

app/lib/service/download_counts/computations.dart

@@ -244,7 +244,7 @@ class WeeklyDownloadCounts {
 }
 
 @JsonSerializable(includeIfNull: false)
-class WeeklyVersionsDownloadCounts {
+class WeeklyVersionDownloadCounts {
   /// An integer list where each number is the total number of downloads for a
   /// given 7 day period starting from [newestDate].
   final List<int> totalWeeklyDownloads;
@@ -273,15 +273,15 @@ class WeeklyVersionsDownloadCounts {
   /// The newest date with download counts data available.
   final DateTime newestDate;
 
-  WeeklyVersionsDownloadCounts({
+  WeeklyVersionDownloadCounts({
     required this.newestDate,
     required this.majorRangeWeeklyDownloads,
     required this.minorRangeWeeklyDownloads,
     required this.patchRangeWeeklyDownloads,
     required this.totalWeeklyDownloads,
   });
 
-  factory WeeklyVersionsDownloadCounts.fromJson(Map<String, dynamic> json) =>
-      _$WeeklyVersionsDownloadCountsFromJson(json);
-  Map<String, dynamic> toJson() => _$WeeklyVersionsDownloadCountsToJson(this);
+  factory WeeklyVersionDownloadCounts.fromJson(Map<String, dynamic> json) =>
+      _$WeeklyVersionDownloadCountsFromJson(json);
+  Map<String, dynamic> toJson() => _$WeeklyVersionDownloadCountsToJson(this);
 }

app/lib/service/download_counts/download_counts.dart

@@ -257,17 +257,17 @@ class CachePatterns {
         decode: (d) => WeeklyDownloadCounts.fromJson(d as Map<String, dynamic>),
       ))[package];
 
-  Entry<WeeklyVersionsDownloadCounts> weeklyVersionsDownloadCounts(
+  Entry<WeeklyVersionDownloadCounts> weeklyVersionDownloadCounts(
           String package) =>
       _cache
           .withPrefix('weekly-versions-download-counts/')
           .withTTL(Duration(hours: 6))
           .withCodec(utf8)
           .withCodec(json)
           .withCodec(wrapAsCodec(
-            encode: (WeeklyVersionsDownloadCounts wdc) => wdc.toJson(),
-            decode: (d) => WeeklyVersionsDownloadCounts.fromJson(
-                d as Map<String, dynamic>),
+            encode: (WeeklyVersionDownloadCounts wdc) => wdc.toJson(),
+            decode: (d) =>
+                WeeklyVersionDownloadCounts.fromJson(d as Map<String, dynamic>),
           ))[package];
 
   Entry<List<LikeData>> userPackageLikes(String userId) => _cache

app/lib/service/download_counts/download_counts.g.dart

@@ -293,7 +293,7 @@ <h3>
                       </div>
                     </div>
                   </div>
-                  <div id="-versions-downloads-chart" class="versions-downloads-chart" data-widget="versions-downloads-chart" data-versions-downloads-chart="AO1QZwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=,[>=1.0.0-0 &lt;2.0.0, >=1.2.0-0 &lt;1.3.0, >=1.2.0-0 &lt;1.2.1]"></div>
+                  <div id="-downloads-chart" class="downloads-chart" data-widget="downloads-chart" data-downloads-chart="AO1QZwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=,[>=1.0.0-0 &lt;2.0.0, >=1.2.0-0 &lt;1.3.0, >=1.2.0-0 &lt;1.2.1]"></div>
                   <p class="tool-env-info">
                     Analyzed with Pana
                     <code>%%pana-version%%</code>

app/lib/shared/redis_cache.dart

@@ -293,7 +293,7 @@ <h3>
                       </div>
                     </div>
                   </div>
-                  <div id="-versions-downloads-chart" class="versions-downloads-chart" data-widget="versions-downloads-chart" data-versions-downloads-chart="AO1QZwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=,[>=1.0.0-0 &lt;2.0.0, >=1.2.0-0 &lt;1.3.0, >=1.2.0-0 &lt;1.2.1]"></div>
+                  <div id="-downloads-chart" class="downloads-chart" data-widget="downloads-chart" data-downloads-chart="AO1QZwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=,[>=1.0.0-0 &lt;2.0.0, >=1.2.0-0 &lt;1.3.0, >=1.2.0-0 &lt;1.2.1]"></div>
                   <p class="tool-env-info">
                     Analyzed with Pana
                     <code>%%pana-version%%</code>