-
Notifications
You must be signed in to change notification settings - Fork 45
UI: Display an error message and disable salt actions when salt is unavailable #3118
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
UI: Display an error message and disable salt actions when salt is unavailable #3118
Conversation
Hello jbwatenbergscality,My role is to assist you with the merge of this Status report is not available. |
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( $ git fetch
$ git checkout origin/improvement/ui-salt-error-management
$ git merge origin/development/2.8
$ # <intense conflict resolution>
$ git commit
$ git push origin HEAD:improvement/ui-salt-error-management |
8947771
to
752a5cf
Compare
25f464c
to
162d78c
Compare
…ectly following to solution navbar integration
162d78c
to
2707b36
Compare
d47f6cd
to
43581e4
Compare
d695076
to
73e4a52
Compare
Branches have divergedThis pull request's source branch To avoid any integration risks, please re-synchronize them using one of the
Note: If you choose to rebase, you may have to ask me to rebuild |
Component:
UI
Context:
Instead of login the user out in case of salt API unavailability, the user should be prompted with a message disclaiming it and be able to access monitoring screens. Salt related actions should be disabled.
Closes: #3117