tried to add an column and failed

Author: kubaneko

datafiles/templates/Html/noscript-search-form.html.st

@@ -23,6 +23,7 @@
         <option $if(tags)$        selected $endif$ value=tags>tags</option>
         <option $if(lastUpload)$  selected $endif$ value=lastUpload>date of last upload</option>
         <option $if(maintainers)$ selected $endif$ value=maintainers>maintainers</option>
+        <option $if(packageRank)$ selected $endif$ value=packageRank>packageRank</option>
       </select>
     </label>
   </div>

src/Distribution/Server/Features/Browse.hs

@@ -138,7 +138,7 @@ packageIndexInfoToValue :: CoreResource -> TagsResource -> UserResource -> Packa
 packageIndexInfoToValue
   coreResource tagsResource userResource
   PackageItem{itemName, itemDownloads, itemVotes,
-    itemDesc, itemTags, itemLastUpload, itemMaintainer} =
+    itemDesc, itemTags, itemLastUpload, itemMaintainer, itemPackageRank} =
   object
     [ Key.fromString "name" .= renderPackage itemName
     , Key.fromString "downloads" .= itemDownloads
@@ -147,6 +147,7 @@ packageIndexInfoToValue
     , Key.fromString "tags" .= map renderTag (S.toAscList itemTags)
     , Key.fromString "lastUpload" .= iso8601Show itemLastUpload
     , Key.fromString "maintainers" .= map renderUser itemMaintainer
+    , Key.fromString "packageRank" .= itemPackageRank
     ]
   where
   renderTag :: Tag -> Value

src/Distribution/Server/Features/Browse/ApplyFilter.hs

@@ -64,6 +64,7 @@ sort isSearch sortColumn sortDirection =
             Tags -> comparing (S.toAscList . itemTags)
             LastUpload -> comparing itemLastUpload
             Maintainers -> comparing itemMaintainer
+            PackageRank -> comparing itemPackageRank
        in sortBy (maybeReverse comparer)
   where
     maybeReverse =

src/Distribution/Server/Features/Browse/Options.hs

@@ -9,7 +9,7 @@ import Distribution.Server.Features.Browse.Parsers (Filter, conditions, condsToF
 
 data IsSearch = IsSearch | IsNotSearch
 
-data NormalColumn = Name | Downloads | Rating | Description | Tags | LastUpload | Maintainers
+data NormalColumn = Name | Downloads | Rating | Description | Tags | LastUpload | Maintainers | PackageRank
   deriving (Show, Eq)
 
 data Column = DefaultColumn | NormalColumn NormalColumn
@@ -37,6 +37,7 @@ instance FromJSON Column where
         "tags" -> pure $ NormalColumn Tags
         "lastUpload" -> pure $ NormalColumn LastUpload
         "maintainers" -> pure $ NormalColumn Maintainers
+        "packageRank" -> pure $ NormalColumn PackageRank
         t -> fail $ "Column invalid: " ++ T.unpack t
 
 columnToTemplateName :: Column -> String
@@ -49,6 +50,7 @@ columnToTemplateName = \case
   NormalColumn Tags -> "tags"
   NormalColumn LastUpload -> "lastUpload"
   NormalColumn Maintainers -> "maintainers"
+  NormalColumn PackageRank -> "packageRank"
 
 instance FromJSON Direction where
   parseJSON =

src/Distribution/Server/Features/Browse/Parsers.hs

@@ -85,7 +85,7 @@ allowedAfterOpeningBrace AllowNot = "not " <|> allowedAfterOpeningBrace Disallow
 allowedAfterOpeningBrace _ =
   asum
     [ "downloads", "rating", "lastUpload" , "ageOfLastUpload"
-    , "tag:", "maintainer:", "deprecated:", "distro:"
+    , "tag:", "maintainer:", "deprecated:", "distro:", "packageRank"
     ]
 
 -- Whether the 'not' operator can be used.
@@ -113,6 +113,7 @@ filterWith allowNot = do
         "maintainer:" -> MaintainerFilter <$> wordWoSpaceOrParens
         "deprecated:" -> DeprecatedFilter <$> deprecatedOption
         "distro:" -> DistroFilter <$> wordWoSpaceOrParens
+        "packageRank" -> DownloadsFilter <$> opAndSndParam decimal
         _ -> fail "Impossible since fieldName possibilities are known at compile time"
       pure filt