From 226aa0b3bac1aee4d83a633b8a1fb57407ff0d1a Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 6 Aug 2018 17:18:33 -0400 Subject: [PATCH] show message that users needs to be confirmed --- .../manage/people.component.html | 101 +++++++++--------- .../organizations/manage/people.component.ts | 9 ++ src/locales/en/messages.json | 6 ++ 3 files changed, 68 insertions(+), 48 deletions(-) diff --git a/src/app/organizations/manage/people.component.html b/src/app/organizations/manage/people.component.html index 3032bf05115..9009ff88425 100644 --- a/src/app/organizations/manage/people.component.html +++ b/src/app/organizations/manage/people.component.html @@ -29,55 +29,60 @@

{{'noUsersInList' | i18n}}

- - - - - - - + + +
- - - {{u.email}} - {{'invited' | i18n}} - {{'accepted' | i18n}} - {{u.name}} - - {{'owner' | i18n}} - {{'admin' | i18n}} - {{'user' | i18n}} - -
- -
- - - {{'resendInvitation' | i18n}} - - - - {{'confirm' | i18n}} - - - - {{'groups' | i18n}} - - - - {{'eventLogs' | i18n}} - - - - {{'remove' | i18n}} - + + + {{'usersNeedConfirmed' | i18n}} + + + + + + + + - - -
+ + + {{u.email}} + {{'invited' | i18n}} + {{'accepted' | i18n}} + {{u.name}} + + {{'owner' | i18n}} + {{'admin' | i18n}} + {{'user' | i18n}} + +
+ +
+ + + {{'resendInvitation' | i18n}} + + + + {{'confirm' | i18n}} + + + + {{'groups' | i18n}} + + + + {{'eventLogs' | i18n}} + + + + {{'remove' | i18n}} + +
- -
+
+ diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts index 43fcbef7fa3..1c2bc85b7d1 100644 --- a/src/app/organizations/manage/people.component.ts +++ b/src/app/organizations/manage/people.component.ts @@ -228,6 +228,15 @@ export class PeopleComponent implements OnInit { }); } + get showConfirmUsers(): boolean { + return this.allUsers != null && this.allUsers.length > 1 && + this.statusMap.has(OrganizationUserStatusType.Confirmed) && + this.statusMap.get(OrganizationUserStatusType.Confirmed).length > 0 && + this.statusMap.get(OrganizationUserStatusType.Confirmed).length < 3 && + this.statusMap.has(OrganizationUserStatusType.Accepted) && + this.statusMap.get(OrganizationUserStatusType.Accepted).length > 0; + } + private async doConfirmation(user: OrganizationUserUserDetailsResponse) { const orgKey = await this.cryptoService.getOrgKey(this.organizationId); const publicKeyResponse = await this.apiService.getUserPublicKey(user.userId); diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index 5cca596af0c..e1beb28ded8 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -2102,6 +2102,12 @@ } } }, + "confirmUsers": { + "message": "Confirm Users" + }, + "usersNeedConfirmed": { + "message": "You have users that have accepted their invitation, but still need to be confirmed. Users will not have access to the organization until they are confirmed." + }, "startDate": { "message": "Start Date" },