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

UI option to subscribe existing accounts during bulk invites. #16041

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+130 −21
Open

UI option to subscribe existing accounts during bulk invites. #16041

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6ba394
email_validation/tests: Return anonymous email when inviting existing…
sumanthvrao Aug 4, 2020
8a454ae
tests: Add test for existing user anon_email matching delivery_email.
sumanthvrao Aug 5, 2020
aca56d6
actions: Add show_subscription param when raising InvitationError.
sumanthvrao Aug 5, 2020
9a1608b
api: Document API changes for invites and bump API_FEATURE_LEVEL.
sumanthvrao Aug 5, 2020
2e0bc93
invite: Add UI to subscribe users with existing accounts.
sumanthvrao Aug 5, 2020
4916ebf
css: Add subscribe_existing_accounts button styling in zulip.scss.
sumanthvrao Aug 5, 2020
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
Prev Previous commit
Next Next commit
actions: Add show_subscription param when raising InvitationError. 
This flag helps the frontend to know when to display the option of
subscribing users on invitation. Currently we show the option in two
cases:
   - When no one was invited (Probably all users exist already)
   - When some were invited while some weren't.

We do not show the subcription option when:
   - We fail to send any invites because emails were invalid.
   - Account is too new to send invites.
  • Loading branch information
@sumanthvrao
sumanthvrao committed Aug 25, 2020
commit aca56d6748d9e99965fb7bb1715331e2df78ebce
9 changes: 5 additions & 4 deletions zerver/lib/actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5147,13 +5147,14 @@ def email_not_system_bot(email: str) -> None:

class InvitationError(JsonableError):
code = ErrorCode.INVITATION_FAILED
data_fields = ['errors', 'sent_invitations']
data_fields = ['errors', 'sent_invitations', 'show_subscription']

def __init__(self, msg: str, errors: List[Tuple[str, str, bool, str]],
sent_invitations: bool) -> None:
sent_invitations: bool, show_subscription: bool=False) -> None:
self._msg: str = msg
self.errors: List[Tuple[str, str, bool, str]] = errors
self.sent_invitations: bool = sent_invitations
self.show_subscription: bool = show_subscription

def estimate_recent_invites(realms: Iterable[Realm], *, days: int) -> int:
'''An upper bound on the number of invites sent in the last `days` days'''
Expand Down Expand Up @@ -5258,7 +5259,7 @@ def do_invite_users(user_profile: UserProfile,
if skipped and len(skipped) == len(invitee_emails):
# All e-mails were skipped, so we didn't actually invite anyone.
raise InvitationError(_("We weren't able to invite anyone."),
skipped, sent_invitations=False)
skipped, sent_invitations=False, show_subscription=True)

# We do this here rather than in the invite queue processor since this
# is used for rate limiting invitations, rather than keeping track of
Expand All @@ -5284,7 +5285,7 @@ def do_invite_users(user_profile: UserProfile,
raise InvitationError(_("Some of those addresses are already using Zulip, "
"so we didn't send them an invitation. We did send "
"invitations to everyone else!"),
skipped, sent_invitations=True)
skipped, sent_invitations=True, show_subscription=True)
notify_invites_changed(user_profile)

def do_get_user_invites(user_profile: UserProfile) -> List[Dict[str, Any]]:
Expand Down