Fix messing documentationCandidates

Author: AliasQli

src/Distribution/Server/Features/Documentation.hs

@@ -156,16 +156,14 @@ documentationFeature name
                        , guardValidPackageId
                        , corePackagePage
                        , corePackagesPage
+                       , lookupPackageName
                        }
                      getPackages
                      UploadFeature{..}
                      TarIndexCacheFeature{cachedTarIndex}
                      ReportsFeature{..}
                      UserFeature{ guardAuthorised_ }
-                     VersionsFeature
-                        { queryGetPreferredInfo
-                        , withPackagePreferred
-                        }
+                     VersionsFeature{queryGetPreferredInfo}
                      documentationState
                      documentationChangeHook
   = DocumentationFeature{..}
@@ -391,7 +389,8 @@ documentationFeature name
 
       case pkgVersion pkgid == nullVersion of
         -- if no version is given we want to redirect to the latest version with docs
-        True -> withPackagePreferred pkgid $ \_ pkgs -> do
+        True -> do
+            pkgs <- lookupPackageName (pkgName pkgid)
             prefInfo <- queryGetPreferredInfo (pkgName pkgid)
             findLastVerWithDoc queryHasDocumentation prefInfo pkgs >>= \case
               Just (latestWithDocs, _) -> do
@@ -454,7 +453,7 @@ findLastVerWithDoc queryHasDoc prefInfo ps = helper (reverse ps)
     helper (pkg:pkgs) = do
       hasDoc <- queryHasDoc (pkgInfoId pkg)
       let status = getVersionStatus prefInfo (packageVersion pkg)
-      if hasDoc && status /= DeprecatedVersion 
+      if hasDoc && status == NormalVersion 
           then pure (Just (packageId pkg, status)) 
           else helper pkgs
 

src/Distribution/Server/Features/Html.hs

@@ -593,15 +593,6 @@ mkHtmlCore ServerEnv{serverBaseURI, serverBlobStore}
             pkgdesc = flattenPackageDescription $ pkgDesc pkg
 
         prefInfo      <- queryGetPreferredInfo pkgname
-
-        -- let findLastDocVer [] = pure Nothing
-        --     findLastDocVer (pkg':pkgs') = do
-        --         hasDoc <- queryHasDocumentation documentationFeature (pkgInfoId pkg')
-        --         let status = getVersionStatus prefInfo (packageVersion pkg')
-        --         if hasDoc && status /= DeprecatedVersion 
-        --             then pure (Just (packageVersion pkg', status)) 
-        --             else findLastDocVer pkgs'
-
         distributions <- queryPackageStatus pkgname
         totalDown     <- cmFind pkgname `liftM` totalPackageDownloads
         recentDown    <- cmFind pkgname `liftM` recentPackageDownloads
@@ -614,7 +605,7 @@ mkHtmlCore ServerEnv{serverBaseURI, serverBlobStore}
         deprs         <- queryGetDeprecatedFor pkgname
         mreadme       <- makeReadme render
         hasDocs       <- queryHasDocumentation documentationFeature realpkg
-        lastVerWithDoc<- findLastVerWithDoc (queryHasDocumentation documentationFeature) prefInfo (reverse pkgs)
+        lastVerWithDoc<- findLastVerWithDoc (queryHasDocumentation documentationFeature) prefInfo pkgs
         rptStats      <- queryLastReportStats reportsFeature realpkg
         candidates    <- lookupCandidateName pkgname
         buildStatus   <- renderBuildStatus