diff --git a/app/lib/frontend/handlers.dart b/app/lib/frontend/handlers.dart index 7a5b63e449..3d7a5f1626 100644 --- a/app/lib/frontend/handlers.dart +++ b/app/lib/frontend/handlers.dart @@ -444,11 +444,8 @@ Future _packageVersionsHandler( return backend.downloadUrl(packageName, version.version); }).toList()); - final dartdocEntries = await dartdocClient.getEntries( - packageName, versions.map((pv) => pv.version).toList()); - return htmlResponse(templateService.renderPkgVersionsPage( - packageName, versions, dartdocEntries, versionDownloadUrls)); + packageName, versions, versionDownloadUrls)); } /// Handles requests for /packages/ @@ -478,8 +475,6 @@ Future _packageVersionHandlerHtml( sortPackageVersionsDesc(versions, decreasing: true, pubSorting: true); final latestStable = versions[0]; final first10Versions = versions.take(10).toList(); - final dartdocEntries = await dartdocClient.getEntries( - packageName, first10Versions.map((pv) => pv.version).toList()); sortPackageVersionsDesc(versions, decreasing: true, pubSorting: false); final latestDev = versions[0]; @@ -517,7 +512,6 @@ Future _packageVersionHandlerHtml( package, versionName != null, first10Versions, - dartdocEntries, versionDownloadUrls, selectedVersion, latestStable, diff --git a/app/lib/frontend/templates.dart b/app/lib/frontend/templates.dart index 94bf4ba782..6c6ee62eac 100644 --- a/app/lib/frontend/templates.dart +++ b/app/lib/frontend/templates.dart @@ -13,7 +13,6 @@ import 'package:meta/meta.dart'; import 'package:mustache/mustache.dart' as mustache; import '../shared/analyzer_client.dart'; -import '../shared/dartdoc_client.dart' show DartdocEntry; import '../shared/markdown.dart'; import '../shared/platform.dart'; import '../shared/search_service.dart' show SearchQuery, serializeSearchOrder; @@ -50,7 +49,7 @@ class TemplateService { /// Renders the `views/pkg/versions/index` template. String renderPkgVersionsPage(String package, List versions, - List dartdocEntries, List versionDownloadUrls) { + List versionDownloadUrls) { assert(versions.length == versionDownloadUrls.length); final stableVersionRows = []; @@ -58,9 +57,8 @@ class TemplateService { PackageVersion latestDevVersion; for (int i = 0; i < versions.length; i++) { final PackageVersion version = versions[i]; - final DartdocEntry dartdocEntry = dartdocEntries[i]; final String url = versionDownloadUrls[i].toString(); - final rowHtml = _renderVersionTableRow(version, dartdocEntry, url); + final rowHtml = _renderVersionTableRow(version, url); if (version.semanticVersion.isPreRelease) { latestDevVersion ??= version; devVersionRows.add(rowHtml); @@ -96,18 +94,13 @@ class TemplateService { canonicalUrl: urls.pkgPageUrl(package, includeHost: true)); } - String _renderVersionTableRow( - PackageVersion version, DartdocEntry dartdocEntry, String downloadUrl) { - final dartdocOk = dartdocEntry != null && dartdocEntry.hasContent; - final dartdocFailed = dartdocEntry != null && !dartdocEntry.hasContent; + String _renderVersionTableRow(PackageVersion version, String downloadUrl) { final versionData = { 'package': version.package, 'version': version.version, 'version_url': urls.pkgPageUrl(version.package, version: version.version), 'short_created': version.shortCreated, 'dartdocs_url': _attr(version.dartdocsUrl), - 'dartdoc_ok': dartdocOk, - 'dartdoc_failed': dartdocFailed, 'download_url': _attr(downloadUrl), 'icons': staticUrls.versionsTableIcons, }; @@ -279,7 +272,6 @@ class TemplateService { Map _pkgShowPageValues( Package package, List versions, - List dartdocEntries, List versionDownloadUrls, PackageVersion selectedVersion, PackageVersion latestStableVersion, @@ -340,9 +332,8 @@ class TemplateService { final versionTableRows = []; for (int i = 0; i < versions.length; i++) { final PackageVersion version = versions[i]; - final DartdocEntry dartdocEntry = dartdocEntries[i]; final String url = versionDownloadUrls[i].toString(); - versionTableRows.add(_renderVersionTableRow(version, dartdocEntry, url)); + versionTableRows.add(_renderVersionTableRow(version, url)); } final bool should_show_dev = @@ -481,7 +472,6 @@ class TemplateService { Package package, bool isVersionPage, List versions, - List dartdocEntries, List versionDownloadUrls, PackageVersion selectedVersion, PackageVersion latestStableVersion, @@ -504,7 +494,6 @@ class TemplateService { final Map values = _pkgShowPageValues( package, versions, - dartdocEntries, versionDownloadUrls, selectedVersion, latestStableVersion, diff --git a/app/lib/shared/memcache.dart b/app/lib/shared/memcache.dart index f7d8f4f26f..750624d10a 100644 --- a/app/lib/shared/memcache.dart +++ b/app/lib/shared/memcache.dart @@ -12,7 +12,7 @@ const Duration packageJsonExpiration = const Duration(minutes: 10); const Duration packageUiPageExpiration = const Duration(minutes: 10); const Duration analyzerDataExpiration = const Duration(minutes: 60); const Duration analyzerDataLocalExpiration = const Duration(minutes: 15); -const Duration dartdocEntryExpiration = const Duration(minutes: 60); +const Duration dartdocEntryExpiration = const Duration(hours: 24); const Duration dartdocFileInfoExpiration = const Duration(minutes: 60); const Duration searchUiPageExpiration = const Duration(minutes: 10); const Duration memcacheRequestTimeout = const Duration(seconds: 5); diff --git a/app/test/frontend/golden/authorized_page.html b/app/test/frontend/golden/authorized_page.html index 8508f4ddf1..0f8656e69c 100644 --- a/app/test/frontend/golden/authorized_page.html +++ b/app/test/frontend/golden/authorized_page.html @@ -25,7 +25,7 @@ - +