Skip to content

erp5
erp5
Commit eca65602 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

[erp5_web_renderjs_ui] Page form: do not load too much gadgets 

If ERP5 hateoas calculation is fast, try not to wait for the warmup to be finished (especially if those gadgets are not used).

Warmup the panel, header, translation gadgets
parent 3e2a73df
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 47 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
View file @ eca65602
...@@ -7,36 +7,50 @@ and handling data send&receive. ...@@ -7,36 +7,50 @@ and handling data send&receive.
(function (window, document, rJS, URI, RSVP, jIO, Blob, URL, asBoolean) { (function (window, document, rJS, URI, RSVP, jIO, Blob, URL, asBoolean) {
"use strict"; "use strict";
/*jslint regexp: true*/
var warmup_gadget_done = false, var warmup_gadget_done = false,
warmup_list = ['gadget_erp5_label_field.html', warmup_list = [
'gadget_erp5_pt_form_list.html', 'gadget_erp5_label_field.html',
'gadget_erp5_pt_form_dialog.html', 'gadget_html5_element.html',
'gadget_erp5_pt_form_view_editable.html', 'gadget_erp5_field_datetime.html',
'gadget_erp5_pt_form_view.html', 'gadget_erp5_field_string.html',
'gadget_erp5_pt_embedded_form_render.html', 'gadget_erp5_form.html',
'gadget_html5_input.html', 'gadget_erp5_field_float.html',
'gadget_html5_textarea.html', 'gadget_erp5_field_listbox.html',
'gadget_html5_input.html', // Used in panel
'gadget_html5_select.html', 'gadget_translation.html',
'gadget_html5_element.html', 'gadget_erp5_panel.html',
'gadget_erp5_field_datetime.html', 'gadget_erp5_header.html',
'gadget_erp5_field_float.html', 'gadget_erp5_searchfield.html',
'gadget_erp5_field_integer.html', 'gadget_erp5_field_multicheckbox.html',
'gadget_erp5_field_list.html', 'gadget_html5_input.html'
'gadget_erp5_field_lines.html', ],
'gadget_erp5_field_gadget.html', field_warmup_list = [
'gadget_erp5_field_email.html', 'gadget_erp5_pt_embedded_form_render.html',
'gadget_erp5_field_formbox.html', 'gadget_erp5_field_integer.html',
'gadget_erp5_field_listbox.html', 'gadget_erp5_field_list.html',
'gadget_erp5_field_multilist.html', 'gadget_erp5_field_email.html',
'gadget_erp5_field_relationstring.html', 'gadget_erp5_field_formbox.html',
'gadget_erp5_field_multirelationstring.html', 'gadget_erp5_field_multilist.html',
'gadget_erp5_relation_input.html', 'gadget_erp5_field_relationstring.html',
'gadget_erp5_field_string.html', 'gadget_erp5_field_multirelationstring.html',
'gadget_erp5_field_textarea.html', 'gadget_erp5_relation_input.html',
'gadget_editor.html', 'gadget_erp5_field_textarea.html'
'gadget_erp5_form.html' ],
]; form_list_warmup_list = [
'gadget_erp5_pt_form_list.html'
],
form_view_warmup_list = [
'gadget_erp5_pt_form_view.html'
],
form_view_editable_warmup_list = [
'gadget_erp5_pt_form_view_editable.html',
'gadget_html5_input.html',
'gadget_html5_textarea.html',
'gadget_html5_select.html'
],
erp5_module_document_regexp = /^[^\/]+_module\/.+$/;
/*jslint regexp: false*/
/** Return local modifications to editable form fields after leaving the form /** Return local modifications to editable form fields after leaving the form
for a while - for example selecting a related object. for a while - for example selecting a related object.
...@@ -76,6 +90,16 @@ and handling data send&receive. ...@@ -76,6 +90,16 @@ and handling data send&receive.
} }
} }
function warmupGadgetList(gadget, url_list) {
var i;
for (i = 0; i < url_list.length; i += 1) {
// No need to check the result, as it will fail later
// when rJS will try to instanciate one of this gadget
rJS.declareGadgetKlass(rJS.getAbsoluteURL(url_list[i],
gadget.__path));
}
}
rJS(window) rJS(window)
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
...@@ -154,6 +178,13 @@ and handling data send&receive. ...@@ -154,6 +178,13 @@ and handling data send&receive.
embedded: asBoolean(options.embedded) embedded: asBoolean(options.embedded)
}; };
// options.editable differs when it comes from the erp5_launcher of FormBox - try to unify it here
if (asBoolean(options.editable)) {
options.editable = 1;
} else {
options.editable = 0;
}
if (options.hasOwnProperty('erp5_document')) { if (options.hasOwnProperty('erp5_document')) {
// if we get erp5 document during rendering then no need to fetch it // if we get erp5 document during rendering then no need to fetch it
new_state.erp5_document = options.erp5_document; new_state.erp5_document = options.erp5_document;
...@@ -164,20 +195,25 @@ and handling data send&receive. ...@@ -164,20 +195,25 @@ and handling data send&receive.
promise_queue promise_queue
.push(function () { .push(function () {
var result = gadget.jio_getAttachment(options.jio_key, var result = gadget.jio_getAttachment(options.jio_key,
options.view), options.view);
i;
if (!warmup_gadget_done) { if (!warmup_gadget_done) {
// In order to speed up initial form rendering, // In order to speed up initial form rendering,
// preload most used gadgets while waiting for ERP5 form // preload most used gadgets while waiting for ERP5 form
// calculation // calculation
// Wait a big for the ajax query to be triggered // Wait a bit for the ajax query to be triggered
RSVP.delay(10) RSVP.delay(10)
.then(function () { .then(function () {
for (i = 0; i < warmup_list.length; i += 1) { warmupGadgetList(gadget, warmup_list);
// No need to check the result, as it will fail later if (erp5_module_document_regexp.test(options.jio_key)) {
// when rJS will try to instanciate one of this gadget // Form view is used
rJS.declareGadgetKlass(rJS.getAbsoluteURL(warmup_list[i], if (options.editable) {
gadget.__path)); warmupGadgetList(gadget, form_view_editable_warmup_list);
} else {
warmupGadgetList(gadget, form_view_warmup_list);
}
warmupGadgetList(gadget, field_warmup_list);
} else {
warmupGadgetList(gadget, form_list_warmup_list);
} }
}); });
warmup_gadget_done = true; warmup_gadget_done = true;
...@@ -199,13 +235,6 @@ and handling data send&receive. ...@@ -199,13 +235,6 @@ and handling data send&receive.
}); });
} }
// options.editable differs when it comes from the erp5_launcher of FormBox - try to unify it here
if (asBoolean(options.editable)) {
options.editable = 1;
} else {
options.editable = 0;
}
return promise_queue return promise_queue
.push(function () { .push(function () {
if (new_state.erp5_document._embedded._view.hasOwnProperty('_embedded')) { if (new_state.erp5_document._embedded._view.hasOwnProperty('_embedded')) {
...@@ -280,7 +309,7 @@ and handling data send&receive. ...@@ -280,7 +309,7 @@ and handling data send&receive.
.push(function () { .push(function () {
var jio_key = gadget.state.options.jio_key; var jio_key = gadget.state.options.jio_key;
/*jslint regexp: true*/ /*jslint regexp: true*/
if ((/^[^\/]+_module\/.+$/.test(jio_key)) || (/^portal_.*\/.+$/.test(jio_key))) { if ((erp5_module_document_regexp.test(jio_key)) || (/^portal_.*\/.+$/.test(jio_key))) {
/*jslint regexp: false*/ /*jslint regexp: false*/
return gadget.updatePanel({ return gadget.updatePanel({
erp5_document: erp5_document, erp5_document: erp5_document,
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
View file @ eca65602
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>971.7721.48108.61320</string> </value> <value> <string>971.31806.18783.21043</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1540382099.49</float> <float>1541672619.58</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7