Add SwitchBranch picker to ProjectHistoryPage

Author: hojberg

src/UnisonShare/Page/ProjectHistoryPage.elm

@@ -9,6 +9,7 @@ import Lib.Util as Util
 import RemoteData exposing (RemoteData(..), WebData)
 import String.Extra exposing (pluralize)
 import UI
+import UI.AnchoredOverlay as AnchoredOverlay exposing (AnchoredOverlay)
 import UI.Card as Card
 import UI.DateTime as DateTime
 import UI.Icon as Icon exposing (Icon)
@@ -25,6 +26,8 @@ import UnisonShare.Paginated as Paginated exposing (Paginated(..))
 import UnisonShare.Project as Project exposing (ProjectDetails)
 import UnisonShare.Project.BranchHistory as BranchHistory exposing (HistoryEntry)
 import UnisonShare.Project.ProjectRef exposing (ProjectRef)
+import UnisonShare.Route as Route
+import UnisonShare.SwitchBranch as SwitchBranch
 
 
 
@@ -37,23 +40,26 @@ type alias PaginatedBranchHistory =
 
 type alias Model =
     { history : WebData PaginatedBranchHistory
+    , switchBranch : SwitchBranch.Model
     }
 
 
 preInit : Model
 preInit =
     { history = NotAsked
+    , switchBranch = SwitchBranch.init
     }
 
 
 init : AppContext -> ProjectDetails -> Maybe BranchRef -> Paginated.PageCursorParam -> ( Model, Cmd Msg )
 init appContext project branchRef cursor =
     let
-        branchRef_ : BranchRef
         branchRef_ =
             Maybe.withDefault (Project.defaultBrowsingBranch project) branchRef
     in
-    ( { history = Loading }
+    ( { history = Loading
+      , switchBranch = SwitchBranch.init
+      }
     , fetchProjectBranchHistory appContext project.ref branchRef_ cursor
     )
 
@@ -64,14 +70,41 @@ init appContext project branchRef cursor =
 
 type Msg
     = FetchProjectBranchHistoryFinished BranchRef (WebData PaginatedBranchHistory)
+    | SwitchBranchMsg SwitchBranch.Msg
 
 
 update : AppContext -> ProjectDetails -> Maybe BranchRef -> Msg -> Model -> ( Model, Cmd Msg )
-update _ _ _ msg model =
+update appContext project _ msg model =
     case msg of
         FetchProjectBranchHistoryFinished _ history ->
             ( { model | history = history }, Cmd.none )
 
+        SwitchBranchMsg sbMsg ->
+            let
+                ( switchBranch, switchBranchCmd, out ) =
+                    SwitchBranch.update appContext project.ref sbMsg model.switchBranch
+
+                navCmd =
+                    case out of
+                        SwitchBranch.SwitchToBranchRequest branchRef ->
+                            Route.navigate
+                                appContext.navKey
+                                (Route.projectHistory
+                                    project.ref
+                                    (Just branchRef)
+                                    Paginated.NoPageCursor
+                                )
+
+                        _ ->
+                            Cmd.none
+            in
+            ( { model | switchBranch = switchBranch }
+            , Cmd.batch
+                [ Cmd.map SwitchBranchMsg switchBranchCmd
+                , navCmd
+                ]
+            )
+
 
 
 -- EFFECTS
@@ -265,9 +298,12 @@ viewPaginationControls projectRef branchRef cursors =
     Paginated.view toLink cursors
 
 
-viewPageContent : AppContext -> ProjectDetails -> Maybe BranchRef -> PaginatedBranchHistory -> PageContent Msg
-viewPageContent appContext project branchRef (Paginated history) =
+viewPageContent : AppContext -> ProjectDetails -> Maybe BranchRef -> SwitchBranch.Model -> PaginatedBranchHistory -> PageContent Msg
+viewPageContent appContext project branchRef switchBranch (Paginated history) =
     let
+        branchRef_ =
+            Maybe.withDefault (Project.defaultBrowsingBranch project) branchRef
+
         entries =
             if List.isEmpty history.items then
                 [ div [] [ text "No entries" ] ]
@@ -279,7 +315,17 @@ viewPageContent appContext project branchRef (Paginated history) =
         [ div [ class "history-entries" ] entries
         , viewPaginationControls project.ref branchRef history
         ]
-        |> PageContent.withPageTitle (PageTitle.title "History")
+        |> PageContent.withPageTitle
+            (PageTitle.title "History"
+                |> PageTitle.withRightSide
+                    [ SwitchBranch.toAnchoredOverlay project.ref
+                        branchRef_
+                        False
+                        switchBranch
+                        |> AnchoredOverlay.map SwitchBranchMsg
+                        |> AnchoredOverlay.view
+                    ]
+            )
 
 
 view :
@@ -299,7 +345,7 @@ view appContext project branchRef _ model =
 
         Success history ->
             ( PageLayout.centeredNarrowLayout
-                (viewPageContent appContext project branchRef history)
+                (viewPageContent appContext project branchRef model.switchBranch history)
                 PageFooter.pageFooter
                 |> PageLayout.withSubduedBackground
             , Nothing

src/UnisonShare/Page/ProjectPage.elm

@@ -1534,7 +1534,7 @@ view appContext projectRef model =
                 , switchBranch =
                     AnchoredOverlay.map
                         SwitchBranchMsg
-                        (SwitchBranch.toAnchoredOverlay projectRef branchRef model.switchBranch)
+                        (SwitchBranch.toAnchoredOverlay projectRef branchRef True model.switchBranch)
                 , contextClick = Click.onClick (ChangeRouteTo (Route.projectOverview projectRef))
                 }
                 project

src/UnisonShare/SwitchBranch.elm

@@ -201,8 +201,8 @@ viewSuggestions data =
     MaybeE.values [ ownContributorBranches, projectBranches ]
 
 
-viewSheet : ProjectRef -> Sheet -> Html Msg
-viewSheet projectRef sheet =
+viewSheet : ProjectRef -> Bool -> Sheet -> Html Msg
+viewSheet projectRef withViewAllBranches sheet =
     let
         recentBranches =
             RemoteData.map2
@@ -222,18 +222,25 @@ viewSheet projectRef sheet =
             { data = recentBranches
             , view = viewSuggestions
             }
+
+        viewAll =
+            if withViewAllBranches then
+                Just (Link.view "View all branches" (Link.projectBranches projectRef Paginated.NoPageCursor))
+
+            else
+                Nothing
     in
     Html.map SearchBranchSheetMsg
         (SearchBranchSheet.view
             "Switch Branch"
             suggestions
-            (Just (Link.view "View all branches" (Link.projectBranches projectRef Paginated.NoPageCursor)))
+            viewAll
             sheet.sheet
         )
 
 
-toAnchoredOverlay : ProjectRef -> BranchRef -> Model -> AnchoredOverlay Msg
-toAnchoredOverlay projectRef branchRef model =
+toAnchoredOverlay : ProjectRef -> BranchRef -> Bool -> Model -> AnchoredOverlay Msg
+toAnchoredOverlay projectRef branchRef withViewAllBranches model =
     let
         button caret =
             Button.iconThenLabel ToggleSheet Icon.branch (BranchRef.toString branchRef)
@@ -252,4 +259,4 @@ toAnchoredOverlay projectRef branchRef model =
         Open sheet ->
             ao_ (button Icon.caretUp)
                 |> AnchoredOverlay.withSheetPosition AnchoredOverlay.BottomLeft
-                |> AnchoredOverlay.withSheet (AnchoredOverlay.sheet (viewSheet projectRef sheet))
+                |> AnchoredOverlay.withSheet (AnchoredOverlay.sheet (viewSheet projectRef withViewAllBranches sheet))