From: Paul Spooren <mail@aparcar.org>
Date: Mon, 16 Aug 2021 04:50:49 +0000 (-1000)
Subject: luci-app-attendedsysupgrade: show position in queue
X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=53ff7ca676d10fa253d3ab472b9b5645996527ed

luci-app-attendedsysupgrade: show position in queue

The server provides a queue_position argument, show it.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
index 802868ad0d..5d5d4bd9ba 100644
--- a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
+++ b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
@@ -170,14 +170,12 @@ function request_sysupgrade(server_url, data) {
 			case 202:
 				res = response.json()
 				data.request_hash = res.request_hash;
-				switch (res.status) {
-					case "queued":
-						displayStatus("notice spinning", E('p', _('Request in build queue')));
-						break;
-					case "started":
-						displayStatus("notice spinning", E('p', _('Building the sysupgrade image')));
-						break;
-				}
+
+				if ("queue_position" in res)
+					displayStatus("notice spinning", E('p', _('Request in build queue position %d'.format(res.queue_position))));
+				else
+					displayStatus("notice spinning", E('p', _('Building firmware sysupgrade image')));
+
 				setTimeout(function() {
 					request_sysupgrade(server_url, data);
 				}, 5000);