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.

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

feat(nms): Merging administration tools into nms #12402

Merged
merged 1 commit into from Apr 13, 2022

Conversation

thmsschmitt
Copy link
Contributor

@thmsschmitt thmsschmitt commented Apr 5, 2022

Summary

Move administration and password settings from separate tab into main UI.

Fixes: #11543

Details

The administration page has been moved into the network specific UI thus the URL scheme has been changed to /nms/<networkID>/admin/.... If the admin page is selected the account menu button will be highlighted as suggested in the mockup. The new design for the button, menu and the account settings page itself are done as a separate PR #12430.
Screenshot 2022-04-07 at 15 46 35

The form to change the password was previously on the admin page but did not have a sidebar entry. Now it is a separate page under /nms/<networkID>/settings.
Screenshot 2022-04-07 at 15 46 54

If no network exists one still needs to be able to get to the admin and account settings page. Therefore in this special case the pages can still be reached under /admin/... and /settings without the network related entries in the sidebar.

Screenshot 2022-04-07 at 15 51 07
Screenshot 2022-04-07 at 15 50 39

The account settings are also available on the organizations page.
Screenshot 2022-04-07 at 15 47 25

Testplan

Open the administration page as:

  • super user with at least one network
  • super user without any network

Open the account settings page:

  • as super user with at least one network
  • as super user without any network
  • as regular user with at least one network
  • as regular user without any network
  • from the organizations page

@pull-request-size pull-request-size bot added the size/XL Denotes a Pull Request that changes 500-999 lines. label Apr 5, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Apr 5, 2022

Thanks for opening a PR! 💯

A couple initial guidelines

Howto

  • Reviews. The "Reviewers" listed for this PR are the Magma maintainers who will shepherd it.
  • Checks. All required CI checks must pass before merge.
  • Merge. Once approved and passing CI checks, use the ready2merge label to indicate the maintainers can merge your PR.

More info

Please take a moment to read through the Magma project's

If this is your first Magma PR, also consider reading

@github-actions github-actions bot added the component: nms NMS-related issue label Apr 5, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Apr 5, 2022

nms-workflow

0 files  0 suites   0s ⏱️
0 tests 0 ✔️ 0 💤 0

Results for commit 8ef614f.

♻️ This comment has been updated with latest results.

@pull-request-size pull-request-size bot added size/XXL Denotes a Pull Request that changes 1000+ lines. and removed size/XL Denotes a Pull Request that changes 500-999 lines. labels Apr 6, 2022
@thmsschmitt thmsschmitt force-pushed the integrate-admin-ui branch 2 times, most recently from 5106de0 to 2af1673 Compare April 6, 2022 16:31
@github-actions
Copy link
Contributor

github-actions bot commented Apr 6, 2022

cloud-workflow

0 files  0 suites   0s ⏱️
0 tests 0 ✔️ 0 💤 0

Results for commit 2af1673.

@thmsschmitt thmsschmitt force-pushed the integrate-admin-ui branch 3 times, most recently from c7d3dc0 to 50e0484 Compare April 7, 2022 13:44
@thmsschmitt thmsschmitt marked this pull request as ready for review April 7, 2022 14:01
@thmsschmitt thmsschmitt requested review from a team, HannaFar and iirisgao April 7, 2022 14:01
Copy link
Contributor

@andreilee andreilee left a comment

Choose a reason for hiding this comment

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

Looks great! Could you just add a comment about isOrganizations, before I merge this?

There are some refactoring/cleanup type changes that have been included in the PR here. I would prefer that those types of changes are put in a separate commit (or even PR) whenever possible.

Move administration and password settings from separate tab into main UI.

Signed-off-by: Thomas Schmitt <thomas.schmitt@tngtech.com>
@thmsschmitt thmsschmitt added the ready2merge This PR is ready to be merged (is approved and passes all required checks) label Apr 13, 2022
@themarwhal themarwhal merged commit a27017e into magma:master Apr 13, 2022
emakeev pushed a commit to emakeev/magma that referenced this pull request Aug 5, 2022
Move administration and password settings from separate tab into main UI.

Signed-off-by: Thomas Schmitt <thomas.schmitt@tngtech.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: nms NMS-related issue ready2merge This PR is ready to be merged (is approved and passes all required checks) size/XXL Denotes a Pull Request that changes 1000+ lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[NMS] Merging Administration Tools into NMS
3 participants