-
Notifications
You must be signed in to change notification settings - Fork 356
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
Support new filtering options on Topology page #4396
Conversation
@EsdrasVP I think this looks good 👍 (I still have to test properly though) But, looks like the specs need fixing to expect that extra field.. :) |
cc @skateman |
ff47c16
to
4acb6b1
Compare
4acb6b1
to
734d980
Compare
@miq-bot add_label ux/review @terezanovotna Could you take a look at it too? |
4f957f4
to
08a77eb
Compare
cc1de8a
to
b4ae7a4
Compare
Hi @EsdrasVP,
What do you think @EsdrasVP? Let me know if you have any questions. |
Except for what @terezanovotna said, LGTM :). All the existing topologies still work with kubernetes-ui/topology-graph#29 (+ the css changes in here). Re icon colors: even the blue icons should be black. (The blue was introduced by openshift at some point and got copied over, it should not be blue in containers either.) |
Hi @terezanovotna, regarding these questions:
Is there something else you want to address? |
b4ae7a4
to
5d38178
Compare
@terezanovotna @himdel So all components icons should be black? |
Yes, all components icons should be black @EsdrasVP |
Hey guys, I would say that we got a good readability of our topology differentiating components also by colors and not only by the icon, so, making all components black we will go back to the chaos that was before, to distinguish kinds of components in a dense topology. In a previous conversation with @terezanovotna we discuss about not use only colors to communicate with the user, once some people has different perceptions of colors, so, to solve this problem, we have different icons, but even so, we also can improve the communication with those people that not have such perception issues. @terezanovotna, @himdel and @EsdrasVP what do you think? P.S. please don't make all icons black 🙏 😢 |
I think we want the icons black precisely so that we can use color for state, and not end up with a rainbow cake. But.. not my decision, staying out of that one. :) Not that related to this PR anyway, just don't add any red ones here please, those do look like an error indicator. |
I agree with @douglasgabriel. This was already a topic of discussion before and we agreed that assign different colors for each component is more legible for the user. @himdel we could avoid using critical state colors, the problem is that we have few options left available by pattern fly palette. |
@EsdrasVP Do you have any links to that discussion? As far as I know, black icons is the decision that stands. |
@douglasgabriel @EsdrasVP I had no problem with colored icons before we added Health State. As health state is communicated via colors, we cannot use color coding for two same purposes as it is confusing for the user. As we show the health state in the colors, it would be great to have the icons black. |
This pull request is not mergeable. Please rebase and repush. |
@EsdrasVP looks like as it is now, this is breaking the styling of filters in all the other topologies: |
@EsdrasVP now that the change in kubernetes-topology-graph is released, can you please add this to make it use that new release? :) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7826cc9b9..a980426bd 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -32,7 +32,7 @@
//= require bower_components/d3/d3
//= require bower_components/c3/c3
//= require bower_components/lodash/lodash
-//= require bower_components/kubernetes-topology-graph/dist/topology-graph
+//= require kubernetes-topology-graph/dist/topology-graph
//= require ./miq_browser_detect
//= require ./miq_application
//= require ./miq_flash
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index cf860cbae..e735d5251 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -11,7 +11,7 @@
*= require ./miq_tree
*= require bower_components/codemirror/lib/codemirror
*= require bower_components/codemirror/theme/eclipse
- *= require bower_components/kubernetes-topology-graph/dist/topology-graph
+ *= require kubernetes-topology-graph/dist/topology-graph
*= require ./wizard
*= require ./timeline
*= require ./topology
diff --git a/bower.json b/bower.json
index f519d06d2..d01339ab6 100644
--- a/bower.json
+++ b/bower.json
@@ -32,7 +32,6 @@
"jquery-ui": "jqueryui#~1.12.1",
"jquery-ujs": "~1.2.2",
"jquery.observe_field": "himdel/jquery.observe_field#~0.1.0",
- "kubernetes-topology-graph": "~0.0.23",
"lodash": "~3.10.0",
"manageiq-ui-components": "bower-dev",
"moment-duration-format": "~1.3.0",
diff --git a/package.json b/package.json
index 81b8b8486..f2f6f61b3 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
"graphql": "~0.12.0",
"history": "^4.7.2",
"jquery": "~2.2.4",
+ "kubernetes-topology-graph": "~0.0.25",
"lodash": "^4.17.4",
"patternfly": "~3.54.1",
"patternfly-react": "2.10.1", (referencing #3734 because this moves the graph to npm) |
76ba177
to
d8e1c1b
Compare
d8e1c1b
to
960606c
Compare
@EsdrasVP all the topologies look consistent now, thanks! :) |
@EsdrasVP maybe 2 little things you could fix?
|
@himdel That's fine, I changed the |
960606c
to
738709c
Compare
@EsdrasVP please look at the files changed screen.. There is no change to package.json, and I still see css for filter-group. |
738709c
to
c3f65fe
Compare
c3f65fe
to
c8252a7
Compare
Checked commit EsdrasVP@c8252a7 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
@EsdrasVP no problem, now I can see it all :) aand it works, without breaking the other topologiges 👍 :) Thanks :) |
This PR is able to:
Depends on:
kubernetes-ui/topology-graph#29