erp5_web_project_ui: refactoring in queries and html document parsing

- test extended

bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_redirector_js.js

-/*global document, window, rJS */
+/*global window, rJS, SimpleQuery, ComplexQuery, Query */
 /*jslint nomen: true, indent: 2, maxerr: 10, maxlen: 90 */
-(function (document, window, rJS) {
+(function (window, rJS, SimpleQuery, ComplexQuery, Query) {
   "use strict";
 
+  function createMultipleSimpleOrQuery(key, value_list) {
+    var i,
+      search_query,
+      query_list = [];
+    for (i = 0; i < value_list.length; i += 1) {
+      query_list.push(new SimpleQuery({
+        key: key,
+        operator: "",
+        type: "simple",
+        value: value_list[i]
+      }));
+    }
+    search_query = new ComplexQuery({
+      operator: "OR",
+      query_list: query_list,
+      type: "complex"
+    });
+    return Query.objectToSearchText(search_query);
+  }
+
   rJS(window)
 
     /////////////////////////////////////////////////////////////////
@@ -17,14 +37,25 @@
     /////////////////////////////////////////////////////////////////
 
     .declareMethod("render", function (options) {
-      var gadget = this, id,
-        types = '("Text", "File", "PDF", "Drawing", ' +
-          '"Presentation", "Spreadsheet")',
-        states = '("shared", "published", "released", ' +
-          '"shared_alive", "published_alive", "released_alive")',
-        query = 'portal_type:' + types +
-          'AND reference:"' + options.reference +
-          '" AND validation_state:' + states;
+      var gadget = this,
+        type_list = ["Text", "File", "PDF", "Drawing",
+          "Presentation", "Spreadsheet"],
+        state_list = ["shared", "published", "released", "shared_alive",
+          "published_alive", "released_alive"],
+        portal_type_query = createMultipleSimpleOrQuery('portal_type', type_list),
+        state_query = createMultipleSimpleOrQuery('validation_state', state_list),
+        reference_query = new SimpleQuery({
+          key: "reference",
+          operator: "=",
+          type: "simple",
+          value: options.reference
+        }),
+        query = new ComplexQuery({
+          operator: "AND",
+          query_list: [portal_type_query, state_query, reference_query],
+          type: "complex"
+        });
+      query = Query.objectToSearchText(query);
       return gadget.jio_allDocs({
         query: query,
         limit: 1
@@ -38,10 +69,9 @@
                 'history': options.history
               }
             });
-          } else {
-            return gadget.redirect({command: 'history_previous', options: {}});
           }
+          return gadget.redirect({command: 'history_previous', options: {}});
         });
     });
 
-}(document, window, rJS));
+}(window, rJS, SimpleQuery, ComplexQuery, Query));
\ No newline at end of file

bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_redirector_js.xml

@@ -234,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>979.50783.7411.19677</string> </value>
+                      <value> <string>979.57611.25870.2542</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1573658874.74</float>
+                              <float>1574068976.28</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_project_info.js.js

 /*jslint nomen: true, indent: 2 */
-/*global window, rJS, RSVP, document, ensureArray*/
-(function (window, rJS, RSVP, document, ensureArray) {
+/*global window, rJS, RSVP, document, ensureArray, DOMParser, XMLSerializer, SimpleQuery, ComplexQuery, Query*/
+(function (window, rJS, RSVP, document, ensureArray, DOMParser, XMLSerializer, SimpleQuery, ComplexQuery, Query) {
   "use strict";
 
+  function addRedirectionToReference(href, url) {
+    if (!href.startsWith("https") && !href.startsWith("http") &&
+        !href.startsWith("ftp") && !href.includes("/")
+        ) {
+      href = url + "&n.reference=" + href;
+    }
+    return href;
+  }
+
   function parseHTMLLinks(html, url) {
-    var content = document.createElement('html'),
-      regex = /href="(.*?)"/g,
-      link;
-    while ((link = regex.exec(html)) !== null) {
-      if (! link[1].startsWith("https") && ! link[1].startsWith("http") &&
-          ! link[1].startsWith("ftp") && ! link[1].includes("/")
-         ) {
-        html = html.replace(link[1], url + "&n.reference=" + link[1]);
-      }
+    var parser = new DOMParser(), i,
+      oSerializer = new XMLSerializer(),
+      doc = parser.parseFromString(html, "text/html"),
+      link_list = doc.getElementsByTagName("a");
+    for (i = 0; i < link_list.length; i += 1) {
+      link_list[i].setAttribute('href', addRedirectionToReference(link_list[i].getAttribute('href'), url));
     }
-    return html;
+    return oSerializer.serializeToString(doc);
   }
 
   function enableLink(link_element, url) {
@@ -29,7 +35,8 @@
 
   function setLastTestResult(gadget, project_title, span_element) {
     span_element.classList.remove("ui-disabled");
-    var query = 'portal_type:="Benchmark Result" AND source_project_title:"' + project_title + '"';
+    var query = createProjectQuery(project_title,
+                 [["portal_type", "Benchmark Result"]]);
     return gadget.jio_allDocs({
       query: query,
       limit: 2, //first result could be the running test
@@ -44,7 +51,8 @@
           if (state === "stopped" || state === "public_stopped") {
             span_element.classList.add("pass");
             break;
-          } else if (state === "failed") {
+          }
+          if (state === "failed") {
             span_element.classList.add("fail");
             break;
           }
@@ -52,15 +60,66 @@
       });
   }
 
+  function createProjectQuery(project_title, key_value_list) {
+    var i, query_list = [];
+    if (project_title) {
+      query_list.push(new SimpleQuery({
+        key: "source_project_title",
+        operator: "",
+        type: "simple",
+        value: project_title
+      }));
+    }
+    for (i = 0; i < key_value_list.length; i += 1) {
+      query_list.push(new SimpleQuery({
+        key: key_value_list[i][0],
+        operator: "",
+        type: "simple",
+        value: key_value_list[i][1]
+      }));
+    }
+    return Query.objectToSearchText(new ComplexQuery({
+      operator: "AND",
+      query_list: query_list,
+      type: "complex"
+    }));
+  }
+
   function getWebPageInfo(gadget, project_reference) {
-    var query = 'portal_type:="Web Page" AND reference:"' + project_reference +
-                '-Home.Page" AND validation_state:"published_alive"',
-      id, content, edit_view, redirector_ulr;
+    var id,
+      content,
+      edit_view,
+      redirector_ulr,
+      query,
+      query_list = [];
+    query_list.push(new SimpleQuery({
+      key: "portal_type",
+      operator: "=",
+      type: "simple",
+      value: "Web Page"
+    }));
+    query_list.push(new SimpleQuery({
+      key: "reference",
+      operator: "=",
+      type: "simple",
+      value: project_reference + '-Home.Page'
+    }));
+    query_list.push(new SimpleQuery({
+      key: "validation_state",
+      operator: "=",
+      type: "simple",
+      value: "published_alive"
+    }));
+    query = new ComplexQuery({
+      operator: "AND",
+      query_list: query_list,
+      type: "complex"
+    });
     return gadget.getUrlFor({command: 'push_history', options: {page: "project_redirector"}})
       .push(function (url) {
         redirector_ulr = url;
         return gadget.jio_allDocs({
-          query: query,
+          query: Query.objectToSearchText(query),
           limit: 1,
           select_list: ['text_content']
         });
@@ -72,7 +131,9 @@
           return gadget.jio_getAttachment(id, "links")
             .push(function (web_page_document) {
               edit_view = getActionListByName(
-                ensureArray(web_page_document._links.view), "view_editor");
+                ensureArray(web_page_document._links.view),
+                "view_editor"
+              );
               return {"id": id, "content": content, "edit_view": edit_view};
             });
         }
@@ -126,10 +187,12 @@
         })
         .push(function (result_list) {
           var milestone_view = getActionListByName(
-            ensureArray(result_list[1]._links.view), "milestone"),
+            ensureArray(result_list[1]._links.view),
+            "milestone"
+          ),
             document_view = result_list[3] +
-              '/ERP5Document_getHateoas?mode=traverse&relative_url=' +
-              modification_dict.jio_key + '&view=Project_viewDocumentList';
+            '/ERP5Document_getHateoas?mode=traverse&relative_url=' +
+            modification_dict.jio_key + '&view=Project_viewDocumentList';
           web_page_info = result_list[0];
           editor = result_list[2];
           editor.render({"editor": "fck_editor", "editable": false,
@@ -138,43 +201,43 @@
             getUrlParameterDict('milestone_module', milestone_view, [["stop_date", "ascending"]]),
             getUrlParameterDict('task_module', "view", [["delivery.start_date", "descending"]],
               ["title", "delivery.start_date", "delivery.stop_date", "destination_decision_title",
-               "source_title", "destination_title", "total_quantity", "task_line_quantity_unit_title"],
-              ('source_project_title:  "' + modification_dict.project_title +
-               '" AND selection_domain_state_task_domain:  "confirmed"')),
+                "source_title", "destination_title", "total_quantity", "task_line_quantity_unit_title"],
+              createProjectQuery(modification_dict.project_title,
+                [["selection_domain_state_task_domain", "confirmed"]])),
             getUrlParameterDict('support_request_module', "view", [["delivery.start_date", "descending"]],
-              null, ('source_project_title:  "' + modification_dict.project_title +
-                     '" AND destination_project_title:  "' + modification_dict.project_title +
-                     '" AND selection_domain_state_support_domain:  "validated"')),
+              null, createProjectQuery(modification_dict.project_title,
+                [["destination_project_title", modification_dict.project_title],
+                 ["selection_domain_state_support_domain", "validated"]])),
             getUrlParameterDict('bug_module', "view", [["delivery.start_date", "descending"]],
               ["title", "description", "delivery.start_date"],
-              ('source_project_title:  "' + modification_dict.project_title +
-               '" AND selection_domain_state_bug_domain:  "started"')),
+              createProjectQuery(modification_dict.project_title,
+                [["selection_domain_state_bug_domain", "started"]])),
             getUrlParameterDict('bug_module', "view", [["delivery.start_date", "descending"]],
               ["title", "description", "delivery.start_date"],
-              ('source_project_title:  "' + modification_dict.project_title +
-               '" AND selection_domain_state_bug_domain:  "closed"')),
+              createProjectQuery(modification_dict.project_title,
+                [["selection_domain_state_bug_domain", "closed"]])),
             getUrlParameterDict('task_report_module', 'view', [["delivery.start_date", "descending"]],
               ["title", "delivery.start_date", "delivery.stop_date", "destination_decision_title",
-               "source_title", "destination_title", "total_quantity", "task_line_quantity_unit_title"],
-              ('source_project_title:  "' + modification_dict.project_title +
-               '" AND selection_domain_state_task_report_domain:  "started"')),
+                "source_title", "destination_title", "total_quantity", "task_line_quantity_unit_title"],
+              createProjectQuery(modification_dict.project_title,
+                [["selection_domain_state_task_report_domain", "started"]])),
             getUrlParameterDict('task_report_module', 'view', [["delivery.start_date", "descending"]],
               ["title", "delivery.start_date", "delivery.stop_date", "destination_decision_title",
-               "source_title", "destination_title", "total_quantity", "task_line_quantity_unit_title"],
-              ('source_project_title:  "' + modification_dict.project_title +
-               '" AND selection_domain_state_task_report_domain:  "closed"')),
+                "source_title", "destination_title", "total_quantity", "task_line_quantity_unit_title"],
+              createProjectQuery(modification_dict.project_title,
+                [["selection_domain_state_task_report_domain", "closed"]])),
             getUrlParameterDict('test_result_module', 'view', [["delivery.start_date", "descending"]],
-              null, ('source_project_title:  "' + modification_dict.project_title + '"')),
+              null, createProjectQuery(modification_dict.project_title, [])),
             getUrlParameterDict('test_suite_module', 'view', [["creation_date", "descending"]],
-              null, ('source_project_title:  "' + modification_dict.project_title + '"')),
+              null, createProjectQuery(modification_dict.project_title, [])),
             getUrlParameterDict('task_module', "view", [["delivery.start_date", "descending"]],
               ["title", "delivery.start_date", "delivery.stop_date", "destination_decision_title",
-               "source_title", "destination_title", "total_quantity", "task_line_quantity_unit_title"],
-              ('source_project_title:  "' + modification_dict.project_title +
-               '" AND selection_domain_state_task_domain:  "not_confirmed"')),
+                "source_title", "destination_title", "total_quantity", "task_line_quantity_unit_title"],
+              createProjectQuery(modification_dict.project_title,
+                [["selection_domain_state_task_domain", "not_confirmed"]])),
             getUrlParameterDict(web_page_info.id, web_page_info.edit_view),
             getUrlParameterDict(modification_dict.jio_key, document_view, [["modification_date", "descending"]],
-                                null, ('selection_domain_state_document_domain:  "confirmed"'))
+              null, createProjectQuery(null, [["selection_domain_state_document_domain", "confirmed"]]))
           ]);
         })
         .push(function (url_list) {
@@ -205,4 +268,4 @@
       return true;
     });
 
-}(window, rJS, RSVP, document, ensureArray));
+}(window, rJS, RSVP, document, ensureArray, DOMParser, XMLSerializer, SimpleQuery, ComplexQuery, Query));
\ No newline at end of file

bt5/erp5_web_project_ui_test/PathTemplateItem/portal_tests/project_ui_zuite/testRenderjsBasicNavigation.zpt

@@ -24,17 +24,25 @@
 </tr>
 
 <!-- Initialize -->
+<tr>
+  <td>open</td>
+  <td>${base_url}/portal_skins/erp5_web_project_test/gadget_create_project/</td>
+  <td></td>
+</tr>
+<tr>
+  <td>assertTextPresent</td>
+  <td>Project Created</td>
+  <td></td>
+</tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
 <tr>
   <td>open</td>
   <td>${base_url}/web_site_module/project_management/</td>
   <td></td>
 </tr>
-
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
-
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" />
 
-
 <tr>
   <td>assertElementPresent</td>
   <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_erp5_field_listbox.html']</td>
@@ -45,6 +53,17 @@
   <td>Projects</td>
   <td></td>
 </tr>
+<!-- Check filter -->
+<tr>
+  <td>assertElementPresent</td>
+  <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_erp5_searchfield.html']</td>
+  <td></td>
+</tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_erp5_searchfield.html']//button[text()="started"]</td>
+  <td></td>
+</tr>
 <!-- Check sort -->
 <tr>
   <td>assertElementPresent</td>
@@ -87,7 +106,95 @@
   <td>//div[@class='document_table']//th//a[text()="Location"]</td>
   <td></td>
 </tr>
-
+<!-- Check project present -->
+<tr>
+  <td>assertElementPresent</td>
+  <td>//div[@class='document_table']//table//tbody//tr//a[text()="test-project"]</td>
+  <td></td>
+</tr>
+<tr>
+  <td>click</td>
+  <td>//div[@class='document_table']//table//tbody//tr//a[text()="test-project"]</td>
+  <td></td>
+</tr>
+<!-- check project quick view page elements -->
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[@id='milestone_link' and @class='first-line-buttons']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Milestones' and contains(@href, '#!push_history') and contains(@href, 'n.jio_key=milestone_module') and contains(@href, 'view%3Dmilestone')]</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Support requests']</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Documents']</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Opened Bugs']</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Closed Bugs']</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Confirmed Tasks']</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Not Confirmed Tasks']</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Opened Task Reports']</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Closed Task Reports']</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Last test result']</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Test suite']</td>
+ <td></td>
+</tr>
+  
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@data-gadget-url='${base_url}/web_site_module/project_management/gadget_project_info.html']//a[text()='Edit Project Page']</td>
+ <td></td>
+</tr>
+  
 </tbody></table>
 </body>
 </html>
\ No newline at end of file

bt5/erp5_web_project_ui_test/SkinTemplateItem/portal_skins/erp5_web_project_test.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Folder" module="OFS.Folder"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>erp5_web_project_test</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_web_project_ui_test/SkinTemplateItem/portal_skins/erp5_web_project_test/gadget_create_project.py

+portal = context.getPortalObject()
+
+module = portal.getDefaultModule('Project')
+project = module.newContent(portal_type = 'Project',
+                            reference = 'test-project')
+project.validate()
+print "Project Created"
+return printed

bt5/erp5_web_project_ui_test/SkinTemplateItem/portal_skins/erp5_web_project_test/gadget_create_project.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>gadget_create_project</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_web_project_ui_test/bt/template_skin_id_list

+erp5_web_project_test
\ No newline at end of file