From bac7eed21f26a867bba78cb450b5e212cfda97b4 Mon Sep 17 00:00:00 2001
From: amitjoshi <amitjoshi@microsoft.com>
Date: Mon, 30 Sep 2024 12:38:59 +0530
Subject: [PATCH] Refactor OrgChangeNotifier and Copilot Notification

---
 src/client/extension.ts | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/client/extension.ts b/src/client/extension.ts
index 837798b9..15dc7f03 100644
--- a/src/client/extension.ts
+++ b/src/client/extension.ts
@@ -187,9 +187,6 @@ export async function activate(
     _context.subscriptions.push(cli);
     _context.subscriptions.push(pacTerminal);
 
-    // Init OrgChangeNotifier instance
-    OrgChangeNotifier.createOrgChangeNotifierInstance(pacTerminal.getWrapper());
-
     let copilotNotificationShown = false;
 
     const workspaceFolders =
@@ -234,24 +231,23 @@ export async function activate(
             }
 
             if (!copilotNotificationShown) {
-                if (workspaceContainsPortalConfigFolder(workspaceFolders)) {
-                    let telemetryData = '';
-                    let listOfActivePortals = [];
-                    try {
-                        listOfActivePortals = getPortalsOrgURLs(workspaceFolders, _telemetry);
-                        telemetryData = JSON.stringify(listOfActivePortals);
-                        _telemetry.sendTelemetryEvent("VscodeDesktopUsage", { listOfActivePortals: telemetryData, countOfActivePortals: listOfActivePortals.length.toString() });
-                        oneDSLoggerWrapper.getLogger().traceInfo("VscodeDesktopUsage", { listOfActivePortals: telemetryData, countOfActivePortals: listOfActivePortals.length.toString() });
-                    } catch (exception) {
-                        const exceptionError = exception as Error;
-                        _telemetry.sendTelemetryException(exceptionError, { eventName: 'VscodeDesktopUsage' });
-                        oneDSLoggerWrapper.getLogger().traceError(exceptionError.name, exceptionError.message, exceptionError, { eventName: 'VscodeDesktopUsage' });
-                    }
-
-                    // Show Copilot notification after ECS initialization and workspace check
-                    showNotificationForCopilot(_telemetry, telemetryData, listOfActivePortals.length.toString());
-                    copilotNotificationShown = true;
+                let telemetryData = '';
+                let listOfActivePortals = [];
+                try {
+                    listOfActivePortals = getPortalsOrgURLs(workspaceFolders, _telemetry);
+                    telemetryData = JSON.stringify(listOfActivePortals);
+                    _telemetry.sendTelemetryEvent("VscodeDesktopUsage", { listOfActivePortals: telemetryData, countOfActivePortals: listOfActivePortals.length.toString() });
+                    oneDSLoggerWrapper.getLogger().traceInfo("VscodeDesktopUsage", { listOfActivePortals: telemetryData, countOfActivePortals: listOfActivePortals.length.toString() });
+                } catch (exception) {
+                    const exceptionError = exception as Error;
+                    _telemetry.sendTelemetryException(exceptionError, { eventName: 'VscodeDesktopUsage' });
+                    oneDSLoggerWrapper.getLogger().traceError(exceptionError.name, exceptionError.message, exceptionError, { eventName: 'VscodeDesktopUsage' });
                 }
+
+                // Show Copilot notification after ECS initialization and workspace check
+                showNotificationForCopilot(_telemetry, telemetryData, listOfActivePortals.length.toString());
+                copilotNotificationShown = true;
+
             }
 
         })
@@ -261,6 +257,9 @@ export async function activate(
 
     if (workspaceContainsPortalConfigFolder(workspaceFolders)) {
 
+        // Init OrgChangeNotifier instance
+        OrgChangeNotifier.createOrgChangeNotifierInstance(pacTerminal.getWrapper());
+
         vscode.workspace.onDidOpenTextDocument(didOpenTextDocument);
         vscode.workspace.textDocuments.forEach(didOpenTextDocument);