From 04db4d52c5ec1985fd5cfe59f187232649b16ad4 Mon Sep 17 00:00:00 2001
From: Maciej Barelkowski <maciej.barelkowski@camunda.com>
Date: Mon, 18 Mar 2019 13:49:07 +0100
Subject: [PATCH] fix(backend/menu): pass plugin menu item enabled fn to
 Boolean filter

This will allow for convenient usage of `&&` within menuItem#enabled
method, e.g. `return menuState.bpmn && menuState.inactiveInput`.
Previously, `menuState.bpmn === undefined` would make menu item enabled.
---
 app/lib/menu/menu-builder.js            |  2 +-
 app/test/spec/menu/menu-builder-spec.js | 47 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/app/lib/menu/menu-builder.js b/app/lib/menu/menu-builder.js
index 13bae21c31..eebb05adbd 100644
--- a/app/lib/menu/menu-builder.js
+++ b/app/lib/menu/menu-builder.js
@@ -455,7 +455,7 @@ class MenuBuilder {
               return new MenuItem({
                 label,
                 accelerator,
-                enabled: isFunction(enabled) ? enabled() : enabled,
+                enabled: isFunction(enabled) ? Boolean(enabled()) : enabled,
                 click: action && wrapPluginAction(action, name),
                 submenu
               });
diff --git a/app/test/spec/menu/menu-builder-spec.js b/app/test/spec/menu/menu-builder-spec.js
index d487c317cd..e74314283e 100644
--- a/app/test/spec/menu/menu-builder-spec.js
+++ b/app/test/spec/menu/menu-builder-spec.js
@@ -58,6 +58,7 @@ describe('MenuBuilder', () => {
   describe('plugins menu', function() {
 
     it('should accept callable values for enabled', () => {
+
       // given
       const pluginName = 'test';
       const menuStub = sinon.stub().returns([
@@ -89,7 +90,50 @@ describe('MenuBuilder', () => {
     });
 
 
+    it('should disable menu item if enable function returns falsy value', () => {
+
+      // given
+      const falsyValues = [
+        false,
+        0,
+        '',
+        null,
+        undefined,
+        NaN
+      ];
+      const pluginName = 'test';
+      const menuStub = sinon.stub().returns(falsyValues.map(value => ({
+        label: 'label',
+        enabled: () => value
+      })));
+
+      const options = getOptionsWithPlugins([
+        {
+          name: pluginName,
+          menu: menuStub
+        }
+      ]);
+
+      const menuBuilder = new MenuBuilder(options);
+
+      // when
+      const { menu } = menuBuilder.build();
+
+      // then
+      const plugins = menu.find(item => item.label === 'Plugins');
+      const pluginMenu = plugins.submenu.find(plugin => plugin.label === pluginName);
+
+      expect(pluginMenu).to.exist;
+      expect(pluginMenu.submenu).to.be.an('Array').and.have.lengthOf(falsyValues.length);
+
+      for (const entry of pluginMenu.submenu) {
+        expect(entry).to.have.property('enabled', false);
+      }
+    });
+
+
     it('should properly label plugin with error', function() {
+
       // given
       const pluginName = 'test';
       const expectedLabel = `${pluginName} <error>`;
@@ -117,6 +161,7 @@ describe('MenuBuilder', () => {
 
 
     it('should accept non-callable values for enabled', () => {
+
       // given
       const pluginName = 'test';
       const menuStub = sinon.stub().returns([
@@ -149,6 +194,7 @@ describe('MenuBuilder', () => {
 
 
     it('should properly handle plugin menu error', function() {
+
       // given
       const pluginName = 'test';
       const menuStub = sinon.stub().throwsException();
@@ -168,6 +214,7 @@ describe('MenuBuilder', () => {
 
 
     it('should properly handle plugin menu item action error', function() {
+
       // given
       const pluginName = 'test';
       const actionStub = sinon.stub().throwsException();