Update UI: Use json/info instead of xml.cpp

willmmiles · willmmiles · commit 5934655ab272 · 2025-09-22T22:18:52.000-04:00
Alas the AI's attempt at dynamic content was flawed: the JS
function was being removed by cdata.js in favor of a s.js call.
Rather than patch up the old UI, convert to using the info struct for
everything.
diff --git a/tools/cdata.js b/tools/cdata.js
@@ -388,12 +388,6 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
       name: "PAGE_update",
       method: "gzip",
       filter: "html-minify",
-      mangle: (str) =>
-        str
-          .replace(
-            /function GetV().*\<\/script\>/gms,
-            "</script><script src=\"/settings/s.js?p=9\"></script>"
-          )
     },
     {
       file: "welcome.htm",
diff --git a/wled00/data/update.htm b/wled00/data/update.htm
@@ -22,20 +22,19 @@
 			fetch('/json/info')
 				.then(response => response.json())
 				.then(data => {
-					if (data.release) {
-						var releaseSpan = document.querySelector('.release-name');
-						if (releaseSpan) {
-							releaseSpan.textContent = data.release;
-						}
+					document.querySelector('.installed-version').textContent = `${data.brand} ${data.ver} (${data.vid})`;
+					document.querySelector('.release-name').textContent = data.release;
+					// TODO - assemble update URL
+					// TODO - can this be done at build time?
+					if (data.arch == "esp8266") {
+						toggle('rev');
 					}
 				})
 				.catch(error => {
 					console.log('Could not fetch device info:', error);
 					// Fallback to compiled-in value if API call fails
-					var releaseSpan = document.querySelector('.release-name');
-					if (releaseSpan && releaseSpan.textContent === 'Loading...') {
-						releaseSpan.textContent = 'Unknown';
-					}
+					document.querySelector('.installed-version').textContent = 'Unknown';
+					document.querySelector('.release-name').textContent = 'Unknown';
 				});
 		}
 	</script>
@@ -47,7 +46,7 @@
 <body onload="GetV()">
 	<h2>WLED Software Update</h2>
 	<form method='POST' action='./update' id='upd' enctype='multipart/form-data' onsubmit="toggle('upd')">
-		Installed version: <span class="sip">WLED ##VERSION##</span><br>
+		Installed version: <span class="sip installed-version">Loading...</span><br>
 		Release: <span class="sip release-name">Loading...</span><br>
 		Download the latest binary: <a href="https://github.com/wled-dev/WLED/releases" target="_blank" 
 		style="vertical-align: text-bottom; display: inline-flex;">
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
@@ -671,16 +671,6 @@ void getSettingsJS(byte subPage, Print& settingsScript)
     UsermodManager::appendConfigData(settingsScript);
   }
 
-  if (subPage == SUBPAGE_UPDATE) // update
-  {
-    char tmp_buf[128];
-    fillWLEDVersion(tmp_buf,sizeof(tmp_buf));
-    printSetClassElementHTML(settingsScript,PSTR("sip"),0,tmp_buf);
-    #ifndef ARDUINO_ARCH_ESP32
-    settingsScript.print(F("toggle('rev');"));  // hide revert button on ESP8266
-    #endif
-  }
-
   if (subPage == SUBPAGE_2D) // 2D matrices
   {
     printSetFormValue(settingsScript,PSTR("SOMP"),strip.isMatrix);
