erp5_web_renderjs_ui: fix cancellation issue

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_js.js

@@ -83,7 +83,7 @@
           [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
           [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
         ],//leapyear
-        queue = new RSVP.Queue(),
+        queue,
         promise_list,
         input_state = {
           name: gadget.state.key,
@@ -122,10 +122,7 @@
             gadget.declareGadget('gadget_html5_element.html', {scope: 'P'})
           ];
         }
-        queue
-          .push(function () {
-            return RSVP.all(promise_list);
-          })
+        queue = new RSVP.Queue(RSVP.all(promise_list))
           .push(function (result_list) {
             // Clear first to DOM, append after to reduce flickering/manip
             while (element.firstChild) {
@@ -148,10 +145,7 @@
         } else {
           promise_list = [gadget.getDeclaredGadget('P')];
         }
-        queue
-          .push(function () {
-            return RSVP.all(promise_list);
-          });
+        queue = new RSVP.Queue(RSVP.all(promise_list));
       }
 
       // Calculate sub gadget states
@@ -268,9 +262,11 @@
                 }
               } else {
                 //get timezone difference between server and local browser
-                offset_time_zone = timezone + (state_date.getTimezoneOffset() / 60);
+                offset_time_zone = timezone +
+                                   (state_date.getTimezoneOffset() / 60);
                 //adjust hour in order to get correct date time string
-                state_date.setUTCHours(state_date.getUTCHours() + offset_time_zone);
+                state_date.setUTCHours(state_date.getUTCHours() +
+                                       offset_time_zone);
                 text_content = state_date.toLocaleDateString(language);
                 if (!gadget.state.date_only) {
                   text_content += " " + locale_formatted_state_date;
@@ -298,10 +294,7 @@
         if (gadget.state.timezone_style) {
           promise_list.push(gadget.getDeclaredGadget('SELECT'));
         }
-        return new RSVP.Queue()
-          .push(function () {
-            return RSVP.all(promise_list);
-          })
+        return new RSVP.Queue(RSVP.all(promise_list))
           .push(function (result_list) {
             var i;
             promise_list = [];

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_js.xml

@@ -228,7 +228,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>980.55051.50282.19404</string> </value>
+                      <value> <string>982.20840.63890.24627</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -246,7 +246,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1577775957.85</float>
+                              <float>1583399782.26</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.js

@@ -378,10 +378,7 @@
         promise_list.push(null);
       }
 
-      return new RSVP.Queue()
-        .push(function () {
-          return RSVP.all(promise_list);
-        })
+      return new RSVP.Queue(RSVP.all(promise_list))
         .push(function (result_list) {
           var j;
           for (j = 0; j < result_list.length; j += 1) {

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml

@@ -154,11 +154,13 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -202,16 +204,20 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -234,7 +240,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                <value> <string>971.18983.58402.648</string> </value>
+                      <value> <string>982.16970.11028.17066</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +258,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                        <float>1540898451.07</float>
+                              <float>1583167358.84</float>
                               <string>UTC</string>
                             </tuple>
                           </state>
@@ -261,16 +267,20 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -318,7 +328,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js

@@ -202,7 +202,7 @@
       // Gadget has not yet been correctly initialized
       throw error;
     }
-    if (error_response && error_response.text) {
+    if (error_response && error_response.text) {
       return error_response.text().then(
         function (request_error_text) {
           return gadget.changeState({
@@ -243,7 +243,7 @@
 
   function triggerMaximize(gadget, maximize) {
     if (gadget.props.deferred_minimize !== undefined) {
-      gadget.props.deferred_minimize.resolve();
+      gadget.props.deferred_minimize.cancel();
       gadget.props.deferred_minimize = undefined;
     }
     hideDesktopPanel(gadget, maximize);
@@ -253,13 +253,16 @@
         action: "maximize"
       }])
         .push(function () {
-          gadget.props.deferred_minimize = RSVP.defer();
-          return gadget.props.deferred_minimize.promise;
-        })
-        .push(undefined, function (error) {
-          if (error instanceof RSVP.CancellationError) {
-            return triggerMaximize(gadget, false);
+          gadget.props.deferred_minimize = new RSVP.Promise(
+            function () {return; },
+            function () {
+              // Wait for cancellation
+              // return triggerMaximize(gadget, false);
+              hideDesktopPanel(gadget, false);
+              return route(gadget, 'header', 'setButtonTitle', [{}]);
             }
+          );
+          return gadget.props.deferred_minimize;
         });
     }
     return route(gadget, 'header', 'setButtonTitle', [{}]);
@@ -771,7 +774,7 @@
             element.appendChild(container);
 
             // make an iframe to display error page from XMLHttpRequest.
-            if (gadget.state.request_error_text) {
+            if (gadget.state.request_error_text) {
               iframe = document.createElement('iframe');
               container.appendChild(iframe);
               iframe.srcdoc = gadget.state.request_error_text;

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml

@@ -234,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>981.63449.54271.9625</string> </value>
+                      <value> <string>982.16935.24089.33911</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1582196761.8</float>
+                              <float>1583166534.25</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_js.js

@@ -248,8 +248,7 @@
       return RSVP.Queue()
         .push(function () {
           var plane = gadget.element.querySelector("a"),
-            ul = gadget.element.querySelector(".search_ul"),
-            translation_promise;
+            ul = gadget.element.querySelector(".search_ul");
           plane.href = '';
 
           // uid is known
@@ -315,12 +314,9 @@
               return RSVP.delay(200);
             })
             .push(function () {
-              translation_promise = gadget.getTranslationList([
-                'Create New',
-                'Explore the Search Result List'
-              ]);
+              return RSVP.all([
 
-              return gadget.jio_allDocs({
+                gadget.jio_allDocs({
                   query: Query.objectToSearchText(new ComplexQuery({
                     operator: "AND",
                     query_list: [
@@ -336,11 +332,14 @@
                   limit: [0, 10],
                   select_list: [gadget.state.catalog_index, "uid"],
                   sort_on: JSON.parse(gadget.state.sort_list_json)
-              })
-                .push(function (result) {
-                  return new RSVP.Queue()
-                    .push(function () {
-                      return RSVP.all([result, translation_promise]);
+                }),
+
+                gadget.getTranslationList([
+                  'Create New',
+                  'Explore the Search Result List'
+                ])
+
+              ]);
             })
             .push(function (result_list) {
               var i,
@@ -407,7 +406,6 @@
                 ul.removeChild(ul.firstChild);
               }
               ul.appendChild(fragment_element);
-                    });
             }, function (error) {
               if (error instanceof Error &&
                   error.hash &&
@@ -424,7 +422,6 @@
               throw error;
             });
         });
-        });
 
     })
 

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_js.xml

@@ -154,11 +154,13 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -202,16 +204,20 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -234,7 +240,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                <value> <string>978.15497.3144.35652</string> </value>
+                      <value> <string>982.20937.32183.16281</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +258,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                        <float>1567695948.47</float>
+                              <float>1583405380.32</float>
                               <string>UTC</string>
                             </tuple>
                           </state>
@@ -261,16 +267,20 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -320,7 +330,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_editor_gadget_zuite/testMaximize.zpt

@@ -29,7 +29,9 @@
 </tal:block>
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
 
-<!-- Wait for Maximize button -->
+<tr>
+  <td colspan="3"><b>Maximize</b></td>
+</tr>
 <tr>
   <td>waitForElementPresent</td>
   <td>//div[@data-gadget-scope='maximize']//button[text()='Maximize' and @type='button']</td>
@@ -40,10 +42,18 @@
   <td>//div[@data-gadget-scope='maximize']//button[text()='Maximize' and @type='button']</td>
   <td></td>
 </tr>
+<tr>
+  <td>waitForElementPresent</td>
+  <td>//div[@data-role='page' and @class='desktop-panel-hidden']</td>
+  <td></td>
+</tr>
 
+<tr>
+  <td colspan="3"><b>Check full screen</b></td>
+</tr>
 <!-- Wait For full screen -->
 <tr>
-  <td>waitForElementPresent</td>
+  <td>assertElementPresent</td>
   <td>//div[@data-role='page' and @class='desktop-panel-hidden']</td>
   <td></td>
 </tr>
@@ -59,6 +69,9 @@
 </tr>
 
 <!-- minimize with header button -->
+<tr>
+  <td colspan="3"><b>Minimize with header button</b></td>
+</tr>
 <tr>
   <td>click</td>
   <td>//div[@data-gadget-scope='header']//button[@name='maximize' and @type='submit']</td>
@@ -66,6 +79,9 @@
 </tr>
 
 <!-- Check is minimize -->
+<tr>
+  <td colspan="3"><b>Check not full screen</b></td>
+</tr>
 <tr>
   <td>waitForElementNotPresent</td>
   <td>//div[@data-role='page' and @class='desktop-panel-hidden']</td>
@@ -83,6 +99,9 @@
 </tr>
 
 <!-- Re maximize -->
+<tr>
+  <td colspan="3"><b>Maximize</b></td>
+</tr>
 <tr>
   <td>click</td>
   <td>//div[@data-gadget-scope='maximize']//button[text()='Maximize' and @type='button']</td>
@@ -90,6 +109,9 @@
 </tr>
 
 <!-- Wait For full screen -->
+<tr>
+  <td colspan="3"><b>Check full screen</b></td>
+</tr>
 <tr>
   <td>waitForElementPresent</td>
   <td>//div[@data-role='page' and @class='desktop-panel-hidden']</td>
@@ -108,16 +130,17 @@
 
 <!-- make some change in url -->
 <tr>
-  <td>open</td>
-  <td>${base_url}/web_site_module/renderjs_runner/</td>
-  <td></td>
+  <td colspan="3"><b>Minimize with url change</b></td>
 </tr>
+<tal:block tal:define="click_configuration python: {'text': 'Search'}">
+  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_panel_link" />
+</tal:block>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+
+<!-- Check is minimize -->
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@role='main']</td>
-  <td></td>
+  <td colspan="3"><b>Check not full screen</b></td>
 </tr>
-<!-- Check is minimize -->
 <tr>
   <td>assertElementNotPresent</td>
   <td>//div[@data-role='page' and @class='desktop-panel-hidden']</td>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_editor.js.js

@@ -38,7 +38,7 @@ lockGadgetInQueue, unlockGadgetInQueue, unlockGadgetInFailedQueue*/
         this.element.classList.toggle('editor-maximize');
       }
       return this.triggerMaximize.apply(this, param_list)
-        .push(function () {
+        .push(undefined, function () {
           if (gadget.element.classList.contains('editor-maximize')) {
             gadget.element.classList.remove('editor-maximize');
           }