From 8cc113c5a46105ed5e5a351b0117ee25ccaf9aa5 Mon Sep 17 00:00:00 2001
From: aj-rosado <109146700+aj-rosado@users.noreply.github.com>
Date: Thu, 16 May 2024 21:45:25 +0100
Subject: [PATCH] [AC-2502][AC-2498] Update free org report upgrade dialog
 (#9101)

* updated upgrade organization report popup texts

* updated icon on free org upgrade at reports

* solved floating promise

* Showing upgrade on subscription page when navigating from report dialog
---
 .../organizations/guards/is-paid-org.guard.ts   | 17 ++++++++++++++---
 apps/web/src/locales/en/messages.json           |  6 ++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts b/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts
index f6968daca9f..aaf24e48346 100644
--- a/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts
+++ b/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts
@@ -27,15 +27,26 @@ export class IsPaidOrgGuard implements CanActivate {
       // Users without billing permission can't access billing
       if (!org.canEditSubscription) {
         await this.dialogService.openSimpleDialog({
-          title: { key: "upgradeOrganization" },
-          content: { key: "notAvailableForFreeOrganization" },
+          title: { key: "upgradeOrganizationCloseSecurityGaps" },
+          content: { key: "upgradeOrganizationCloseSecurityGapsDesc" },
           acceptButtonText: { key: "ok" },
           cancelButtonText: null,
           type: "info",
         });
         return false;
       } else {
-        this.messagingService.send("upgradeOrganization", { organizationId: org.id });
+        const upgradeConfirmed = await this.dialogService.openSimpleDialog({
+          title: { key: "upgradeOrganizationCloseSecurityGaps" },
+          content: { key: "upgradeOrganizationCloseSecurityGapsDesc" },
+          acceptButtonText: { key: "upgradeOrganization" },
+          type: "info",
+          icon: "bwi-arrow-circle-up",
+        });
+        if (upgradeConfirmed) {
+          await this.router.navigate(["organizations", org.id, "billing", "subscription"], {
+            queryParams: { upgrade: true },
+          });
+        }
       }
     }
 
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 3afd318266e..fb1c30e5468 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -8222,5 +8222,11 @@
   },
   "protectYourFamilyOrBusiness": {
     "message": "Protect your family or business"
+  },
+  "upgradeOrganizationCloseSecurityGaps": {
+    "message": "Close security gaps with monitoring reports"
+  },
+  "upgradeOrganizationCloseSecurityGapsDesc": {
+    "message": "Stay ahead of security vulnerabilities by upgrading to a paid plan for enhanced monitoring."
   }
 }