GRI-2139: split Network and IP rules into two Settings menu entries #273

Merged
vivy merged 2 commits from feature/GRI-2139-settings-network-ip-rules-split into dev 2026-11-16 09:54:23 +00:00
Member

Summary

Splits the Settings left menu's merged "Network / IP rules" entry into two separate entries, each with its own URL, per forge #269:

Menu entry URL Who sees it
Network /settings/network global user with settings_manage
IP rules /settings/ip-rules devices_approve (global, or campus-scoped — server already filters)
  • NetworkSettingsTab now renders only the network fields, with no permission props of its own (it's only ever mounted for a global settings_manage holder).
  • IpRulesScreen is mounted directly by SettingsSectionScreen on its own menu entry/URL instead of being rendered inside NetworkSettingsTab.
  • The legacy top-level /ip-rules bookmark redirect now goes to /settings/ip-rules instead of /settings/network.
  • Permission behavior is unchanged: a campus user with devices_approve (with or without settings_manage) still sees only IP rules, never Network — covered by existing + new tests (the #218 fix stays covered).
  • An old link to /settings/network for a user who only has IP rules still falls back to their first available tab.

Test plan

  • npx vitest run for SettingsSectionScreen, NetworkSettingsTab, DashboardScreen, IpRulesScreen — all passing, including new tests for the two-entry menu and the /settings/network fallback for an IP-rules-only user.
  • ./scripts/local-gates.sh --frontend-only — prettier, oxlint, tsc, full vitest suite (163 tests) and the production build all green.
## Summary Splits the Settings left menu's merged "Network / IP rules" entry into two separate entries, each with its own URL, per forge #269: | Menu entry | URL | Who sees it | |---|---|---| | Network | `/settings/network` | global user with `settings_manage` | | IP rules | `/settings/ip-rules` | `devices_approve` (global, or campus-scoped — server already filters) | - `NetworkSettingsTab` now renders only the network fields, with no permission props of its own (it's only ever mounted for a global `settings_manage` holder). - `IpRulesScreen` is mounted directly by `SettingsSectionScreen` on its own menu entry/URL instead of being rendered inside `NetworkSettingsTab`. - The legacy top-level `/ip-rules` bookmark redirect now goes to `/settings/ip-rules` instead of `/settings/network`. - Permission behavior is unchanged: a campus user with `devices_approve` (with or without `settings_manage`) still sees only IP rules, never Network — covered by existing + new tests (the #218 fix stays covered). - An old link to `/settings/network` for a user who only has IP rules still falls back to their first available tab. ## Test plan - [x] `npx vitest run` for `SettingsSectionScreen`, `NetworkSettingsTab`, `DashboardScreen`, `IpRulesScreen` — all passing, including new tests for the two-entry menu and the `/settings/network` fallback for an IP-rules-only user. - [x] `./scripts/local-gates.sh --frontend-only` — prettier, oxlint, tsc, full vitest suite (163 tests) and the production build all green.
GRI-2139: split the Settings Network / IP rules tab into two entries
All checks were successful
CI / the pre-push hook (pull_request) Successful in 5s
CI / cargo fmt (pull_request) Successful in 4s
CI / install.sh client upgrade (pull_request) Successful in 12s
CI / cargo deny advisories (pull_request) Successful in 13s
CI / cargo deny (pull_request) Successful in 19s
CI / repository boundary (pull_request) Successful in 5s
CI / cargo clippy (pull_request) Successful in 1m3s
CI / frontend-web (pull_request) Successful in 1m6s
CI / cargo test (pull_request) Successful in 4m20s
CI / CI (pull_request) Successful in 2s
CI / Notify gate failed (pull_request) Has been skipped
f71486e6aa
Network stays global settings_manage only, at /settings/network.
IP rules gets its own entry and URL, /settings/ip-rules, for any
devices_approve holder, global or campus-scoped. The old merged
/settings/network link and the legacy /ip-rules bookmark both fall
back correctly for a user who only has one of the two permissions.
Merge remote-tracking branch 'origin/dev' into feature/GRI-2139-settings-network-ip-rules-split
All checks were successful
CI / the pre-push hook (pull_request) Successful in 5s
CI / install.sh client upgrade (pull_request) Successful in 15s
CI / cargo fmt (pull_request) Successful in 5s
CI / cargo clippy (pull_request) Successful in 1m36s
CI / cargo deny (pull_request) Successful in 21s
CI / cargo deny advisories (pull_request) Successful in 20s
CI / repository boundary (pull_request) Successful in 4s
CI / frontend-web (pull_request) Successful in 1m17s
CI / cargo test (pull_request) Successful in 4m45s
CI / CI (pull_request) Successful in 1s
CI / Notify gate failed (pull_request) Has been skipped
60356a5db3
vivy approved these changes 2026-11-16 09:33:53 +00:00
Dismissed
vivy left a comment

Reviewed: Network and IP rules are separate entries, Network is global settings_manage only, IP rules for devices_approve (campus approver keeps it), /ip-rules redirects to /settings/ip-rules. Merged dev in (60356a5); merge on green.

Reviewed: Network and IP rules are separate entries, Network is global settings_manage only, IP rules for devices_approve (campus approver keeps it), /ip-rules redirects to /settings/ip-rules. Merged dev in (60356a5); merge on green.
vivy approved these changes 2026-11-16 09:39:56 +00:00
vivy left a comment

Reviewed by the chief of staff (the CTO is held to infra-only work by GRI-72/GRI-1099, so signage review is routed to me).

  • Two entries, two URLs: /settings/network (global settings_manage) and /settings/ip-rules (devices_approve, global or campus).
  • Permissions unchanged: a campus approver sees IP rules and never Network; the #218 case is covered by a test.
  • An old /settings/network link for an IP-rules-only user falls back to the first tab (items[0]), with a test. Old /ip-rules now redirects to /settings/ip-rules.
  • No hard-coded endpoints or config added.

Approved. I merge to dev when the required cargo test context is green on 60356a5d. No deploy.

Reviewed by the chief of staff (the CTO is held to infra-only work by GRI-72/GRI-1099, so signage review is routed to me). - Two entries, two URLs: `/settings/network` (global `settings_manage`) and `/settings/ip-rules` (`devices_approve`, global or campus). - Permissions unchanged: a campus approver sees IP rules and never Network; the #218 case is covered by a test. - An old `/settings/network` link for an IP-rules-only user falls back to the first tab (`items[0]`), with a test. Old `/ip-rules` now redirects to `/settings/ip-rules`. - No hard-coded endpoints or config added. Approved. I merge to `dev` when the required `cargo test` context is green on 60356a5d. No deploy.
vivy merged commit 12701a975b into dev 2026-11-16 09:54:23 +00:00
vivy deleted branch feature/GRI-2139-settings-network-ip-rules-split 2026-11-16 09:54:24 +00:00
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
Grimoirix/grimoire-of-digital-signage!273
No description provided.