github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8704 from overleaf/ta-multiple-invites-fix

Browse source 
Fix UX on Duplicate Group Invites

GitOrigin-RevId: e51c406d578b130972024065f9b8bdb2503944a9
This commit is contained in:
Timothée Alby 2022-07-07 10:01:47 +02:00 committed by Copybot
parent e48c23546e
commit 5bfb1b8781
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/web/app/src/Features/Subscription/TeamInvitesHandler.js
View file

@ -174,6 +174,7 @@ function createInvite(subscription, email, inviter, callback) {
)
if (invite) {
invite = invite.toObject()
invite.sentAt = new Date()
} else {
invite = {

7
services/web/frontend/js/main/user-membership.js
View file

@ -56,7 +56,12 @@ App.controller('UserMembershipController', function ($scope, queuedHttp) {
$scope.inputs.addMembers.inflightCount -= 1
const { data } = response
if (data.user != null) {
$scope.users.push(data.user)
const alreadyListed = $scope.users.find(
scopeUser => scopeUser.email === data.user.email
)
if (!alreadyListed) {
$scope.users.push(data.user)
}
}
return ($scope.inputs.addMembers.content = '')
})

2
services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js
View file

@ -23,6 +23,8 @@ describe('TeamInvitesHandler', function () {
email: 'jorah@example.com',
token: this.token,
}
// ensure teamInvite can be converted from Document to Object
this.teamInvite.toObject = () => this.teamInvite
this.subscription = {
id: '55153a8014829a865bbf700d',