Named command, method and provider more logically

microsoft · Dec 7, 2023 · 5f5617c · 5f5617c
1 parent 584b763
commit 5f5617c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -155,15 +155,15 @@
     ],
     "commands": [
       {
-        "command": "powerpages.powerPagesPeopleOnTheSite.openTeamsChat",
+        "command": "powerpages.collaboration.openTeamsChat",
         "title": "Open Teams Chat",
         "icon": {
           "light": "src/web/client/assets/microsoftTeamsIcon/light/microsoftTeams.svg",
           "dark": "src/web/client/assets/microsoftTeamsIcon/dark/microsoftTeams.svg"
         }
       },
       {
-        "command": "powerpages.powerPagesPeopleOnTheSite.openMail",
+        "command": "powerpages.collaboration.openMail",
         "title": "Open Mail",
         "icon": "$(mail)"
       },
@@ -877,12 +877,12 @@
           "when": "!virtualWorkspace && view == pacCLI.envAndSolutionsPanel && viewItem == ENVIRONMENT"
         },
         {
-          "command": "powerpages.powerPagesPeopleOnTheSite.openTeamsChat",
+          "command": "powerpages.collaboration.openTeamsChat",
           "group": "inline",
           "when": "viewItem == userNode"
         },
         {
-          "command": "powerpages.powerPagesPeopleOnTheSite.openMail",
+          "command": "powerpages.collaboration.openMail",
           "group": "inline",
           "when": "viewItem == userNode"
         }
@@ -938,7 +938,7 @@
           "visibility": "visible"
         },
         {
-          "id": "powerpages.powerPagesPeopleOnTheSite",
+          "id": "powerpages.collaborationView",
           "name": "People On The Site",
           "when": "isWeb && virtualWorkspace",
           "contextualTitle": "People On The Site",

diff --git a/src/web/client/WebExtensionContext.ts b/src/web/client/WebExtensionContext.ts
@@ -32,7 +32,7 @@ import { isMultifileEnabled } from "./utilities/commonUtil";
 import { UserDataMap } from "./context/userDataMap";
 import { EntityForeignKeyDataMap } from "./context/entityForeignKeyDataMap";
 import { QuickPickProvider } from "./webViews/QuickPickProvider";
-import { PowerPagesUserCollaborationProvider } from "./webViews/powerPagesUserCollaborationProvider";
+import { UserCollaborationProvider } from "./webViews/userCollaborationProvider";
 
 export interface IWebExtensionContext {
     // From portalSchema properties
@@ -113,7 +113,7 @@ class WebExtensionContext implements IWebExtensionContext {
     private _containerId: string;
     private _connectedUsers: UserDataMap;
     private _quickPickProvider: QuickPickProvider;
-    private _powerPagesUserCollaborationProvider: PowerPagesUserCollaborationProvider;
+    private _userCollaborationProvider: UserCollaborationProvider;
 
     public get schemaDataSourcePropertiesMap() {
         return this._schemaDataSourcePropertiesMap;
@@ -217,8 +217,8 @@ class WebExtensionContext implements IWebExtensionContext {
     public get quickPickProvider() {
         return this._quickPickProvider;
     }
-    public get powerPagesUserCollaborationProvider() {
-        return this._powerPagesUserCollaborationProvider;
+    public get userCollaborationProvider() {
+        return this._userCollaborationProvider;
     }
 
     constructor() {
@@ -254,7 +254,7 @@ class WebExtensionContext implements IWebExtensionContext {
         this._containerId = "";
         this._connectedUsers = new UserDataMap();
         this._quickPickProvider = new QuickPickProvider();
-        this._powerPagesUserCollaborationProvider = new PowerPagesUserCollaborationProvider();
+        this._userCollaborationProvider = new UserCollaborationProvider();
     }
 
     public setWebExtensionContext(

diff --git a/src/web/client/common/constants.ts b/src/web/client/common/constants.ts
@@ -132,3 +132,7 @@ export enum GraphService {
 }
 
 export const MICROSOFT_GRAPH_PROFILE_PICTURE_SERVICE_CALL = "/photo/$value";
+
+// User collaboration constants
+export const USER_COLLABORATION_CONTEXT_VALUE = "userNode";
+export const THEME_ICON_ACCOUNT = "account";
diff --git a/src/web/client/extension.ts b/src/web/client/extension.ts
@@ -195,18 +195,18 @@ export function activate(context: vscode.ExtensionContext): void {
     showWalkthrough(context, WebExtensionContext.telemetry);
 }
 
-export function powerPagesOnTheSite() {
-    vscode.window.registerTreeDataProvider('powerpages.powerPagesPeopleOnTheSite', WebExtensionContext.powerPagesUserCollaborationProvider);
+export function registerCollaborationView() {
+    vscode.window.registerTreeDataProvider('powerpages.collaborationView', WebExtensionContext.userCollaborationProvider);
     vscode.commands.registerCommand(
-        "powerpages.powerPagesPeopleOnTheSite.openTeamsChat",
+        "powerpages.collaboration.openTeamsChat",
         (event) => {
-            WebExtensionContext.powerPagesUserCollaborationProvider.openTeamsChat(event.id)
+            WebExtensionContext.userCollaborationProvider.openTeamsChat(event.id)
         }
     );
     vscode.commands.registerCommand(
-        "powerpages.powerPagesPeopleOnTheSite.openMail",
+        "powerpages.collaboration.openMail",
         (event) => {
-            WebExtensionContext.powerPagesUserCollaborationProvider.openMail(event.id)
+            WebExtensionContext.userCollaborationProvider.openMail(event.id)
         }
     );
 }
@@ -317,7 +317,7 @@ export function processWillSaveDocument(context: vscode.ExtensionContext) {
 export function processWillStartCollaboartion(context: vscode.ExtensionContext) {
     // feature in progress, hence disabling it
     if (isCoPresenceEnabled()) {
-        powerPagesOnTheSite();
+        registerCollaborationView();
         vscode.commands.registerCommand('powerPlatform.previewCurrentActiveUsers', () => WebExtensionContext.quickPickProvider.showQuickPick());
         createWebWorkerInstance(context);
     }
@@ -356,7 +356,7 @@ export function createWebWorkerInstance(
                             WebExtensionContext.removeConnectedUserInContext(
                                 data.userId
                             );
-                            WebExtensionContext.powerPagesUserCollaborationProvider.refresh();
+                            WebExtensionContext.userCollaborationProvider.refresh();
                         }
                         if (data.type === Constants.workerEventMessages.UPDATE_CONNECTED_USERS) {
                             WebExtensionContext.updateConnectedUsersInContext(
@@ -365,7 +365,7 @@ export function createWebWorkerInstance(
                                 data.userId,
                                 data.entityId
                             );
-                            WebExtensionContext.powerPagesUserCollaborationProvider.refresh();
+                            WebExtensionContext.userCollaborationProvider.refresh();
                         }
                     };
                 }

diff --git a/...ws/powerPagesUserCollaborationProvider.ts → ...ent/webViews/userCollaborationProvider.ts b/...ws/powerPagesUserCollaborationProvider.ts → ...ent/webViews/userCollaborationProvider.ts
@@ -7,8 +7,9 @@ import * as vscode from "vscode";
 import WebExtensionContext from "../WebExtensionContext";
 import { GraphClientService } from "../services/graphClientService";
 import { getMailToPath, getTeamChatURL } from "../utilities/commonUtil";
+import * as Constants from "../common/constants";
 
-export class PowerPagesUserCollaborationProvider
+export class UserCollaborationProvider
     implements vscode.TreeDataProvider<UserNode>
 {
     private graphClientService: GraphClientService;
@@ -71,8 +72,8 @@ export class UserNode extends vscode.TreeItem {
         super(label, collapsibleState);
 
         this.tooltip = this.label;
-        this.iconPath = new vscode.ThemeIcon("account");
+        this.iconPath = new vscode.ThemeIcon(Constants.THEME_ICON_ACCOUNT);
     }
 
-    contextValue = "userNode";
+    contextValue = Constants.USER_COLLABORATION_CONTEXT_VALUE;
 }