added collaboration option on quick pick

microsoft · Dec 11, 2023 · b76fa90 · b76fa90
1 parent 608dbe1
commit b76fa90
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 27 deletions.
diff --git a/src/web/client/WebExtensionContext.ts b/src/web/client/WebExtensionContext.ts
@@ -28,11 +28,12 @@ import { EntityDataMap } from "./context/entityDataMap";
 import { FileDataMap } from "./context/fileDataMap";
 import { IAttributePath, IEntityInfo } from "./common/interfaces";
 import { ConcurrencyHandler } from "./dal/concurrencyHandler";
-import { isMultifileEnabled } from "./utilities/commonUtil";
+import { getMailToPath, getTeamChatURL, isMultifileEnabled } from "./utilities/commonUtil";
 import { UserDataMap } from "./context/userDataMap";
 import { EntityForeignKeyDataMap } from "./context/entityForeignKeyDataMap";
 import { QuickPickProvider } from "./webViews/QuickPickProvider";
 import { UserCollaborationProvider } from "./webViews/userCollaborationProvider";
+import { GraphClientService } from "./services/graphClientService";
 
 export interface IWebExtensionContext {
     // From portalSchema properties
@@ -114,6 +115,7 @@ class WebExtensionContext implements IWebExtensionContext {
     private _connectedUsers: UserDataMap;
     private _quickPickProvider: QuickPickProvider;
     private _userCollaborationProvider: UserCollaborationProvider;
+    private _graphClientService: GraphClientService;
 
     public get schemaDataSourcePropertiesMap() {
         return this._schemaDataSourcePropertiesMap;
@@ -220,6 +222,9 @@ class WebExtensionContext implements IWebExtensionContext {
     public get userCollaborationProvider() {
         return this._userCollaborationProvider;
     }
+    public get graphClientService() {
+        return this._graphClientService;
+    }
 
     constructor() {
         this._schemaDataSourcePropertiesMap = new Map<string, string>();
@@ -255,6 +260,7 @@ class WebExtensionContext implements IWebExtensionContext {
         this._connectedUsers = new UserDataMap();
         this._quickPickProvider = new QuickPickProvider();
         this._userCollaborationProvider = new UserCollaborationProvider();
+        this._graphClientService = new GraphClientService();
     }
 
     public setWebExtensionContext(
@@ -783,6 +789,18 @@ class WebExtensionContext implements IWebExtensionContext {
     public async removeConnectedUserInContext(userId: string) {
         this.connectedUsers.removeUser(userId);
     }
+
+    public async openTeamsChat(userId: string): Promise<void> {
+        const mail = await this.graphClientService.getUserEmail(userId);
+        const teamsChatLink = getTeamChatURL(mail);
+        vscode.env.openExternal(vscode.Uri.parse(teamsChatLink.href));
+    }
+
+    public async openMail(userId: string): Promise<void> {
+        const mail = await this.graphClientService.getUserEmail(userId);
+        const mailToPath = getMailToPath(mail);
+        vscode.env.openExternal(vscode.Uri.parse(mailToPath));
+    }
 }
 
 export default new WebExtensionContext();
diff --git a/src/web/client/common/constants.ts b/src/web/client/common/constants.ts
@@ -136,3 +136,6 @@ 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";
+export const THEME_ICON_MAIL = "mail";
+export const START_TEAMS_CHAT = "Start Teams Chat";
+export const SEND_AN_EMAIL = "Send an email";
diff --git a/src/web/client/extension.ts b/src/web/client/extension.ts
@@ -200,13 +200,13 @@ export function registerCollaborationView() {
     vscode.commands.registerCommand(
         "powerpages.collaboration.openTeamsChat",
         (event) => {
-            WebExtensionContext.userCollaborationProvider.openTeamsChat(event.id)
+            WebExtensionContext.openTeamsChat(event.id)
         }
     );
     vscode.commands.registerCommand(
         "powerpages.collaboration.openMail",
         (event) => {
-            WebExtensionContext.userCollaborationProvider.openMail(event.id)
+            WebExtensionContext.openMail(event.id)
         }
     );
 }

diff --git a/src/web/client/webViews/QuickPickProvider.ts b/src/web/client/webViews/QuickPickProvider.ts
@@ -7,18 +7,27 @@ import * as vscode from "vscode";
 import WebExtensionContext from "../WebExtensionContext";
 import { IEntityInfo } from "../common/interfaces";
 import * as Constants from "../common/constants";
+import { GraphClientService } from "../services/graphClientService";
+
+interface IQuickPickItem extends vscode.QuickPickItem {
+    label: string;
+    id?: string;
+    iconPath?: string | vscode.Uri | { light: string | vscode.Uri; dark: string | vscode.Uri } | vscode.ThemeIcon;
+}
 
 export class QuickPickProvider {
-    private items: vscode.QuickPickItem[] = [];
+    private items: IQuickPickItem[] = [];
+    graphClientService: GraphClientService;
 
     constructor() {
-        this.items = new Array<vscode.QuickPickItem>();
+        this.items = new Array<IQuickPickItem>();
+        this.graphClientService = new GraphClientService();
     }
 
     public async updateQuickPickItems(entityInfo: IEntityInfo) {
         const connectedUsersMap = WebExtensionContext.connectedUsers.getUserMap;
 
-        const currentUsers: vscode.QuickPickItem[] = [];
+        const currentUsers: IQuickPickItem[] = [];
 
         Array.from(
             connectedUsersMap.entries()
@@ -33,6 +42,7 @@ export class QuickPickProvider {
                     ) {
                         currentUsers.push({
                             label: value._userName,
+                            id: value._userId,
                         });
                     }
                 })
@@ -44,11 +54,49 @@ export class QuickPickProvider {
         } else {
             this.items = [{
                 label: Constants.WEB_EXTENSION_QUICK_PICK_DEFAULT_STRING,
+                id: "",
             }];
         }
     }
 
-    public showQuickPick() {
-        vscode.window.showQuickPick(this.items);
+    public async showQuickPick() {
+        const selectedUSer = await vscode.window.showQuickPick(this.items);
+        if (selectedUSer) {
+            this.handleSelectedOption(selectedUSer);
+        }
+    }
+
+    private handleSelectedOption(selectedOption: IQuickPickItem) {
+        this.collaborationQuickPick(selectedOption);
+    }
+
+    public async collaborationQuickPick(selectedOption: IQuickPickItem) {
+        const collaborationOptions: IQuickPickItem[] = [
+            {
+                label: Constants.START_TEAMS_CHAT,
+                iconPath: {
+                    light: '../assets/microsoftTeamsIcon/light/microsoftTeams.svg',
+                    dark: '../assets/microsoftTeamsIcon/dark/microsoftTeams.svg',
+                }
+            },
+            {
+                label: Constants.SEND_AN_EMAIL,
+                iconPath: Constants.THEME_ICON_MAIL
+            },
+        ];
+
+        const collaborationOptionsSelected = await vscode.window.showQuickPick(collaborationOptions);
+
+        if (collaborationOptionsSelected) {
+            if (collaborationOptionsSelected.label === Constants.START_TEAMS_CHAT) {
+                if (selectedOption.id) {
+                    WebExtensionContext.openTeamsChat(selectedOption.id);
+                }
+            } else if (collaborationOptionsSelected.label === Constants.SEND_AN_EMAIL) {
+                if (selectedOption.id) {
+                    WebExtensionContext.openMail(selectedOption.id);
+                }
+            }
+        }
     }
 }
diff --git a/src/web/client/webViews/userCollaborationProvider.ts b/src/web/client/webViews/userCollaborationProvider.ts
@@ -5,24 +5,17 @@
 
 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 UserCollaborationProvider
     implements vscode.TreeDataProvider<UserNode>
 {
-    private graphClientService: GraphClientService;
     private _onDidChangeTreeData: vscode.EventEmitter<
         UserNode | undefined | void
     > = new vscode.EventEmitter<UserNode | undefined | void>();
     readonly onDidChangeTreeData: vscode.Event<UserNode | undefined | void> =
         this._onDidChangeTreeData.event;
 
-    constructor() {
-        this.graphClientService = new GraphClientService();
-    }
-
     refresh(): void {
         this._onDidChangeTreeData.fire();
     }
@@ -49,18 +42,6 @@ export class UserCollaborationProvider
 
         return connectedUsers;
     }
-
-    async openTeamsChat(userId: string): Promise<void> {
-        const mail = await this.graphClientService.getUserEmail(userId);
-        const teamsChatLink = getTeamChatURL(mail);
-        vscode.env.openExternal(vscode.Uri.parse(teamsChatLink.href));
-    }
-
-    async openMail(userId: string): Promise<void> {
-        const mail = await this.graphClientService.getUserEmail(userId);
-        const mailToPath = getMailToPath(mail);
-        vscode.env.openExternal(vscode.Uri.parse(mailToPath));
-    }
 }
 
 export class UserNode extends vscode.TreeItem {