Repository navigation
Add a Rule Sets tab to the Blocking page - #414
Merged
Merged
Conversation
Rule sets were config-only. The Blocking page now lists them beside a Default row, with dialogs to add, edit, rename and delete a rule set and to pick the block lists for devices without one. Renaming or deleting a rule set carries its devices along in the same change, and removing a block list also drops it from every rule set and the default lists.
govulncheck reports ten advisories (GO-2026-6603, 6605, 6607 to 6613, 6617) in net/http, its http2 code, net/textproto and crypto/tls in Go 1.27.1, and the matching http2 ones in x/net 0.59.0. Go 1.27.2 and x/net 0.60.0 fix all of them.
Owner
Author
|
Quality failed in govulncheck, not because of anything in this PR. Ten new Go advisories (GO-2026-6603, 6605, 6607 to 6613 and 6617) cover net/http, http2, net/textproto and crypto/tls in Go 1.27.1, and golang.org/x/net 0.59.0. Main has the same versions, so it fails this check too. 8b88ef6 moves the toolchain to Go 1.27.2 and x/net to 0.60.0, which fix all ten. Generated by Claude Code |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Before: rule sets (#240) worked only from the config file. The Blocking page had three tabs, and nothing in the console showed which devices used which block lists.
After: the Blocking page has a fourth tab, Rule Sets. It lists a Default row (the block lists for every device without a rule set) and one row per rule set, with its lists, its own blocked and allowed domain counts, and the devices in it by name. Add, Edit and Delete open the usual dialog. Edit Default chooses between Every Block List and Only These Lists.
Renaming a rule set moves its devices to the new name, and deleting one moves its devices back to Default, in the same change. Removing a block list now also drops it from every rule set and from the Default lists, and refuses when it is the Default's only list, so a list removal can no longer leave the config invalid.
Picking a device's rule set comes in the next PR (the device panel in Insights), so this tab's help text points there.
Screenshots
Laptop dark
Phone
Phone dark
How
config.SaveRuleSet,DeleteRuleSetandBlocking.RemoveListininternal/config/rule_sets.godo the edits, so the console, the MCPremove_block_listtool and the old block list delete all share them.ruleSetServiceininternal/web/rule_set_service.goapplies them through the settings editor like the other policy changes, and needsblocking.write.internal/web/pages/blocking_rule_sets.templ, built from the shared Dialog, Field, Button and EmptyState components. The tab strip now has four columns.mage verifypasses. New tests cover save, rename, delete, the default lists, and removing a list that rule sets use.Part of #240.