Enhance Actions Hub with environment retrieval and refresh functionality

package.json

@@ -375,6 +375,11 @@
         "command": "microsoft.powerplatform.pages.preview-site",
         "category": "Powerpages",
         "title": "%powerplatform.pages.previewSite.title%"
+      },
+      {
+        "command": "powerpages.actionsHub.refresh",
+        "title": "Refresh",
+        "icon": "$(refresh)"
       }
     ],
     "configuration": {
@@ -850,6 +855,11 @@
           "command": "powerpages.copilot.clearConversation",
           "when": "view == powerpages.copilot",
           "group": "navigation"
+        },
+        {
+          "command": "powerpages.actionsHub.refresh",
+          "when": "view == powerpages.actionsHub",
+          "group": "navigation"
         }
       ],
       "view/item/context": [

src/client/OrgChangeNotifier.ts

@@ -50,6 +50,7 @@ export class OrgChangeNotifier {
             this._orgDetails = pacActiveOrg.Results;
             orgChangeEventEmitter.fire(this._orgDetails);
         } else {
+            //If org/env is expired or deleted, this event will be fired
             orgChangeErrorEventEmitter.fire();
         }
     }

src/client/extension.ts

@@ -34,7 +34,7 @@ import { CopilotNotificationShown } from "../common/copilot/telemetry/telemetryC
 import { copilotNotificationPanel, disposeNotificationPanel } from "../common/copilot/welcome-notification/CopilotNotificationPanel";
 import { COPILOT_NOTIFICATION_DISABLED, EXTENSION_VERSION_KEY } from "../common/copilot/constants";
 import { oneDSLoggerWrapper } from "../common/OneDSLoggerTelemetry/oneDSLoggerWrapper";
-import { OrgChangeNotifier, orgChangeEvent } from "./OrgChangeNotifier";
+import { OrgChangeNotifier, orgChangeErrorEvent, orgChangeEvent } from "./OrgChangeNotifier";
 import { ActiveOrgOutput } from "./pac/PacTypes";
 import { desktopTelemetryEventNames } from "../common/OneDSLoggerTelemetry/client/desktopExtensionTelemetryEventNames";
 import { ArtemisService } from "../common/services/ArtemisService";
@@ -48,6 +48,10 @@ import { getECSOrgLocationValue, getWorkspaceFolders } from "../common/utilities
 import { CliAcquisitionContext } from "./lib/CliAcquisitionContext";
 import { PreviewSite } from "./power-pages/preview-site/PreviewSite";
 import { ActionsHub } from "./power-pages/actions-hub/ActionsHub";
+import { pacAuthManager } from "./pac/PacAuthManager";
+import { showErrorDialog } from "../common/utilities/errorHandlerUtil";
+import { ENVIRONMENT_EXPIRED } from "./power-pages/actions-hub/Constants";
+import { extractAuthInfo } from "./power-pages/commonUtility";
 
 let client: LanguageClient;
 let _context: vscode.ExtensionContext;
@@ -205,6 +209,8 @@ export async function activate(
                     AadIdObject = pacActiveAuth.Results?.filter(obj => obj.Key === AadIdKey);
                     EnvID = pacActiveAuth.Results?.filter(obj => obj.Key === EnvIdKey);
                     TenantID = pacActiveAuth.Results?.filter(obj => obj.Key === TenantIdKey);
+                    const authInfo = extractAuthInfo(pacActiveAuth.Results);
+                    pacAuthManager.setAuthInfo(authInfo);
                 }
 
                 if (EnvID?.[0]?.Value && TenantID?.[0]?.Value && AadIdObject?.[0]?.Value) {
@@ -251,6 +257,10 @@ export async function activate(
             await PreviewSite.initialize(artemisResponse, workspaceFolders, orgDetails, pacTerminal, context, _telemetry);
 
             await ActionsHub.initialize(context, pacTerminal);
+        }),
+
+        orgChangeErrorEvent(() => {
+            showErrorDialog(ENVIRONMENT_EXPIRED);
         })
     );
 

src/client/pac/PacAuthManager.ts

@@ -3,13 +3,14 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  */
 
+import { EventEmitter, Event } from "vscode";
 import { AuthInfo } from "./PacTypes";
 
-
-
 class PacAuthManager {
     private static instance: PacAuthManager;
     private authInfo: AuthInfo | null = null;
+    private _onDidChangeEnvironment: EventEmitter<void> = new EventEmitter<void>();
+    public readonly onDidChangeEnvironment: Event<void> = this._onDidChangeEnvironment.event;
 
     public static getInstance(): PacAuthManager {
         if (!PacAuthManager.instance) {
@@ -20,6 +21,7 @@ class PacAuthManager {
 
     public setAuthInfo(authInfo: AuthInfo): void {
         this.authInfo = authInfo;
+        this._onDidChangeEnvironment.fire();
     }
 
     public getAuthInfo(): AuthInfo | null {

src/client/power-pages/actions-hub/ActionsHub.ts

@@ -45,7 +45,7 @@ export class ActionsHub {
                 pacAuthManager.setAuthInfo(authInfo);
             }
 
-            ActionsHubTreeDataProvider.initialize(context);
+            ActionsHubTreeDataProvider.initialize(context, pacTerminal);
         } catch (error) {
             oneDSLoggerWrapper.getLogger().traceError(Constants.EventNames.ACTIONS_HUB_INITIALIZATION_FAILED, error as string, error as Error, { methodName: ActionsHub.initialize.name }, {});
         }

src/client/power-pages/actions-hub/ActionsHubTreeDataProvider.ts

@@ -11,21 +11,31 @@ import { oneDSLoggerWrapper } from "../../../common/OneDSLoggerTelemetry/oneDSLo
 import { EnvironmentGroupTreeItem } from "./tree-items/EnvironmentGroupTreeItem";
 import { IEnvironmentInfo } from "./models/IEnvironmentInfo";
 import { pacAuthManager } from "../../pac/PacAuthManager";
+import { SUCCESS } from "../../../common/constants";
+import { extractAuthInfo } from "../commonUtility";
+import { PacTerminal } from "../../lib/PacTerminal";
 
 export class ActionsHubTreeDataProvider implements vscode.TreeDataProvider<ActionsHubTreeItem> {
     private readonly _disposables: vscode.Disposable[] = [];
     private readonly _context: vscode.ExtensionContext;
+    private _onDidChangeTreeData: vscode.EventEmitter<ActionsHubTreeItem | undefined | void> = new vscode.EventEmitter<ActionsHubTreeItem | undefined | void>();
+    readonly onDidChangeTreeData: vscode.Event<ActionsHubTreeItem | undefined | void> = this._onDidChangeTreeData.event;
 
-    private constructor(context: vscode.ExtensionContext) {
+
+    private constructor(context: vscode.ExtensionContext, private readonly _pacTerminal: PacTerminal) {
         this._disposables.push(
             vscode.window.registerTreeDataProvider("powerpages.actionsHub", this)
         );
 
         this._context = context;
+
+        // Register an event listener for environment changes
+        pacAuthManager.onDidChangeEnvironment(() => this.refresh());
+        this._disposables.push(...this.registerPanel(this._pacTerminal));
     }
 
-    public static initialize(context: vscode.ExtensionContext): ActionsHubTreeDataProvider {
-        const actionsHubTreeDataProvider = new ActionsHubTreeDataProvider(context);
+    public static initialize(context: vscode.ExtensionContext, pacTerminal: PacTerminal): ActionsHubTreeDataProvider {
+        const actionsHubTreeDataProvider = new ActionsHubTreeDataProvider(context, pacTerminal);
         oneDSLoggerWrapper.getLogger().traceInfo(Constants.EventNames.ACTIONS_HUB_INITIALIZED);
 
         return actionsHubTreeDataProvider;
@@ -61,7 +71,29 @@ export class ActionsHubTreeDataProvider implements vscode.TreeDataProvider<Actio
         }
     }
 
+    public refresh(): void {
+        this._onDidChangeTreeData.fire();
+    }
+
     public dispose(): void {
         this._disposables.forEach(d => d.dispose());
     }
+
+    private registerPanel(pacTerminal: PacTerminal): vscode.Disposable[] {
+        const pacWrapper = pacTerminal.getWrapper();
+        return [
+            vscode.commands.registerCommand("powerpages.actionsHub.refresh", async () => {
+                try {
+                    const pacActiveAuth = await pacWrapper.activeAuth();
+                    if (pacActiveAuth && pacActiveAuth.Status === SUCCESS) {
+                        const authInfo = extractAuthInfo(pacActiveAuth.Results);
+                        pacAuthManager.setAuthInfo(authInfo);
+                    }
+                    this.refresh();
+                } catch (error) {
+                    oneDSLoggerWrapper.getLogger().traceError(Constants.EventNames.ACTIONS_HUB_REFRESH_FAILED, error as string, error as Error, { methodName: this.refresh.name }, {});
+                }
+            })
+        ];
+    }
 }

src/client/power-pages/actions-hub/Constants.ts

@@ -32,6 +32,27 @@ export const Constants = {
         ACTIONS_HUB_INITIALIZED: "actionsHubInitialized",
         ACTIONS_HUB_INITIALIZATION_FAILED: "actionsHubInitializationFailed",
         ACTIONS_HUB_CURRENT_ENV_FETCH_FAILED: "actionsHubCurrentEnvFetchFailed",
+        ACTIONS_HUB_REFRESH_FAILED: "actionsHubRefreshFailed"
     }
 };
 
+export interface AuthInfo {
+    userType: string;
+    cloud: string;
+    tenantId: string;
+    tenantCountry: string;
+    user: string;
+    entraIdObjectId: string;
+    puid: string;
+    userCountryRegion: string;
+    tokenExpires: string;
+    authority: string;
+    environmentGeo: string;
+    environmentId: string;
+    environmentType: string;
+    organizationId: string;
+    organizationUniqueName: string;
+    organizationFriendlyName: string;
+}
+
+export const ENVIRONMENT_EXPIRED = vscode.l10n.t("Active Environment is expired or deleted. Please select a new environment.")

src/client/test/Integration/power-pages/actions-hub/ActionsHubTreeDataProvider.test.ts

@@ -14,12 +14,14 @@ import { EnvironmentGroupTreeItem } from "../../../../power-pages/actions-hub/tr
 import { OtherSitesGroupTreeItem } from "../../../../power-pages/actions-hub/tree-items/OtherSitesGroupTreeItem";
 import { ActionsHubTreeItem } from "../../../../power-pages/actions-hub/tree-items/ActionsHubTreeItem";
 import { pacAuthManager } from "../../../../pac/PacAuthManager";
+import { PacTerminal } from "../../../../lib/PacTerminal";
 
 describe("ActionsHubTreeDataProvider", () => {
     let context: vscode.ExtensionContext;
     let traceInfoStub: sinon.SinonStub;
     let traceErrorStub: sinon.SinonStub;
     let authInfoStub: sinon.SinonStub;
+    let pacTerminal: PacTerminal;
 
     beforeEach(() => {
         context = {
@@ -34,6 +36,7 @@ describe("ActionsHubTreeDataProvider", () => {
             featureUsage: sinon.stub()
         });
         authInfoStub = sinon.stub(pacAuthManager, "getAuthInfo");
+        pacTerminal = {} as PacTerminal;
     });
 
     afterEach(() => {
@@ -42,15 +45,15 @@ describe("ActionsHubTreeDataProvider", () => {
 
     describe('initialize', () => {
         it("should initialize and log initialization event", () => {
-            ActionsHubTreeDataProvider.initialize(context);
+            ActionsHubTreeDataProvider.initialize(context, pacTerminal);
             expect(traceInfoStub.calledWith(Constants.EventNames.ACTIONS_HUB_INITIALIZED)).to.be.true;
         });
     });
 
     describe('getTreeItem', () => {
         it("should return the element in getTreeItem", () => {
             const element = {} as ActionsHubTreeItem;
-            const result = ActionsHubTreeDataProvider.initialize(context).getTreeItem(element);
+            const result = ActionsHubTreeDataProvider.initialize(context, pacTerminal).getTreeItem(element);
             expect(result).to.equal(element);
         });
     });
@@ -75,7 +78,7 @@ describe("ActionsHubTreeDataProvider", () => {
                 organizationId: "",
                 organizationUniqueName: ""
             });
-            const provider = ActionsHubTreeDataProvider.initialize(context);
+            const provider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
             const result = await provider.getChildren();
 
             expect(result).to.not.be.null;
@@ -87,7 +90,7 @@ describe("ActionsHubTreeDataProvider", () => {
 
         it("should return environment group tree item with default name when no auth info is available", async () => {
             authInfoStub.returns(null);
-            const provider = ActionsHubTreeDataProvider.initialize(context);
+            const provider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
             const result = await provider.getChildren();
 
             expect(result).to.not.be.null;
@@ -101,7 +104,7 @@ describe("ActionsHubTreeDataProvider", () => {
         it("should return null in getChildren when an error occurs", async () => {
             authInfoStub.throws(new Error("Test Error"));
 
-            const provider = ActionsHubTreeDataProvider.initialize(context);
+            const provider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
             const result = await provider.getChildren();
 
             expect(result).to.be.null;
@@ -112,7 +115,7 @@ describe("ActionsHubTreeDataProvider", () => {
 
         it("should return an empty array in getChildren when an element is passed", async () => {
             const element = {} as ActionsHubTreeItem;
-            const provider = ActionsHubTreeDataProvider.initialize(context);
+            const provider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
             const result = await provider.getChildren(element);
 
             expect(result).to.be.an("array").that.is.empty;
@@ -123,7 +126,7 @@ describe("ActionsHubTreeDataProvider", () => {
         it("should dispose all disposables", () => {
             const disposable1 = { dispose: sinon.spy() };
             const disposable2 = { dispose: sinon.spy() };
-            const actionsHubTreeDataProvider = ActionsHubTreeDataProvider.initialize(context);
+            const actionsHubTreeDataProvider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
             actionsHubTreeDataProvider["_disposables"].push(disposable1 as vscode.Disposable, disposable2 as vscode.Disposable);
 
             actionsHubTreeDataProvider.dispose();