Merge branch 'users/nityagi/CompleteNavigationLoop' of https://github…

….com/microsoft/powerplatform-vscode into users/nityagi/CompleteNavigationLoop
microsoft · Sep 29, 2023 · c538bc5 · c538bc5
2 parents d07a5a7 + 612ce1d
commit c538bc5
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -334,6 +334,11 @@
         "category": "Copilot In Power Pages",
         "title": "Clear Conversation",
         "icon": "$(clear-all)"
+      },
+      {
+        "command": "powerpages.copilot.explain",
+        "category": "Copilot In Power Pages",
+        "title": "Explain"
       }
     ],
     "configuration": {
@@ -567,6 +572,19 @@
       }
     ],
     "menus": {
+      "editor/context": [
+        {
+          "submenu": "microsoft-powerapps-portals.powerpages-copilot",
+          "group": "0_powerpages-copilot",
+          "when": "never"
+        }
+      ],
+      "microsoft-powerapps-portals.powerpages-copilot": [
+        {
+          "command": "powerpages.copilot.explain",
+          "group": "0_powerpages-copilot@1"
+        }
+      ],
       "explorer/context": [
         {
           "submenu": "microsoft-powerapps-portals.powerpages",
@@ -721,6 +739,10 @@
           "command": "powerpages.copilot.clearConversation",
           "when": "never"
         },
+        {
+          "command": "powerpages.copilot.explain",
+          "when": "never"
+        },
         {
           "command": "microsoft-powerapps-portals.webpage",
           "when": "config.powerPlatform.generatorInstalled"
@@ -834,6 +856,10 @@
       {
         "id": "microsoft-powerapps-portals.powerpages",
         "label": "Power Pages"
+      },
+      {
+        "id": "microsoft-powerapps-portals.powerpages-copilot",
+        "label": "Copilot In Power Pages"
       }
     ],
     "viewsContainers": {

diff --git a/src/common/copilot/PowerPagesCopilot.ts b/src/common/copilot/PowerPagesCopilot.ts
@@ -140,16 +140,21 @@ export class PowerPagesCopilot implements vscode.WebviewViewProvider {
     const pacOutput = await this._pacWrapper?.activeOrg();
 
     if (pacOutput && pacOutput.Status === PAC_SUCCESS) {
-      this.handleOrgChangeSuccess(pacOutput.Results);
+      await this.handleOrgChangeSuccess(pacOutput.Results);
     } else if (!IS_DESKTOP && orgID && activeOrgUrl) {
-      this.handleOrgChangeSuccess({ OrgId: orgID, UserId: userID, OrgUrl: activeOrgUrl } as ActiveOrgOutput);
+      await this.handleOrgChangeSuccess({ OrgId: orgID, UserId: userID, OrgUrl: activeOrgUrl } as ActiveOrgOutput);
     }
 
     webviewView.webview.html = this._getHtmlForWebview(webviewView.webview);
 
     webviewView.webview.onDidReceiveMessage(async (data) => {
       switch (data.type) {
         case "webViewLoaded": {
+          if (this.aibEndpoint === COPILOT_UNAVAILABLE) {
+            this.sendMessageToWebview({ type: 'Unavailable' });
+            return;
+          }
+
           sendTelemetryEvent(this.telemetry, { eventName: CopilotLoadedEvent, copilotSessionId: sessionID, orgId: orgID });
           this.sendMessageToWebview({ type: 'env' }); //TODO Use IS_DESKTOP
           await this.checkAuthentication();
@@ -327,7 +332,7 @@ export class PowerPagesCopilot implements vscode.WebviewViewProvider {
 
     this.aibEndpoint = await getIntelligenceEndpoint(orgID, this.telemetry, sessionID);
     if (this.aibEndpoint === COPILOT_UNAVAILABLE) {
-      sendTelemetryEvent(this.telemetry, {eventName: CopilotNotAvailable, copilotSessionId: sessionID, orgId: orgID});
+      sendTelemetryEvent(this.telemetry, { eventName: CopilotNotAvailable, copilotSessionId: sessionID, orgId: orgID });
       this.sendMessageToWebview({ type: 'Unavailable' });
     } else {
       this.sendMessageToWebview({ type: 'Available' });