B: disable sidebar bttn when there's no pipelines

- Adding no pipeline tooltip message - Keeping sidebar grey when is not clickable - Adding no pipeline tooltip message test - Updating tests Signed-off-by: Esteban Foronda <eforonda@vmware.com> Co-authored-by: Bohan Chen <bochen@pivotal.io>
concourse · Feb 11, 2021 · bc0bed4 · bc0bed4
1 parent 40745e3
commit bc0bed4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/web/elm/src/SideBar/SideBar.elm b/web/elm/src/SideBar/SideBar.elm
@@ -258,7 +258,17 @@ view model currentPipeline =
 
 
 tooltip : Model m -> Maybe Tooltip.Tooltip
-tooltip { hovered, sideBarState } =
+tooltip model =
+    let
+        hovered =
+            model.hovered
+
+        sideBarState =
+            model.sideBarState
+
+        isSideBarClickable =
+            hasVisiblePipelines model
+    in
     case hovered of
         HoverState.Tooltip (SideBarTeam _ teamName) _ ->
             Just
@@ -302,7 +312,10 @@ tooltip { hovered, sideBarState } =
         HoverState.Tooltip SideBarIcon _ ->
             let
                 text =
-                    if sideBarState.isOpen then
+                    if not isSideBarClickable then
+                        "no visible pipelines"
+
+                    else if sideBarState.isOpen then
                         "hide sidebar"
 
                     else
@@ -404,7 +417,10 @@ sideBarIcon model =
                 HoverState.isHovered SideBarIcon model.hovered
 
             assetSideBarIcon =
-                if isOpen && isHovered then
+                if not isSideBarClickable then
+                    Assets.SideBarIconOpenedGrey
+
+                else if isOpen && isHovered then
                     Assets.SideBarIconClosedWhite
 
                 else if isOpen && not isHovered then

diff --git a/web/elm/tests/SideBarFeature.elm b/web/elm/tests/SideBarFeature.elm
@@ -78,6 +78,11 @@ hasSideBar iAmLookingAtThePage =
 
         iHaveAnExpandedTeam =
             iHaveAnOpenSideBar_ >> iClickedThePipelineGroup
+
+        iHaveANotClickableSiteBar_ =
+            given iAmLookingAtThePage
+                >> given iAmOnANonPhoneScreen
+                >> given myBrowserFetchedNoPipelines
     in
     [ test "top bar is exactly 54px tall" <|
         given iAmLookingAtThePage
@@ -117,7 +122,7 @@ hasSideBar iAmLookingAtThePage =
                 , hoverable = Message.SideBarIcon
                 , hoveredSelector =
                     { description = "still grey"
-                    , selector = hoveredSideBarIcon True
+                    , selector = sideBarIcon True
                     }
                 }
             , test "is not clickable" <|
@@ -197,6 +202,10 @@ hasSideBar iAmLookingAtThePage =
                 given iHaveAClosedSideBar_
                     >> when iHoverOverTheSideBarIcon
                     >> then_ iSeeShowSideBarMessage
+            , test "shows no pipelines tooltip when is not clickable" <|
+                given iHaveANotClickableSiteBar_
+                    >> when iHoverOverTheSideBarIcon
+                    >> then_ iSeeNoPipelineSideBarMessage
             , defineHoverBehaviour
                 { name = "sidebar icon"
                 , setup =
@@ -919,6 +928,10 @@ iSeeShowSideBarMessage =
     expectTooltip Message.SideBarIcon "show sidebar"
 
 
+iSeeNoPipelineSideBarMessage =
+    expectTooltip Message.SideBarIcon "no visible pipelines"
+
+
 iSeeAnOpenedSideBarIcon =
     Query.has <|
         sideBarIcon True
@@ -949,6 +962,7 @@ hoveredSideBarIcon opened =
             { size = sidebarIconWidth
             , image = Assets.SideBarIconOpenedWhite
             }
+
     else
         DashboardTests.iconSelector
             { size = sidebarIconWidth