From 3aed202d4e24aef4c4c098c0767a33961a2ac298 Mon Sep 17 00:00:00 2001
From: Ghislain Beaulac <ghislain.beaulac@se.com>
Date: Fri, 31 Jul 2020 19:37:57 -0400
Subject: [PATCH] fix(extensions): adding Context Menu custom commands was not
 working - seems like it was working only when "enableTranslate" was active,
 it should now work in both cases with/without translations

---
 .../__tests__/contextMenuExtension.spec.ts    | 27 +++++++++++++++++--
 .../extensions/contextMenuExtension.ts        |  5 +++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/app/modules/angular-slickgrid/extensions/__tests__/contextMenuExtension.spec.ts b/src/app/modules/angular-slickgrid/extensions/__tests__/contextMenuExtension.spec.ts
index ec7a2c3f2..5cae9d12a 100644
--- a/src/app/modules/angular-slickgrid/extensions/__tests__/contextMenuExtension.spec.ts
+++ b/src/app/modules/angular-slickgrid/extensions/__tests__/contextMenuExtension.spec.ts
@@ -536,6 +536,7 @@ describe('contextMenuExtension', () => {
     describe('adding Context Menu Command Items', () => {
       const commandItemsMock = [{
         iconCssClass: 'fa fa-question-circle',
+        title: 'Help',
         titleKey: 'HELP',
         disabled: false,
         command: 'help',
@@ -560,7 +561,6 @@ describe('contextMenuExtension', () => {
 
         jest.spyOn(SharedService.prototype, 'dataView', 'get').mockReturnValue(dataViewStub);
         jest.spyOn(SharedService.prototype, 'grid', 'get').mockReturnValue(gridStub);
-        jest.spyOn(SharedService.prototype, 'gridOptions', 'get').mockReturnValue(gridOptionsMock);
         jest.spyOn(SharedService.prototype, 'allColumns', 'get').mockReturnValue(columnsMock);
         jest.spyOn(SharedService.prototype, 'visibleColumns', 'get').mockReturnValue(columnsMock);
         jest.spyOn(SharedService.prototype, 'columnDefinitions', 'get').mockReturnValue(columnsMock);
@@ -571,7 +571,30 @@ describe('contextMenuExtension', () => {
         extension.dispose();
       });
 
-      it('should have user Context Menu Command items', () => {
+      it('should have user Context Menu Command items when "enableTranslate" is disabled', () => {
+        const copyGridOptionsMock = {
+          ...gridOptionsMock, enableTranslate: false, enableExport: true,
+          contextMenu: {
+            commandItems: commandItemsMock,
+            hideCopyCellValueCommand: true,
+            hideExportCsvCommand: false,
+            hideExportExcelCommand: true,
+            hideExportTextDelimitedCommand: true,
+            hideClearAllGrouping: true,
+            hideCollapseAllGroups: true,
+            hideExpandAllGroups: true,
+          }
+        } as GridOption;
+        jest.spyOn(SharedService.prototype, 'gridOptions', 'get').mockReturnValue(copyGridOptionsMock);
+        extension.register();
+        expect(SharedService.prototype.gridOptions.contextMenu.commandItems).toEqual([
+          { action: expect.anything(), command: 'export-csv', disabled: false, iconCssClass: 'fa fa-download', positionOrder: 51, title: 'Export in CSV format' },
+          // { action: expect.anything(), command: 'export-excel', disabled: false, iconCssClass: 'fa fa-file-excel-o text-success', positionOrder: 54, title: 'Exporter vers Excel' },
+          { command: 'help', disabled: false, iconCssClass: 'fa fa-question-circle', positionOrder: 99, title: 'Help', titleKey: 'HELP' },
+        ]);
+      });
+
+      it('should have user Context Menu Command items when "enableTranslate" is active', () => {
         extension.register();
         expect(SharedService.prototype.gridOptions.contextMenu.commandItems).toEqual([
           { action: expect.anything(), command: 'export-csv', disabled: false, iconCssClass: 'fa fa-download', positionOrder: 51, title: 'Exporter en format CSV' },
diff --git a/src/app/modules/angular-slickgrid/extensions/contextMenuExtension.ts b/src/app/modules/angular-slickgrid/extensions/contextMenuExtension.ts
index 94731580c..9e76cb4ec 100644
--- a/src/app/modules/angular-slickgrid/extensions/contextMenuExtension.ts
+++ b/src/app/modules/angular-slickgrid/extensions/contextMenuExtension.ts
@@ -82,10 +82,13 @@ export class ContextMenuExtension implements Extension {
 
       // dynamically import the SlickGrid plugin (addon) with RequireJS
       this.extensionUtility.loadExtensionDynamically(ExtensionName.contextMenu);
+
+      // merge the original commands with the built-in internal commands
+      const originalCommandItems = this._userOriginalContextMenu && Array.isArray(this._userOriginalContextMenu.commandItems) ? this._userOriginalContextMenu.commandItems : [];
+      contextMenu.commandItems = [...originalCommandItems, ...this.addMenuCustomCommands(originalCommandItems)];
       this.sharedService.gridOptions.contextMenu = { ...contextMenu };
 
       // sort all menu items by their position order when defined
-      contextMenu.commandItems = this.addMenuCustomCommands([]);
       this.extensionUtility.sortItems(contextMenu.commandItems || [], 'positionOrder');
       this.extensionUtility.sortItems(contextMenu.optionItems || [], 'positionOrder');