HEEDLS-594 Centre administrators - deactivate admin account #792

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

Merged

AlexJacksonDS merged 11 commits into master from HEEDLS-594-Centre-administrators-deactivate-admin-account-test-fix2

Feb 10, 2022

Contributor

showkath10 commented Dec 2, 2021 •

edited

Loading

JIRA link

https://softwiretech.atlassian.net/browse/HEEDLS-594

Description

The deactivate admin button will be visible for super admins however, the super admin cannot deactivate their own account

Screenshots

Developer checks

(Leave tasks unticked if they haven't been appropriate for your ticket.)

I have:

Run the formatter and made sure there are no IDE errors.
Written tests for the changes (accessibility tests, unit tests for controller, data services, services, view models, etc)
Manually tested my work with and without JavaScript. Full manual testing guidelines can be found here: https://softwiretech.atlassian.net/wiki/spaces/HEE/pages/6703648740/Testing
Updated/added documentation in Swiki and/or Readme. Links (if any) are below:
- doc_1_here
Updated my Jira ticket with information about other parts of the system that were touched as part of the MR and have to be sanity tested to ensure nothing’s broken.
Scanned over my own MR to ensure everything is as expected.

showkath10 added 2 commits

December 2, 2021 07:34


          HEEDLS-594 Centre administrators - deactivate admin account

6323a82


          Updated test cases with new changes

fc755b2

JBsoftwire suggested changes

View reviewed changes

...lLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/_SearchableAdminCard.cshtml Outdated Show resolved Hide resolved


          Simplified show deactivate button check as suggested in MR review

c7c1a3d

SteveJacksonSoft reviewed

View reviewed changes

...ningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs Outdated Show resolved Hide resolved


          Added new test cases as requested

bead55a

Contributor

JBsoftwire commented Dec 9, 2021

The new tests look good, but I'll wait on the fixes for the issue Steve raised (and I missed, sorry) regarding centre manager deactivation.


          Code changes made this will now work for the new scenrio given in the…

0933c8f

… ticket

JBsoftwire approved these changes

View reviewed changes

Contributor

JBsoftwire left a comment

Flagged a formatting issue, but no need to re-review.

...ningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs Outdated Show resolved Hide resolved

Contributor

JBsoftwire commented Dec 14, 2021

I'll assign this to you so you can move it to tech lead review when you've run the code cleaner.


          Ran code cleanup

49fd106

SteveJacksonSoft suggested changes

View reviewed changes

...ningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs Outdated Show resolved Hide resolved

...ningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs Outdated Show resolved Hide resolved

...ningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs Outdated Show resolved Hide resolved

...ns.Web.Tests/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModelTests.cs Outdated Show resolved Hide resolved

...ns.Web.Tests/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModelTests.cs Outdated Show resolved Hide resolved

...ns.Web.Tests/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModelTests.cs Outdated Show resolved Hide resolved

...ns.Web.Tests/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModelTests.cs Outdated Show resolved Hide resolved


          Tech review - updates

799b8be

SteveJacksonSoft reviewed

View reviewed changes

...ningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs Outdated Show resolved Hide resolved

AlexJacksonDS added 2 commits

January 7, 2022 11:51


          HEEDLS-594 Tech lead review markups

b567fcd


          Merge branch 'master' into HEEDLS-594-Centre-administrators-deactivat…

860a33d

…e-admin-account-test-fix2

SteveJacksonSoft reviewed

View reviewed changes

...ningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs Outdated Show resolved Hide resolved

...ningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs Outdated Show resolved Hide resolved

AlexJacksonDS added 2 commits

February 10, 2022 15:53


          Merge branch 'master' into HEEDLS-594-Centre-administrators-deactivat…

2be40d4

…e-admin-account-test-fix2


          HEEDLS-594 Refactor Deactivate permissions logic into helper

78a8210

SteveJacksonSoft approved these changes

View reviewed changes

Contributor

SteveJacksonSoft left a comment

Looks good!

AlexJacksonDS merged commit 09159ac into master

AlexJacksonDS deleted the HEEDLS-594-Centre-administrators-deactivate-admin-account-test-fix2 branch

February 10, 2022 16:43

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet