|
4 | 4 | {{super()}}
|
5 | 5 | <script type="text/javascript">
|
6 | 6 | $(function() {
|
7 |
| - var clearAlert = function(alertSelector) { |
8 |
| - $('#alerts').find(alertSelector).find('> div').remove(); |
9 |
| - }; |
10 | 7 |
|
11 |
| - var showAlert = function(alertSelector, html) { |
12 |
| - $('#alerts').find(alertSelector).append(html); |
| 8 | + var setupLogElement = function(tabSelector, title, type="light") { |
| 9 | + // Clear previous |
| 10 | + $('#logs').find(tabSelector).find('> div').remove(); |
| 11 | + |
| 12 | + var container = $('<div>').addClass('alert alert-' + type).attr('role', 'alert'); |
| 13 | + var title = $('<strong>').text(title); |
| 14 | + var contents = $('<pre>'); |
| 15 | + container.append(title).append(contents); |
| 16 | + $('#logs').find(tabSelector).append(container); |
| 17 | + return contents; |
13 | 18 | }
|
14 | 19 |
|
15 |
| - var setupAPIRequestButton = function(buttonSelector, url, options, alertSelector, titleSuccess, titleError) { |
| 20 | + var setupAPIRequestButton = function(buttonSelector, url, options, tabSelector, titleSuccess, titleError) { |
16 | 21 | var button = $(buttonSelector);
|
17 | 22 | button.click(function() {
|
18 |
| - clearAlert(alertSelector); |
19 | 23 | button.attr("disabled", true);
|
20 | 24 | $(document.body).css("cursor", 'wait');
|
| 25 | + $(tabSelector + "-tab").click(); |
21 | 26 |
|
22 |
| - let reqUrl = url; |
| 27 | + var reqUrl = url; |
23 | 28 | options.forEach(option => {
|
24 | 29 | if ($('#' + option).prop('checked')) {
|
25 | 30 | reqUrl += (reqUrl.includes('?') ? '&' : '?') + option + '=1';
|
|
28 | 33 | }
|
29 | 34 | });
|
30 | 35 |
|
| 36 | + var logElement = setupLogElement(tabSelector, titleSuccess); |
| 37 | + |
31 | 38 | // call Admin GUI service
|
32 |
| - $.post( |
33 |
| - reqUrl, |
| 39 | + var last_chunk_len = null; |
| 40 | + $.ajax({ |
| 41 | + xhr: function() |
34 | 42 | {
|
| 43 | + var xhr = new window.XMLHttpRequest(); |
| 44 | + xhr.addEventListener("progress", function(e){ |
| 45 | + var response_chunk; |
| 46 | + var response = e.currentTarget.response; |
| 47 | + if (last_chunk_len === false) |
| 48 | + { |
| 49 | + response_chunk = response; |
| 50 | + last_chunk_len = response.length; |
| 51 | + } else { |
| 52 | + response_chunk = response.substring(last_chunk_len); |
| 53 | + last_chunk_len = response.length; |
| 54 | + } |
| 55 | + logElement.append(response_chunk); |
| 56 | + }, false); |
| 57 | + return xhr; |
| 58 | + }, |
| 59 | + type: 'POST', |
| 60 | + url: reqUrl, |
| 61 | + data: { |
35 | 62 | csrf_token: '{{ csrf_token() }}'
|
36 | 63 | }
|
37 |
| - ).done(function(data, status) { |
| 64 | + }).done(function(data, status) { |
38 | 65 | button.prop("disabled", false);
|
39 | 66 | $(document.body).css("cursor", '');
|
40 | 67 |
|
41 | 68 | // show response
|
42 |
| - var html = ''; |
43 |
| - html += '<div class="alert alert-light" role="alert">'; |
44 |
| - html += '<strong>' + titleSuccess + '</strong>'; |
45 |
| - html += '<pre>'; |
46 |
| - html += data; |
47 |
| - html += '</pre>'; |
48 |
| - html += '</div>'; |
49 |
| - showAlert(alertSelector, html); |
50 |
| - $(alertSelector + "-tab").click(); |
| 69 | + logElement.html(data); |
51 | 70 | }).fail(function(jqXHR, status) {
|
52 | 71 | button.prop("disabled", false);
|
53 | 72 | $(document.body).css("cursor", '');
|
|
67 | 86 | msg = '<pre>' + jqXHR.responseText + '</pre>';
|
68 | 87 | }
|
69 | 88 |
|
70 |
| - var html = ''; |
71 |
| - html += '<div class="alert alert-danger" role="alert">'; |
72 |
| - html += '<strong>' + titleError + '</strong><br/>'; |
73 |
| - html += '<div style="font-family: monospace">' + msg + '</div>'; |
74 |
| - html += '</div>'; |
75 |
| - showAlert(alertSelector, html); |
76 |
| - $(alertSelector + "-tab").click(); |
| 89 | + setupLogElement(tabSelector, titleError, 'danger').html(msg); |
77 | 90 | });
|
78 | 91 | });
|
79 | 92 | }
|
@@ -166,7 +179,7 @@ <h1>{{ admin_gui_title }}</h1>
|
166 | 179 | </button>
|
167 | 180 | {% endif %}
|
168 | 181 |
|
169 |
| - <div id="alerts" class="row mt-4"> |
| 182 | + <div id="logs" class="row mt-4"> |
170 | 183 | <nav>
|
171 | 184 | <div class="nav nav-tabs" id="nav-tab" role="tablist">
|
172 | 185 | {% if have_config_generator %}
|
|
0 commit comments