fix: button for toggling gridlist gets activated when MailAccountWizard is shown

refs #277

Author: ThorstenSuckow

src/app/PackageController.js

@@ -276,6 +276,11 @@ Ext.define("conjoon.cn_mail.app.PackageController", {
      */
     observedMessageEditor: null,
 
+    /**
+     * @private
+     * @type bool mailAccountWizardShown
+     */
+
 
     /**
      * Configures the urlPrefix from the base-address found in the package-configuration.
@@ -528,14 +533,16 @@ Ext.define("conjoon.cn_mail.app.PackageController", {
      *
      * @param {conjoon.cn_mail.store.mail.message.MessageItemStore} store
      */
-    onMailMessageGridLoad: function (store) {
+    onMailMessageGridLoad: function () {
         var me = this;
 
         if (me.getMailDesktopView().getLayout().getActiveItem() !== me.getMailInboxView()) {
             return;
         }
 
-        me.getToggleGridListButton().setDisabled(false);
+        if (!me.mailAccountWizardShown) {
+            me.getToggleGridListButton().setDisabled(false);
+        }
     },
 
 
@@ -954,6 +961,7 @@ Ext.define("conjoon.cn_mail.app.PackageController", {
             isVisible || !activeAccount
         );
 
+        me.mailAccountWizardShown = isVisible;
         if (isVisible) {
             me.disableMessageItemContextButtons(true);
         } else {

tests/src/app/PackageControllerTest.js

@@ -798,25 +798,34 @@ StartTest(async t => {
 
 
                         t.expect(TOGGLEGRIDDISABLED).toBeUndefined();
-                        packageCtrl.onMailMessageGridBeforeLoad(null, null);
+                        packageCtrl.onMailMessageGridBeforeLoad();
 
                         t.expect(TOGGLEGRIDDISABLED).toBe(true);
-                        packageCtrl.onMailMessageGridLoad(null, null);
+                        packageCtrl.onMailMessageGridLoad();
                         t.expect(TOGGLEGRIDDISABLED).toBe(false);
 
                         TOGGLEGRIDDISABLED = true;
-                        packageCtrl.onMailMessageGridLoad(null, null);
+                        packageCtrl.onMailMessageGridLoad();
                         t.expect(TOGGLEGRIDDISABLED).toBe(false);
 
                         TOGGLEGRIDDISABLED = true;
                         ISSAME_LEFT = true;
-                        packageCtrl.onMailMessageGridLoad(null, null);
+                        packageCtrl.onMailMessageGridLoad();
                         t.expect(TOGGLEGRIDDISABLED).toBe(true);
 
                         ISSAME_LEFT = false;
-                        packageCtrl.onMailMessageGridLoad(null, null);
+                        packageCtrl.onMailMessageGridLoad();
                         t.expect(TOGGLEGRIDDISABLED).toBe(false);
 
+                        // @see conjoon/extjs-app-webmail#277
+                        TOGGLEGRIDDISABLED = true;
+                        packageCtrl.onMailMessageGridLoad();
+                        t.expect(TOGGLEGRIDDISABLED).toBe(false);
+                        packageCtrl.mailAccountWizardShown = true;
+                        TOGGLEGRIDDISABLED = true;
+                        packageCtrl.onMailMessageGridLoad();
+                        t.expect(TOGGLEGRIDDISABLED).toBe(true);
+
                     });
 
 
@@ -1837,6 +1846,7 @@ StartTest(async t => {
                             VISIBLE = isVisible;
                             packageCtrl.onMailAccountWizardShownOrClosed(FAKEWIZARD);
 
+                            t.expect(packageCtrl.mailAccountWizardShown).toBe(VISIBLE);
                             t.expect(uiButtonSpy.calls.mostRecent().args[0]).toBe(VISIBLE);
 
                             t.expect(disableAddMailAccountButtonSpy.calls.mostRecent().args[0]).toBe(VISIBLE);