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

Feature/approve org requests #529

Merged
merged 25 commits into from
Jan 31, 2019
Merged

Conversation

agduncan94
Copy link
Contributor

@agduncan94 agduncan94 commented Jan 24, 2019

Adds a request tab to the accounts page, where:

  • Admins can approve or reject organisations
  • Users can see their pending organisations
  • Users can accept or reject organisation invites

Currently needs a new release with dockstore/dockstore#2044

Top of page
top-requests

Requests
accounts-request-page

@agduncan94 agduncan94 self-assigned this Jan 24, 2019
@codecov
Copy link

codecov bot commented Jan 30, 2019

Codecov Report

Merging #529 into develop will decrease coverage by 0.29%.
The diff coverage is 39.28%.

Impacted file tree graph

@@            Coverage Diff            @@
##           develop    #529     +/-   ##
=========================================
- Coverage    62.69%   62.4%   -0.3%     
=========================================
  Files          215     218      +3     
  Lines         6473    6556     +83     
  Branches       650     652      +2     
=========================================
+ Hits          4058    4091     +33     
- Misses        2259    2307     +48     
- Partials       156     158      +2
Impacted Files Coverage Δ
src/app/shared/user/user.query.ts 64.28% <0%> (-10.72%) ⬇️
...ganizations/state/register-organization.service.ts 50.74% <0%> (ø) ⬆️
src/app/loginComponents/state/requests.service.ts 25.8% <25.8%> (ø)
src/app/loginComponents/state/requests.store.ts 85.71% <85.71%> (ø)
src/app/loginComponents/state/requests.query.ts 91.66% <91.66%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1337e7c...520dd11. Read the comment docs.

@coverbeck
Copy link
Collaborator

Screenshot feedback:

  1. I suggest saying Decline instead of Reject for invitations.
  2. I feel the Reject button is too jarring and prominent. I would be inclined to give it less emphasis per Material guidelines. On the other hand, maybe Reject should be just as prominent, as the default action won't necessarily be to approve. Not sure... It just doesn't look quite right to me.

@@ -0,0 +1,15 @@
<h1 mat-dialog-title>{{data.approve ? 'Accept' : 'Decline'}} Organization</h1>
Copy link
Collaborator

Choose a reason for hiding this comment

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

If this is for accepting an invite, I think it should say you're accepting/declining the invitation, not the organization.

Also, if you were invited to more than one org, which is probably unlikely, it would be nice to know the org name you are accepting.

@@ -0,0 +1,15 @@
<h1 mat-dialog-title>{{data.approve ? 'Approve' : 'Decline'}} Organization</h1>
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think you should say reject here. :)

Sorry I wasn't clearer in my earlier suggestion -- I think you should decline invites, but I think you should reject organizations. Because rejecting an org is a bigger deal, I think it needs a stronger word.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops I'll change those back.

<!-- Curator/Admin Pending Organizations -->
<div *ngIf="(isAdmin$ | async) || (isCurator$ | async)" class="p-3">
<h3>Curator Requests</h3>
<p>As a curator/admin, you can approve and decline organization requests.</p>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggest reject -- see previous comment; I won't flag any more if there are any

@agduncan94 agduncan94 requested a review from garyluu January 31, 2019 17:46
@agduncan94 agduncan94 merged commit 5f92328 into develop Jan 31, 2019
@agduncan94 agduncan94 deleted the feature/approve-org-requests branch January 31, 2019 18:05
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.

4 participants