Skip to content

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

Closed

Conversation

JBWatenbergScality
Copy link
Contributor

@JBWatenbergScality JBWatenbergScality commented Feb 16, 2021

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

@bert-e
Copy link
Contributor

bert-e commented Feb 16, 2021

Hello jbwatenbergscality,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Feb 16, 2021

Conflict

There is a conflict between your branch improvement/ui-salt-error-management and the
destination branch development/2.8.

Please resolve the conflict on the feature branch (improvement/ui-salt-error-management).

 $ 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

@JBWatenbergScality JBWatenbergScality changed the base branch from development/2.8 to improvement/use-solutions-navbar-in-metalk8s-ui February 16, 2021 09:11
@JBWatenbergScality JBWatenbergScality added the topic:ui UI-related issues label Feb 16, 2021
@JBWatenbergScality JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch 6 times, most recently from 8947771 to 752a5cf Compare February 18, 2021 16:25
@JBWatenbergScality JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch 12 times, most recently from 25f464c to 162d78c Compare February 22, 2021 08:53
@JBWatenbergScality JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch from 162d78c to 2707b36 Compare February 22, 2021 09:43
@JBWatenbergScality JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch 20 times, most recently from d47f6cd to 43581e4 Compare March 1, 2021 13:55
@JBWatenbergScality JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch 7 times, most recently from d695076 to 73e4a52 Compare March 9, 2021 18:12
Base automatically changed from improvement/use-solutions-navbar-in-metalk8s-ui to development/2.9 March 10, 2021 15:44
@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

Branches have diverged

This pull request's source branch improvement/ui-salt-error-management has diverged from
development/2.9 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/2.9 into improvement/ui-salt-error-management
  • Rebase improvement/ui-salt-error-management onto origin/development/2.9

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic:ui UI-related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UI: Display an error message and disable salt actions when salt is unavailable
2 participants