Selectable labels (#932)

* Make the labels selectable * Update bindata.go
prometheus · Jul 31, 2017 · 7de7cf3 · 7de7cf3
1 parent ed52b4b
commit 7de7cf3
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 15 deletions.
diff --git a/ui/app/src/Views/AlertList/AlertView.elm b/ui/app/src/Views/AlertList/AlertView.elm
@@ -1,8 +1,8 @@
-module Views.AlertList.AlertView exposing (view)
+module Views.AlertList.AlertView exposing (view, addLabelMsg)
 
 import Alerts.Types exposing (Alert)
 import Html exposing (..)
-import Html.Attributes exposing (class, style, href)
+import Html.Attributes exposing (class, style, href, value, readonly, title)
 import Html.Events exposing (onClick)
 import Types exposing (Msg(CreateSilenceFromAlert, Noop, MsgForAlertList))
 import Utils.Date
@@ -87,24 +87,39 @@ annotation ( key, value ) =
 
 
 labelButton : ( String, String ) -> Html Msg
-labelButton ( key, value ) =
-    button
-        [ class "btn btn-sm bg-faded btn-secondary mr-2 mb-2"
-        , onClick (addLabelMsg ( key, value ))
+labelButton ( key, val ) =
+    div
+        [ class "btn-group mr-2 mb-2" ]
+        [ span
+            [ class "btn btn-sm border-right-0 text-muted"
+
+            -- have to reset bootstrap button styles to make the text selectable
+            , style
+                [ ( "user-select", "initial" )
+                , ( "-moz-user-select", "initial" )
+                , ( "-webkit-user-select", "initial" )
+                , ( "border-color", "#ccc" )
+                ]
+            ]
+            [ text (key ++ "=\"" ++ val ++ "\"") ]
+        , button
+            [ class "btn btn-sm bg-faded btn-outline-secondary"
+            , onClick (addLabelMsg ( key, val ))
+            , title "Filter by this label"
+            ]
+            [ text "+" ]
         ]
-        [ span [ class "text-muted" ] [ text (key ++ "=\"" ++ value ++ "\"") ] ]
 
 
 addLabelMsg : ( String, String ) -> Msg
 addLabelMsg ( key, value ) =
-    (FilterBarTypes.AddFilterMatcher False
+    FilterBarTypes.AddFilterMatcher False
         { key = key
         , op = Utils.Filter.Eq
         , value = value
         }
         |> MsgForFilterBar
         |> MsgForAlertList
-    )
 
 
 silenceButton : Alert -> Html Msg

diff --git a/ui/app/src/Views/AlertList/Views.elm b/ui/app/src/Views/AlertList/Views.elm
@@ -111,8 +111,24 @@ alertList activeId labels filter alerts =
                 _ ->
                     List.map
                         (\( key, value ) ->
-                            span [ class "btn btn-info mr-1 mb-3" ]
-                                [ text (key ++ "=\"" ++ value ++ "\"") ]
+                            div [ class "btn-group mr-1 mb-3" ]
+                                [ span
+                                    [ class "btn text-muted"
+                                    , style
+                                        [ ( "user-select", "initial" )
+                                        , ( "-moz-user-select", "initial" )
+                                        , ( "-webkit-user-select", "initial" )
+                                        , ( "border-color", "#5bc0de" )
+                                        ]
+                                    ]
+                                    [ text (key ++ "=\"" ++ value ++ "\"") ]
+                                , button
+                                    [ class "btn btn-outline-info"
+                                    , onClick (AlertView.addLabelMsg ( key, value ))
+                                    , title "Filter by this label"
+                                    ]
+                                    [ text "+" ]
+                                ]
                         )
                         labels
             )

diff --git a/ui/app/src/Views/FilterBar/Views.elm b/ui/app/src/Views/FilterBar/Views.elm
@@ -116,7 +116,7 @@ view { matchers, matcherText, backspacePressed } =
                                 []
                             , span
                                 [ class "input-group-btn" ]
-                                [ button [ class "btn btn-primary", disabled isDisabled, onClickAttr ] [ text "Add" ] ]
+                                [ button [ class "btn btn-primary", disabled isDisabled, onClickAttr ] [ text "+" ] ]
                             ]
                         , small [ class "form-text text-muted" ]
                             [ text "Custom matcher, e.g."

diff --git a/ui/app/src/Views/GroupBar/Views.elm b/ui/app/src/Views/GroupBar/Views.elm
@@ -119,7 +119,7 @@ textInputField isDisabled { fieldText, matches, maybeSelectedMatch, fields, back
                 []
             , span
                 [ class "input-group-btn" ]
-                [ button [ class "btn btn-primary", disabled isDisabled, onClick onClickMsg ] [ text "Add" ] ]
+                [ button [ class "btn btn-primary", disabled isDisabled, onClick onClickMsg ] [ text "+" ] ]
             ]
 
 

diff --git a/ui/bindata.go b/ui/bindata.go
-Original file line number
+Diff line change
@@ Expand Up @@
                     []
                 , span
                     [ class "input-group-btn" ]
-                    [ button [ class "btn btn-primary", disabled isDisabled, onClick onClickMsg ] [ text "Add" ] ]
+                    [ button [ class "btn btn-primary", disabled isDisabled, onClick onClickMsg ] [ text "+" ] ]
                 ]
@@ Expand Down @@