From 4bb905113617b099b191804f53c48164d9f05316 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 14 Dec 2018 14:48:12 -0500 Subject: [PATCH] show reports with upgrade message --- src/app/organizations/tools/tools.component.html | 9 +++++++-- src/app/organizations/tools/tools.component.ts | 7 ++++++- src/app/tools/tools.component.ts | 2 +- src/app/vault/add-edit.component.ts | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/app/organizations/tools/tools.component.html b/src/app/organizations/tools/tools.component.html index 0b0e5ff91d..ed1d181bf2 100644 --- a/src/app/organizations/tools/tools.component.html +++ b/src/app/organizations/tools/tools.component.html @@ -12,9 +12,14 @@ -
-
+
+
{{'reports' | i18n}} +
diff --git a/src/app/organizations/tools/tools.component.ts b/src/app/organizations/tools/tools.component.ts index 82f632e600..97a9d12068 100644 --- a/src/app/organizations/tools/tools.component.ts +++ b/src/app/organizations/tools/tools.component.ts @@ -3,6 +3,7 @@ import { ActivatedRoute } from '@angular/router'; import { Organization } from 'jslib/models/domain/organization'; +import { MessagingService } from 'jslib/abstractions/messaging.service'; import { UserService } from 'jslib/abstractions/user.service'; @Component({ @@ -13,7 +14,8 @@ export class ToolsComponent { organization: Organization; accessReports = false; - constructor(private route: ActivatedRoute, private userService: UserService) { } + constructor(private route: ActivatedRoute, private userService: UserService, + private messagingService: MessagingService) { } ngOnInit() { this.route.parent.params.subscribe(async (params) => { @@ -24,4 +26,7 @@ export class ToolsComponent { }); } + upgradeOrganization() { + this.messagingService.send('upgradeOrganization', { organizationId: this.organization.id }); + } } diff --git a/src/app/tools/tools.component.ts b/src/app/tools/tools.component.ts index 4d7ecadc13..f9ecdbe7a1 100644 --- a/src/app/tools/tools.component.ts +++ b/src/app/tools/tools.component.ts @@ -19,7 +19,7 @@ export class ToolsComponent implements OnInit { this.canAccessPremium = await this.userService.canAccessPremium(); } - async premiumRequired() { + premiumRequired() { if (!this.canAccessPremium) { this.messagingService.send('premiumRequired'); return; diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts index 8354747fe1..72ebe1f516 100644 --- a/src/app/vault/add-edit.component.ts +++ b/src/app/vault/add-edit.component.ts @@ -97,14 +97,14 @@ export class AddEditComponent extends BaseAddEditComponent { return confirmed; } - async premiumRequired() { + premiumRequired() { if (!this.canAccessPremium) { this.messagingService.send('premiumRequired'); return; } } - async upgradeOrganization() { + upgradeOrganization() { this.messagingService.send('upgradeOrganization', { organizationId: this.cipher.organizationId }); }