diff options
author | Elliot Smith <elliot.smith@intel.com> | 2016-06-29 15:41:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-11 00:09:26 +0100 |
commit | 952ffb3e1f4a00793e0c9c49bc0c8fb8729424c4 (patch) | |
tree | 604083d9477c9d3d2f51c714fe3b74ac8196f26c /bitbake/lib/toaster/toastergui/templates/base.html | |
parent | c471740f5ba023dccc992438c75f1534950d26af (diff) | |
download | poky-952ffb3e1f4a00793e0c9c49bc0c8fb8729424c4.tar.gz |
bitbake: toaster: move most recent builds templating to client
The most recent builds area of the all builds and project builds
table needs to update as a build progresses. It also needs
additional functionality to show other states (e.g. recipe parsing,
queued) which again needs to update on the client side.
Rather than add to the existing mix of server-side templating
with client-side DOM updating, translate all of the server-side
templates to client-side ones (jsrender), and add logic which
updates the most recent builds area as the state of a build changes.
Add a JSON API for mostrecentbuilds, which returns the state of
all "recent" builds. Fetch this via Ajax from the build dashboard
(rather than fetching the ad hoc API as in the previous version).
Then, as new states for builds are fetched via Ajax, determine
whether the build state has changed completely, or whether the progress
has just updated. If the state completely changed, re-render the
template on the client side for that build. If only the progress
changed, just update the progress bar. (NB this fixes the
task progress bar so it works for the project builds and all builds
pages.)
In cases where the builds table needs to update as the result of
a build finishing, reload the whole page.
This work highlighted a variety of other issues, such as
build requests not being able to change state as necessary. This
was one part of the cause of the "cancelling build..." state
being fragile and disappearing entirely when the page refreshed.
The cancelling state now persists between page reloads, as the
logic for determining whether a build is cancelling is now on
the Build object itself.
Note that jsrender is redistributed as part of Toaster, so
a note was added to LICENSE to that effect.
[YOCTO #9631]
(Bitbake rev: c868ea036aa34b387a72ec5116a66b2cd863995b)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/base.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/base.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index 8a9f690309..58491eba81 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html | |||
@@ -22,6 +22,8 @@ | |||
22 | </script> | 22 | </script> |
23 | <script src="{% static 'js/typeahead.jquery.js' %}"> | 23 | <script src="{% static 'js/typeahead.jquery.js' %}"> |
24 | </script> | 24 | </script> |
25 | <script src="{% static 'js/jsrender.min.js' %}"> | ||
26 | </script> | ||
25 | <script src="{% static 'js/prettify.js' %}"> | 27 | <script src="{% static 'js/prettify.js' %}"> |
26 | </script> | 28 | </script> |
27 | <script src="{% static 'js/libtoaster.js' %}"> | 29 | <script src="{% static 'js/libtoaster.js' %}"> |
@@ -32,6 +34,8 @@ | |||
32 | </script> | 34 | </script> |
33 | {% endif %} | 35 | {% endif %} |
34 | <script> | 36 | <script> |
37 | $.views.settings.delimiters("<%", "%>"); | ||
38 | |||
35 | libtoaster.ctx = { | 39 | libtoaster.ctx = { |
36 | jsUrl : "{% static 'js/' %}", | 40 | jsUrl : "{% static 'js/' %}", |
37 | htmlUrl : "{% static 'html/' %}", | 41 | htmlUrl : "{% static 'html/' %}", |
@@ -48,7 +52,9 @@ | |||
48 | xhrCustomRecipeUrl : "{% url 'xhr_customrecipe' %}", | 52 | xhrCustomRecipeUrl : "{% url 'xhr_customrecipe' %}", |
49 | projectId : {{project.id}}, | 53 | projectId : {{project.id}}, |
50 | xhrBuildRequestUrl: "{% url 'xhr_buildrequest' project.id %}", | 54 | xhrBuildRequestUrl: "{% url 'xhr_buildrequest' project.id %}", |
55 | mostRecentBuildsUrl: "{% url 'most_recent_builds' %}?project_id={{project.id}}", | ||
51 | {% else %} | 56 | {% else %} |
57 | mostRecentBuildsUrl: "{% url 'most_recent_builds' %}", | ||
52 | projectId : undefined, | 58 | projectId : undefined, |
53 | projectPageUrl : undefined, | 59 | projectPageUrl : undefined, |
54 | projectName : undefined, | 60 | projectName : undefined, |