show message that users needs to be confirmed
This commit is contained in:
parent
c37359cdfd
commit
226aa0b3ba
|
@ -29,7 +29,11 @@
|
||||||
<i class="fa fa-spinner fa-spin text-muted" *ngIf="loading" title="{{'loading' | i18n}}"></i>
|
<i class="fa fa-spinner fa-spin text-muted" *ngIf="loading" title="{{'loading' | i18n}}"></i>
|
||||||
<ng-container *ngIf="!loading && (users | search:searchText:'name':'email':'id') as searchedUsers">
|
<ng-container *ngIf="!loading && (users | search:searchText:'name':'email':'id') as searchedUsers">
|
||||||
<p *ngIf="!searchedUsers.length">{{'noUsersInList' | i18n}}</p>
|
<p *ngIf="!searchedUsers.length">{{'noUsersInList' | i18n}}</p>
|
||||||
<table class="table table-hover table-list" *ngIf="searchedUsers.length">
|
<ng-container *ngIf="searchedUsers.length">
|
||||||
|
<app-callout type="info" title="{{'confirmUsers' | i18n}}" icon="fa-check-circle" *ngIf="showConfirmUsers">
|
||||||
|
{{'usersNeedConfirmed' | i18n}}
|
||||||
|
</app-callout>
|
||||||
|
<table class="table table-hover table-list">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr *ngFor="let u of searchedUsers">
|
<tr *ngFor="let u of searchedUsers">
|
||||||
<td width="30">
|
<td width="30">
|
||||||
|
@ -78,6 +82,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
</ng-container>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-template #addEdit></ng-template>
|
<ng-template #addEdit></ng-template>
|
||||||
<ng-template #groupsTemplate></ng-template>
|
<ng-template #groupsTemplate></ng-template>
|
||||||
|
|
|
@ -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) {
|
private async doConfirmation(user: OrganizationUserUserDetailsResponse) {
|
||||||
const orgKey = await this.cryptoService.getOrgKey(this.organizationId);
|
const orgKey = await this.cryptoService.getOrgKey(this.organizationId);
|
||||||
const publicKeyResponse = await this.apiService.getUserPublicKey(user.userId);
|
const publicKeyResponse = await this.apiService.getUserPublicKey(user.userId);
|
||||||
|
|
|
@ -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": {
|
"startDate": {
|
||||||
"message": "Start Date"
|
"message": "Start Date"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue