Simpler renderPkgShowPage parameters. (dart-lang#2412)

jonasfj · Jun 27, 2019 · 885b110 · 885b110
1 parent 1c0bbd3
commit 885b110
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 33 deletions.
diff --git a/app/lib/frontend/handlers/package.dart b/app/lib/frontend/handlers/package.dart
@@ -105,7 +105,6 @@ Future<shelf.Response> packageVersionHandlerHtml(
     final first10Versions = versions.take(10).toList();
 
     sortPackageVersionsDesc(versions, decreasing: true, pubSorting: false);
-    final latestDev = versions[0];
 
     PackageVersion selectedVersion;
     if (versionName != null) {
@@ -142,8 +141,6 @@ Future<shelf.Response> packageVersionHandlerHtml(
         first10Versions,
         versionDownloadUrls,
         selectedVersion,
-        latestStable,
-        latestDev,
         versions.length,
         analysisView);
     _packageDoneLatencyTracker.add(serviceSw.elapsed);

diff --git a/app/lib/frontend/templates/package.dart b/app/lib/frontend/templates/package.dart
@@ -206,8 +206,6 @@ String renderPkgShowPage(
     List<PackageVersion> versions,
     List<Uri> versionDownloadUrls,
     PackageVersion selectedVersion,
-    PackageVersion latestStableVersion,
-    PackageVersion latestDevVersion,
     int totalNumberOfVersions,
     AnalysisView analysis) {
   assert(versions.length == versionDownloadUrls.length);
@@ -219,12 +217,12 @@ String renderPkgShowPage(
       singlePlatform != null && singlePlatform != KnownPlatforms.other;
   final bool hasOnlyFlutterPlatform = singlePlatform == KnownPlatforms.flutter;
   final bool isFlutterPackage =
-      hasOnlyFlutterPlatform || latestStableVersion.pubspec.usesFlutter;
+      hasOnlyFlutterPlatform || selectedVersion.pubspec.usesFlutter;
 
-  final bool shouldShowDev =
-      latestStableVersion.semanticVersion < latestDevVersion.semanticVersion;
-  final bool shouldShow =
-      selectedVersion != latestStableVersion || shouldShowDev;
+  final bool showDevVersion = package.latestDevVersion != null &&
+      package.latestSemanticVersion < package.latestDevSemanticVersion;
+  final bool showUpdated =
+      selectedVersion.version != package.latestVersion || showDevVersion;
 
   final isAwaiting = card == null ||
       analysis == null ||
@@ -245,13 +243,13 @@ String renderPkgShowPage(
       'name': package.name,
       'version': selectedVersion.id,
       'latest': {
-        'should_show': shouldShow,
-        'should_show_dev': shouldShowDev,
+        'show_updated': showUpdated,
+        'show_dev_version': showDevVersion,
         'stable_url': urls.pkgPageUrl(package.name),
-        'stable_name': latestStableVersion.version,
+        'stable_version': package.latestVersion,
         'dev_url':
-            urls.pkgPageUrl(package.name, version: latestDevVersion.version),
-        'dev_name': latestDevVersion.version,
+            urls.pkgPageUrl(package.name, version: package.latestDevVersion),
+        'dev_version': package.latestDevVersion,
       },
       'tags_html': renderTags(
         analysis?.platforms,

diff --git a/app/lib/frontend/templates/views/pkg/show.mustache b/app/lib/frontend/templates/views/pkg/show.mustache
@@ -7,14 +7,14 @@
   <div class="metadata">
     Published <span>{{package.short_created}}</span>
     <!-- &bull; Downloads: X -->
-    {{#package.latest.should_show}}
+    {{#package.latest.show_updated}}
       &bull; Updated:
-      <span><a href="{{& package.latest.stable_url}}">{{package.latest.stable_name}}</a></span>
-      {{#package.latest.should_show_dev}}
+      <span><a href="{{& package.latest.stable_url}}">{{package.latest.stable_version}}</a></span>
+      {{#package.latest.show_dev_version}}
         /
-        <span><a href="{{& package.latest.dev_url}}">{{package.latest.dev_name}}</a></span>
-      {{/package.latest.should_show_dev}}
-    {{/package.latest.should_show}}
+        <span><a href="{{& package.latest.dev_url}}">{{package.latest.dev_version}}</a></span>
+      {{/package.latest.show_dev_version}}
+    {{/package.latest.show_updated}}
     <div class="tags">{{& package.tags_html}}</div>
   </div>
 </div>

diff --git a/app/test/frontend/golden/pkg_show_page_flutter_plugin.html b/app/test/frontend/golden/pkg_show_page_flutter_plugin.html
@@ -74,6 +74,16 @@ <h2 class="title">foobar_pkg 0.1.1+5</h2>
     Published 
           <span>Jan 1, 2015</span>
           <!-- &bull; Downloads: X -->
+      • Updated:
+
+          <span>
+            <a href="/packages/foobar_pkg">0.1.1+5</a>
+          </span>
+        /
+
+          <span>
+            <a href="/packages/foobar_pkg/versions/0.2.0-dev">0.2.0-dev</a>
+          </span>
           <div class="tags">
             <a class="package-tag" href="/flutter/packages" title="Compatible with the Flutter platform.">Flutter</a>
           </div>

diff --git a/app/test/frontend/golden/pkg_show_page_legacy.html b/app/test/frontend/golden/pkg_show_page_legacy.html
@@ -77,6 +77,16 @@ <h2 class="title">foobar_pkg 0.1.1+5</h2>
     Published 
           <span>Jan 1, 2014</span>
           <!-- &bull; Downloads: X -->
+      • Updated:
+
+          <span>
+            <a href="/packages/foobar_pkg">0.1.1+5</a>
+          </span>
+        /
+
+          <span>
+            <a href="/packages/foobar_pkg/versions/0.2.0-dev">0.2.0-dev</a>
+          </span>
           <div class="tags">
             <span class="package-tag legacy" title="Package does not support Dart 2.">Dart 2 incompatible</span>
           </div>

diff --git a/app/test/frontend/golden/pkg_show_page_outdated.html b/app/test/frontend/golden/pkg_show_page_outdated.html
@@ -77,6 +77,16 @@ <h2 class="title">foobar_pkg 0.1.1+5</h2>
     Published 
           <span>Jan 1, 2014</span>
           <!-- &bull; Downloads: X -->
+      • Updated:
+
+          <span>
+            <a href="/packages/foobar_pkg">0.1.1+5</a>
+          </span>
+        /
+
+          <span>
+            <a href="/packages/foobar_pkg/versions/0.2.0-dev">0.2.0-dev</a>
+          </span>
           <div class="tags">
             <span class="package-tag missing" title="Package version too old, check latest stable.">[outdated]</span>
           </div>

diff --git a/app/test/frontend/templates_test.dart b/app/test/frontend/templates_test.dart
@@ -137,8 +137,6 @@ void main() {
           [testPackageVersion],
           [Uri.parse('http://dart-example.com/')],
           testPackageVersion,
-          testPackageVersion,
-          devPackageVersion,
           1,
           AnalysisView(
             card: ScoreCardData(reportTypes: ['pana'], healthScore: 0.1),
@@ -189,8 +187,6 @@ void main() {
           [testPackageVersion],
           [Uri.parse('http://dart-example.com/')],
           testPackageVersion,
-          testPackageVersion,
-          devPackageVersion,
           1,
           AnalysisView(
             card: ScoreCardData(reportTypes: ['pana'], healthScore: 0.1),
@@ -240,8 +236,6 @@ void main() {
         [flutterPackageVersion],
         [Uri.parse('http://dart-example.com/')],
         flutterPackageVersion,
-        flutterPackageVersion,
-        flutterPackageVersion,
         1,
         AnalysisView(
           card: ScoreCardData(
@@ -279,8 +273,6 @@ void main() {
           [testPackageVersion],
           [Uri.parse('http://dart-example.com/')],
           testPackageVersion,
-          testPackageVersion,
-          testPackageVersion,
           1,
           AnalysisView(
             card: ScoreCardData(
@@ -300,8 +292,6 @@ void main() {
           [testPackageVersion],
           [Uri.parse('http://dart-example.com/')],
           testPackageVersion,
-          testPackageVersion,
-          testPackageVersion,
           1,
           AnalysisView(
             card: ScoreCardData(
@@ -323,8 +313,6 @@ void main() {
           [testPackageVersion],
           [Uri.parse('http://dart-example.com/')],
           testPackageVersion,
-          testPackageVersion,
-          testPackageVersion,
           1,
           AnalysisView(
             card: ScoreCardData(