Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stn/edit on silence view page #970

Merged
merged 7 commits into from
Sep 5, 2017
Merged

Conversation

stuartnelson3
Copy link
Contributor

fixes #794

@w0rm @mxinden I thought about moving the buttons into their own Views/Shared/SilenceButtons.elm but decided to wait to see what you thought. The only thing I'm not really happy about is having the refresh bool to indicate "navigate to all silences if on a silence view page, but don't if on the main silences page".

update : SilenceViewMsg -> Model -> String -> ( Model, Cmd SilenceViewMsg )
update msg model basePath =
update : SilenceViewMsg -> Model -> String -> String -> ( Model, Cmd SilenceViewMsg )
update msg model basePath apiUrl =
Copy link
Member

@w0rm w0rm Sep 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the basePath argument isn't used.

@stuartnelson3
Copy link
Contributor Author

@w0rm can you take a look at the style on the silence view page? the buttons don't really line up with the header, and I'm not sure what to do about it.

@w0rm
Copy link
Member

w0rm commented Sep 3, 2017

@stuartnelson3 sure, I will check this tomorrow!

@w0rm
Copy link
Member

w0rm commented Sep 4, 2017

@stuartnelson3 this would make it look nicer

h1 []
    [ text "Silence"
    , span
        [ class "ml-3" ]
        [ editButton silence
        , deleteButton silence True
        ]
    ]

64x64-3d

@stuartnelson3
Copy link
Contributor Author

looks great, updated

@stuartnelson3 stuartnelson3 merged commit cb9c946 into master Sep 5, 2017
@stuartnelson3 stuartnelson3 deleted the stn/edit-on-silence-view-page branch September 5, 2017 09:01
@mxinden
Copy link
Member

mxinden commented Sep 5, 2017

@stuartnelson3 Cool, thanks for the fix!

I am fine with the refresh boolean. What we could do as well is just always redirect to the /#silences page on delete just for simpler code, as performance is probably not that important. No strong opinion, I am totally fine with this.

@stuartnelson3
Copy link
Contributor Author

That's what I initially did, but if you have an active filter, redirecting will erase that. If we preserve the filter, we still have to deal with having an unstable silence order currently :/ happy to change this once we have stable silence order.

iksaif pushed a commit to iksaif/alertmanager that referenced this pull request Sep 15, 2017
* Edit/recreate/destroy silence on view page

* Share stuff from SilenceList

* Update bindata

* Remove unused variable

* Update bindata

* Update silence style

* Update bindata
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Edit / Expire silence on SilenceView page
3 participants