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.

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

SSO: Add invite user button option #88369

Merged
merged 13 commits into from
Mar 14, 2024
Merged

SSO: Add invite user button option #88369

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a5b59ff
Add invite button option
renancarvalho Mar 11, 2024
0e5d298
Fix type
renancarvalho Mar 11, 2024
5dc0b2a
Remove unnecessary comment
renancarvalho Mar 11, 2024
90cd024
Add notice and style
renancarvalho Mar 11, 2024
6c33370
Merge branch 'trunk' into add/sso-send-invite
renancarvalho Mar 12, 2024
74fb30b
Merge branch 'trunk' into add/sso-send-invite
renancarvalho Mar 12, 2024
65b999d
Use LocalizeUrl
renancarvalho Mar 12, 2024
77f7906
Fix small viewport message style
renancarvalho Mar 12, 2024
5721ce0
Fix pending invites not being shown sometimes
renancarvalho Mar 13, 2024
fd83cc4
Add error handling
renancarvalho Mar 13, 2024
9f2e827
Use correct icon
renancarvalho Mar 13, 2024
0ea9519
Rename variable
renancarvalho Mar 13, 2024
4045525
Remove unnecessary test expectation
renancarvalho Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions client/my-sites/people/invite-status/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,11 @@ const InviteStatus = ( {
handleDelete,
resendSuccess,
requestingResend,
inviteWasDeleted,
deletingInvite,
} ) => {
const translate = useTranslate();
const { isPending } = invite;

if ( invite && inviteWasDeleted ) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @agrullon95 To keep the pending list up to date, I had to remove this logic added by you in #86927. Could you please help me to test and make sure it is still working well?

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't recall why I added that there, but I didn't notice any issues with invitations/revokes when testing.

return null;
}

return (
<div
className={ classNames( 'people-list-item__invite-status', {
Expand Down
3 changes: 1 addition & 2 deletions client/my-sites/people/people-invite-details/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,13 @@ export class PeopleInviteDetails extends PureComponent {
requesting,
invite,
translate,
deleteSuccess,
requestingResend,
resendSuccess,
inviteWasDeleted,
deletingInvite,
} = this.props;

if ( ! site || ! site.ID || deleteSuccess ) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@agrullon95 same here

if ( ! site || ! site.ID ) {
return this.renderPlaceholder();
}

Expand Down
165 changes: 0 additions & 165 deletions client/my-sites/people/people-list-item/index.jsx
View file
Open in desktop

This file was deleted.

Loading
Loading