Add tabbar to 'Recent Activity' (#266)

Added tab-based filtering for Recent Activity page to show built vs
unbuilt branches separately, in addition to all activity.

Resolves #264

---

<img width="1207" height="668" alt="image"
src="https://github.com/user-attachments/assets/e752a733-b9de-4a7c-ab92-a744fa591ac7"
/>

Author: srid

packages/vira/src/Vira/CI/AutoBuild.hs

@@ -116,4 +116,4 @@ handleBranchUpdates autoBuildNewBranches repo updates = do
     skipReasonText :: SkipReason -> Text
     skipReasonText = \case
       OldCommit -> "old commit"
-      NeverBuilt -> "never build before (autoBuildNewBranches=False)"
+      NeverBuilt -> "never built before (autoBuildNewBranches=False)"

packages/vira/src/Vira/State/Acid.hs

@@ -75,41 +75,56 @@ getRepoByNameA name = do
 enrichBranchWithJobs :: IxJob -> Branch -> BranchDetails
 enrichBranchWithJobs jobsIx branch =
   let branchJobs = Ix.toDescList (Proxy @JobId) $ jobsIx @= branch.repoName @= branch.branchName
-      mLatestJob = viaNonEmpty head branchJobs
-      -- Compute badge state based on job and commit comparison
-      badgeState = case mLatestJob of
-        Nothing -> Just NeverBuilt
+      -- Compute build state based on job and commit comparison
+      buildState = case viaNonEmpty head branchJobs of
+        Nothing -> NeverBuilt
         Just job
-          | job.commit /= branch.headCommit.id -> Just OutOfDate
-          | otherwise -> Nothing
+          | job.commit /= branch.headCommit.id -> Built job OutOfDate
+          | otherwise -> Built job UpToDate
    in BranchDetails
         { branch
-        , mLatestJob
         , jobsCount = fromIntegral $ length branchJobs
-        , badgeState
+        , buildState
         }
 
-{- | Get branches with enriched metadata, optionally filtered by repo and/or name.
+{- | Query branches with enriched metadata, filtered by BranchQuery criteria.
 
 This is the canonical query for getting branches - used by both RepoPage and IndexPage.
 
 - Nothing repo: all repos (IndexPage)
 - Just repo: single repo (RepoPage)
 - Filter by branch name if provided
+- Filter by build status (Nothing = all, Just True = unbuilt only, Just False = built only)
 - Sorted by activity time (most recent first)
 -}
-getAllBranchesA :: Maybe RepoName -> Maybe Text -> Natural -> Query ViraState [BranchDetails]
-getAllBranchesA mRepo mFilter limit = do
+queryBranchDetailsA :: BranchQuery -> Natural -> Query ViraState [BranchDetails]
+queryBranchDetailsA query limit = do
   ViraState {branches, jobs} <- ask
-  let candidateBranches = case mRepo of
-        Nothing -> Ix.toList branches
-        Just repo -> Ix.toList $ branches @= repo
-      matchesFilter branch = case mFilter of
-        Nothing -> True
-        Just s -> T.toLower s `T.isInfixOf` T.toLower (toText branch.branchName)
-      enriched = enrichBranchWithJobs jobs <$> filter matchesFilter candidateBranches
-      sorted = sortWith (Down . branchActivityTime) enriched
-  pure $ take (fromIntegral limit) sorted
+  pure $
+    branches
+      & maybe Prelude.id getEQ query.repoName
+      & Ix.toList
+      & filter matchesBranch
+      & fmap (enrichBranchWithJobs jobs)
+      & filterByBuildStatus
+      & sortWith (Down . branchActivityTime)
+      & take (fromIntegral limit)
+  where
+    matchesBranch branch = case query.branchNamePattern of
+      Nothing -> True
+      Just q -> T.toLower q `T.isInfixOf` T.toLower (toText branch.branchName)
+    filterByBuildStatus = case query.neverBuilt of
+      Nothing -> Prelude.id -- all branches
+      Just True -> filter (\d -> d.buildState == NeverBuilt)
+      Just False -> filter (\d -> d.buildState /= NeverBuilt)
+
+-- | Get single branch with enriched metadata
+getBranchDetailsA :: RepoName -> BranchName -> Query ViraState (Maybe BranchDetails)
+getBranchDetailsA repo branchName = do
+  ViraState {branches, jobs} <- ask
+  pure $ do
+    branch <- Ix.getOne $ branches @= repo @= branchName
+    pure $ enrichBranchWithJobs jobs branch
 
 -- | Get all branches for a repo
 getRepoBranchesA :: RepoName -> Query ViraState [Branch]
@@ -123,14 +138,6 @@ getBranchByNameA repo branch = do
   ViraState {branches} <- ask
   pure $ Ix.getOne $ branches @= repo @= branch
 
--- | Get branch with enriched metadata
-getBranchDetailsA :: RepoName -> BranchName -> Query ViraState (Maybe BranchDetails)
-getBranchDetailsA repo branchName = do
-  ViraState {branches, jobs} <- ask
-  case Ix.getOne $ branches @= repo @= branchName of
-    Nothing -> pure Nothing
-    Just branch -> pure $ Just $ enrichBranchWithJobs jobs branch
-
 -- | Set a repository's refresh status
 setRefreshStatusA :: RepoName -> Maybe RefreshResult -> Update ViraState ()
 setRefreshStatusA name mResult = do
@@ -314,7 +321,7 @@ $( makeAcidic
      [ 'setAllReposA
      , 'getAllReposA
      , 'getRepoByNameA
-     , 'getAllBranchesA
+     , 'queryBranchDetailsA
      , 'getRepoBranchesA
      , 'getBranchByNameA
      , 'getBranchDetailsA

packages/vira/src/Vira/State/Type.hs

@@ -7,6 +7,7 @@ module Vira.State.Type where
 
 import Data.Aeson (FromJSON, ToJSON)
 import Data.Data (Data)
+import Data.Default (Default (..))
 import Data.IxSet.Typed
 import Data.SafeCopy
 import Data.Time (UTCTime)
@@ -61,20 +62,44 @@ instance Indexable BranchIxs Branch where
       (ixFun $ \Branch {repoName} -> [repoName])
       (ixFun $ \Branch {branchName} -> [branchName])
 
--- | Badge state for 'Branch' status
-data BadgeState = NeverBuilt | OutOfDate
+-- | Build freshness indicator for branches that have been built
+data BuildFreshness
+  = -- | Latest job commit matches head commit
+    UpToDate
+  | -- | Latest job commit differs from head commit
+    OutOfDate
   deriving stock (Generic, Show, Eq)
 
+-- | Build state for a 'Branch'
+data BranchBuildState
+  = -- | Branch has never been built
+    NeverBuilt
+  | -- | Branch has builds, with the latest job and freshness indicator
+    Built Job BuildFreshness
+  deriving stock (Generic, Show, Eq)
+
+-- | Query parameters for filtering branches
+data BranchQuery = BranchQuery
+  { repoName :: Maybe RepoName
+  -- ^ Filter by specific repository (Nothing = all repos)
+  , branchNamePattern :: Maybe Text
+  -- ^ Filter by branch name substring (Nothing = no name filter)
+  , neverBuilt :: Maybe Bool
+  -- ^ Nothing = all branches, Just True = unbuilt only, Just False = built only
+  }
+  deriving stock (Generic, Show, Eq)
+
+instance Default BranchQuery where
+  def = BranchQuery {repoName = Nothing, branchNamePattern = Nothing, neverBuilt = Nothing}
+
 -- | 'Branch' with enriched metadata for display
 data BranchDetails = BranchDetails
   { branch :: Branch
   -- ^ The 'Branch' information from the database
-  , mLatestJob :: Maybe Job
-  -- ^ The most recent CI 'Job' for this branch, if any
   , jobsCount :: Natural
   -- ^ Total number of 'Job's for this branch
-  , badgeState :: Maybe BadgeState
-  -- ^ 'BadgeState' computed from job/commit comparison
+  , buildState :: BranchBuildState
+  -- ^ Build state computed from job/commit comparison (includes latest job if built)
   }
   deriving stock (Generic, Show, Eq)
 
@@ -84,9 +109,9 @@ Activity is defined as @max(head commit date, latest job created time)@.
 This ensures branches with recent commits OR recent builds appear first.
 -}
 branchActivityTime :: BranchDetails -> UTCTime
-branchActivityTime details = case details.mLatestJob of
-  Nothing -> details.branch.headCommit.date
-  Just job -> max details.branch.headCommit.date job.jobCreatedTime
+branchActivityTime details = case details.buildState of
+  NeverBuilt -> details.branch.headCommit.date
+  Built job _ -> max details.branch.headCommit.date job.jobCreatedTime
 
 -- | Sorts 'BranchDetails' by most recent activity descending (most recent first).
 instance Ord BranchDetails where
@@ -181,7 +206,9 @@ $(deriveSafeCopy 0 'base ''JobStatus)
 $(deriveSafeCopy 0 'base ''JobId)
 $(deriveSafeCopy 0 'base ''Job)
 $(deriveSafeCopy 1 'base ''Branch)
-$(deriveSafeCopy 0 'base ''BadgeState)
+$(deriveSafeCopy 0 'base ''BuildFreshness)
+$(deriveSafeCopy 0 'base ''BranchBuildState)
+$(deriveSafeCopy 0 'base ''BranchQuery)
 $(deriveSafeCopy 0 'base ''BranchDetails)
 $(deriveSafeCopy 0 'base ''Repo)
 
@@ -190,4 +217,4 @@ The version is automatically used by the @--auto-reset-state@ feature to detect
 When enabled, auto-reset will remove @ViraState/@ and @workspace/*/jobs@ directories on mismatch.
 Run @vira info@ to see the current schema version.
 -}
-$(deriveSafeCopy 6 'base ''ViraState)
+$(deriveSafeCopy 7 'base ''ViraState)

packages/vira/src/Vira/Web/LinkTo/Resolve.hs

@@ -17,7 +17,7 @@ import Vira.Web.Servant ((//), (/:))
 -- | Resolve a 'LinkTo' into a servant 'Link'
 linkTo :: LinkTo -> Link
 linkTo = \case
-  Home -> fieldLink _home
+  Home neverBuilt -> fieldLink _home neverBuilt
   RepoListing -> fieldLink _repos // RegistryPage._listing
   Repo name -> fieldLink _repos // RegistryPage._repo /: name // RepoPage._view
   RepoUpdate name -> fieldLink _repos // RegistryPage._repo /: name // RepoPage._update

packages/vira/src/Vira/Web/LinkTo/Type.hs

@@ -12,7 +12,7 @@ Avoids cyclic imports by providing a type-level hint instead of direct route ref
 Used with 'Vira.Web.Lucid.getLink' to generate 'Servant.Links.Link' values.
 -}
 data LinkTo
-  = Home
+  = Home (Maybe Bool) -- Nothing = all, Just True = unbuilt, Just False = built
   | RepoListing
   | Repo RepoName
   | RepoUpdate RepoName
@@ -32,7 +32,7 @@ data LinkTo
 
 linkShortTitle :: LinkTo -> Text
 linkShortTitle = \case
-  Home -> "Vira"
+  Home _ -> "Vira"
   RepoListing -> "Repositories"
   Repo name -> toStringText name
   RepoUpdate _ -> "Update" -- unused

packages/vira/src/Vira/Web/Pages/BranchPage.hs

@@ -12,7 +12,7 @@ import Vira.App qualified as App
 import Vira.App.CLI (WebSettings)
 import Vira.State.Acid qualified as St
 import Vira.State.Core qualified as St
-import Vira.State.Type (BadgeState (..), BranchDetails (..))
+import Vira.State.Type (BranchBuildState (..), BranchDetails (..), BuildFreshness (..))
 import Vira.Web.LinkTo.Type qualified as LinkTo
 import Vira.Web.Lucid (AppHtml, getLink, runAppHtml)
 import Vira.Web.Stack qualified as Web
@@ -66,12 +66,12 @@ viewBranch repo branchDetails jobs = do
               div_ [class_ "w-3 h-3 mr-1 flex items-center justify-center"] $ toHtmlRaw Icon.alert_triangle
               "Branch deleted from remote"
           -- Out of date badge
-          whenJust branchDetails.badgeState $ \case
-            OutOfDate ->
+          case branchDetails.buildState of
+            Built _ OutOfDate ->
               span_ [class_ "inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-orange-100 dark:bg-orange-900/30 text-orange-700 dark:text-orange-300"] $ do
                 div_ [class_ "w-3 h-3 mr-1 flex items-center justify-center"] $ toHtmlRaw Icon.clock
                 "Out of date"
-            NeverBuilt -> mempty -- Don't show in header
+            _ -> mempty -- Don't show badge for NeverBuilt or UpToDate
         div_ [class_ "flex items-center gap-2"] $ do
           buildLink <- lift $ getLink $ LinkTo.Build repo.name branchDetails.branch.branchName
           W.viraRequestButton_

packages/vira/src/Vira/Web/Pages/IndexPage.hs

@@ -1,16 +1,18 @@
 -- | Top-level routes and views
 module Vira.Web.Pages.IndexPage where
 
+import Data.Default (def)
 import Lucid
-import Servant.API (Get, NamedRoutes, (:>))
+import Servant.API (Get, NamedRoutes, QueryParam, (:>))
 import Servant.API.ContentTypes.Lucid (HTML)
 import Servant.API.Generic (GenericMode (type (:-)))
 import Servant.Links (fieldLink, linkURI)
 import Servant.Server.Generic (AsServer)
 import Vira.App qualified as App
 import Vira.State.Acid qualified as St
-import Vira.State.Type qualified as St
-import Vira.Web.Lucid (AppHtml, runAppHtml)
+import Vira.State.Type (BranchQuery (..))
+import Vira.Web.LinkTo.Type (LinkTo (..))
+import Vira.Web.Lucid (AppHtml, getLinkUrl, runAppHtml)
 import Vira.Web.Pages.CachePage qualified as CachePage
 import Vira.Web.Pages.EnvironmentPage qualified as EnvironmentPage
 import Vira.Web.Pages.EventsPage qualified as EventsPage
@@ -21,11 +23,12 @@ import Vira.Web.Stack qualified as Web
 import Vira.Web.Stream.ScopedRefresh qualified as Refresh
 import Vira.Web.Widgets.JobsListing qualified as W
 import Vira.Web.Widgets.Layout qualified as W
+import Vira.Web.Widgets.Tabs (TabItem (..), viraTabs_)
 import Web.TablerIcons.Outline qualified as Icon
 import Prelude hiding (Reader, ask, runReader)
 
 data Routes mode = Routes
-  { _home :: mode :- Get '[HTML] (Html ())
+  { _home :: mode :- QueryParam "neverBuilt" Bool :> Get '[HTML] (Html ())
   , _repos :: mode :- "r" Servant.API.:> NamedRoutes RegistryPage.Routes
   , _jobs :: mode :- "j" Servant.API.:> NamedRoutes JobPage.Routes
   , _environment :: mode :- "env" Servant.API.:> NamedRoutes EnvironmentPage.Routes
@@ -40,8 +43,9 @@ handlers :: App.GlobalSettings -> App.ViraRuntimeState -> App.WebSettings -> Rou
 handlers globalSettings viraRuntimeState webSettings =
   Routes
     { _home =
-        Web.runAppInServant globalSettings viraRuntimeState webSettings $
-          runAppHtml indexView
+        Web.runAppInServant globalSettings viraRuntimeState webSettings
+          . runAppHtml
+          . indexView
     , _repos = RegistryPage.handlers globalSettings viraRuntimeState webSettings
     , _jobs = JobPage.handlers globalSettings viraRuntimeState webSettings
     , _environment = EnvironmentPage.handlers globalSettings viraRuntimeState webSettings
@@ -54,24 +58,43 @@ handlers globalSettings viraRuntimeState webSettings =
 activityLimit :: Natural
 activityLimit = 15
 
-indexView :: AppHtml ()
-indexView = do
+indexView :: Maybe Bool -> AppHtml ()
+indexView mUnbuilt = do
   logoUrl <- W.appLogoUrl
-  activities <- lift $ App.query (St.GetAllBranchesA Nothing Nothing activityLimit)
   let linkText = show . linkURI
       reposLink = linkText $ fieldLink _repos // RegistryPage._listing
       envLink = linkText $ fieldLink _environment // EnvironmentPage._view
       cacheLink = linkText $ fieldLink _cache // CachePage._view
   W.layout mempty $ do
     heroWelcome logoUrl reposLink envLink cacheLink
-    unless (null activities) $
-      viewRecentActivity activities
+    viewRecentActivity mUnbuilt
+
+viewRecentActivity :: Maybe Bool -> AppHtml ()
+viewRecentActivity mNeverBuilt = do
+  -- Get filtered activities based on neverBuilt flag
+  let query = def {neverBuilt = mNeverBuilt}
+  activities <- lift $ App.query (St.QueryBranchDetailsA query activityLimit)
+  -- Calculate unbuilt count for badge
+  let unbuiltQuery = def {neverBuilt = Just True}
+  unbuiltCount <- length <$> lift (App.query (St.QueryBranchDetailsA unbuiltQuery activityLimit))
 
-viewRecentActivity :: [St.BranchDetails] -> AppHtml ()
-viewRecentActivity activities = do
   W.viraSection_ [] $ do
-    h2_ [class_ "text-2xl font-bold text-gray-900 dark:text-gray-100 mb-6"] "Recent Activity"
-    div_ [] $ do
+    -- Header with title
+    h2_ [class_ "text-2xl font-bold text-gray-900 dark:text-gray-100"] "Recent Activity"
+
+    -- Tab bar
+    allUrl <- lift $ getLinkUrl (Home Nothing)
+    buildsUrl <- lift $ getLinkUrl (Home (Just False))
+    unbuiltUrl <- lift $ getLinkUrl (Home (Just True))
+    viraTabs_
+      []
+      [ TabItem "All" allUrl (isNothing mNeverBuilt) Nothing
+      , TabItem "Builds" buildsUrl (mNeverBuilt == Just False) Nothing
+      , TabItem "Unbuilt" unbuiltUrl (mNeverBuilt == Just True) (Just unbuiltCount)
+      ]
+
+    -- Activity list
+    div_ $ do
       forM_ activities $ \details ->
         W.viraBranchDetailsRow_ True details
 

packages/vira/src/Vira/Web/Pages/RepoPage.hs

@@ -5,6 +5,7 @@ module Vira.Web.Pages.RepoPage (
   handlers,
 ) where
 
+import Data.Default (def)
 import Effectful (Eff)
 import Effectful.Colog.Simple (withLogContext)
 import Effectful.Error.Static (throwError)
@@ -23,7 +24,7 @@ import Vira.Refresh qualified as Refresh
 import Vira.Refresh.Type (RefreshPriority (Now))
 import Vira.State.Acid qualified as St
 import Vira.State.Core qualified as St
-import Vira.State.Type (BranchDetails (..))
+import Vira.State.Type (BranchDetails (..), BranchQuery (..))
 import Vira.Web.LinkTo.Type qualified as LinkTo
 import Vira.Web.Lucid (AppHtml, getLink, getLinkUrl, runAppHtml)
 import Vira.Web.Stack qualified as Web
@@ -62,14 +63,16 @@ handlers globalSettings viraRuntimeState webSettings name = do
 viewHandler :: RepoName -> AppHtml ()
 viewHandler name = do
   repo <- lift $ App.query (St.GetRepoByNameA name) >>= maybe (throwError err404) pure
-  branchDetails <- lift $ App.query (St.GetAllBranchesA (Just name) Nothing (fromIntegral maxBranchesDisplayed + 1))
+  let query = def {repoName = Just name}
+  branchDetails <- lift $ App.query (St.QueryBranchDetailsA query (fromIntegral maxBranchesDisplayed + 1))
   let isPruned = length branchDetails > maxBranchesDisplayed
       displayed = take maxBranchesDisplayed branchDetails
   W.layout (crumbs <> [LinkTo.Repo name]) $ viewRepo repo displayed isPruned
 
 filterBranchesHandler :: RepoName -> Maybe Text -> AppHtml ()
 filterBranchesHandler name mQuery = do
-  branchDetails <- lift $ App.query (St.GetAllBranchesA (Just name) mQuery (fromIntegral maxBranchesDisplayed + 1))
+  let query = def {repoName = Just name, branchNamePattern = mQuery}
+  branchDetails <- lift $ App.query (St.QueryBranchDetailsA query (fromIntegral maxBranchesDisplayed + 1))
   let isPruned = length branchDetails > maxBranchesDisplayed
       displayed = take maxBranchesDisplayed branchDetails
   _ <- lift $ App.query (St.GetRepoByNameA name) >>= maybe (throwError err404) pure