From d9967f30b0ac80849981a48ecff54ee7289385d0 Mon Sep 17 00:00:00 2001
From: yasser khan <attitude3cena.yf@gmail.com>
Date: Fri, 14 Feb 2025 15:30:03 +0530
Subject: [PATCH] Fix(e2e): E2E report should be available in the community
 channel. (#3305)

---
 e2e/utils/artifacts.js                      | 2 +-
 src/main/contextMenu.ts                     | 6 +++---
 src/main/views/MattermostWebContentsView.ts | 2 +-
 src/main/views/modalView.ts                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/e2e/utils/artifacts.js b/e2e/utils/artifacts.js
index b14f3c0a..a5e94d2a 100644
--- a/e2e/utils/artifacts.js
+++ b/e2e/utils/artifacts.js
@@ -44,7 +44,7 @@ async function saveArtifacts() {
     }
 
     const s3Folder = `${BUILD_ID}-${BRANCH}-${BUILD_TAG}`.replace(/\./g, '-');
-    const uploadPath = path.resolve(__dirname, `../../${MOCHAWESOME_REPORT_DIR}`);
+    const uploadPath = path.resolve(__dirname, `../${MOCHAWESOME_REPORT_DIR}`);
     const filesToUpload = await getFiles(uploadPath);
 
     return new Promise((resolve, reject) => {
diff --git a/src/main/contextMenu.ts b/src/main/contextMenu.ts
index 2d6b561b..20fdc1b9 100644
--- a/src/main/contextMenu.ts
+++ b/src/main/contextMenu.ts
@@ -2,7 +2,7 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import type {WebContentsView, BrowserWindow, ContextMenuParams, Event} from 'electron';
+import type {BrowserWindow, BrowserView, WebviewTag, WebContents, ContextMenuParams, Event} from 'electron';
 import type {Options} from 'electron-context-menu';
 import electronContextMenu from 'electron-context-menu';
 
@@ -29,11 +29,11 @@ const defaultMenuOptions = {
 };
 
 export default class ContextMenu {
-    view: BrowserWindow | WebContentsView;
+    view: BrowserWindow | BrowserView | WebviewTag | WebContents;
     menuOptions: Options;
     menuDispose?: () => void;
 
-    constructor(options: Options, view: BrowserWindow | WebContentsView) {
+    constructor(options: Options, view: BrowserWindow | WebContents) {
         const providedOptions: Options = options || {};
 
         this.menuOptions = Object.assign({}, defaultMenuOptions, providedOptions);
diff --git a/src/main/views/MattermostWebContentsView.ts b/src/main/views/MattermostWebContentsView.ts
index 27a71824..45a2d2c1 100644
--- a/src/main/views/MattermostWebContentsView.ts
+++ b/src/main/views/MattermostWebContentsView.ts
@@ -91,7 +91,7 @@ export class MattermostWebContentsView extends EventEmitter {
         WebContentsEventManager.addWebContentsEventListeners(this.webContentsView.webContents);
 
         if (!DeveloperMode.get('disableContextMenu')) {
-            this.contextMenu = new ContextMenu({}, this.webContentsView);
+            this.contextMenu = new ContextMenu({}, this.webContentsView.webContents);
         }
         this.maxRetries = MAX_SERVER_RETRIES;
 
diff --git a/src/main/views/modalView.ts b/src/main/views/modalView.ts
index 4ba8efb0..7330095e 100644
--- a/src/main/views/modalView.ts
+++ b/src/main/views/modalView.ts
@@ -52,7 +52,7 @@ export class ModalView<T, T2> {
             this.log.error(e);
         }
 
-        this.contextMenu = new ContextMenu({}, this.view);
+        this.contextMenu = new ContextMenu({}, this.view.webContents);
     }
 
     show = (win?: BrowserWindow, withDevTools?: boolean) => {