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

Add ability for Super Admins to merge Orgs #2763

Merged
merged 21 commits into from
Jul 26, 2021
Merged

Add ability for Super Admins to merge Orgs #2763

merged 21 commits into from
Jul 26, 2021

Conversation

briri
Copy link
Contributor

@briri briri commented Dec 15, 2020

Fixes #2398.

Changes proposed in this PR:

  • Add a 'Merge' tab to the edit Org page that is only visible to Super Admins
  • Add routes, controller actions, policies and views to support:
    • A first-pass analysis of what will be merged (e.g. contact_email, plans, users, etc.)
    • The actual merge
  • Add helper and presenter to display analysis of merge
  • Tests for controller, presenter and feature

The primary use-case here is to merge an Org that was created automatically when a user did not select one from the typeahead. For example if the user typed 'USGS' instead of selecting 'United States Geological Survey (usgs.gov)'. In this scenario the Super Admin would select the 'USGS' org from the main Admin -> Organisations menu, click on the 'Merge' tab and then select 'United States Geological Survey (usgs.gov)' from that typeahead.

The following screenshot shows the 'Merge' tab when the user first clicks on it:
Screen Shot 2020-12-14 at 3 19 23 PM

The remaining screenshots show the Analysis results and all messaging:
Screen Shot 2020-12-14 at 3 20 04 PM
Screen Shot 2020-12-14 at 3 20 16 PM
etc. etc.
Screen Shot 2020-12-14 at 3 20 27 PM

@briri
Copy link
Contributor Author

briri commented Feb 1, 2021

This will need to be updated in conjunction with any changes made to #2724

@briri
Copy link
Contributor Author

briri commented Feb 2, 2021

Just noting that we are testing this out in stage and will be deploying to production next week. The functionality is only available to Super Admins

@briri
Copy link
Contributor Author

briri commented Jul 20, 2021

@raycarrick-ed can you merge this one when you have a chance?

@briri briri mentioned this pull request Jul 20, 2021
@briri briri merged commit 01c4781 into development Jul 26, 2021
@briri briri deleted the merge-orgs branch July 26, 2021 18:24
portagenetwork pushed a commit to portagenetwork/roadmap that referenced this pull request Feb 24, 2022
Add ability for Super Admins to merge Orgs
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.

1 participant