Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Gambier
erp5
Commits
883ba373
Commit
883ba373
authored
6 years ago
by
Alain Takoudjou
Committed by
Rafael Monnerat
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_monitoring] load graph using declareJob to prevent slowing down the page rendering
parent
60ac6a93
No related merge requests found
Changes
16
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
844 additions
and
100 deletions
+844
-100
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_js.js
...module/gadget_erp5_page_ojsm_software_instance_list_js.js
+1
-1
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_js.xml
...odule/gadget_erp5_page_ojsm_software_instance_list_js.xml
+2
-2
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_html.html
...dule/gadget_officejs_jio_software_instance_view_html.html
+0
-1
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_html.xml
...odule/gadget_officejs_jio_software_instance_view_html.xml
+2
-2
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_js.js
...e_module/gadget_officejs_jio_software_instance_view_js.js
+64
-86
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_js.xml
..._module/gadget_officejs_jio_software_instance_view_js.xml
+2
-2
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_appcache.xml
...m/web_page_module/gadget_officejs_monitoring_appcache.xml
+5
-3
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_html.html
...ateItem/web_page_module/gadget_ojsm_graph_field_html.html
+18
-0
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_html.xml
...lateItem/web_page_module/gadget_ojsm_graph_field_html.xml
+332
-0
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.js
...emplateItem/web_page_module/gadget_ojsm_graph_field_js.js
+83
-0
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.xml
...mplateItem/web_page_module/gadget_ojsm_graph_field_js.xml
+328
-0
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_html.html
...em/web_page_module/ojsm_gadget_erp5_statusfield_html.html
+1
-0
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_html.xml
...tem/web_page_module/ojsm_gadget_erp5_statusfield_html.xml
+3
-3
bt5/erp5_web_monitoring/bt/template_keep_last_workflow_history_only_path_list
...ing/bt/template_keep_last_workflow_history_only_path_list
+1
-0
bt5/erp5_web_monitoring/bt/template_keep_workflow_path_list
bt5/erp5_web_monitoring/bt/template_keep_workflow_path_list
+1
-0
bt5/erp5_web_monitoring/bt/template_path_list
bt5/erp5_web_monitoring/bt/template_path_list
+1
-0
No files found.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_js.js
View file @
883ba373
...
...
@@ -114,7 +114,7 @@
"
portal_type
"
:
[],
"
search_column_list
"
:
column_list
,
"
sort_column_list
"
:
column_list
,
"
sort
"
:
[[
"
title
"
,
"
ascending
"
],
[
"
status
"
,
"
ascending
"
]],
"
sort
"
:
[[
"
status
"
,
"
ascending
"
]],
"
title
"
:
"
Software Instances
"
,
"
type
"
:
"
ListBox
"
}
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_js.xml
View file @
883ba373
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
964.1446
6.37435.3993
</string>
</value>
<value>
<string>
964.1446
7.38710.51797
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
151
3620695.39
</float>
<float>
151
4302362.58
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_html.html
View file @
883ba373
...
...
@@ -19,7 +19,6 @@
</head>
<body>
<div
data-gadget-url=
"gadget_officejs_monitoring_jio.html"
data-gadget-scope=
"jio_gadget"
data-gadget-sandbox=
"public"
></div>
<form>
<button
type=
"submit"
class=
"ui-btn ui-btn-b ui-btn-inline
ui-icon-edit ui-btn-icon-right ui-screen-hidden"
></button>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_html.xml
View file @
883ba373
...
...
@@ -250,7 +250,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
963.33703.
32471.53657
</string>
</value>
<value>
<string>
963.33703.
45054.40584
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -268,7 +268,7 @@
</tuple>
<state>
<tuple>
<float>
151
0929101.2
</float>
<float>
151
4370578.19
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_js.js
View file @
883ba373
...
...
@@ -10,18 +10,11 @@
link_template
=
Handlebars
.
compile
(
source
);
gadget_klass
.
setState
({
jio_gadget
:
""
,
instance
:
""
,
opml
:
""
,
opml_outline
:
""
,
graph_value
:
{}
})
.
ready
(
function
(
gadget
)
{
return
gadget
.
getDeclaredGadget
(
"
jio_gadget
"
)
.
push
(
function
(
jio_gadget
)
{
return
gadget
.
changeState
({
"
jio_gadget
"
:
jio_gadget
});
});
})
/////////////////////////////////////////////////////////////////
// Acquired methods
/////////////////////////////////////////////////////////////////
...
...
@@ -30,7 +23,6 @@
.
declareAcquiredMethod
(
"
getUrlFor
"
,
"
getUrlFor
"
)
.
declareAcquiredMethod
(
"
jio_get
"
,
"
jio_get
"
)
.
declareAcquiredMethod
(
"
jio_allDocs
"
,
"
jio_allDocs
"
)
.
declareAcquiredMethod
(
"
notifySubmitted
"
,
'
notifySubmitted
'
)
.
declareAcquiredMethod
(
"
translateHtml
"
,
"
translateHtml
"
)
.
declareAcquiredMethod
(
"
redirect
"
,
"
redirect
"
)
/////////////////////////////////////////////////////////////////
...
...
@@ -61,16 +53,6 @@
opml
:
opml_doc
});
})
.
push
(
function
()
{
return
gadget
.
state
.
jio_gadget
.
createJio
({
type
:
"
webhttp
"
,
// XXX fix of url
url
:
gadget
.
state
.
instance
.
_links
.
private_url
.
href
.
replace
(
"
jio_private
"
,
"
private
"
)
+
'
documents/
'
,
basic_login
:
gadget
.
state
.
opml
.
basic_login
});
})
.
push
(
function
()
{
return
gadget
.
getUrlFor
({
command
:
'
push_history
'
,
options
:
{
jio_key
:
options
.
doc
.
reference
,
...
...
@@ -197,31 +179,24 @@
})
.
onStateChange
(
function
()
{
var
gadget
=
this
,
graph_
value
=
{}
;
graph_
data
;
if
(
!
gadget
.
state
.
hasOwnProperty
(
'
status
'
)
&&
!
gadget
.
state
.
hasOwnProperty
(
'
title
'
))
{
return
;
}
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
// Move this to not slow down the page rendering...
return
gadget
.
state
.
jio_gadget
.
get
(
gadget
.
state
.
instance
.
data
.
state
)
.
push
(
undefined
,
function
(
error
)
{
return
gadget
.
notifySubmitted
({
message
:
"
Warning: Failed to download monitoring state history file!
\n
"
+
error
.
message
||
""
,
status
:
"
error
"
})
.
push
(
function
()
{
return
{};
});
})
.
push
(
function
(
element_dict
)
{
var
graph_options
=
{
data_url
:
gadget
.
state
.
instance
.
_links
.
private_url
.
href
+
'
documents/
'
,
data_filename
:
gadget
.
state
.
instance
.
data
.
state
,
basic_login
:
gadget
.
state
.
opml
.
basic_login
};
graph_options
.
extract_method
=
function
(
element_dict
)
{
var
promise_data
=
[
"
Date, Success, Error, Warning
"
,
new
Date
()
+
"
,0
,0,0
"
"
Date, Success, Error
"
,
new
Date
()
+
"
,0,0
"
],
data
=
element_dict
.
data
||
promise_data
,
data_list
=
[],
...
...
@@ -249,12 +224,14 @@
data_list
[
1
].
value_dict
[
"
0
"
].
push
(
line_list
[
0
]);
data_list
[
1
].
value_dict
[
"
1
"
].
push
(
line_list
[
2
]);
}
graph_value
=
{
data
:
data_list
,
return
data_list
;
};
graph_options
.
data_dict
=
{
data
:
{},
layout
:
{
axis_dict
:
{
"
0
"
:
{
"
title
"
:
"
Success/
Failure Progression
"
,
"
title
"
:
"
Promises
Failure Progression
"
,
"
scale_type
"
:
"
linear
"
,
"
value_type
"
:
"
date
"
},
...
...
@@ -267,12 +244,13 @@
"
position
"
:
"
right
"
}
},
title
:
"
Success/
Failure Progression
"
title
:
"
Promises
Failure Progression
"
}
};
})
;
return
graph_options
;
})
.
push
(
function
()
{
.
push
(
function
(
g
)
{
graph_data
=
g
;
//gadget.element.querySelector('.template-view').innerHTML = html;
return
gadget
.
getDeclaredGadget
(
'
form_view
'
);
})
...
...
@@ -486,9 +464,9 @@
css_class
:
"
no_label
"
,
description
:
"
The Graph Status
"
,
hidden
:
0
,
"
default
"
:
graph_
value
||
{}
,
"
default
"
:
graph_
data
,
key
:
"
graph_status
"
,
url
:
"
gadget_
field_graph_dygraph
.html
"
,
url
:
"
gadget_
ojsm_graph_field
.html
"
,
title
:
""
,
type
:
"
GadgetField
"
}
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_js.xml
View file @
883ba373
...
...
@@ -250,7 +250,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
3.33702.55453.15257
</string>
</value>
<value>
<string>
96
4.26968.43905.35072
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -268,7 +268,7 @@
</tuple>
<state>
<tuple>
<float>
151
0929159.97
</float>
<float>
151
4370868.02
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_appcache.xml
View file @
883ba373
...
...
@@ -108,7 +108,7 @@
<item>
<key>
<string>
text_content
</string>
</key>
<value>
<string>
CACHE MANIFEST\n
# generated on Fri,
15 Nov 2017 15:47
:33 +0000\n
# generated on Fri,
27 Dec 2017 11:48
:33 +0000\n
# XXX + fonts\n
# images/ajax-loader.gif\n
CACHE:\n
...
...
@@ -224,6 +224,7 @@ gadget_erp5_page_ojsm_erp5_configurator.html\n
gadget_erp5_page_ojsm_jump.html\n
gadget_officejs_monitoring_opml_edit.html\n
gadget_erp5_page_ojsm_dispatch.html\n
gadget_ojsm_graph_field.html\n
\n
# monitoring js\n
gadget_officejs_monitoring_jio.js\n
...
...
@@ -251,6 +252,7 @@ gadget_erp5_page_ojsm_jump.js\n
gadget_erp5_page_ojsm_erp5_configurator.js\n
gadget_officejs_monitoring_opml_edit.js\n
gadget_erp5_page_ojsm_dispatch.js\n
gadget_ojsm_graph_field.js\n
\n
# erp5_web_renderjs_ui\n
gadget_erp5_editor_panel.html\n
...
...
@@ -385,7 +387,7 @@ NETWORK:\n
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
3.40590.4483.37222
</string>
</value>
<value>
<string>
96
4.26988.39431.42120
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -403,7 +405,7 @@ NETWORK:\n
</tuple>
<state>
<tuple>
<float>
151
1342469.81
</float>
<float>
151
4371963.04
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_html.html
0 → 100644
View file @
883ba373
<!DOCTYPE html>
<html>
<head>
<meta
http-equiv=
"Content-type"
content=
"text/html; charset=utf-8"
/>
<meta
name=
"viewport"
content=
"width=device-width, user-scalable=no"
/>
<title>
ERP5 Gadget Graph
</title>
<!-- renderjs -->
<script
src=
"rsvp.js"
type=
"text/javascript"
></script>
<script
src=
"renderjs.js"
type=
"text/javascript"
></script>
<!-- custom script -->
<script
src=
"gadget_ojsm_graph_field.js"
type=
"text/javascript"
></script>
</head>
<body>
<div
data-gadget-url=
"gadget_officejs_monitoring_jio.html"
data-gadget-scope=
"jio_gadget"
data-gadget-sandbox=
"public"
></div>
<div
data-gadget-url=
"gadget_field_graph_dygraph.html"
data-gadget-scope=
"graph_gadget"
data-gadget-sandbox=
"public"
></div>
</body>
</html>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_html.xml
0 → 100644
View file @
883ba373
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.js
0 → 100644
View file @
883ba373
/*global window, rJS, RSVP */
/*jslint indent: 2, maxerr: 3 */
(
function
(
window
,
rJS
,
RSVP
)
{
"
use strict
"
;
function
displayGraph
(
gadget
,
data
)
{
return
gadget
.
getDeclaredGadget
(
'
graph_gadget
'
)
.
push
(
function
(
graph_gadget
)
{
return
graph_gadget
.
render
({
value
:
data
});
});
}
rJS
(
window
)
.
declareAcquiredMethod
(
"
notifySubmitted
"
,
'
notifySubmitted
'
)
.
declareMethod
(
'
render
'
,
function
(
options
)
{
var
field_json
=
options
||
{},
state_dict
=
{
data_dict
:
field_json
.
value
.
data_dict
,
data_url
:
field_json
.
value
.
data_url
,
data_filename
:
field_json
.
value
.
data_filename
,
extract_method
:
field_json
.
value
.
extract_method
,
basic_login
:
field_json
.
value
.
basic_login
};
return
this
.
changeState
(
state_dict
);
})
.
onStateChange
(
function
()
{
return
this
.
renderGraph
();
})
.
declareJob
(
'
renderGraph
'
,
function
()
{
var
gadget
=
this
,
jio_gadget
;
if
(
gadget
.
state
.
data_url
!==
undefined
&&
gadget
.
state
.
data_filename
!==
undefined
)
{
return
gadget
.
getDeclaredGadget
(
"
jio_gadget
"
)
.
push
(
function
(
g
)
{
jio_gadget
=
g
;
return
jio_gadget
.
createJio
({
type
:
"
webhttp
"
,
// XXX fix of url
url
:
gadget
.
state
.
data_url
.
replace
(
"
jio_private
"
,
"
private
"
),
basic_login
:
gadget
.
state
.
basic_login
});
})
.
push
(
function
()
{
return
jio_gadget
.
get
(
gadget
.
state
.
data_filename
);
})
.
push
(
undefined
,
function
(
error
)
{
gadget
.
state
.
data_dict
.
data
=
{};
return
gadget
.
notifySubmitted
({
message
:
"
Warning: Failed to download graph data file '
"
+
gadget
.
state
.
data_filename
+
"
'!
\n
"
+
error
.
message
||
""
,
status
:
"
error
"
})
.
push
(
function
()
{
return
undefined
;
});
})
.
push
(
function
(
data_result
)
{
if
(
data_result
!==
undefined
&&
gadget
.
state
.
extract_method
!==
undefined
)
{
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
gadget
.
state
.
extract_method
(
data_result
,
gadget
.
state
.
data_filename
);
})
.
push
(
function
(
result
)
{
gadget
.
state
.
data_dict
.
data
=
result
;
return
displayGraph
(
gadget
,
gadget
.
state
.
data_dict
);
});
}
return
displayGraph
(
gadget
,
gadget
.
state
.
data_dict
);
});
}
return
displayGraph
(
gadget
,
gadget
.
state
.
data_dict
);
});
}(
window
,
rJS
,
RSVP
));
\ No newline at end of file
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.xml
0 → 100644
View file @
883ba373
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_html.html
View file @
883ba373
...
...
@@ -8,6 +8,7 @@
<!-- renderjs -->
<script
src=
"rsvp.js"
type=
"text/javascript"
></script>
<script
src=
"renderjs.js"
type=
"text/javascript"
></script>
<script
src=
"handlebars.js"
></script>
<!-- custom script -->
<script
src=
"gadget_erp5_field_status.js"
type=
"text/javascript"
></script>
<script
id=
"template-status-field"
type=
"text/x-handlebars-template"
>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_html.xml
View file @
883ba373
...
...
@@ -111,7 +111,7 @@
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
password
Gadget ERP5 Statusfield
</string>
</value>
<value>
<string>
Gadget ERP5 Statusfield
</string>
</value>
</item>
<item>
<key>
<string>
version
</string>
</key>
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
3.8986.63671.20514
</string>
</value>
<value>
<string>
96
4.25935.32773.12561
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
15
09446386.7
6
</float>
<float>
15
14308778.9
6
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/bt/template_keep_last_workflow_history_only_path_list
View file @
883ba373
web_page_module/gadget_erp5_field_status_*
web_page_module/gadget_erp5_page_ojsm_*
web_page_module/gadget_ojsm_*
web_page_module/gadget_erp5_page_settings_configurator_*
web_page_module/gadget_officejs_jio_software_instance_view_html
web_page_module/gadget_officejs_jio_software_instance_view_js
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/bt/template_keep_workflow_path_list
View file @
883ba373
web_page_module/gadget_erp5_field_status_*
web_page_module/gadget_erp5_page_ojsm_*
web_page_module/gadget_ojsm_*
web_page_module/gadget_erp5_page_settings_configurator_*
web_page_module/gadget_officejs_jio_software_instance_view_html
web_page_module/gadget_officejs_jio_software_instance_view_js
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_web_monitoring/bt/template_path_list
View file @
883ba373
...
...
@@ -8,6 +8,7 @@ web_page_module/gadget_officejs_jio_promise_view_js
web_page_module/gadget_officejs_jio_software_instance_view_html
web_page_module/gadget_officejs_jio_software_instance_view_js
web_page_module/gadget_officejs_monitoring_*
web_page_module/gadget_ojsm_*
web_page_module/jsen_json_validator_js
web_page_module/monitoring_jio_storage_js
web_page_module/monitoring_jio_web_storage_js
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment