Skip to content

fix: Utilities confirmation layout, headings and port/IP partitioning names - #456

Merged
TheWitness merged 2 commits into
developfrom
fix/mactrack-oui-confirm-dialog
Nov 17, 2026
Merged

TheWitness merged 2 commits into
developfrom
fix/mactrack-oui-confirm-dialog

Conversation

@TheWitness

Copy link
Copy Markdown
Member

Summary

The Utilities confirmation page had three problems:

  • Cancel and Continue were stacked. Continue is a <form> (a block element) and Cancel sat outside it. Cancel now sits inside the form beside the button, so the two are side by side for every action.
  • The heading was the generic "Are You Sure?" The heading is now the name of the action, for example Rebuild IEEE Vendor MAC/OUI Database for the OUI refresh. The question itself stays in the body.
  • "Configure Port Partitioning" is no longer accurate. The rebuild covers the port and IP address tables. The action is now Configure Port and IP Address Partitioning, and the Port Partition Size setting is now Port and IP Address Partition Size (the setting key is unchanged). The README, setup text and CLI messages use the new names. The internal action and function are renamed from mactrack_utilities_convert_ports to mactrack_utilities_convert_partitions.

The bulk-action confirmations on the device, site, MAC and other list pages already use the action name as their heading, so they are unchanged.

Tests

The Pest suite passes (1105 passed, 12 skipped for lack of a database DSN). It adds tests that:

  • every action has its own non-generic heading;
  • Cancel and Continue share one form;
  • the direct (unconfirmed) button has no Cancel link.

Translation catalogs are not touched; they are regenerated separately.

…, port and IP partitioning names

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings November 17, 2026 16:45

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Changes recommended

The renamed partition labels and new confirmation heading are missing from locales/po/cacti.pot, preventing Weblate from offering them for translation.

1 open issue
What changed in this PR

This PR improves MacTrack Utilities confirmations and clarifies that partitioning applies to both port and IP address tables.

Changes:

  • Places Cancel and Continue inside one form and gives each confirmation an action-specific heading.
  • Updates partitioning labels, documentation, CLI messages, and the internal action name while preserving the setting key.
  • Adds confirmation regression tests and updates existing partitioning tests.
File Description
tests/​Unit/​UtilitiesRequirePostTest.php Checks action-specific headings and updates the action name.
tests/​Unit/​PartitionWebTest.php Tests shared-form buttons and direct actions; updates renamed calls.
tests/​Unit/​PartitionRebuildTest.php Updates expected CLI setting labels.
setup.php Renames the partition setting label and description.
README.md Aligns partitioning instructions with the new labels.
mactrack_utilities.php Fixes confirmation layout and headings; renames the partitioning action.
lib/​mactrack_functions.php Adds confirmation titles and updates the partitioning action key.
cli/​upgrade_partitioning.php Updates help, status messages, and comments to use the new setting name.
CHANGELOG.md Records the confirmation and naming changes.

Review effort: Balanced

Comment thread setup.php Resolved
xmacan
xmacan previously approved these changes Nov 17, 2026
…oning strings

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@sonarqubecloud

Copy link
Copy Markdown

@TheWitness
TheWitness merged commit fe14b07 into develop Nov 17, 2026
12 of 14 checks passed
@TheWitness
TheWitness deleted the fix/mactrack-oui-confirm-dialog branch November 17, 2026 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants