Only display max package count disclaimer when there's over 300 packages

Author: luis-gustavo

Sources/App/Controllers/KeywordController.swift

@@ -60,19 +60,24 @@ enum KeywordController {
             throw Abort(.notFound)
         }
         let query = try req.query.decode(Query.self)
-        let page = try await Self.query(on: req.db, keyword: keyword, page: query.page, pageSize: query.pageSize)
 
-        guard !page.results.isEmpty else {
+        async let page = Self.query(on: req.db, keyword: keyword, page: query.page, pageSize: query.pageSize)
+        async let weightedKeywords = WeightedKeyword.query(on: req.db, keywords: [keyword])
+
+        let (pageResult, weightedKeywordsResult) = try await (page, weightedKeywords)
+
+        guard !pageResult.results.isEmpty else {
             throw Abort(.notFound)
         }
 
-        let packageInfo = page.results.compactMap(PackageInfo.init(package:))
+        let packageInfo = pageResult.results.compactMap(PackageInfo.init(package:))
 
         let model = KeywordShow.Model(
             keyword: keyword,
             packages: packageInfo,
             page: query.page,
-            hasMoreResults: page.hasMoreResults
+            hasMoreResults: pageResult.hasMoreResults,
+            totalPackageCount: weightedKeywordsResult.weight(for: keyword)
         )
 
         return KeywordShow.View(path: req.url.path, model: model).document()

Sources/App/Views/Keyword/KeywordShow+Model.swift

@@ -18,15 +18,18 @@ extension KeywordShow {
         var packages: [PackageInfo]
         var page: Int
         var hasMoreResults: Bool
+        let totalPackageCount: Int
 
         internal init(keyword: String,
                       packages: [PackageInfo],
                       page: Int,
-                      hasMoreResults: Bool) {
+                      hasMoreResults: Bool,
+                      totalPackageCount: Int) {
             self.keyword = keyword
             self.packages = packages
             self.page = page
             self.hasMoreResults = hasMoreResults
+            self.totalPackageCount = totalPackageCount
         }
     }
 }

Sources/App/Views/Keyword/KeywordShow+View.swift

@@ -59,11 +59,7 @@ enum KeywordShow {
                 .copyableInputForm(buttonName: "Copy Package Collection URL",
                                    eventName: "Copy Package Collection URL Button",
                                    valueToCopy: SiteURL.packageCollectionKeyword(.value(model.keyword)).absoluteURL()),
-                .p(
-                    .h6(
-                        .i("Note: Package collections are limited to a maximum of \(Constants.maxKeywordPackageCollectionCount) packages. If a keyword has more than \(Constants.maxKeywordPackageCollectionCount) packages, only the top \(Constants.maxKeywordPackageCollectionCount) packages will be included based on their package score.")
-                    )
-                ),
+                showPackageLimitDisclaimer(),
                 .hr(.class("minor")),
                 .ul(
                     .id("package-list"),
@@ -83,6 +79,15 @@ enum KeywordShow {
                 )
             )
         }
+
+        private func showPackageLimitDisclaimer() -> Node<HTML.BodyContext> {
+            guard model.totalPackageCount >= Constants.maxKeywordPackageCollectionCount else { return .empty }
+            return .p(
+                .h6(
+                    .i("Note: Package collections are limited to a maximum of \(Constants.maxKeywordPackageCollectionCount) packages. If a keyword has more than \(Constants.maxKeywordPackageCollectionCount) packages, only the top \(Constants.maxKeywordPackageCollectionCount) packages will be included based on their package score.")
+                )
+            )
+        }
     }
 }
 

Tests/AppTests/Mocks/KeywordShow+mock.swift

@@ -29,6 +29,6 @@ extension KeywordShow.Model {
             lastActivityAt: .t0,
             hasDocs: true
         ) }
-        return .init(keyword: "networking", packages: packages, page: 1, hasMoreResults: false)
+        return .init(keyword: "networking", packages: packages, page: 1, hasMoreResults: false, totalPackageCount: 10)
     }
 }

Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_KeywordShow.1.html

@@ -89,11 +89,6 @@ <h2 class="trimmed">Packages for keyword “networking”</h2>
         <form class="copyable-input">
           <input type="text" data-button-name="Copy Package Collection URL" data-event-name="Copy Package Collection URL Button" value="http://localhost:8080/keywords/networking/collection.json" readonly/>
         </form>
-        <p>
-          <h6>
-            <i>Note: Package collections are limited to a maximum of 300 packages. If a keyword has more than 300 packages, only the top 300 packages will be included based on their package score.</i>
-          </h6>
-        </p>
         <hr class="minor"/>
         <ul id="package-list">
           <li>