[FLORA-66] Signal deprecations and revision dates in version listing …

…page (#548)

fixes #544

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 1.0.18 -- 2024-03-26
 
 * Add @horizon namespace ([#498](https://github.com/flora-pm/flora-server/issues/498))
+* Signal deprecations and revision dates in version listing page ([#548](https://github.com/flora-pm/flora-server/pull/548))
 
 ## 1.0.17 -- 2024-03-26
 

src/web/FloraWeb/Pages/Templates/Packages.hs

@@ -1,4 +1,28 @@
-module FloraWeb.Pages.Templates.Packages where
+module FloraWeb.Pages.Templates.Packages
+  ( displayCategories
+  , displayDependencies
+  , displayDependents
+  , displayInstructions
+  , displayLicense
+  , displayLinks
+  , displayMaintainer
+  , displayNamespace
+  , displayPackageDeprecation
+  , displayPackageFlags
+  , displayReadme
+  , displayReleaseDeprecation
+  , displayReleaseVersion
+  , displayTestedWith
+  , displayVersions
+  , listVersions
+  , packageListing
+  , packageWithExecutableListing
+  , presentationHeaderForSubpage
+  , presentationHeaderForVersions
+  , showChangelog
+  , showDependencies
+  , showDependents
+  ) where
 
 import Control.Monad (when)
 import Control.Monad.Extra (whenJust)
@@ -153,11 +177,20 @@ versionListItem namespace packageName release = do
     a_ [href, class_ ""] $
       do
         h4_ [class_ "package-list-item__name"]
-          $ strong_ [class_ ""]
+          $ strong_ [class_ (if Just True == release.deprecated then " release-deprecated" else "")]
             . toHtml
           $ "v"
             <> toHtml release.version
         uploadedAt
+        case release.revisedAt of
+          Nothing -> span_ [] ""
+          Just revisionDate ->
+            span_
+              [ dataText_
+                  ("Revised on " <> display (Time.formatTime defaultTimeLocale "%a, %_d %b %Y, %R %EZ" revisionDate))
+              , class_ "revised-date"
+              ]
+              Icon.pen
         div_ [class_ "package-list-item__metadata"] $
           span_ [class_ "package-list-item__license"] $
             do

test/Flora/PackageSpec.hs

@@ -203,7 +203,7 @@ testGetNonDeprecatedPackages = do
 testReleaseDeprecation :: TestEff ()
 testReleaseDeprecation = do
   result <- Query.getHackagePackagesWithoutReleaseDeprecationInformation
-  assertEqual 69 (length result)
+  assertEqual 70 (length result)
 
   binary <- fromJust <$> Query.getPackageByNamespaceAndName (Namespace "haskell") (PackageName "binary")
   deprecatedBinaryVersion' <- assertJust =<< Query.getReleaseByVersion binary.packageId (mkVersion [0, 10, 0, 0])

test/Flora/TestUtils.hs

@@ -136,7 +136,6 @@ import Test.Tasty.HUnit qualified as Test
 
 import Flora.Environment
 import Flora.Environment.Config (LoggingDestination (..), PoolConfig (..))
-import Flora.Import.Categories (importCategories)
 import Flora.Import.Package.Bulk (importAllFilesInRelativeDirectory, importFromIndex)
 import Flora.Logging qualified as Logging
 import Flora.Model.BlobStore.API
@@ -311,7 +310,6 @@ testMigrations = do
   pool <- getPool
   liftIO $ withResource pool $ \conn ->
     void $ runMigrations conn defaultOptions [MigrationInitialization, MigrationDirectory "./migrations"]
-  importCategories
 
 genWord32 :: MonadGen m => m Word32
 genWord32 = H.word32 (Range.constant minBound maxBound)

test/Main.hs

@@ -13,6 +13,7 @@ import Flora.BlobSpec qualified as BlobSpec
 import Flora.CabalSpec qualified as CabalSpec
 import Flora.CategorySpec qualified as CategorySpec
 import Flora.Environment
+import Flora.Import.Categories (importCategories)
 import Flora.ImportSpec qualified as ImportSpec
 import Flora.Model.PackageIndex.Update qualified as Update
 import Flora.Model.User (UserCreationForm (..), mkUser)
@@ -31,13 +32,14 @@ main = do
   fixtures <-
     runTestEff
       ( do
+          testMigrations
           cleanUp
+          importCategories
           Update.createPackageIndex "hackage" "" "" Nothing
           Update.createPackageIndex "cardano" "" "" Nothing
           password <- liftIO $ Sel.hashText "foobar2000"
           templateUser <- mkUser $ UserCreationForm "hackage-user" "tech@flora.pm" password
           Update.insertUser templateUser
-          testMigrations
           f' <- getFixtures
           importAllPackages f'
           pure f'