ecsInitialization fix for desktop (#1039)

Co-authored-by: amitjoshi <[email protected]>
microsoft · Sep 11, 2024 · 669d801 · 669d801
1 parent 0912e35
commit 669d801
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/client/extension.ts b/src/client/extension.ts
@@ -185,10 +185,6 @@ export async function activate(
     const pacTerminal = new PacTerminal(_context, _telemetry, cliPath);
     _context.subscriptions.push(cli);
     _context.subscriptions.push(pacTerminal);
-    const workspaceFolders =
-        vscode.workspace.workspaceFolders?.map(
-            (fl) => ({ ...fl, uri: fl.uri.fsPath } as WorkspaceFolder)
-        ) || [];
 
     _context.subscriptions.push(
         orgChangeEvent(async (orgDetails: ActiveOrgOutput) => {
@@ -213,7 +209,7 @@ export async function activate(
                             TenantID: TenantID[0].Value,
                             Region: artemisResponse.stamp
                         },
-                        PowerPagesClientName);
+                        PowerPagesClientName, true);
                 }
 
                 oneDSLoggerWrapper.instantiate(geoName, geoLongName);
@@ -226,6 +222,11 @@ export async function activate(
         })
     );
 
+
+    const workspaceFolders =
+        vscode.workspace.workspaceFolders?.map(
+            (fl) => ({ ...fl, uri: fl.uri.fsPath } as WorkspaceFolder)
+        ) || [];
     // TODO: Handle for VSCode.dev also
     if (workspaceContainsPortalConfigFolder(workspaceFolders)) {
         let telemetryData = '';

diff --git a/src/common/ecs-features/ecsFeatureClient.ts b/src/common/ecs-features/ecsFeatureClient.ts
@@ -16,8 +16,8 @@ export abstract class ECSFeaturesClient {
 
     // Initialize ECSFeatureClient - any client config can be fetched with utility function like below
     // EnableMultifileVscodeWeb.getConfig().enableMultifileVscodeWeb
-    public static async init(telemetry: ITelemetry | TelemetryReporter, filters: ECSAPIFeatureFlagFilters, clientName: string) {
-        if (this._ecsConfig) return;
+    public static async init(telemetry: ITelemetry | TelemetryReporter, filters: ECSAPIFeatureFlagFilters, clientName: string, force = false) {
+        if (this._ecsConfig && !force) return
 
         const requestURL = createECSRequestURL(filters, clientName);
         try {