Merge branch 'features/PowerPagesAgent' into user/amitjoshi/githubCop…

…ilotAgentTelemetry

CHANGELOG.md

@@ -1,11 +1,13 @@
 # Change Log - Power Platform Extension
 
-## NEXTRELEASE
+## 2.0.58
 - pac CLI 1.32.7, (May 2024 refresh, see release notes on [nuget.org](https://www.nuget.org/packages/Microsoft.PowerApps.CLI/))
+- Web extension updates
+  - Copilot available in public regions that has " Move data across regions" option enabled per [Turn on copilots and generative AI features](https://learn.microsoft.com/en-us/power-platform/admin/geographical-availability-copilot#turn-on-copilots-and-generative-ai-features-1)
 
 ## 2.0.49
-Web extension updates
-- Copresence support - Find out who's working on a site (Power Pages Studio and Power Pages VS Code for the Web) at the same time as you with copresence
+- Web extension updates
+  - Copresence support - Find out who's working on a site (Power Pages Studio and Power Pages VS Code for the Web) at the same time as you with copresence
 
 ## 2.0.41
 - pac CLI 1.31.6, (February 2024 refresh, see release notes on [nuget.org](https://www.nuget.org/packages/Microsoft.PowerApps.CLI/))

src/client/power-pages/create/Contentsnippet.ts

@@ -13,7 +13,7 @@ import {
     isNullOrEmpty,
 } from "./utils/CommonUtils";
 import { QuickPickItem } from "vscode";
-import { MultiStepInput } from "./utils/MultiStepInput";
+import { MultiStepInput } from "../../../common/utilities/MultiStepInput";
 import path from "path";
 import { statSync } from "fs";
 import {

src/client/power-pages/create/PageTemplate.ts

@@ -14,7 +14,7 @@ import {
     getWebTemplates,
 } from "./utils/CommonUtils";
 import { QuickPickItem } from "vscode";
-import { MultiStepInput } from "./utils/MultiStepInput";
+import { MultiStepInput } from "../../../common/utilities/MultiStepInput";
 import path from "path";
 import { statSync } from "fs";
 import { ITelemetry } from "../../telemetry/ITelemetry";
@@ -150,7 +150,7 @@ async function getPageTemplateInputs(
         if (!name) {
             return vscode.l10n.t("Please enter a name for the page template.");
         }
-    
+
         const file = formatFileName(name);
         const filePath = path.join(
             selectedWorkspaceFolder,

src/client/power-pages/create/Webfile.ts

@@ -12,7 +12,7 @@ import {
     logErrorAndNotifyUser,
 } from "./utils/CommonUtils";
 import { QuickPickItem } from "vscode";
-import { MultiStepInput } from "./utils/MultiStepInput";
+import { MultiStepInput } from "../../../common/utilities/MultiStepInput";
 import { exec } from "child_process";
 import { Tables, WEBFILE, YoSubGenerator } from "./CreateOperationConstants";
 import { FileCreateEvent, sendTelemetryEvent, UserFileCreateEvent } from "../telemetry";

src/client/power-pages/create/Webpage.ts

@@ -17,7 +17,7 @@ import {
 } from "./utils/CommonUtils";
 import { QuickPickItem } from "vscode";
 
-import { MultiStepInput } from "./utils/MultiStepInput";
+import { MultiStepInput } from "../../../common/utilities/MultiStepInput";
 import { TableFolder, Tables, YoSubGenerator } from "./CreateOperationConstants";
 import path from "path";
 import { ITelemetry } from "../../telemetry/ITelemetry";

src/common/copilot/PowerPagesCopilot.ts

@@ -110,7 +110,7 @@ export class PowerPagesCopilot implements vscode.WebviewViewProvider {
             orgChangeEvent((orgDetails: ActiveOrgOutput) => this.handleOrgChangeSuccess(orgDetails))
         );
 
-        if(this._view?.visible) {
+        if (this._view?.visible) {
             this._disposables.push(orgChangeErrorEvent(async () => await createAuthProfileExp(this._pacWrapper)));
         }
 
@@ -165,7 +165,7 @@ export class PowerPagesCopilot implements vscode.WebviewViewProvider {
         if (pacOutput && pacOutput.Status === PAC_SUCCESS) {
             await this.handleOrgChangeSuccess(pacOutput.Results);
         } else if (!IS_DESKTOP && orgID && activeOrgUrl) {
-            await this.handleOrgChangeSuccess({ OrgId: orgID, UserId: userID, OrgUrl: activeOrgUrl } as ActiveOrgOutput);
+            await this.handleOrgChangeSuccess({ OrgId: orgID, UserId: userID, OrgUrl: activeOrgUrl, EnvironmentId: environmentId } as ActiveOrgOutput);
         }
 
         webviewView.webview.html = this._getHtmlForWebview(webviewView.webview);

src/common/services/ArtemisService.ts

@@ -41,7 +41,7 @@ export class ArtemisService {
 
             const intelligenceEndpoint = `https://aibuildertextapiservice.${geoName}-${'il' + clusterNumber}.gateway.${environment}.island.powerapps.com/v1.0/${orgId}/appintelligence/chat`
 
-            return { intelligenceEndpoint: intelligenceEndpoint, geoName: geoName, crossGeoDataMovementEnabledPPACFlag: false };
+            return { intelligenceEndpoint: intelligenceEndpoint, geoName: geoName, crossGeoDataMovementEnabledPPACFlag: crossGeoDataMovementEnabledPPACFlag };
         }
 
         return { intelligenceEndpoint: null, geoName: null, crossGeoDataMovementEnabledPPACFlag: false };

src/common/services/BAPService.ts

@@ -22,8 +22,8 @@ export class BAPService {
 
             if (response.ok) {
                 const data = await response.json();
-                sendTelemetryEvent(telemetry, { eventName: VSCODE_EXTENSION_GET_CROSS_GEO_DATA_MOVEMENT_ENABLED_FLAG_COMPLETED, data: data.enabled });
-                return data.enabled;
+                sendTelemetryEvent(telemetry, { eventName: VSCODE_EXTENSION_GET_CROSS_GEO_DATA_MOVEMENT_ENABLED_FLAG_COMPLETED, data: data.properties.copilotPolicies?.crossGeoCopilotDataMovementEnabled });
+                return data.properties.copilotPolicies?.crossGeoCopilotDataMovementEnabled;
             }
 
         } catch (error) {