Fixes #16326: Display compliance bar in Node details #2693
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ElaadF
force-pushed
the
ust_16326/display_compliance_bar_in_node_details
branch
2 times, most recently
from
2752c62
to
fd8b56b
Compare
VinceMacBuche
requested changes
Jan 3, 2020
| node <- nodeInfo | ||
| t <- asyncComplianceService.nodeCompliance(node.id) | ||
| } yield { | ||
| ComplianceLevelSerialisation.ComplianceLevelToJs(t(node.id).get).toJsArray() |
There was a problem hiding this comment.
never use get !! this thows exception ! in fact your service should return a Box[ComplianceLevel], not the Map[NodeId,Option[ComplianceLevel]]
Also don't do t(node.id), it's also a get and it throws exception !!
| @@ -468,6 +485,7 @@ object DisplayNode extends Loggable { | |||
|
|
|||
| <div class="status-info col-lg-6 col-sm-5 col-xs-12"> | |||
| <h3>Status information</h3> | |||
| <div id={s"compliance-bar-${nodeInfo.get.id.value}"}></div> | |||
There was a problem hiding this comment.
Here you should have a class "node-compliance-bar" and define all the css done below in a css file targeting that class
ElaadF
force-pushed
the
ust_16326/display_compliance_bar_in_node_details
branch
from
fd8b56b
to
60d35c0
Compare
| val node = new NodeCompliance(Set(nodeId), Set()) | ||
| node.computeCompliance match { | ||
| case Full(contentMap) => | ||
| contentMap.values.head match { |
There was a problem hiding this comment.
head throws exception too, especially if this is empty
You shoud should do
contentMap.get(nodeId) match case Some(Some(compiance)) => Full(Compliance) case _ =>
ElaadF
force-pushed
the
ust_16326/display_compliance_bar_in_node_details
branch
from
60d35c0
to
0b71933
Compare
VinceMacBuche
previously approved these changes
Jan 7, 2020
ElaadF
force-pushed
the
ust_16326/display_compliance_bar_in_node_details
branch
from
0b71933
to
1a2ae0a
Compare
VinceMacBuche
approved these changes
Jan 8, 2020
|
OK, merging this PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.rudder.io/issues/16326