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.

Sign up for GitHub

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

Jump to bottom

Fixes #23895: We can access system rules detail page from node system status tab #5246

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Fixes #23895: We can access system rules detail page from node system status tab #5246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeCompliance/ViewUtils.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ byRuleCompliance mod complianceFilters =
|> List.sortWith sortFunction
)
(\m i -> i)
[ ("Rule", (\r -> span[][ text r.name, goToBtn (getRuleLink mod.contextPath r.ruleId) ]), (\r1 r2 -> N.compare r1.name r2.name))
[ ("Rule", (\r -> span[][ text r.name, if (mod.onlySystem) then text "" else goToBtn (getRuleLink mod.contextPath r.ruleId) ]), (\r1 r2 -> N.compare r1.name r2.name))
, ("Compliance", .complianceDetails >> buildComplianceBar complianceFilters, (\r1 r2 -> Basics.compare r1.compliance r2.compliance))
]
(.ruleId >> .value)
Expand All @@ -166,8 +166,7 @@ byDirectiveCompliance model subFun complianceFilters =
|> List.sortWith sortFunction
)
(\m i -> i )
[-- ("Directive", \i -> span [] [ (badgePolicyMode model.policyMode (Maybe.map .policyMode model.directiveCompliance|> Maybe.withDefault "default")), text i.name , goToBtn (getRuleLink contextPath i.ruleId) ], (\r1 r2 -> N.compare r1.name r2.name ))
("Directive", \i -> span [] [ text i.name, goToBtn (getDirectiveLink contextPath i.directiveId) ], (\d1 d2 -> N.compare d1.name d2.name ))
[ ("Directive", \i -> span [] [ text i.name, if (model.onlySystem) then text "" else goToBtn (getDirectiveLink contextPath i.directiveId) ], (\d1 d2 -> N.compare d1.name d2.name ))
, ("Compliance", \i -> buildComplianceBar complianceFilters i.complianceDetails, (\(d1) (d2) -> Basics.compare d1.compliance d2.compliance ))
]
(.directiveId >> .value)
Expand Down