From b3a89a1fcc30039bd4cd3502e80c259f8f0c14d0 Mon Sep 17 00:00:00 2001
From: Magnus Persson <magnus@noreply.github.com>
Date: Fri, 5 Aug 2022 10:13:20 +0200
Subject: [PATCH] Fix javascript error in format

---
 html/format.htm     | 2 --
 html/format.min.htm | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/html/format.htm b/html/format.htm
index 3776f66..38ca5d3 100644
--- a/html/format.htm
+++ b/html/format.htm
@@ -244,8 +244,6 @@
         return;
       }*/
 
-      hideError();
-
       $('#spinner').show(); 
       setButtonDisabled( true );
       var ha = false;   
diff --git a/html/format.min.htm b/html/format.min.htm
index 0be9b83..8139d9a 100644
--- a/html/format.min.htm
+++ b/html/format.min.htm
@@ -8,4 +8,4 @@
               { "id": "HomeAssistant-Mqtt", "format": "gravmon%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Frssi%3A%24%7Brssi%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Btilt%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7C%0A" },
               { "id": "HomeAssistant-Mqtt2", "format": "gravmon%2F%24%7Bmdns%7D%2Ftemperature%3A%24%7Btemp%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fgravity%3A%24%7Bgravity%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Frssi%3A%24%7Brssi%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Ftilt%3A%24%7Btilt%7D%7C%0Agravmon%2F%24%7Bmdns%7D%2Fbattery%3A%24%7Bbattery%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Ftemperature%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_temp%22%2C%22name%22%3A%22temperature%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22%24%7Btemp-unit%7D%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Ftemperature%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Fgravity%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_grav%22%2C%22name%22%3A%22gravity%22%2C%22dev_cla%22%3A%22temperature%22%2C%22unit_of_meas%22%3A%22%20%24%7Bgravity-unit%7D%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Fgravity%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Frssi%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_rssi%22%2C%22name%22%3A%22rssi%22%2C%22dev_cla%22%3A%22signal_strength%22%2C%22unit_of_meas%22%3A%22dBm%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Frssi%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Ftilt%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_tilt%22%2C%22name%22%3A%22tilt%22%2C%22dev_cla%22%3A%22temperature%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Ftilt%22%7D%7C%0Ahomeassistant%2Fsensor%2Fgravmon_%24%7Bid%7D%2Fbattery%2Fconfig%3A%7B%22dev%22%3A%7B%22name%22%3A%22%24%7Bmdns%7D%22%2C%22mdl%22%3A%22gravmon%22%2C%22sw%22%3A%22%24%7Bapp-ver%7D%22%2C%22ids%22%3A%22%24%7Bid%7D%22%7D%2C%22uniq_id%22%3A%22%24%7Bid%7D_batt%22%2C%22name%22%3A%22battery%22%2C%22dev_cla%22%3A%22voltage%22%2C%22unit_of_meas%22%3A%22V%22%2C%22stat_t%22%3A%22gravmon%2F%24%7Bmdns%7D%2Fbattery%22%7D%7C%0A" },
               { "id": "Brewblox-Mqtt", "format": "brewcast%2Fhistory%3A%7B%22key%22%3A%22%24%7Bmdns%7D%22%2C%22data%22%3A%7B%22Temperature%5BdegC%5D%22%3A%20%24%7Btemp-c%7D%2C%22Temperature%5BdegF%5D%22%3A%20%24%7Btemp-f%7D%2C%22Battery%5BV%5D%22%3A%24%7Bbattery%7D%2C%22Tilt%5Bdeg%5D%22%3A%24%7Bangle%7D%2C%22Rssi%5BdBm%5D%22%3A%24%7Brssi%7D%2C%22SG%22%3A%24%7Bgravity-sg%7D%2C%22Plato%22%3A%24%7Bgravity-plato%7D%7D%7D%7C" },
-              { "id": "UBIDots-Post", "format": "%7B%0A%20%20%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%20%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%20%20%22rssi%22%3A%20%24%7Brssi%7D%0A%7D" } ];</script><div class="row mb-3"><div class="col-sm-2"><button class="btn btn-primary" id="format-btn" data-bs-toggle="tooltip" title="Save the format template, saving an empty form will reset the template to default">Save</button> <button class="btn btn-secondary" id="test-btn" data-bs-toggle="tooltip" title="Apply device data to template to see how it works">Test</button></div><select class="custom-select col-sm-4" required name="predefined" id="predefined" data-bs-toggle="tooltip" title="Select a pre-defined format template"><option value="iSpindle-Post">iSpindle (POST)</option><option value="GravityMon-Post">GravityMon (POST)</option><option value="iSpindle-Mqtt">iSpindle (MQTT)</option><option value="HomeAssistant-Mqtt">Home Assistant (MQTT)</option><option value="HomeAssistant-Mqtt2">Home Assistant - Auto register sensor (MQTT)</option><option value="UBIDots-Post">UBIdots (POST)</option><option value="BrewFatherCustom-Post">Brewfather - Custom Endpoint (POST)</option><option value="iSpindle-Post">Brewfather - iSpindle Endpoint (POST)</option><option value="GravityMon-Get">GravityMon (GET)</option><option value="Brewblox-Mqtt">BrewBlox (MQTT)</option></select><div class="col-sm-4"><button class="btn btn-secondary" id="copy-btn" data-bs-toggle="tooltip" title="Copy the selected format template to the selected push target">Copy format</button> <button class="btn btn-secondary" id="clear-btn" data-bs-toggle="tooltip" title="Clear the current format template">Clear format</button></div></div><div class="col-sm-8" id="status"></div><hr class="my-2"><pre class="card-preview" id="preview" name="preview"></pre></div></div></div></div></div><script type="text/javascript">function updateStatusField(){var e=$("#format").val();$("#status").text(e.length+" characters in template, recommended maximum is "+maxCharsInFormatTemplate),e.length>maxCharsInFormatTemplate?showWarningLength():hideWarningLength()}function postHomeAssistant(e){if(e){console.log("Current format is mqtt, running post tests to register device."),$("#spinner").show(),setButtonDisabled(!0);var t="/api/test/push";t+="?id="+$("#id").val()+"&format=mqtt",$.getJSON(t,function(e){console.log(e);e.code;var t=e.success;e.enabled;t?showSuccess("Format stored successfully. Home Assistant Device Registration Successful."):showError("Format stored successfully. Home Assistant Device Registration Failed!")}).fail(function(){showError("Format stored successfully. Home Assistant Device Registration Failed!")}).always(function(){$("#spinner").hide(),setButtonDisabled(!1),getConfig()})}else getConfig()}function setButtonDisabled(e){$("#format-btn").prop("disabled",e),$("#test-btn").prop("disabled",e),$("#copy-btn").prop("disabled",e),$("#clear-btn").prop("disabled",e),$("#push-target").prop("disabled",e)}function selectFormat(){var e="#"+$("#push-target").val();console.log(e),e=decodeURIComponent($(e).val()),console.log(e),e=e.replaceAll("|","|\n"),console.log(e),$("#format").val(e),$("#preview").text(""),updateStatusField()}function getConfig(){setButtonDisabled(!0);var e="/api/config/format";$("#spinner").show(),$.getJSON(e,function(e){console.log(e),$("#id").val(e.id),$("#http-1").val(e["http-1"]),$("#http-2").val(e["http-2"]),$("#http-3").val(e["http-3"]),$("#influxdb").val(e.influxdb),$("#mqtt").val(e.mqtt),selectFormat()}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide(),setButtonDisabled(!1)}),updateStatusField()}window.onload=getConfig;var maxCharsInFormatTemplate=1500;setButtonDisabled(!0),$(document).ready(function(){null!=location.hash&&""!=location.hash&&($(".collapse").removeClass("in"),$(location.hash+".collapse").collapse("show"))}),$("#push-target").change(function(e){console.log(e),selectFormat()}),$("#copy-btn").click(function(e){var a=$("#predefined").val();formatTemplates.forEach(function(e,t){e.id==a&&$("#format").val(decodeURIComponent(e.format))}),updateStatusField()}),$("#clear-btn").click(function(e){$("#format").val(""),updateStatusField()}),$("#format-btn").click(function(e){var t=$("#format").val();hideError(),$("#spinner").show(),setButtonDisabled(!0);var a=!1;hideWarningHomeAssistant(),"mqtt"==$("#push-target").val()&&-1!=t.search("homeassistant/sensor/")&&(console.log("Current format is mqtt, it contains topics for Home Assistant device registration."),showWarningHomeAssistant(),a=!0),t=t.replaceAll("\n","");var l="id="+$("#id").val()+"&"+$("#push-target").val()+"="+encodeURIComponent(t);console.log(l),$.ajax({type:"POST",url:"/api/config/format",data:l,success:function(e){showSuccess("Format stored successfully."),postHomeAssistant(a)},error:function(e){showError("Unable to store format."),$("#spinner").hide()},always:function(){$("#spinner").hide(),setButtonDisabled(!1)}})}),$("#test-btn").click(function(e){var t="/api/status";$("#spinner").show(),$.getJSON(t,function(e){console.log(e);var t=$("#format").val();if(t="C"==e["temp-format"]?t.replaceAll("${temp}",e["temp-c"]):t.replaceAll("${temp}",e["temp-f"]),"G"==e["gravity-format"]){var a=e.gravity;t=t.replaceAll("${gravity-sg}",a),t=t.replaceAll("${corr-gravity-sg}",a);var l=259-(259-a);t=t.replaceAll("${gravity-plato}",l),t=t.replaceAll("${corr-gravity-plato}",l)}else{l=e.gravity;t=t.replaceAll("${gravity-plato}",l),t=t.replaceAll("${corr-gravity-plato}",l);a=259/(259-l);t=t.replaceAll("${gravity-sg}",a),t=t.replaceAll("${corr-gravity-sg}",a)}t=t.replaceAll("${mdns}",e.mdns),t=t.replaceAll("${id}",e.id),t=t.replaceAll("${sleep-interval}",e["sleep-interval"]),t=t.replaceAll("${token}",e.token),t=t.replaceAll("${token2}",e.token2),t=t.replaceAll("${temp-c}",e["temp-c"]),t=t.replaceAll("${temp-f}",e["temp-f"]),t=t.replaceAll("${temp-unit}",e["temp-format"]),t=t.replaceAll("${battery}",e.battery),t=t.replaceAll("${rssi}",e.rssi),t=t.replaceAll("${run-time}",e["runtime-average"]),t=t.replaceAll("${gravity}",e.gravity),t=t.replaceAll("${gravity-unit}",e["gravity-format"]),t=t.replaceAll("${corr-gravity}",e.gravity),t=t.replaceAll("${angle}",e.angle),t=t.replaceAll("${tilt}",e.angle),t=t.replaceAll("${app-ver}",e["app-ver"]),t=t.replaceAll("${app-build}",e["app-build"]);try{var o=JSON.parse(t);t=JSON.stringify(o,null,2)}catch(e){console.log("Not a JSON object!")}$("#preview").text(t)}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})})</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div></body></html>
\ No newline at end of file
+              { "id": "UBIDots-Post", "format": "%7B%0A%20%20%20%22temperature%22%3A%20%24%7Btemp%7D%2C%0A%20%20%20%22gravity%22%3A%20%24%7Bgravity%7D%2C%0A%20%20%20%22angle%22%3A%20%24%7Bangle%7D%2C%0A%20%20%20%22battery%22%3A%20%24%7Bbattery%7D%2C%0A%20%20%20%22rssi%22%3A%20%24%7Brssi%7D%0A%7D" } ];</script><div class="row mb-3"><div class="col-sm-2"><button class="btn btn-primary" id="format-btn" data-bs-toggle="tooltip" title="Save the format template, saving an empty form will reset the template to default">Save</button> <button class="btn btn-secondary" id="test-btn" data-bs-toggle="tooltip" title="Apply device data to template to see how it works">Test</button></div><select class="custom-select col-sm-4" required name="predefined" id="predefined" data-bs-toggle="tooltip" title="Select a pre-defined format template"><option value="iSpindle-Post">iSpindle (POST)</option><option value="GravityMon-Post">GravityMon (POST)</option><option value="iSpindle-Mqtt">iSpindle (MQTT)</option><option value="HomeAssistant-Mqtt">Home Assistant (MQTT)</option><option value="HomeAssistant-Mqtt2">Home Assistant - Auto register sensor (MQTT)</option><option value="UBIDots-Post">UBIdots (POST)</option><option value="BrewFatherCustom-Post">Brewfather - Custom Endpoint (POST)</option><option value="iSpindle-Post">Brewfather - iSpindle Endpoint (POST)</option><option value="GravityMon-Get">GravityMon (GET)</option><option value="Brewblox-Mqtt">BrewBlox (MQTT)</option></select><div class="col-sm-4"><button class="btn btn-secondary" id="copy-btn" data-bs-toggle="tooltip" title="Copy the selected format template to the selected push target">Copy format</button> <button class="btn btn-secondary" id="clear-btn" data-bs-toggle="tooltip" title="Clear the current format template">Clear format</button></div></div><div class="col-sm-8" id="status"></div><hr class="my-2"><pre class="card-preview" id="preview" name="preview"></pre></div></div></div></div></div><script type="text/javascript">function updateStatusField(){var e=$("#format").val();$("#status").text(e.length+" characters in template, recommended maximum is "+maxCharsInFormatTemplate),e.length>maxCharsInFormatTemplate?showWarningLength():hideWarningLength()}function postHomeAssistant(e){if(e){console.log("Current format is mqtt, running post tests to register device."),$("#spinner").show(),setButtonDisabled(!0);var t="/api/test/push";t+="?id="+$("#id").val()+"&format=mqtt",$.getJSON(t,function(e){console.log(e);e.code;var t=e.success;e.enabled;t?showSuccess("Format stored successfully. Home Assistant Device Registration Successful."):showError("Format stored successfully. Home Assistant Device Registration Failed!")}).fail(function(){showError("Format stored successfully. Home Assistant Device Registration Failed!")}).always(function(){$("#spinner").hide(),setButtonDisabled(!1),getConfig()})}else getConfig()}function setButtonDisabled(e){$("#format-btn").prop("disabled",e),$("#test-btn").prop("disabled",e),$("#copy-btn").prop("disabled",e),$("#clear-btn").prop("disabled",e),$("#push-target").prop("disabled",e)}function selectFormat(){var e="#"+$("#push-target").val();console.log(e),e=decodeURIComponent($(e).val()),console.log(e),e=e.replaceAll("|","|\n"),console.log(e),$("#format").val(e),$("#preview").text(""),updateStatusField()}function getConfig(){setButtonDisabled(!0);var e="/api/config/format";$("#spinner").show(),$.getJSON(e,function(e){console.log(e),$("#id").val(e.id),$("#http-1").val(e["http-1"]),$("#http-2").val(e["http-2"]),$("#http-3").val(e["http-3"]),$("#influxdb").val(e.influxdb),$("#mqtt").val(e.mqtt),selectFormat()}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide(),setButtonDisabled(!1)}),updateStatusField()}window.onload=getConfig;var maxCharsInFormatTemplate=1500;setButtonDisabled(!0),$(document).ready(function(){null!=location.hash&&""!=location.hash&&($(".collapse").removeClass("in"),$(location.hash+".collapse").collapse("show"))}),$("#push-target").change(function(e){console.log(e),selectFormat()}),$("#copy-btn").click(function(e){var a=$("#predefined").val();formatTemplates.forEach(function(e,t){e.id==a&&$("#format").val(decodeURIComponent(e.format))}),updateStatusField()}),$("#clear-btn").click(function(e){$("#format").val(""),updateStatusField()}),$("#format-btn").click(function(e){var t=$("#format").val();$("#spinner").show(),setButtonDisabled(!0);var a=!1;hideWarningHomeAssistant(),"mqtt"==$("#push-target").val()&&-1!=t.search("homeassistant/sensor/")&&(console.log("Current format is mqtt, it contains topics for Home Assistant device registration."),showWarningHomeAssistant(),a=!0),t=t.replaceAll("\n","");var l="id="+$("#id").val()+"&"+$("#push-target").val()+"="+encodeURIComponent(t);console.log(l),$.ajax({type:"POST",url:"/api/config/format",data:l,success:function(e){showSuccess("Format stored successfully."),postHomeAssistant(a)},error:function(e){showError("Unable to store format."),$("#spinner").hide()},always:function(){$("#spinner").hide(),setButtonDisabled(!1)}})}),$("#test-btn").click(function(e){var t="/api/status";$("#spinner").show(),$.getJSON(t,function(e){console.log(e);var t=$("#format").val();if(t="C"==e["temp-format"]?t.replaceAll("${temp}",e["temp-c"]):t.replaceAll("${temp}",e["temp-f"]),"G"==e["gravity-format"]){var a=e.gravity;t=t.replaceAll("${gravity-sg}",a),t=t.replaceAll("${corr-gravity-sg}",a);var l=259-(259-a);t=t.replaceAll("${gravity-plato}",l),t=t.replaceAll("${corr-gravity-plato}",l)}else{l=e.gravity;t=t.replaceAll("${gravity-plato}",l),t=t.replaceAll("${corr-gravity-plato}",l);a=259/(259-l);t=t.replaceAll("${gravity-sg}",a),t=t.replaceAll("${corr-gravity-sg}",a)}t=t.replaceAll("${mdns}",e.mdns),t=t.replaceAll("${id}",e.id),t=t.replaceAll("${sleep-interval}",e["sleep-interval"]),t=t.replaceAll("${token}",e.token),t=t.replaceAll("${token2}",e.token2),t=t.replaceAll("${temp-c}",e["temp-c"]),t=t.replaceAll("${temp-f}",e["temp-f"]),t=t.replaceAll("${temp-unit}",e["temp-format"]),t=t.replaceAll("${battery}",e.battery),t=t.replaceAll("${rssi}",e.rssi),t=t.replaceAll("${run-time}",e["runtime-average"]),t=t.replaceAll("${gravity}",e.gravity),t=t.replaceAll("${gravity-unit}",e["gravity-format"]),t=t.replaceAll("${corr-gravity}",e.gravity),t=t.replaceAll("${angle}",e.angle),t=t.replaceAll("${tilt}",e.angle),t=t.replaceAll("${app-ver}",e["app-ver"]),t=t.replaceAll("${app-build}",e["app-build"]);try{var o=JSON.parse(t);t=JSON.stringify(o,null,2)}catch(e){console.log("Not a JSON object!")}$("#preview").text(t)}).fail(function(){showError("Unable to get data from the device.")}).always(function(){$("#spinner").hide()})})</script><!-- START FOOTER --><div class="container themed-container bg-primary text-light row-margin-10">(C) Copyright 2021-22 Magnus Persson</div></body></html>
\ No newline at end of file