diff --git a/docker/MQTTManager/include/entity_manager/entity_manager.cpp b/docker/MQTTManager/include/entity_manager/entity_manager.cpp index 97e2aad75..51688f519 100644 --- a/docker/MQTTManager/include/entity_manager/entity_manager.cpp +++ b/docker/MQTTManager/include/entity_manager/entity_manager.cpp @@ -170,7 +170,6 @@ void EntityManager::load_nspanels() { auto existing_nspanel = EntityManager::get_nspanel_by_id(nspanel_id); if (existing_nspanel) [[likely]] { (*existing_nspanel)->reload_config(); - (*existing_nspanel)->send_config(); } else { std::lock_guard mutex_guard(EntityManager::_nspanels_mutex); auto panel = std::shared_ptr(new NSPanel(nspanel_id)); @@ -368,7 +367,7 @@ void EntityManager::load_media_players() { void EntityManager::load_covers() { auto cover_ids = database_manager::database.select(&database_manager::Entity::id, sqlite_orm::from(), - sqlite_orm::where(sqlite_orm::glob(&database_manager::Entity::entity_type, "cover"))); + sqlite_orm::where(sqlite_orm::glob(&database_manager::Entity::entity_type, "cover"))); SPDLOG_INFO("Loading {} covers.", cover_ids.size()); // Check if any existing cover has been removed. @@ -489,7 +488,7 @@ void EntityManager::load_scenes() { SPDLOG_INFO("Scene {}::{} was found in database but not in config. Creating scene.", scene->get_id(), scene->get_name()); std::lock_guard mutex_guard(EntityManager::_entities_mutex); EntityManager::_entities.push_back(scene); - } else if (scene_settings.scene_type.compare("nspm_scene") == 0) { + } else if (scene_settings.scene_type.compare("nspm_scene") == 0 || scene_settings.scene_type.compare("nspm") == 0) { std::shared_ptr scene = std::shared_ptr(new NSPMScene(scene_settings.id)); SPDLOG_INFO("Scene {}::{} was found in database but not in config. Creating scene.", scene->get_id(), scene->get_name()); std::lock_guard mutex_guard(EntityManager::_entities_mutex); diff --git a/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.cpp b/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.cpp index 498eda8f1..bc65e2efe 100644 --- a/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.cpp +++ b/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.cpp @@ -2,6 +2,7 @@ #include "light/light.hpp" #include "openssl/evp.h" #include "web_helper/WebHelper.hpp" +#include #include #include #include @@ -15,6 +16,8 @@ #include #include #include +#include +#include #include #include #include @@ -30,6 +33,7 @@ #include #include #include +#include #include void MqttManagerConfig::load() { @@ -81,6 +85,7 @@ void MqttManagerConfig::load() { MqttManagerConfig::update_firmware_checksum(); MqttManagerConfig::update_tft_checksums(); + SPDLOG_DEBUG("Checksum calculation done."); MqttManagerConfig::populate_default_and_clean(); @@ -187,181 +192,107 @@ LightTurnOnBehaviour MqttManagerConfig::get_light_turn_on_behaviour() { } void MqttManagerConfig::update_firmware_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); SPDLOG_INFO("Updating/calculating MD5 checksums for all firmware files."); - // Update firmware checksum - auto firmware_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/firmware/sonoff/firmware.bin"); - if (firmware_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_firmware_sonoff = firmware_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for sonoff firmware was not able to be calculated."); - SPDLOG_INFO("Firmware checksum: {}", firmware_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for sonoff firmware was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for sonoff firmware!"); - } - - firmware_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/firmware/custom/firmware.bin"); - if (firmware_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_firmware_custom = firmware_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for custom firmware was not able to be calculated."); - SPDLOG_INFO("Firmware checksum: {}", firmware_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for custom firmware was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for custom firmware!"); - } - - // Update LittleFS checksum - auto littlefs_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/firmware/sonoff/data_file.bin"); - if (littlefs_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_littlefs_sonoff = littlefs_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for sonoff littlefs/data file was not able to be calculated."); - SPDLOG_INFO("LittleFS checksum: {}", littlefs_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for sonoff littlefs/data file was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for LittleFS!"); - } + std::vector files = { + "/usr/src/app/nspanelmanager/firmware/sonoff/firmware.bin", + "/usr/src/app/nspanelmanager/firmware/custom/firmware.bin", + "/usr/src/app/nspanelmanager/firmware/sonoff/data_file.bin", + "/usr/src/app/nspanelmanager/firmware/custom/data_file.bin", + }; + + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + bool recalculate_file = false; + for (auto &file : files) { + // Check if a cached key already exists for the file. + bool file_in_map = MqttManagerConfig::_checksums.find(file) != MqttManagerConfig::_checksums.end(); + std::expected file_mtime; + if (file_in_map) [[likely]] { + file_mtime = MqttManagerConfig::_get_file_mtime(file); + if (file_mtime.has_value()) [[likely]] { + if (MqttManagerConfig::_checksums[file].mtime != *file_mtime) { + recalculate_file = true; + } else [[likely]] { + recalculate_file = false; + } + } else { + SPDLOG_ERROR("Failed to check mtime for file '{}'. Will try to recalculate file checksum anyway.", file); + } + } else { + recalculate_file = true; + } - littlefs_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/firmware/custom/data_file.bin"); - if (littlefs_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_littlefs_custom = littlefs_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for custom littlefs/data file was not able to be calculated."); - SPDLOG_INFO("LittleFS checksum: {}", littlefs_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for custom littlefs/data file was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for LittleFS!"); + if (recalculate_file) [[unlikely]] { + auto checksum = MqttManagerConfig::_get_file_md5_checksum(file); + if (checksum.has_value()) [[likely]] { + MqttManagerConfig::_checksums[file] = { + .mtime = file_mtime.has_value() ? std::optional{*file_mtime} : std::nullopt, + .checksum = *checksum, + }; + } else { + SPDLOG_ERROR("Failed to calculate checksum for file '{}'. Error: {}", file, checksum.error()); + } + } } } void MqttManagerConfig::update_tft_checksums() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); SPDLOG_INFO("Updating/calculating MD5 checksums for all .tft GUI files."); - auto eu_tft1_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft1/gui.tft"); - if (eu_tft1_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_eu_tft1 = eu_tft1_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for EU tft1 was not able to be calculated."); - SPDLOG_INFO("EU TFT1 GUI file checksum: {}", eu_tft1_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for EU tft1 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for EU TFT1 Nextion GUI file!"); - } - - auto eu_tft2_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft2/gui.tft"); - if (eu_tft2_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_eu_tft2 = eu_tft2_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for EU tft2 was not able to be calculated."); - SPDLOG_INFO("EU TFT2 GUI file checksum: {}", eu_tft2_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for EU tft2 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for EU TFT2 Nextion GUI file!"); - } - - auto eu_tft3_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft3/gui.tft"); - if (eu_tft3_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_eu_tft3 = eu_tft3_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for EU tft3 was not able to be calculated."); - SPDLOG_INFO("EU TFT3 GUI file checksum: {}", eu_tft3_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for EU tft3 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for EU TFT3 Nextion GUI file!"); - } - - auto eu_tft4_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft4/gui.tft"); - if (eu_tft4_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_eu_tft4 = eu_tft4_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for EU tft4 was not able to be calculated."); - SPDLOG_INFO("EU TFT4 GUI file checksum: {}", eu_tft4_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for EU tft4 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for EU TFT4 Nextion GUI file!"); - } - - auto us_tft1_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft1/gui.tft"); - if (us_tft1_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_tft1 = us_tft1_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft1 was not able to be calculated."); - SPDLOG_INFO("US TFT1 GUI file checksum: {}", us_tft1_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft1 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US TFT1 Nextion GUI file!"); - } - - auto us_tft2_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft2/gui.tft"); - if (us_tft2_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_tft2 = us_tft2_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft2 was not able to be calculated."); - SPDLOG_INFO("US TFT2 GUI file checksum: {}", us_tft2_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft2 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US TFT2 Nextion GUI file!"); - } - - auto us_tft3_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft3/gui.tft"); - if (us_tft3_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_tft3 = us_tft3_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft3 was not able to be calculated."); - SPDLOG_INFO("US TFT3 GUI file checksum: {}", us_tft3_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft3 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US TFT3 Nextion GUI file!"); - } - - auto us_tft4_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft4/gui.tft"); - if (us_tft4_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_tft4 = us_tft4_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft4 was not able to be calculated."); - SPDLOG_INFO("US TFT4 GUI file checksum: {}", us_tft4_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft4 was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US TFT4 Nextion GUI file!"); - } - - auto us_tft1_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft1/gui.tft"); - if (us_tft1_horizontal_mirrored_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft1 = us_tft1_horizontal_mirrored_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft1 (mirrored) was not able to be calculated."); - SPDLOG_INFO("US landscape mirrored TFT1 GUI file checksum: {}", us_tft1_horizontal_mirrored_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft1 (mirrored) was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT1 Nextion GUI file!"); - } - - auto us_tft2_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft2/gui.tft"); - if (us_tft2_horizontal_mirrored_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft2 = us_tft2_horizontal_mirrored_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft2 (mirrored) was not able to be calculated."); - SPDLOG_INFO("US landscape mirrored TFT2 GUI file checksum: {}", us_tft2_horizontal_mirrored_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft2 (mirrored) was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT2 Nextion GUI file!"); - } - - auto us_tft3_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft3/gui.tft"); - if (us_tft3_horizontal_mirrored_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft3 = us_tft3_horizontal_mirrored_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft3 (mirrored) was not able to be calculated."); - SPDLOG_INFO("US landscape mirrored TFT3 GUI file checksum: {}", us_tft3_horizontal_mirrored_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft3 (mirrored) was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT3 Nextion GUI file!"); - } + std::vector files = { + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft1/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft2/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft3/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft4/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft1/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft2/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft3/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft4/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft1/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft2/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft3/gui.tft", + "/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft4/gui.tft", + }; + + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + bool recalculate_file = false; + for (auto &file : files) { + // Check if a cached key already exists for the file. + bool file_in_map = MqttManagerConfig::_checksums.find(file) != MqttManagerConfig::_checksums.end(); + std::expected file_mtime; + if (file_in_map) [[likely]] { + file_mtime = MqttManagerConfig::_get_file_mtime(file); + if (file_mtime.has_value()) [[likely]] { + if (MqttManagerConfig::_checksums[file].mtime != *file_mtime) { + recalculate_file = true; + } else [[likely]] { + recalculate_file = false; + } + } else { + SPDLOG_ERROR("Failed to check mtime for file '{}'. Will try to recalculate file checksum anyway.", file); + } + } else { + recalculate_file = true; + } - auto us_tft4_horizontal_mirrored_checksum = MqttManagerConfig::_get_file_md5_checksum("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft4/gui.tft"); - if (us_tft4_horizontal_mirrored_checksum.has_value()) { - MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft4 = us_tft4_horizontal_mirrored_checksum.value(); - WebsocketServer::remove_warning("MD5 checksum for US tft4 (mirrored) was not able to be calculated."); - SPDLOG_INFO("US landscape mirrored TFT4 GUI file checksum: {}", us_tft4_horizontal_mirrored_checksum.value()); - } else { - WebsocketServer::register_warning(WebsocketServer::ActiveWarningLevel::ERROR, "MD5 checksum for US tft4 (mirrored) was not able to be calculated."); - SPDLOG_ERROR("Failed to calculate checksum for US landscape mirrored TFT4 Nextion GUI file!"); + if (recalculate_file) [[unlikely]] { + auto checksum = MqttManagerConfig::_get_file_md5_checksum(file); + if (checksum.has_value()) [[likely]] { + MqttManagerConfig::_checksums[file] = { + .mtime = file_mtime.has_value() ? std::optional{*file_mtime} : std::nullopt, + .checksum = *checksum, + }; + } else { + SPDLOG_ERROR("Failed to calculate checksum for file '{}'. Error: {}", file, checksum.error()); + } + } } } -std::optional MqttManagerConfig::_get_file_md5_checksum(std::string file_path) { +std::expected MqttManagerConfig::_get_file_md5_checksum(std::string file_path) { std::ifstream file(file_path, std::ifstream::binary); if (!file) { - return std::nullopt; + return std::unexpected("Failed to open file."); } EVP_MD_CTX *mdctx; @@ -372,17 +303,11 @@ std::optional MqttManagerConfig::_get_file_md5_checksum(std::string mdctx = EVP_MD_CTX_new(); EVP_DigestInit_ex(mdctx, EVP_md5(), NULL); - // MD5_Update - // char buffer[1024]; - // while (file.read(buffer, 1024)) { - // EVP_DigestUpdate(mdctx, buffer, file.gcount()); - // } - unsigned char buffer[8192]; while (file.read(reinterpret_cast(buffer), sizeof(buffer)) || file.gcount() > 0) { if (EVP_DigestUpdate(mdctx, buffer, file.gcount()) != 1) { EVP_MD_CTX_free(mdctx); - return ""; + return std::unexpected("Failed to update EVP digiest while processing file"); } } @@ -391,13 +316,6 @@ std::optional MqttManagerConfig::_get_file_md5_checksum(std::string EVP_DigestFinal_ex(mdctx, md5_digest, &md5_digest_len); EVP_MD_CTX_free(mdctx); - // char tmp[3] = {0}; - // std::string return_string; - // for (int i = 0; i < md5_digest_len; i++) { - // sprintf(tmp, "%02x", md5_digest[i]); - // return_string.append(tmp); - // } - std::stringstream ss; ss << std::hex << std::uppercase << std::setfill('0'); for (int i = 0; i < EVP_MD_size(EVP_md5()); i++) { @@ -408,132 +326,141 @@ std::optional MqttManagerConfig::_get_file_md5_checksum(std::string return boost::algorithm::to_lower_copy(ss.str()); // Convert to lowercase as the md5 checksum calculated in Django is calculated with lower case latters. } +std::expected MqttManagerConfig::_get_file_mtime(std::string file_path) { + std::error_code ec; + auto mtime = std::filesystem::last_write_time(file_path, ec); + if (ec) [[unlikely]] { + return std::unexpected(fmt::format("Failed to get last write time (mtime) file file '{}'. Error code: '{}', message: {}", file_path, ec.value(), ec.message())); + } + return mtime; +} + std::expected MqttManagerConfig::get_firmware_sonoff_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_firmware_sonoff.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/firmware/sonoff/firmware.bin") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_firmware_sonoff; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/firmware/sonoff/firmware.bin"].checksum; } std::expected MqttManagerConfig::get_firmware_custom_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_firmware_custom.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/firmware/custom/firmware.bin") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_firmware_custom; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/firmware/custom/firmware.bin"].checksum; } std::expected MqttManagerConfig::get_littlefs_sonoff_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_littlefs_sonoff.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/firmware/sonoff/data_file.bin") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_littlefs_sonoff; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/firmware/sonoff/data_file.bin"].checksum; } std::expected MqttManagerConfig::get_littlefs_custom_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_littlefs_custom.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/firmware/custom/data_file.bin") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_littlefs_custom; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/firmware/custom/data_file.bin"].checksum; } std::expected MqttManagerConfig::get_eu_tft1_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_eu_tft1.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft1/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_eu_tft1; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft1/gui.tft"].checksum; } std::expected MqttManagerConfig::get_eu_tft2_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_eu_tft2.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft2/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_eu_tft2; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft2/gui.tft"].checksum; } std::expected MqttManagerConfig::get_eu_tft3_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_eu_tft3.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft3/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_eu_tft3; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft3/gui.tft"].checksum; } std::expected MqttManagerConfig::get_eu_tft4_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_eu_tft4.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft4/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_eu_tft4; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/eu/output_tft4/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_tft1_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_tft1.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft1/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_tft1; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft1/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_tft2_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_tft2.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft2/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_tft2; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft2/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_tft3_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_tft3.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft3/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_tft3; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft3/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_tft4_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_tft4.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft4/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_tft4; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us/output_tft4/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_horizontal_mirrored_tft1_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft1.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft1/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft1; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft1/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_horizontal_mirrored_tft2_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft2.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft2/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft2; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft2/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_horizontal_mirrored_tft3_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft3.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft3/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft3; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft3/gui.tft"].checksum; } std::expected MqttManagerConfig::get_us_horizontal_mirrored_tft4_checksum() { - std::lock_guard lock_guard(MqttManagerConfig::_md5_checksum_files_mutex); - if (MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft4.empty()) { + std::lock_guard lock_guard(MqttManagerConfig::_checksums_mutex); + if (MqttManagerConfig::_checksums.find("/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft4/gui.tft") == MqttManagerConfig::_checksums.end()) { return std::unexpected(false); } - return MqttManagerConfig::_md5_checksum_us_horizontal_mirrored_tft4; + return MqttManagerConfig::_checksums["/usr/src/app/nspanelmanager/HMI_files/tft_automation/us_horizontal_mirrored/output_tft4/gui.tft"].checksum; } std::string MqttManagerConfig::read_posix_tz_rule(const std::string &tzif_path) { diff --git a/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.hpp b/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.hpp index f8ce20763..46b331c3b 100644 --- a/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.hpp +++ b/docker/MQTTManager/include/mqtt_manager_config/mqtt_manager_config.hpp @@ -1,14 +1,17 @@ #ifndef MQTTMANAGER_CONFIG_HPP #define MQTTMANAGER_CONFIG_HPP -#include "light/light.hpp" +#include "filesystem" #include #include #include +#include #include #include +#include #include #include #include +#include #include #include #include @@ -167,24 +170,24 @@ class MqttManagerConfig { static inline LightTurnOnBehaviour _light_turn_on_behaviour = LightTurnOnBehaviour::COLOR_TEMPERATURE; - static std::optional _get_file_md5_checksum(std::string file_path); - static inline std::mutex _md5_checksum_files_mutex; - static inline std::string _md5_checksum_firmware_sonoff; - static inline std::string _md5_checksum_firmware_custom; - static inline std::string _md5_checksum_littlefs_sonoff; - static inline std::string _md5_checksum_littlefs_custom; - static inline std::string _md5_checksum_eu_tft1; - static inline std::string _md5_checksum_eu_tft2; - static inline std::string _md5_checksum_eu_tft3; - static inline std::string _md5_checksum_eu_tft4; - static inline std::string _md5_checksum_us_tft1; - static inline std::string _md5_checksum_us_tft2; - static inline std::string _md5_checksum_us_tft3; - static inline std::string _md5_checksum_us_tft4; - static inline std::string _md5_checksum_us_horizontal_mirrored_tft1; - static inline std::string _md5_checksum_us_horizontal_mirrored_tft2; - static inline std::string _md5_checksum_us_horizontal_mirrored_tft3; - static inline std::string _md5_checksum_us_horizontal_mirrored_tft4; + // A struct of values needed to cache and hold checksums for files. Stored with an unordered map + // where the key of the map is the path to the file. + struct _CachedChecksum { + std::optional mtime; + std::string checksum; + }; + + // Map of cached checksums. Key = file path. + static inline std::unordered_map _checksums; + + // Mutex for _checksums map + static inline std::mutex _checksums_mutex; + + // Get a checksum for a given file. Return error string in case of failure. + static std::expected _get_file_md5_checksum(std::string file_path); + + // Get the mtime (modified time) from a given file. Return error string in case of failure. + static std::expected _get_file_mtime(std::string file_path); static inline std::unordered_map _settings_values_cache; diff --git a/docker/MQTTManager/include/nspanel/nspanel.cpp b/docker/MQTTManager/include/nspanel/nspanel.cpp index 6400ff07e..8cf533f84 100644 --- a/docker/MQTTManager/include/nspanel/nspanel.cpp +++ b/docker/MQTTManager/include/nspanel/nspanel.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -61,10 +62,6 @@ NSPanel::NSPanel(uint32_t id) { this->_id = id; SPDLOG_INFO("Loading new NSPanel with ID {}.", id); this->reload_config(); - if (!this->_mqtt_config_topic.empty() && this->_state != MQTT_MANAGER_NSPANEL_STATE::AWAITING_ACCEPT) { - SPDLOG_INFO("Loaded accepted NSPanel {}::{}.", this->_id, this->_name); - this->_state = MQTT_MANAGER_NSPANEL_STATE::WAITING; - } CommandManager::attach_callback(boost::bind(&NSPanel::command_callback, this, _1)); WebsocketServer::attach_stomp_callback(fmt::format("nspanel/{}/command", this->_mac), boost::bind(&NSPanel::handle_stomp_command_callback, this, _1)); @@ -143,7 +140,7 @@ void NSPanel::reload_config() { } else if (panel_settings.model.compare("web") == 0) { this->_model = MQTT_MANAGER_NSPANEL_MODEL::WEB; } else { - SPDLOG_ERROR("Failed to prase panel model for NSPanel {}::{}. Got value '{}'. Will assume sonoff.", panel_settings.id, panel_settings.friendly_name, panel_settings.model); + SPDLOG_ERROR("Failed to parse panel model for NSPanel {}::{}. Got value '{}'. Will assume sonoff.", panel_settings.id, panel_settings.friendly_name, panel_settings.model); this->_model = MQTT_MANAGER_NSPANEL_MODEL::SONOFF; } @@ -199,7 +196,7 @@ void NSPanel::reload_config() { if (!panel_settings.denied && !panel_settings.accepted) { // No decission has been made on wether ot accept or deny panel. It is therefore awaiting_accept this->_state = MQTT_MANAGER_NSPANEL_STATE::AWAITING_ACCEPT; - } else if (this->_state == MQTT_MANAGER_NSPANEL_STATE::AWAITING_ACCEPT || this->_state == MQTT_MANAGER_NSPANEL_STATE::DENIED) { + } else if (panel_settings.accepted && (this->_state == MQTT_MANAGER_NSPANEL_STATE::AWAITING_ACCEPT || this->_state == MQTT_MANAGER_NSPANEL_STATE::DENIED)) { // The panel has just been accepted. Wait for it to register again. this->_state = MQTT_MANAGER_NSPANEL_STATE::WAITING; } @@ -522,8 +519,13 @@ void NSPanel::send_config() { } } - SPDLOG_DEBUG("Sending updated NSPanelConfig to panel {}::{} over MQTT.", this->_id, this->_name); - MQTT_Manager::publish_protobuf(this->_mqtt_config_topic, config, true); + google::protobuf::util::MessageDifferencer differencer; + if (!differencer.Equals(this->_last_send_config, config)) { + SPDLOG_DEBUG("Sending updated NSPanelConfig to panel {}::{} over MQTT.", this->_id, this->_name); + MQTT_Manager::publish_protobuf(this->_mqtt_config_topic, config, true); + } else { + SPDLOG_DEBUG("Not sending updated config for NSPanel {}::{} as no config change has occured from last sent config."); + } } NSPanel::~NSPanel() { diff --git a/docker/MQTTManager/include/nspanel/nspanel.hpp b/docker/MQTTManager/include/nspanel/nspanel.hpp index 31ec8e4e3..4c440be88 100644 --- a/docker/MQTTManager/include/nspanel/nspanel.hpp +++ b/docker/MQTTManager/include/nspanel/nspanel.hpp @@ -180,6 +180,9 @@ class NSPanel { // A thermostat temperature limit setting, or 0 if it is not a number. int _get_nspanel_temperature_limit_setting(std::string key); + // The last config sent to the panel that is currently retained in MQTT. + NSPanelConfig _last_send_config; + // Vars: uint32_t _id; database_manager::NSPanel _settings; // Settings loaded from database diff --git a/docker/MQTTManager/src/main.cpp b/docker/MQTTManager/src/main.cpp index b163bce99..54dde9281 100644 --- a/docker/MQTTManager/src/main.cpp +++ b/docker/MQTTManager/src/main.cpp @@ -39,8 +39,8 @@ void sigusr1_handler(int signal) { if (signal == SIGUSR1) { - SPDLOG_INFO("Reloading config from manager. Will wait 50ms for other processing to complete before proceeding with config reload."); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); + SPDLOG_INFO("Reloading config from manager."); + // std::this_thread::sleep_for(std::chrono::milliseconds(50)); MqttManagerConfig::load(); MQTT_Manager::reload_config(); diff --git a/docker/MQTTManager/tests/nspanel_test.cpp b/docker/MQTTManager/tests/nspanel_test.cpp index 622f5ee31..5595518d9 100644 --- a/docker/MQTTManager/tests/nspanel_test.cpp +++ b/docker/MQTTManager/tests/nspanel_test.cpp @@ -2,8 +2,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -756,10 +756,10 @@ TEST_F(NSPanelTest, panel_not_yet_accepted_is_awaiting_accept) { EXPECT_EQ(panel->get_state(), MQTT_MANAGER_NSPANEL_STATE::AWAITING_ACCEPT); } -TEST_F(NSPanelTest, accepted_panel_is_loaded_as_waiting) { +TEST_F(NSPanelTest, accepted_panel_is_loaded_as_offline) { load_panel(); - EXPECT_EQ(panel->get_state(), MQTT_MANAGER_NSPANEL_STATE::WAITING); + EXPECT_EQ(panel->get_state(), MQTT_MANAGER_NSPANEL_STATE::OFFLINE); } // Accepting in the web interface sets accepted and reloads the manager. The panel must leave diff --git a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json index 8db2bd578..474423a59 100755 --- a/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json +++ b/docker/web/nspanelmanager/web/react-components/dist/.vite/manifest.json @@ -1,249 +1,259 @@ { - "_AnimatePresence-Dqu00Wbg.js": { - "file": "AnimatePresence-Dqu00Wbg.js", + "_AnimatePresence-CpnHckGS.js": { + "file": "AnimatePresence-CpnHckGS.js", "name": "AnimatePresence", "imports": [ "src/main.tsx", - "_proxy-DUfbqFkY.js" + "_proxy-BQYsYRjY.js" ] }, - "_EntityStore-BkKCiqU6.js": { - "file": "EntityStore-BkKCiqU6.js", + "_EntityStore-CHE3-bsC.js": { + "file": "EntityStore-CHE3-bsC.js", "name": "EntityStore", "imports": [ - "_react-Dmrhcfpd.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_StompStore-YH4Dqjwd.js" + "_react-Cm4z11-B.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_StompStore-Bh-Guhla.js" ] }, - "_MultiStep_AddEditEntity-KDtbEBBY.js": { - "file": "MultiStep_AddEditEntity-KDtbEBBY.js", + "_MultiStep_AddEditEntity-xcopfTe5.js": { + "file": "MultiStep_AddEditEntity-xcopfTe5.js", "name": "MultiStep_AddEditEntity", "imports": [ "src/main.tsx", - "_react-Dmrhcfpd.js", - "_SettingsStore-B_b5mu_f.js", - "_react-select.esm-DIB_MQU9.js", - "_index.esm-OPyB-aE8.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_proxy-DUfbqFkY.js", - "_AnimatePresence-Dqu00Wbg.js" + "_react-Cm4z11-B.js", + "_SettingsStore-msVzBcHM.js", + "_react-select.esm-CbdimKhg.js", + "_index.esm-CnTf2rLv.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_proxy-BQYsYRjY.js", + "_AnimatePresence-CpnHckGS.js" ] }, - "_NSPanelToastContainer-DX4VftN1.js": { - "file": "NSPanelToastContainer-DX4VftN1.js", + "_NSPanelToastContainer-D677tDZJ.js": { + "file": "NSPanelToastContainer-D677tDZJ.js", "name": "NSPanelToastContainer", "imports": [ "src/main.tsx" ] }, - "_SettingsStore-B_b5mu_f.js": { - "file": "SettingsStore-B_b5mu_f.js", + "_SettingsStore-msVzBcHM.js": { + "file": "SettingsStore-msVzBcHM.js", "name": "SettingsStore", "imports": [ - "_react-Dmrhcfpd.js" + "_react-Cm4z11-B.js" ] }, - "_StompStore-YH4Dqjwd.js": { - "file": "StompStore-YH4Dqjwd.js", + "_StompStore-Bh-Guhla.js": { + "file": "StompStore-Bh-Guhla.js", "name": "StompStore", "imports": [ "src/main.tsx", - "_react-Dmrhcfpd.js", - "_NSPanelToastContainer-DX4VftN1.js" + "_react-Cm4z11-B.js", + "_NSPanelToastContainer-D677tDZJ.js" ] }, - "_index.esm-OPyB-aE8.js": { - "file": "index.esm-OPyB-aE8.js", + "_fields-Dr1KI0Cj.js": { + "file": "fields-Dr1KI0Cj.js", + "name": "fields", + "imports": [ + "src/main.tsx", + "_index.esm-CnTf2rLv.js" + ] + }, + "_index.esm-CnTf2rLv.js": { + "file": "index.esm-CnTf2rLv.js", "name": "index.esm", "imports": [ "src/main.tsx" ] }, - "_layout-MHz_8kDh.js": { - "file": "layout-MHz_8kDh.js", + "_layout-HS0oHCMJ.js": { + "file": "layout-HS0oHCMJ.js", "name": "layout", "imports": [ - "src/main.tsx", - "_index.esm-OPyB-aE8.js" + "src/main.tsx" ] }, - "_mdi-gqrDBoHO.js": { - "file": "mdi-gqrDBoHO.js", + "_mdi-Cr6PIsRR.js": { + "file": "mdi-Cr6PIsRR.js", "name": "mdi", "imports": [ "src/main.tsx" ] }, - "_proxy-DUfbqFkY.js": { - "file": "proxy-DUfbqFkY.js", + "_proxy-BQYsYRjY.js": { + "file": "proxy-BQYsYRjY.js", "name": "proxy", "imports": [ "src/main.tsx" ] }, - "_react-Dmrhcfpd.js": { - "file": "react-Dmrhcfpd.js", + "_react-Cm4z11-B.js": { + "file": "react-Cm4z11-B.js", "name": "react", "imports": [ "src/main.tsx" ] }, - "_react-select.esm-DIB_MQU9.js": { - "file": "react-select.esm-DIB_MQU9.js", + "_react-select.esm-CbdimKhg.js": { + "file": "react-select.esm-CbdimKhg.js", "name": "react-select.esm", "imports": [ "src/main.tsx" ] }, - "_sortable-DCj6uSpL.js": { - "file": "sortable-DCj6uSpL.js", + "_sortable-Ke3drO00.js": { + "file": "sortable-Ke3drO00.js", "name": "sortable", "imports": [ "src/main.tsx" ] }, - "_use-spring-BVI2O33U.js": { - "file": "use-spring-BVI2O33U.js", + "_use-spring-BsypnnSW.js": { + "file": "use-spring-BsypnnSW.js", "name": "use-spring", "imports": [ "src/main.tsx", - "_proxy-DUfbqFkY.js" + "_proxy-BQYsYRjY.js" ] }, "src/components/EntitiesPage/EntitiesPagesView.tsx": { - "file": "EntitiesPagesView-s7wQbHCc.js", + "file": "EntitiesPagesView-DShidmI8.js", "name": "EntitiesPagesView", "src": "src/components/EntitiesPage/EntitiesPagesView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-DCj6uSpL.js", - "_react-Dmrhcfpd.js", - "_MultiStep_AddEditEntity-KDtbEBBY.js" + "_sortable-Ke3drO00.js", + "_react-Cm4z11-B.js", + "_MultiStep_AddEditEntity-xcopfTe5.js" ] }, "src/components/IndexPage/NSPanelsView.tsx": { - "file": "NSPanelsView-CVnckJ-l.js", + "file": "NSPanelsView-1YvY26NZ.js", "name": "NSPanelsView", "src": "src/components/IndexPage/NSPanelsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_react-select.esm-DIB_MQU9.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_proxy-DUfbqFkY.js", - "_use-spring-BVI2O33U.js", - "_StompStore-YH4Dqjwd.js", - "_EntityStore-BkKCiqU6.js", - "_mdi-gqrDBoHO.js" + "_react-select.esm-CbdimKhg.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_proxy-BQYsYRjY.js", + "_use-spring-BsypnnSW.js", + "_StompStore-Bh-Guhla.js", + "_EntityStore-CHE3-bsC.js", + "_mdi-Cr6PIsRR.js" ] }, "src/components/InitialSetup/InitialSetup.tsx": { - "file": "InitialSetup-qFecaEyr.js", + "file": "InitialSetup-p38u0OlE.js", "name": "InitialSetup", "src": "src/components/InitialSetup/InitialSetup.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_SettingsStore-B_b5mu_f.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_proxy-DUfbqFkY.js", - "_AnimatePresence-Dqu00Wbg.js", - "_mdi-gqrDBoHO.js" + "_index.esm-CnTf2rLv.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_proxy-BQYsYRjY.js", + "_AnimatePresence-CpnHckGS.js", + "_mdi-Cr6PIsRR.js", + "_layout-HS0oHCMJ.js" ] }, "src/components/NSPanelPage/Logs.tsx": { - "file": "Logs-fyKfGB-i.js", + "file": "Logs-B094dObe.js", "name": "Logs", "src": "src/components/NSPanelPage/Logs.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_SettingsStore-B_b5mu_f.js", - "_StompStore-YH4Dqjwd.js" + "_SettingsStore-msVzBcHM.js", + "_StompStore-Bh-Guhla.js" ] }, "src/components/NSPanelPage/Sidebar.tsx": { - "file": "Sidebar-Ck5FumSR.js", + "file": "Sidebar-CHcoOcQs.js", "name": "Sidebar", "src": "src/components/NSPanelPage/Sidebar.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_NSPanelToastContainer-DX4VftN1.js", - "_StompStore-YH4Dqjwd.js", - "_EntityStore-BkKCiqU6.js", - "_mdi-gqrDBoHO.js" + "_NSPanelToastContainer-D677tDZJ.js", + "_StompStore-Bh-Guhla.js", + "_EntityStore-CHE3-bsC.js", + "_mdi-Cr6PIsRR.js" ] }, "src/components/NSPanelPage/Warnings.tsx": { - "file": "Warnings-B4Wyiqy9.js", + "file": "Warnings-D5nCet1X.js", "name": "Warnings", "src": "src/components/NSPanelPage/Warnings.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_EntityStore-BkKCiqU6.js", - "_mdi-gqrDBoHO.js" + "_EntityStore-CHE3-bsC.js", + "_mdi-Cr6PIsRR.js" ] }, "src/components/RoomPage/RoomPage.tsx": { - "file": "RoomPage-DatvtqhE.js", + "file": "RoomPage-CMRDvbEM.js", "name": "RoomPage", "src": "src/components/RoomPage/RoomPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_MultiStep_AddEditEntity-KDtbEBBY.js", - "_react-select.esm-DIB_MQU9.js", - "_index.esm-OPyB-aE8.js", - "_NSPanelToastContainer-DX4VftN1.js", + "_MultiStep_AddEditEntity-xcopfTe5.js", + "_react-select.esm-CbdimKhg.js", + "_index.esm-CnTf2rLv.js", + "_NSPanelToastContainer-D677tDZJ.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", - "_StompStore-YH4Dqjwd.js", - "_EntityStore-BkKCiqU6.js", - "_mdi-gqrDBoHO.js" + "_StompStore-Bh-Guhla.js", + "_EntityStore-CHE3-bsC.js", + "_mdi-Cr6PIsRR.js" ] }, "src/components/RoomsPage/RoomsView.tsx": { - "file": "RoomsView-CmYCbfLH.js", + "file": "RoomsView-qN1A3y9X.js", "name": "RoomsView", "src": "src/components/RoomsPage/RoomsView.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_sortable-DCj6uSpL.js", - "_index.esm-OPyB-aE8.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_proxy-DUfbqFkY.js", - "_use-spring-BVI2O33U.js", - "_EntityStore-BkKCiqU6.js", - "_mdi-gqrDBoHO.js", - "_layout-MHz_8kDh.js" + "_sortable-Ke3drO00.js", + "_index.esm-CnTf2rLv.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_proxy-BQYsYRjY.js", + "_use-spring-BsypnnSW.js", + "_EntityStore-CHE3-bsC.js", + "_mdi-Cr6PIsRR.js", + "_layout-HS0oHCMJ.js", + "_fields-Dr1KI0Cj.js" ] }, "src/components/SettingsPage/SettingsPage.tsx": { - "file": "SettingsPage-DP7xWhAz.js", + "file": "SettingsPage-CzrUBqYz.js", "name": "SettingsPage", "src": "src/components/SettingsPage/SettingsPage.tsx", "isDynamicEntry": true, "imports": [ "src/main.tsx", - "_index.esm-OPyB-aE8.js", - "_NSPanelToastContainer-DX4VftN1.js", - "_layout-MHz_8kDh.js" + "_index.esm-CnTf2rLv.js", + "_NSPanelToastContainer-D677tDZJ.js", + "_layout-HS0oHCMJ.js", + "_fields-Dr1KI0Cj.js" ] }, "src/main.tsx": { - "file": "main-GTPFHy3s.js", + "file": "main-FKp56mKw.js", "name": "main", "src": "src/main.tsx", "isEntry": true, "dynamicImports": [ - "_MultiStep_AddEditEntity-KDtbEBBY.js", + "_MultiStep_AddEditEntity-xcopfTe5.js", "src/components/EntitiesPage/EntitiesPagesView.tsx", "src/components/IndexPage/NSPanelsView.tsx", - "_NSPanelToastContainer-DX4VftN1.js", + "_NSPanelToastContainer-D677tDZJ.js", "src/components/InitialSetup/InitialSetup.tsx", "src/components/NSPanelPage/Sidebar.tsx", "src/components/NSPanelPage/Warnings.tsx", diff --git a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-Dqu00Wbg.js b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CpnHckGS.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-Dqu00Wbg.js rename to docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CpnHckGS.js index 34f97a47c..341044942 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-Dqu00Wbg.js +++ b/docker/web/nspanelmanager/web/react-components/dist/AnimatePresence-CpnHckGS.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-DUfbqFkY.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { f as PresenceContext, h as LayoutGroupContext, i as isHTMLElement, m as useConstant, n as usePresence, p as useIsomorphicLayoutEffect, r as MotionConfigContext } from "./proxy-BQYsYRjY.js"; //#region node_modules/framer-motion/dist/es/utils/use-composed-ref.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-s7wQbHCc.js b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DShidmI8.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-s7wQbHCc.js rename to docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DShidmI8.js index 8c2fef7b7..fba81cc39 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-s7wQbHCc.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntitiesPagesView-DShidmI8.js @@ -1,7 +1,7 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-DCj6uSpL.js"; -import { t as create } from "./react-Dmrhcfpd.js"; -import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-KDtbEBBY.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { a as useDroppable, i as useDraggable, n as isSortable, r as DragDropProvider, t as useSortable } from "./sortable-Ke3drO00.js"; +import { t as create } from "./react-Cm4z11-B.js"; +import { i as useEntitiesPagesStore, n as MultiStep_AddOrEditEntity } from "./MultiStep_AddEditEntity-xcopfTe5.js"; //#region src/components/EntitiesPage/GenericEntityBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-BkKCiqU6.js b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-CHE3-bsC.js similarity index 92% rename from docker/web/nspanelmanager/web/react-components/dist/EntityStore-BkKCiqU6.js rename to docker/web/nspanelmanager/web/react-components/dist/EntityStore-CHE3-bsC.js index 2d46bb5cd..5ce29ab90 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/EntityStore-BkKCiqU6.js +++ b/docker/web/nspanelmanager/web/react-components/dist/EntityStore-CHE3-bsC.js @@ -1,6 +1,6 @@ -import { t as create } from "./react-Dmrhcfpd.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; +import { t as create } from "./react-Cm4z11-B.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as useStompStore } from "./StompStore-Bh-Guhla.js"; //#region src/stores/EntityStore.ts var nspanel_stomp_status_update_callback = (message) => { const json_data = JSON.parse(message.body); diff --git a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-qFecaEyr.js b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-p38u0OlE.js similarity index 65% rename from docker/web/nspanelmanager/web/react-components/dist/InitialSetup-qFecaEyr.js rename to docker/web/nspanelmanager/web/react-components/dist/InitialSetup-p38u0OlE.js index 160288210..6c1aea277 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-qFecaEyr.js +++ b/docker/web/nspanelmanager/web/react-components/dist/InitialSetup-p38u0OlE.js @@ -1,9 +1,10 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { t as useSettingsStore } from "./SettingsStore-B_b5mu_f.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as motion } from "./proxy-DUfbqFkY.js"; -import { t as AnimatePresence } from "./AnimatePresence-Dqu00Wbg.js"; -import { i as mdiInformationOutline, x as require_Icon } from "./mdi-gqrDBoHO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { s as useForm } from "./index.esm-CnTf2rLv.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as motion } from "./proxy-BQYsYRjY.js"; +import { t as AnimatePresence } from "./AnimatePresence-CpnHckGS.js"; +import { i as mdiInformationOutline, x as require_Icon } from "./mdi-Cr6PIsRR.js"; +import { i as api, t as Alert } from "./layout-HS0oHCMJ.js"; //#region src/components/InitialSetup/Step1_Welcome.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); @@ -45,55 +46,96 @@ var Step1_Welcome = ({ nextStep }) => { })] }); }; //#endregion +//#region src/components/InitialSetup/form.ts +var INITIAL_SETUP_FIELDS = [ + "manager_address", + "manager_port", + "mqtt_server", + "mqtt_port", + "mqtt_username", + "home_assistant_address", + "openhab_address", + "theme" +]; +var SECRETS = [ + "mqtt_password", + "home_assistant_token", + "openhab_token" +]; +var ADDON_MANAGED = ["home_assistant_address", "home_assistant_token"]; +function toFormValues(settings) { + const values = {}; + for (const name of INITIAL_SETUP_FIELDS) values[name] = settings[name]; + for (const secret of SECRETS) { + values[secret] = ""; + values[`clear_${secret}`] = false; + } + return values; +} +/** +* The PATCH body for a submitted form: only the settings that changed. Secrets are sent when a new +* value is typed, or as "" when "clear" is ticked. Add-on managed settings are never sent in the add-on. +*/ +function buildPatch(values, dirty, isHomeAssistantAddon) { + const body = {}; + const allowed = (name) => !(isHomeAssistantAddon && ADDON_MANAGED.includes(name)); + for (const name of INITIAL_SETUP_FIELDS) if (dirty[name] && allowed(name)) body[name] = values[name]; + for (const secret of SECRETS) { + if (!allowed(secret)) continue; + if (values[`clear_${secret}`]) body[secret] = ""; + else if (values[secret]) body[secret] = values[secret]; + } + return body; +} +//#endregion //#region src/components/InitialSetup/Step2_Theme.tsx -var Step2_Theme = ({ setFormData, formData, nextStep, prevStep }) => { - const [selectedTheme, setSelectedTheme] = (0, import_react.useState)("default"); +var Step2_Theme = ({ setValue, nextStep, prevStep, watch }) => { + const themes = { + default: "Default", + light: "Light", + dark: "Dark", + nspmwip: "NSPanel Manager", + cupcake: "Cupcake", + bumblebee: "Bumblebee", + emerald: "Emerald", + corporate: "Corporate", + synthwave: "Synthwave", + retro: "Retro", + cyberpunk: "Cyberpunk", + valentine: "Valentine", + halloween: "Halloween", + garden: "Garden", + forest: "Forest", + aqua: "Aqua", + lofi: "Lo-Fi", + pastel: "Pastel", + fantasy: "Fantasy", + wireframe: "Wireframe", + black: "Black", + luxury: "Luxury", + dracula: "Dracula", + cmyk: "CMYK", + autumn: "Autumn", + business: "Business", + acid: "Acid", + lemonade: "Lemonade", + night: "Night", + coffee: "Coffee", + winter: "Winter", + dim: "Dim", + nord: "Nord", + sunset: "Sunset" + }; + const selectedTheme = watch("theme"); return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "grid gap-4 grid-cols-3 mt-4 justify-end items-center", - children: Object.entries({ - default: "Default", - light: "Light", - dark: "Dark", - nspmwip: "NSPanel Manager", - cupcake: "Cupcake", - bumblebee: "Bumblebee", - emerald: "Emerald", - corporate: "Corporate", - synthwave: "Synthwave", - retro: "Retro", - cyberpunk: "Cyberpunk", - valentine: "Valentine", - halloween: "Halloween", - garden: "Garden", - forest: "Forest", - aqua: "Aqua", - lofi: "Lo-Fi", - pastel: "Pastel", - fantasy: "Fantasy", - wireframe: "Wireframe", - black: "Black", - luxury: "Luxury", - dracula: "Dracula", - cmyk: "CMYK", - autumn: "Autumn", - business: "Business", - acid: "Acid", - lemonade: "Lemonade", - night: "Night", - coffee: "Coffee", - winter: "Winter", - dim: "Dim", - nord: "Nord", - sunset: "Sunset" - }).map(([theme_option, display_name]) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + children: Object.entries(themes).map(([theme_option, display_name]) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "bg-neutral text-neutral-content grid grid-cols-3 w-full h-20 rounded-box overflow-hidden cursor-pointer", "data-theme": theme_option, onClick: () => { - setSelectedTheme(theme_option); - setFormData({ - ...formData, - theme: theme_option - }); + setValue("theme", theme_option, { shouldDirty: true }); + const radio = document.querySelector(`#theme-radio-${CSS.escape(theme_option)}`); + if (radio) radio.checked = true; }, children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "", @@ -111,7 +153,7 @@ var Step2_Theme = ({ setFormData, formData, nextStep, prevStep }) => { name: "theme-dropdown", className: "theme-controller radio radio-xs radio-accent p-0 m-0 absolute top-1 right-1", value: theme_option, - checked: theme_option === selectedTheme + checked: theme_option == selectedTheme }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "label-text justify-start w-full ml-2 text-wrap", children: display_name @@ -146,12 +188,12 @@ var Step2_Theme = ({ setFormData, formData, nextStep, prevStep }) => { }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex gap-2 justify-end mt-8", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-neutral", onClick: prevStep, children: "Back" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-primary", onClick: nextStep, children: "Next" @@ -160,24 +202,15 @@ var Step2_Theme = ({ setFormData, formData, nextStep, prevStep }) => { }; //#endregion //#region src/components/InitialSetup/Step3_ManagerSettings.tsx -var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { - const managerAddressRef = (0, import_react.useRef)(null); - const managerPortRef = (0, import_react.useRef)(null); +var Step3_ManagerSettings = ({ setValue, getValues, register, nextStep, prevStep }) => { const getIPFromURL = () => { fetch("/rest/get_ip_by_hostname", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ hostname: window.location.hostname }) }).then((response) => response.json()).then((data) => { - if (data.ip) { - if (managerAddressRef.current) { - managerAddressRef.current.value = data.ip; - setFormData({ - ...formData, - manager_address: data.ip - }); - } - } else Notify({ + if (data.ip) setValue("manager_address", data.ip, { shouldDirty: true }); + else Notify({ message: "Failed to get IP from URL. No \"ip\" field in response.", level: "error" }); @@ -189,12 +222,33 @@ var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { }); }; const testManagerAddressAndPort = () => { + const address = getValues("manager_address"); + const port = getValues("manager_port"); + if (address == null) { + Notify({ + message: "Manager address is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } + if (port == null) { + Notify({ + message: "Manager port is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } const params = { - address: formData.manager_address, - port: formData.manager_port.toString() + address, + port: port.toString() }; const queryString = new URLSearchParams(params).toString(); - fetch("/rest/mqttmanager/test?" + queryString, { method: "GET" }).then((response) => { + fetch("/rest/mqttmanager/test?" + queryString, { + method: "GET", + signal: AbortSignal.timeout(2e3) + }).then((response) => { if (response.ok) Notify({ message: "Manager address and port are valid.", level: "success", @@ -231,13 +285,8 @@ var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md rounded-r-none border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "text", - onChange: (e) => setFormData({ - ...formData, - manager_address: e.target.value - }), - value: formData.manager_address, - required: true, - ref: managerAddressRef + ...register("manager_address"), + required: true }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "btn btn-info rounded-l-none h-auto", @@ -260,20 +309,14 @@ var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md rounded-r-none border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "number", - onChange: (e) => setFormData({ - ...formData, - manager_port: parseInt(e.target.value) - }), - value: formData.manager_port, - required: true, - ref: managerPortRef + ...register("manager_port", { valueAsNumber: true }), + required: true }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "btn btn-info rounded-l-none h-auto", - onClick: () => managerPortRef.current && (managerPortRef.current.value = window.location.port) && setFormData({ - ...formData, - manager_port: parseInt(window.location.port) - }), + onClick: () => { + setValue("manager_port", parseInt(window.location.port), { shouldDirty: true }); + }, children: "Load from URL" })] })] @@ -288,15 +331,14 @@ var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex gap-2 justify-end mt-8", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-neutral", onClick: prevStep, children: "Back" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-primary", onClick: nextStep, - disabled: !formData.manager_address || !formData.manager_port, children: "Next" })] })] }); @@ -304,8 +346,10 @@ var Step3_ManagerSettings = ({ formData, setFormData, nextStep, prevStep }) => { //#endregion //#region src/components/InitialSetup/Step4_MqttSettings.tsx var import_Icon = require_Icon(); -var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { - const [anonymousLogin, setAnonymousLogin] = (0, import_react.useState)(formData.mqtt_username === ""); +var Step4_MqttSettings = ({ setValue, getValues, register, watch, nextStep, prevStep }) => { + const [noLogin, setNoLogin] = (0, import_react.useState)(getValues("mqtt_username") == "" && getValues("mqtt_password") == ""); + const address = watch("mqtt_server"); + const port = watch("mqtt_port"); return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [ /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "alert alert-info my-4", @@ -330,11 +374,7 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "text", - onChange: (e) => setFormData({ - ...formData, - mqtt_server: e.target.value - }), - value: formData.mqtt_server, + ...register("mqtt_server"), required: true }) })] @@ -353,11 +393,7 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "number", - onChange: (e) => setFormData({ - ...formData, - mqtt_port: parseInt(e.target.value) - }), - value: formData.mqtt_port, + ...register("mqtt_port", { valueAsNumber: true }), required: true }) })] @@ -375,20 +411,20 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", className: "checkbox checkbox-sm checkbox-primary", - checked: anonymousLogin, - onChange: () => { - setAnonymousLogin(!anonymousLogin); - setFormData({ - ...formData, - mqtt_username: "", - mqtt_password: "" - }); + checked: noLogin, + onChange: (e) => { + if (e.currentTarget.checked) { + setValue("mqtt_username", "", { shouldDirty: true }); + setValue("mqtt_password", "", { shouldDirty: true }); + setValue("clear_mqtt_password", true, { shouldDirty: true }); + setNoLogin(true); + } else setNoLogin(false); } }), "Anonymous login"] }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "flex justify-center my-4 duration-500 transition-transform ease-linear", - hidden: anonymousLogin, + hidden: noLogin, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { @@ -401,12 +437,7 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "text", id: "mqtt_username", - onChange: (e) => setFormData({ - ...formData, - mqtt_username: e.target.value - }), - value: formData.mqtt_username, - disabled: anonymousLogin, + ...register("mqtt_username"), required: true }) })] @@ -414,7 +445,7 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "flex justify-center mb-4 duration-500 transition-transform ease-linear", - hidden: anonymousLogin, + hidden: noLogin == true, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { @@ -427,12 +458,7 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5 peer/search_text", type: "password", id: "mqtt_password", - onChange: (e) => setFormData({ - ...formData, - mqtt_password: e.target.value - }), - value: formData.mqtt_password, - disabled: anonymousLogin, + ...register("mqtt_password"), required: true }) })] @@ -445,15 +471,15 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex gap-2 justify-end mt-8", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-neutral", onClick: prevStep, children: "Back" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-primary", onClick: nextStep, - disabled: !formData.mqtt_server || !formData.mqtt_port, + disabled: address == "" || port == null || port < 1 || port > 65535, children: "Next" })] }) @@ -461,13 +487,30 @@ var Step4_MqttSettings = ({ formData, setFormData, nextStep, prevStep }) => { }; //#endregion //#region src/components/InitialSetup/Step5_HomeAssistantSettings.tsx -var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, isHomeAssistantAddon }) => { +var Step5_HomeAssistantSettings = ({ getValues, register, isHomeAssistantAddon, nextStep, prevStep }) => { const testHomeAssistant = () => { - const params = { - address: formData.home_assistant_address, - token: formData.home_assistant_token - }; - const queryString = new URLSearchParams(params).toString(); + const address = getValues("home_assistant_address"); + const token = getValues("home_assistant_token"); + if (address == null) { + Notify({ + message: "Home Assistant address is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } + if (token == null) { + Notify({ + message: "Home Assistant token is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } + const queryString = new URLSearchParams({ + address, + token + }).toString(); fetch("/rest/home_assistant/test?" + queryString, { method: "GET" }).then((response) => { if (response.ok) Notify({ message: "Home Assistant address and token are valid.", @@ -504,7 +547,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Icon.Icon, { path: mdiInformationOutline, className: "w-6" - }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: "You are running NSPanel Manager as a Home Assistant add on. These settings are managed for you by Home Assistant. Simply press next to continue." })] + }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: "You are running NSPanel Manager as a Home Assistant add on. These settings are managed for you by Home Assistant." })] }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "alert alert-info my-4", @@ -519,6 +562,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", + hidden: isHomeAssistantAddon, children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "flex justify-center mb-4 duration-500 transition-transform ease-linear", children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { @@ -532,11 +576,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5", type: "text", - onChange: (e) => setFormData({ - ...formData, - home_assistant_address: e.target.value - }), - value: formData.home_assistant_address, + ...register("home_assistant_address"), disabled: isHomeAssistantAddon, required: true }) @@ -544,6 +584,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, }) }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "flex justify-center mb-4 duration-500 transition-transform ease-linear", + hidden: isHomeAssistantAddon, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { @@ -555,11 +596,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5", type: "password", - onChange: (e) => setFormData({ - ...formData, - home_assistant_token: e.target.value - }), - value: formData.home_assistant_token, + ...register("home_assistant_token"), disabled: isHomeAssistantAddon, required: true }) @@ -570,6 +607,7 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { className: "btn btn-accent w-full", onClick: testHomeAssistant, + hidden: isHomeAssistantAddon, children: "Test settings" }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { @@ -590,13 +628,30 @@ var Step5_HomeAssistantSettings = ({ formData, setFormData, nextStep, prevStep, }; //#endregion //#region src/components/InitialSetup/Step6_OpenhabSettings.tsx -var Step6_OpenhabSettings = ({ formData, setFormData, nextStep, prevStep }) => { +var Step6_OpenhabSettings = ({ getValues, register, nextStep, prevStep }) => { const testOpenhab = () => { - const params = { - address: formData.openhab_address, - token: formData.openhab_token - }; - const queryString = new URLSearchParams(params).toString(); + const address = getValues("openhab_address"); + const token = getValues("openhab_token"); + if (address == null) { + Notify({ + message: "OpenHAB address is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } + if (token == null) { + Notify({ + message: "OpenHAB token is required to test the connection", + level: "error", + duration: 5e3 + }); + return; + } + const queryString = new URLSearchParams({ + address, + token + }).toString(); fetch("/rest/openhab/test?" + queryString, { method: "GET" }).then((response) => { if (response.ok) Notify({ message: "OpenHAB address and token are valid.", @@ -651,11 +706,7 @@ var Step6_OpenhabSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5", type: "text", - onChange: (e) => setFormData({ - ...formData, - openhab_address: e.target.value - }), - value: formData.openhab_address, + ...register("openhab_address"), required: true }) })] @@ -673,11 +724,7 @@ var Step6_OpenhabSettings = ({ formData, setFormData, nextStep, prevStep }) => { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "outline-none bg-base-300 border-neutral rounded-md border focus:ring-0 focus:border-accent block flex-1 min-w-0 w-full text-sm p-2.5", type: "password", - onChange: (e) => setFormData({ - ...formData, - openhab_token: e.target.value - }), - value: formData.openhab_token, + ...register("openhab_token"), required: true }) })] @@ -707,51 +754,48 @@ var Step6_OpenhabSettings = ({ formData, setFormData, nextStep, prevStep }) => { }; //#endregion //#region src/components/InitialSetup/Step7_Finished.tsx -var Step7_Finished = ({ formData, prevStep }) => { - function getCookie(name) { - let cookieValue = ""; - if (document.cookie && document.cookie !== "") { - const cookies = document.cookie.split(";"); - for (let i = 0; i < cookies.length; i++) { - const cookie = cookies[i].trim(); - if (cookie.substring(0, name.length + 1) === name + "=") { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } - } - } - return cookieValue; - } - const saveSettings = () => { - fetch("/rest/settings", { - method: "POST", - headers: { - "Content-Type": "application/json", - "X-CSRFToken": getCookie("csrftoken") - }, - body: JSON.stringify({ settings: formData }) - }).then((response) => { - if (response.ok) { +var Step7_Finished = ({ form, prevStep, isHomeAssistantAddon, dialogRef }) => { + const saveSettings = async () => { + const { getValues, reset, formState: { dirtyFields } } = form; + const body = buildPatch(getValues(), dirtyFields, isHomeAssistantAddon); + try { + const { data, error, response } = await api.PATCH("/rest/v2/settings", { body }); + if (data) { + reset(toFormValues(data)); Notify({ - message: "Settings saved successfully.", + message: "Settings saved.", level: "success", duration: 5e3 }); - window.location.reload(); - } else response.json().then((data) => { - Notify({ - message: "Failed to save settings. Error: " + data.message, + dialogRef.current?.close(); + return; + } + if (response.status === 400 && error && !("detail" in error && error.detail)) { + console.error("Got error ", error); + const fieldErrors = Object.entries(error); + if (fieldErrors.length === 0) Notify({ + message: "Nothing was saved.", level: "error", - duration: 5e3 + duration: 8e3 }); - }); - }).catch((error) => { + for (const [field, messages] of fieldErrors) for (const message of Array.isArray(messages) ? messages : [messages]) Notify({ + message: `${field}: ${message}`, + level: "error", + duration: 8e3 + }); + } else { + const detail = error && "detail" in error ? error.detail : `HTTP ${response.status}`; + Notify({ + message: `Couldn't save the settings: ${detail}`, + level: "error" + }); + } + } catch (failure) { Notify({ - message: "Failed to save settings. Error: " + error.message, - level: "error", - duration: 5e3 + message: `Couldn't save the settings: ${failure instanceof Error ? failure.message : String(failure)}`, + level: "error" }); - }); + } }; return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "w-full", @@ -780,7 +824,7 @@ var Step7_Finished = ({ formData, prevStep }) => { }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "my-2 text-center font-bold", - children: "Thank you for your support and trust and have fun!" + children: "Thank you for your support and trust. Have fun and enjoy!" }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { id: "about_links", @@ -824,12 +868,12 @@ var Step7_Finished = ({ formData, prevStep }) => { /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "flex gap-2 justify-end mt-8", children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-neutral", onClick: prevStep, children: "Back" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { - type: "submit", + type: "button", className: "btn btn-primary", onClick: saveSettings, children: "Save" @@ -841,39 +885,24 @@ var Step7_Finished = ({ formData, prevStep }) => { //#endregion //#region src/components/InitialSetup/InitialSetup.tsx var InitialSetup = ({ opened, isHomeAssistantAddon }) => { - const [step, setStep] = (0, import_react.useState)(1); - const [hasPopulatedFromExistingSettings, setHasPopulatedFromExistingSettings] = (0, import_react.useState)(false); - const [formData, setFormData] = (0, import_react.useState)({ - theme: "default", - manager_address: "", - manager_port: 8e3, - mqtt_server: "", - mqtt_port: 1883, - mqtt_username: "", - mqtt_password: "", - home_assistant_address: "", - home_assistant_token: "", - openhab_address: "", - openhab_token: "" - }); - const settingsStoreStatus = useSettingsStore((state) => state.status); - if (settingsStoreStatus == "none") useSettingsStore.getState().fetchData(); - else if (settingsStoreStatus == "loaded" && !hasPopulatedFromExistingSettings) { - console.log("Settings loaded, updating formData for initial setup."); - setFormData((prev) => ({ - ...prev, - theme: useSettingsStore.getState().settings?.theme ?? "default", - manager_address: useSettingsStore.getState().settings?.manager_address ?? "", - manager_port: useSettingsStore.getState().settings?.manager_port ?? 8e3, - mqtt_server: useSettingsStore.getState().settings?.mqtt_server ?? "", - mqtt_port: useSettingsStore.getState().settings?.mqtt_port ?? 1883, - home_assistant_address: useSettingsStore.getState().settings?.home_assistant_address ?? "", - openhab_address: useSettingsStore.getState().settings?.openhab_address ?? "" + const [state, setState] = (0, import_react.useState)({ status: "loading" }); + const fetchSettings = (0, import_react.useCallback)(() => { + api.GET("/rest/v2/settings").then(({ data, response }) => setState(data ? { + status: "loaded", + settings: data + } : { + status: "error", + message: `HTTP ${response.status}` + })).catch((error) => setState({ + status: "error", + message: error instanceof Error ? error.message : String(error) })); - setHasPopulatedFromExistingSettings(true); - } - const nextStep = () => setStep((prev) => prev + 1); - const prevStep = () => setStep((prev) => prev - 1); + }, []); + (0, import_react.useEffect)(fetchSettings, [fetchSettings]); + const retry = () => { + setState({ status: "loading" }); + fetchSettings(); + }; const dialogRef = (0, import_react.useRef)(null); const contentRef = (0, import_react.useRef)(null); const checkOverflow = () => { @@ -897,126 +926,180 @@ var InitialSetup = ({ opened, isHomeAssistantAddon }) => { ref: dialogRef, open: opened ?? false, className: "modal duration-200", - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { - ref: contentRef, - className: `modal-box max-h-11/12 min-w-180 bg-base-100 text-base-content`, - children: [(() => { - return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { - className: "flex justify-center mb-4 w-full", - children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("ul", { - className: "steps w-full", - children: [ - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 1 ? "step-primary cursor-pointer" : ""}`, - onClick: () => { - setStep(1); - }, - children: "Welcome" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 2 ? "step-primary" : ""}`, - onClick: () => { - setStep(2); - }, - children: "Theme" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 3 ? "step-primary" : ""}`, - onClick: () => { - setStep(3); - }, - children: "Manager settings" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 4 ? "step-primary" : ""}`, - onClick: () => { - setStep(4); - }, - children: "MQTT settings" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 5 ? "step-primary" : ""}`, - onClick: () => { - setStep(5); - }, - children: "Home Assistant settings" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 6 ? "step-primary" : ""}`, - onClick: () => { - setStep(6); - }, - children: "OpenHAB settings" - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { - className: `step cursor-pointer ${step >= 7 ? "step-primary" : ""}`, - onClick: () => { - setStep(7); - }, - children: "Finished" - }) - ] - }) - }); - })(), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AnimatePresence, { - mode: "wait", - children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(motion.div, { - layout: true, - initial: { - opacity: 0, - x: 30 - }, - animate: { - opacity: 1, - x: 0 - }, - exit: { - opacity: 0, - x: -30 - }, - transition: { duration: .1 }, - children: (() => { - if (step == 1) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step1_Welcome, { nextStep }); - else if (step == 2) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step2_Theme, { - formData, - setFormData, - nextStep, - prevStep - }); - else if (step == 3) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step3_ManagerSettings, { - formData, - setFormData, - nextStep, - prevStep - }); - else if (step == 4) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step4_MqttSettings, { - formData, - setFormData, - nextStep, - prevStep - }); - else if (step == 5) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step5_HomeAssistantSettings, { - formData, - setFormData, - nextStep, - prevStep, - isHomeAssistantAddon - }); - else if (step == 6) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step6_OpenhabSettings, { - formData, - setFormData, - nextStep, - prevStep - }); - else if (step == 7) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step7_Finished, { - formData, - prevStep - }); - })() - }, `step.${step}`) - })] - }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "modal-backdrop" })] + children: [ + state.status === "loading" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "flex items-center justify-center modal-box max-h-11/12 min-w-180 min-h-60 bg-base-100 text-base-content", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "loading loading-spinner loading" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { + className: "ml-2 text-xl", + children: "Initializing first setup" + })] + }), + state.status === "error" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Alert, { + level: "error", + children: ["Couldn't load settings: ", state.message] + }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { + type: "button", + className: "btn", + onClick: retry, + children: "Retry" + })] }), + state.status === "loaded" && dialogRef != null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(InitialSetupForm, { + settings: state.settings, + dialogRef, + isHomeAssistantAddon + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "modal-backdrop" }) + ] }); }; +var InitialSetupForm = ({ dialogRef, isHomeAssistantAddon, settings }) => { + const [step, setStep] = (0, import_react.useState)(1); + const form = useForm({ defaultValues: toFormValues(settings) }); + const { register, setValue, getValues, watch } = form; + const nextStep = () => setStep((prev) => prev + 1); + const prevStep = () => setStep((prev) => prev - 1); + const contentRef = (0, import_react.useRef)(null); + const checkOverflow = () => { + if (contentRef.current) { + const maxHeightString = window.getComputedStyle(contentRef.current).maxHeight; + let maxHeight = parseFloat(maxHeightString); + if (maxHeightString.endsWith("%")) maxHeight = Math.trunc(window.innerHeight * maxHeight / 100); + contentRef.current.classList.toggle("overflow-y-auto", contentRef.current.scrollHeight > maxHeight); + contentRef.current.classList.toggle("overflow-y-visible", contentRef.current.scrollHeight <= maxHeight); + } + }; + (0, import_react.useEffect)(() => { + const observer = new ResizeObserver((entries) => { + entries.forEach(() => { + checkOverflow(); + }); + }); + if (contentRef.current) observer.observe(contentRef.current); + }, [contentRef]); + return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + ref: contentRef, + className: `modal-box max-h-11/12 min-w-180 bg-base-100 text-base-content`, + children: [(() => { + return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { + className: "flex justify-center mb-4 w-full", + children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("ul", { + className: "steps w-full", + children: [ + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 1 ? "step-primary cursor-pointer" : ""}`, + onClick: () => { + setStep(1); + }, + children: "Welcome" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 2 ? "step-primary" : ""}`, + onClick: () => { + setStep(2); + }, + children: "Theme" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 3 ? "step-primary" : ""}`, + onClick: () => { + setStep(3); + }, + children: "Manager settings" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 4 ? "step-primary" : ""}`, + onClick: () => { + setStep(4); + }, + children: "MQTT settings" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 5 ? "step-primary" : ""}`, + onClick: () => { + setStep(5); + }, + children: "Home Assistant settings" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 6 ? "step-primary" : ""}`, + onClick: () => { + setStep(6); + }, + children: "OpenHAB settings" + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { + className: `step cursor-pointer ${step >= 7 ? "step-primary" : ""}`, + onClick: () => { + setStep(7); + }, + children: "Finished" + }) + ] + }) + }); + })(), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AnimatePresence, { + mode: "wait", + children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(motion.div, { + layout: true, + initial: { + opacity: 0, + x: 30 + }, + animate: { + opacity: 1, + x: 0 + }, + exit: { + opacity: 0, + x: -30 + }, + transition: { duration: .1 }, + children: (() => { + if (step == 1) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step1_Welcome, { nextStep }); + else if (step == 2) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step2_Theme, { + setValue, + nextStep, + prevStep, + watch + }); + else if (step == 3) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step3_ManagerSettings, { + setValue, + getValues, + register, + nextStep, + prevStep + }); + else if (step == 4) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step4_MqttSettings, { + setValue, + getValues, + register, + watch, + nextStep, + prevStep + }); + else if (step == 5) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step5_HomeAssistantSettings, { + getValues, + register, + nextStep, + prevStep, + isHomeAssistantAddon + }); + else if (step == 6) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step6_OpenhabSettings, { + getValues, + register, + nextStep, + prevStep + }); + else if (step == 7) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Step7_Finished, { + form, + isHomeAssistantAddon, + prevStep, + dialogRef + }); + })() + }, `step.${step}`) + })] + }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "modal-backdrop" })] }); +}; //#endregion export { InitialSetup as default }; diff --git a/docker/web/nspanelmanager/web/react-components/dist/Logs-fyKfGB-i.js b/docker/web/nspanelmanager/web/react-components/dist/Logs-B094dObe.js similarity index 97% rename from docker/web/nspanelmanager/web/react-components/dist/Logs-fyKfGB-i.js rename to docker/web/nspanelmanager/web/react-components/dist/Logs-B094dObe.js index 7d2193e26..e563a34a9 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Logs-fyKfGB-i.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Logs-B094dObe.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { t as useSettingsStore } from "./SettingsStore-B_b5mu_f.js"; -import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { t as useSettingsStore } from "./SettingsStore-msVzBcHM.js"; +import { t as useStompStore } from "./StompStore-Bh-Guhla.js"; //#region src/components/NSPanelPage/Logs.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_jsx_runtime = require_jsx_runtime(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-KDtbEBBY.js b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-xcopfTe5.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-KDtbEBBY.js rename to docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-xcopfTe5.js index 201cf8fc4..c49180932 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-KDtbEBBY.js +++ b/docker/web/nspanelmanager/web/react-components/dist/MultiStep_AddEditEntity-xcopfTe5.js @@ -1,11 +1,11 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { t as create } from "./react-Dmrhcfpd.js"; -import { t as useSettingsStore } from "./SettingsStore-B_b5mu_f.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-DIB_MQU9.js"; -import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-OPyB-aE8.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as motion } from "./proxy-DUfbqFkY.js"; -import { t as AnimatePresence } from "./AnimatePresence-Dqu00Wbg.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { t as create } from "./react-Cm4z11-B.js"; +import { t as useSettingsStore } from "./SettingsStore-msVzBcHM.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-CbdimKhg.js"; +import { a as set, i as get, o as useFieldArray, r as appendErrors, s as useForm } from "./index.esm-CnTf2rLv.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as motion } from "./proxy-BQYsYRjY.js"; +import { t as AnimatePresence } from "./AnimatePresence-CpnHckGS.js"; //#region src/stores/EntitiesPagesStore.ts function getCookie$1(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DX4VftN1.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-D677tDZJ.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DX4VftN1.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-D677tDZJ.js index 67d05c87a..4748dc376 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-DX4VftN1.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelToastContainer-D677tDZJ.js @@ -1,4 +1,4 @@ -import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { c as __toESM, o as __exportAll, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; //#region node_modules/clsx/dist/clsx.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); function r(e) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-CVnckJ-l.js b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-1YvY26NZ.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-CVnckJ-l.js rename to docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-1YvY26NZ.js index 44bd1f39b..bc4e2451f 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-CVnckJ-l.js +++ b/docker/web/nspanelmanager/web/react-components/dist/NSPanelsView-1YvY26NZ.js @@ -1,11 +1,11 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-DIB_MQU9.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as motion } from "./proxy-DUfbqFkY.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-BVI2O33U.js"; -import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; -import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-gqrDBoHO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-CbdimKhg.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as motion } from "./proxy-BQYsYRjY.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-BsypnnSW.js"; +import { t as useStompStore } from "./StompStore-Bh-Guhla.js"; +import { t as useEntityStatesStore } from "./EntityStore-CHE3-bsC.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, l as mdiRestart, n as mdiCog, p as mdiUpload, s as mdiMenuDownOutline, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-Cr6PIsRR.js"; //#region src/components/IndexPage/NSPanelBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-DatvtqhE.js b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-CMRDvbEM.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/RoomPage-DatvtqhE.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomPage-CMRDvbEM.js index c2842f605..8d7037eae 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomPage-DatvtqhE.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomPage-CMRDvbEM.js @@ -1,12 +1,12 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-KDtbEBBY.js"; -import { t as StateManagedSelect$1 } from "./react-select.esm-DIB_MQU9.js"; -import { l as useWatch, s as useForm } from "./index.esm-OPyB-aE8.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import EntitiesPagesView from "./EntitiesPagesView-s7wQbHCc.js"; -import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; -import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; -import { d as mdiTextShort, x as require_Icon } from "./mdi-gqrDBoHO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { r as useAvailableEntitiesStore } from "./MultiStep_AddEditEntity-xcopfTe5.js"; +import { t as StateManagedSelect$1 } from "./react-select.esm-CbdimKhg.js"; +import { l as useWatch, s as useForm } from "./index.esm-CnTf2rLv.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import EntitiesPagesView from "./EntitiesPagesView-DShidmI8.js"; +import { t as useStompStore } from "./StompStore-Bh-Guhla.js"; +import { t as useEntityStatesStore } from "./EntityStore-CHE3-bsC.js"; +import { d as mdiTextShort, x as require_Icon } from "./mdi-Cr6PIsRR.js"; //#region src/components/RoomPage/RoomPage.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-CmYCbfLH.js b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-qN1A3y9X.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/RoomsView-CmYCbfLH.js rename to docker/web/nspanelmanager/web/react-components/dist/RoomsView-qN1A3y9X.js index 0cb8eff8b..d0c9fb41c 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/RoomsView-CmYCbfLH.js +++ b/docker/web/nspanelmanager/web/react-components/dist/RoomsView-qN1A3y9X.js @@ -1,12 +1,13 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { r as DragDropProvider, t as useSortable } from "./sortable-DCj6uSpL.js"; -import { n as FormProvider, s as useForm } from "./index.esm-OPyB-aE8.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as motion } from "./proxy-DUfbqFkY.js"; -import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-BVI2O33U.js"; -import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; -import { o as mdiMenu, x as require_Icon } from "./mdi-gqrDBoHO.js"; -import { c as TextInput, l as api, t as Alert } from "./layout-MHz_8kDh.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { r as DragDropProvider, t as useSortable } from "./sortable-Ke3drO00.js"; +import { n as FormProvider, s as useForm } from "./index.esm-CnTf2rLv.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as motion } from "./proxy-BQYsYRjY.js"; +import { n as useMotionTemplate, r as useMotionValue, t as useSpring } from "./use-spring-BsypnnSW.js"; +import { t as useEntityStatesStore } from "./EntityStore-CHE3-bsC.js"; +import { o as mdiMenu, x as require_Icon } from "./mdi-Cr6PIsRR.js"; +import { i as api, t as Alert } from "./layout-HS0oHCMJ.js"; +import { a as TextInput } from "./fields-Dr1KI0Cj.js"; //#region src/components/RoomsPage/RoomBox.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DP7xWhAz.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-CzrUBqYz.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DP7xWhAz.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsPage-CzrUBqYz.js index f217e89db..b94b6cb76 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-DP7xWhAz.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsPage-CzrUBqYz.js @@ -1,7 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-OPyB-aE8.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { a as RadioGroup$1, c as TextInput$1, i as NumberInput$1, l as api, n as Card, o as SecretInput$1, r as Row, s as Select$1, t as Alert, u as getCookie } from "./layout-MHz_8kDh.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { c as useFormContext, i as get, l as useWatch, n as FormProvider, s as useForm } from "./index.esm-CnTf2rLv.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { a as getCookie, i as api, n as Card, r as Row, t as Alert } from "./layout-HS0oHCMJ.js"; +import { a as TextInput$1, i as Select$1, n as RadioGroup$1, r as SecretInput$1, t as NumberInput$1 } from "./fields-Dr1KI0Cj.js"; //#region src/api/connectionTests.ts var import_react = /* @__PURE__ */ __toESM(require_react(), 1); async function errorMessage(response) { diff --git a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-B_b5mu_f.js b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-msVzBcHM.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/SettingsStore-B_b5mu_f.js rename to docker/web/nspanelmanager/web/react-components/dist/SettingsStore-msVzBcHM.js index 4ac5ef3c6..3a6bb5b8b 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-B_b5mu_f.js +++ b/docker/web/nspanelmanager/web/react-components/dist/SettingsStore-msVzBcHM.js @@ -1,4 +1,4 @@ -import { t as create } from "./react-Dmrhcfpd.js"; +import { t as create } from "./react-Cm4z11-B.js"; //#region src/stores/SettingsStore.ts function getCookie(name) { let cookieValue = ""; diff --git a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-Ck5FumSR.js b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-CHcoOcQs.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/Sidebar-Ck5FumSR.js rename to docker/web/nspanelmanager/web/react-components/dist/Sidebar-CHcoOcQs.js index 0f38fcf78..5dc337f04 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Sidebar-Ck5FumSR.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Sidebar-CHcoOcQs.js @@ -1,8 +1,8 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { n as Notify } from "./NSPanelToastContainer-DX4VftN1.js"; -import { t as useStompStore } from "./StompStore-YH4Dqjwd.js"; -import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; -import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-gqrDBoHO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { n as Notify } from "./NSPanelToastContainer-D677tDZJ.js"; +import { t as useStompStore } from "./StompStore-Bh-Guhla.js"; +import { t as useEntityStatesStore } from "./EntityStore-CHE3-bsC.js"; +import { _ as mdiWifiStrength2, a as mdiMemory, b as mdiWifiStrengthAlertOutline, c as mdiMinusCircle, f as mdiThermometer, g as mdiWifiStrength1Alert, h as mdiWeb, i as mdiInformationOutline, l as mdiRestart, m as mdiWaterPercent, p as mdiUpload, u as mdiTableArrowUp, v as mdiWifiStrength3, x as require_Icon, y as mdiWifiStrength4 } from "./mdi-Cr6PIsRR.js"; //#region src/components/NSPanelPage/Sidebar.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/StompStore-YH4Dqjwd.js b/docker/web/nspanelmanager/web/react-components/dist/StompStore-Bh-Guhla.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/StompStore-YH4Dqjwd.js rename to docker/web/nspanelmanager/web/react-components/dist/StompStore-Bh-Guhla.js index 4160bf5ff..1b04cd103 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/StompStore-YH4Dqjwd.js +++ b/docker/web/nspanelmanager/web/react-components/dist/StompStore-Bh-Guhla.js @@ -1,6 +1,6 @@ -import { i as __commonJSMin } from "./main-GTPFHy3s.js"; -import { t as create } from "./react-Dmrhcfpd.js"; -import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-DX4VftN1.js"; +import { i as __commonJSMin } from "./main-FKp56mKw.js"; +import { t as create } from "./react-Cm4z11-B.js"; +import { n as Notify, r as RemoveNotification } from "./NSPanelToastContainer-D677tDZJ.js"; //#region node_modules/tslib/tslib.es6.mjs /****************************************************************************** Copyright (c) Microsoft Corporation. diff --git a/docker/web/nspanelmanager/web/react-components/dist/Warnings-B4Wyiqy9.js b/docker/web/nspanelmanager/web/react-components/dist/Warnings-D5nCet1X.js similarity index 95% rename from docker/web/nspanelmanager/web/react-components/dist/Warnings-B4Wyiqy9.js rename to docker/web/nspanelmanager/web/react-components/dist/Warnings-D5nCet1X.js index 8dfe173bd..282d50e9c 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/Warnings-B4Wyiqy9.js +++ b/docker/web/nspanelmanager/web/react-components/dist/Warnings-D5nCet1X.js @@ -1,6 +1,6 @@ -import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { t as useEntityStatesStore } from "./EntityStore-BkKCiqU6.js"; -import { x as require_Icon } from "./mdi-gqrDBoHO.js"; +import { c as __toESM, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { t as useEntityStatesStore } from "./EntityStore-CHE3-bsC.js"; +import { x as require_Icon } from "./mdi-Cr6PIsRR.js"; //#region src/components/NSPanelPage/Warnings.tsx var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var import_Icon = require_Icon(); diff --git a/docker/web/nspanelmanager/web/react-components/dist/fields-Dr1KI0Cj.js b/docker/web/nspanelmanager/web/react-components/dist/fields-Dr1KI0Cj.js new file mode 100644 index 000000000..7f147bb62 --- /dev/null +++ b/docker/web/nspanelmanager/web/react-components/dist/fields-Dr1KI0Cj.js @@ -0,0 +1,183 @@ +import { r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; +import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-CnTf2rLv.js"; +require_react(); +var import_jsx_runtime = require_jsx_runtime(); +function Field({ name, label, hint, children }) { + const { formState: { errors, defaultValues } } = useFormContext(); + const error = get(errors, name)?.message; + const unreadable = get(defaultValues, name) === null; + return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "mb-2 w-full", + children: [ + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { + htmlFor: name, + className: "block mb-1 text-sm font-medium", + children: label + }), + children, + error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { + className: "mt-1 text-sm text-error", + id: `${name}-error`, + children: error + }) : unreadable ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { + className: "mt-1 text-sm text-warning", + children: "No valid value is stored. Enter one." + }) : hint ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { + className: "mt-1 text-sm opacity-60", + children: hint + }) : null + ] + }); +} +var inputClass = "input w-full"; +function useInvalid(name) { + const { formState: { errors } } = useFormContext(); + const invalid = get(errors, name) !== void 0; + return { + "aria-invalid": invalid, + "aria-describedby": invalid ? `${name}-error` : void 0 + }; +} +function TextInput({ name, label, hint, disabled, button }) { + const { register } = useFormContext(); + return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { + name, + label, + hint, + children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "join w-full", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + id: name, + type: "text", + className: `${inputClass} join-item`, + disabled, + ...useInvalid(name), + ...register(name) + }), button] + }) + }); +} +var toNumber = (value) => value === "" || value === null || value === void 0 ? null : Number(value); +function NumberInput({ name, label, hint, button }) { + const { register } = useFormContext(); + return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { + name, + label, + hint, + children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "join w-full", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + id: name, + type: "number", + step: 1, + className: `${inputClass} join-item`, + ...useInvalid(name), + ...register(name, { setValueAs: toNumber }) + }), button] + }) + }); +} +function Select({ name, label, options }) { + const { register } = useFormContext(); + return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { + name, + label, + children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", { + id: name, + className: "select w-full", + ...useInvalid(name), + ...register(name), + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { + value: "", + disabled: true, + children: "Choose…" + }), options.map(([value, text]) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { + value, + children: text + }, value))] + }) + }); +} +function RadioGroup({ name, label, options }) { + const { control } = useFormContext(); + return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Controller, { + control, + name, + render: ({ field }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("fieldset", { + className: "mb-2 w-full", + "aria-label": label, + children: [ + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("legend", { + className: "block mb-1 text-sm font-medium", + children: label + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { + className: "flex flex-wrap border border-neutral rounded-lg", + children: options.map(([value, text]) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { + className: "flex items-center gap-2 flex-1 px-3 py-3 text-sm font-medium cursor-pointer", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "radio", + className: "radio radio-accent radio-sm", + name, + checked: field.value === value, + onChange: () => field.onChange(value), + onBlur: field.onBlur + }), text] + }, String(value))) + }), + /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FieldMessage, { name }) + ] + }) + }); +} +function FieldMessage({ name }) { + const { formState: { errors, defaultValues } } = useFormContext(); + const error = get(errors, name)?.message; + if (error) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { + className: "mt-1 text-sm text-error", + children: error + }); + if (get(defaultValues, name) === null) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { + className: "mt-1 text-sm text-warning", + children: "No valid value is stored. Choose one." + }); + return null; +} +function SecretInput({ name, clearName, label, isSet, disabled, button }) { + const { register, control } = useFormContext(); + const clear = useWatch({ + control, + name: clearName + }); + return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Field, { + name, + label, + hint: isSet && !disabled ? "Stored, and not shown. Leave blank to keep it." : void 0, + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { + className: "join w-full", + children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + id: name, + type: "password", + autoComplete: "new-password", + className: `${inputClass} join-item`, + placeholder: isSet ? "••••••••" : "", + disabled: disabled || clear, + ...useInvalid(name), + ...register(name) + }), button] + }), isSet && !disabled && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { + className: "label mt-1 text-sm", + children: [ + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { + type: "checkbox", + className: "checkbox checkbox-accent checkbox-sm", + ...register(clearName) + }), + "Clear the stored ", + label.toLowerCase() + ] + })] + }); +} +//#endregion +export { TextInput as a, Select as i, RadioGroup as n, SecretInput as r, NumberInput as t }; diff --git a/docker/web/nspanelmanager/web/react-components/dist/index.esm-OPyB-aE8.js b/docker/web/nspanelmanager/web/react-components/dist/index.esm-CnTf2rLv.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/index.esm-OPyB-aE8.js rename to docker/web/nspanelmanager/web/react-components/dist/index.esm-CnTf2rLv.js index 30d67dcbd..475295e7c 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/index.esm-OPyB-aE8.js +++ b/docker/web/nspanelmanager/web/react-components/dist/index.esm-CnTf2rLv.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-GTPFHy3s.js"; +import { c as __toESM, r as require_react } from "./main-FKp56mKw.js"; //#region node_modules/react-hook-form/dist/index.esm.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var isCheckBoxInput = (element) => element.type === "checkbox"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/layout-MHz_8kDh.js b/docker/web/nspanelmanager/web/react-components/dist/layout-HS0oHCMJ.js similarity index 70% rename from docker/web/nspanelmanager/web/react-components/dist/layout-MHz_8kDh.js rename to docker/web/nspanelmanager/web/react-components/dist/layout-HS0oHCMJ.js index eb5dfc0c2..f131b10be 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/layout-MHz_8kDh.js +++ b/docker/web/nspanelmanager/web/react-components/dist/layout-HS0oHCMJ.js @@ -1,5 +1,4 @@ -import { r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; -import { c as useFormContext, i as get, l as useWatch, t as Controller } from "./index.esm-OPyB-aE8.js"; +import { r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; //#region node_modules/openapi-fetch/dist/index.mjs var PATH_PARAM_RE = /\{[^{}]+\}/g; var supportsRequestInitExt = () => { @@ -414,185 +413,6 @@ var api = createClient({ api.use(csrf); require_react(); var import_jsx_runtime = require_jsx_runtime(); -function Field({ name, label, hint, children }) { - const { formState: { errors, defaultValues } } = useFormContext(); - const error = get(errors, name)?.message; - const unreadable = get(defaultValues, name) === null; - return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { - className: "mb-2 w-full", - children: [ - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("label", { - htmlFor: name, - className: "block mb-1 text-sm font-medium", - children: label - }), - children, - error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { - className: "mt-1 text-sm text-error", - id: `${name}-error`, - children: error - }) : unreadable ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { - className: "mt-1 text-sm text-warning", - children: "No valid value is stored. Enter one." - }) : hint ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { - className: "mt-1 text-sm opacity-60", - children: hint - }) : null - ] - }); -} -var inputClass = "input w-full"; -function useInvalid(name) { - const { formState: { errors } } = useFormContext(); - const invalid = get(errors, name) !== void 0; - return { - "aria-invalid": invalid, - "aria-describedby": invalid ? `${name}-error` : void 0 - }; -} -function TextInput({ name, label, hint, disabled, button }) { - const { register } = useFormContext(); - return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { - name, - label, - hint, - children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { - className: "join w-full", - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { - id: name, - type: "text", - className: `${inputClass} join-item`, - disabled, - ...useInvalid(name), - ...register(name) - }), button] - }) - }); -} -var toNumber = (value) => value === "" || value === null || value === void 0 ? null : Number(value); -function NumberInput({ name, label, hint, button }) { - const { register } = useFormContext(); - return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { - name, - label, - hint, - children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { - className: "join w-full", - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { - id: name, - type: "number", - step: 1, - className: `${inputClass} join-item`, - ...useInvalid(name), - ...register(name, { setValueAs: toNumber }) - }), button] - }) - }); -} -function Select({ name, label, options }) { - const { register } = useFormContext(); - return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field, { - name, - label, - children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", { - id: name, - className: "select w-full", - ...useInvalid(name), - ...register(name), - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { - value: "", - disabled: true, - children: "Choose…" - }), options.map(([value, text]) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { - value, - children: text - }, value))] - }) - }); -} -function RadioGroup({ name, label, options }) { - const { control } = useFormContext(); - return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Controller, { - control, - name, - render: ({ field }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("fieldset", { - className: "mb-2 w-full", - "aria-label": label, - children: [ - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("legend", { - className: "block mb-1 text-sm font-medium", - children: label - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { - className: "flex flex-wrap border border-neutral rounded-lg", - children: options.map(([value, text]) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { - className: "flex items-center gap-2 flex-1 px-3 py-3 text-sm font-medium cursor-pointer", - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { - type: "radio", - className: "radio radio-accent radio-sm", - name, - checked: field.value === value, - onChange: () => field.onChange(value), - onBlur: field.onBlur - }), text] - }, String(value))) - }), - /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FieldMessage, { name }) - ] - }) - }); -} -function FieldMessage({ name }) { - const { formState: { errors, defaultValues } } = useFormContext(); - const error = get(errors, name)?.message; - if (error) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { - className: "mt-1 text-sm text-error", - children: error - }); - if (get(defaultValues, name) === null) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { - className: "mt-1 text-sm text-warning", - children: "No valid value is stored. Choose one." - }); - return null; -} -function SecretInput({ name, clearName, label, isSet, disabled, button }) { - const { register, control } = useFormContext(); - const clear = useWatch({ - control, - name: clearName - }); - return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Field, { - name, - label, - hint: isSet && !disabled ? "Stored, and not shown. Leave blank to keep it." : void 0, - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { - className: "join w-full", - children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { - id: name, - type: "password", - autoComplete: "new-password", - className: `${inputClass} join-item`, - placeholder: isSet ? "••••••••" : "", - disabled: disabled || clear, - ...useInvalid(name), - ...register(name) - }), button] - }), isSet && !disabled && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { - className: "label mt-1 text-sm", - children: [ - /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { - type: "checkbox", - className: "checkbox checkbox-accent checkbox-sm", - ...register(clearName) - }), - "Clear the stored ", - label.toLowerCase() - ] - })] - }); -} -//#endregion -//#region src/components/common/layout.tsx function Card({ title, actions, children }) { return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", { className: "p-4 mt-2 bg-base-100 rounded-box shadow-lg w-full", @@ -625,4 +445,4 @@ function Alert({ level, children }) { }); } //#endregion -export { RadioGroup as a, TextInput as c, NumberInput as i, api as l, Card as n, SecretInput as o, Row as r, Select as s, Alert as t, getCookie as u }; +export { getCookie as a, api as i, Card as n, Row as r, Alert as t }; diff --git a/docker/web/nspanelmanager/web/react-components/dist/main-GTPFHy3s.js b/docker/web/nspanelmanager/web/react-components/dist/main-FKp56mKw.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/main-GTPFHy3s.js rename to docker/web/nspanelmanager/web/react-components/dist/main-FKp56mKw.js index d15159593..71dff9542 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/main-GTPFHy3s.js +++ b/docker/web/nspanelmanager/web/react-components/dist/main-FKp56mKw.js @@ -1,4 +1,4 @@ -const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-KDtbEBBY.js","react-Dmrhcfpd.js","SettingsStore-B_b5mu_f.js","react-select.esm-DIB_MQU9.js","index.esm-OPyB-aE8.js","NSPanelToastContainer-DX4VftN1.js","proxy-DUfbqFkY.js","AnimatePresence-Dqu00Wbg.js","EntitiesPagesView-s7wQbHCc.js","sortable-DCj6uSpL.js","NSPanelsView-CVnckJ-l.js","use-spring-BVI2O33U.js","StompStore-YH4Dqjwd.js","EntityStore-BkKCiqU6.js","mdi-gqrDBoHO.js","InitialSetup-qFecaEyr.js","Sidebar-Ck5FumSR.js","Warnings-B4Wyiqy9.js","Logs-fyKfGB-i.js","RoomPage-DatvtqhE.js","SettingsPage-DP7xWhAz.js","layout-MHz_8kDh.js","RoomsView-CmYCbfLH.js"])))=>i.map(i=>d[i]); +const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["MultiStep_AddEditEntity-xcopfTe5.js","react-Cm4z11-B.js","SettingsStore-msVzBcHM.js","react-select.esm-CbdimKhg.js","index.esm-CnTf2rLv.js","NSPanelToastContainer-D677tDZJ.js","proxy-BQYsYRjY.js","AnimatePresence-CpnHckGS.js","EntitiesPagesView-DShidmI8.js","sortable-Ke3drO00.js","NSPanelsView-1YvY26NZ.js","use-spring-BsypnnSW.js","StompStore-Bh-Guhla.js","EntityStore-CHE3-bsC.js","mdi-Cr6PIsRR.js","InitialSetup-p38u0OlE.js","layout-HS0oHCMJ.js","Sidebar-CHcoOcQs.js","Warnings-D5nCet1X.js","Logs-B094dObe.js","RoomPage-CMRDvbEM.js","SettingsPage-CzrUBqYz.js","fields-Dr1KI0Cj.js","RoomsView-qN1A3y9X.js"])))=>i.map(i=>d[i]); //#region \0rolldown/runtime.js var __create = Object.create; var __defProp = Object.defineProperty; @@ -10204,16 +10204,16 @@ var __vitePreload = function preload(baseModule, deps, importerUrl) { }; //#endregion //#region src/componentMap.tsx -var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-KDtbEBBY.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); -var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-s7wQbHCc.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); -var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-CVnckJ-l.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); -var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-DX4VftN1.js").then((n) => n.t), [])); -var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-qFecaEyr.js"), __vite__mapDeps([15,2,1,5,6,7,14]))); -var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-Ck5FumSR.js"), __vite__mapDeps([16,5,12,1,13,14]))); -var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-B4Wyiqy9.js"), __vite__mapDeps([17,13,1,5,12,14]))); -var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-fyKfGB-i.js"), __vite__mapDeps([18,2,1,12,5]))); -var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-DatvtqhE.js"), __vite__mapDeps([19,0,1,2,3,4,5,6,7,8,9,12,13,14]))); -var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-DP7xWhAz.js"), __vite__mapDeps([20,4,5,21]))); +var MultiStep_AddEditEntity = (0, import_react.lazy)(() => __vitePreload(() => import("./MultiStep_AddEditEntity-xcopfTe5.js").then((n) => n.t), __vite__mapDeps([0,1,2,3,4,5,6,7]))); +var EntitiesPagesView = (0, import_react.lazy)(() => __vitePreload(() => import("./EntitiesPagesView-DShidmI8.js"), __vite__mapDeps([8,9,1,0,2,3,4,5,6,7]))); +var NSPanelsIndexView = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelsView-1YvY26NZ.js"), __vite__mapDeps([10,3,5,6,11,12,1,13,14]))); +var NSPanelToastContainer = (0, import_react.lazy)(() => __vitePreload(() => import("./NSPanelToastContainer-D677tDZJ.js").then((n) => n.t), [])); +var InitialSetup = (0, import_react.lazy)(() => __vitePreload(() => import("./InitialSetup-p38u0OlE.js"), __vite__mapDeps([15,4,5,6,7,14,16]))); +var NSPanelSideBar = (0, import_react.lazy)(() => __vitePreload(() => import("./Sidebar-CHcoOcQs.js"), __vite__mapDeps([17,5,12,1,13,14]))); +var NSPanelWarnings = (0, import_react.lazy)(() => __vitePreload(() => import("./Warnings-D5nCet1X.js"), __vite__mapDeps([18,13,1,5,12,14]))); +var NSPanelLogs = (0, import_react.lazy)(() => __vitePreload(() => import("./Logs-B094dObe.js"), __vite__mapDeps([19,2,1,12,5]))); +var RoomPage = (0, import_react.lazy)(() => __vitePreload(() => import("./RoomPage-CMRDvbEM.js"), __vite__mapDeps([20,0,1,2,3,4,5,6,7,8,9,12,13,14]))); +var SettingsPage = (0, import_react.lazy)(() => __vitePreload(() => import("./SettingsPage-CzrUBqYz.js"), __vite__mapDeps([21,4,5,16,22]))); var componentMap = { MultiStep_AddEditEntity, EntitiesPagesView, @@ -10224,7 +10224,7 @@ var componentMap = { NSPanelWarnings, NSPanelLogs, RoomPage, - RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-CmYCbfLH.js"), __vite__mapDeps([22,9,4,5,6,11,13,1,12,14,21]))), + RoomsView: (0, import_react.lazy)(() => __vitePreload(() => import("./RoomsView-qN1A3y9X.js"), __vite__mapDeps([23,9,4,5,6,11,13,1,12,14,16,22]))), SettingsPage }; //#endregion diff --git a/docker/web/nspanelmanager/web/react-components/dist/mdi-gqrDBoHO.js b/docker/web/nspanelmanager/web/react-components/dist/mdi-Cr6PIsRR.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/mdi-gqrDBoHO.js rename to docker/web/nspanelmanager/web/react-components/dist/mdi-Cr6PIsRR.js index 7d622ae8f..37e30d6a3 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/mdi-gqrDBoHO.js +++ b/docker/web/nspanelmanager/web/react-components/dist/mdi-Cr6PIsRR.js @@ -1,4 +1,4 @@ -import { i as __commonJSMin, r as require_react } from "./main-GTPFHy3s.js"; +import { i as __commonJSMin, r as require_react } from "./main-FKp56mKw.js"; //#region node_modules/prop-types/lib/ReactPropTypesSecret.js /** * Copyright (c) 2013-present, Facebook, Inc. diff --git a/docker/web/nspanelmanager/web/react-components/dist/proxy-DUfbqFkY.js b/docker/web/nspanelmanager/web/react-components/dist/proxy-BQYsYRjY.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/proxy-DUfbqFkY.js rename to docker/web/nspanelmanager/web/react-components/dist/proxy-BQYsYRjY.js index 27cfca5fa..19fa0561a 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/proxy-DUfbqFkY.js +++ b/docker/web/nspanelmanager/web/react-components/dist/proxy-BQYsYRjY.js @@ -1,4 +1,4 @@ -import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { a as __esmMin, c as __toESM, o as __exportAll, r as require_react, s as __toCommonJS, t as require_jsx_runtime } from "./main-FKp56mKw.js"; //#region node_modules/framer-motion/dist/es/context/LayoutGroupContext.mjs var import_jsx_runtime = require_jsx_runtime(); var import_react = /* @__PURE__ */ __toESM(require_react(), 1); diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-Dmrhcfpd.js b/docker/web/nspanelmanager/web/react-components/dist/react-Cm4z11-B.js similarity index 96% rename from docker/web/nspanelmanager/web/react-components/dist/react-Dmrhcfpd.js rename to docker/web/nspanelmanager/web/react-components/dist/react-Cm4z11-B.js index c6d493b27..4950991a1 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-Dmrhcfpd.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-Cm4z11-B.js @@ -1,4 +1,4 @@ -import { c as __toESM, r as require_react } from "./main-GTPFHy3s.js"; +import { c as __toESM, r as require_react } from "./main-FKp56mKw.js"; //#region node_modules/zustand/esm/vanilla.mjs var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var createStoreImpl = (createState) => { diff --git a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DIB_MQU9.js b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-CbdimKhg.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DIB_MQU9.js rename to docker/web/nspanelmanager/web/react-components/dist/react-select.esm-CbdimKhg.js index 5c300d182..4f340f2fc 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-DIB_MQU9.js +++ b/docker/web/nspanelmanager/web/react-components/dist/react-select.esm-CbdimKhg.js @@ -1,4 +1,4 @@ -import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-GTPFHy3s.js"; +import { c as __toESM, i as __commonJSMin, n as require_react_dom, r as require_react } from "./main-FKp56mKw.js"; //#region node_modules/@babel/runtime/helpers/esm/typeof.js function _typeof(o) { "@babel/helpers - typeof"; diff --git a/docker/web/nspanelmanager/web/react-components/dist/sortable-DCj6uSpL.js b/docker/web/nspanelmanager/web/react-components/dist/sortable-Ke3drO00.js similarity index 99% rename from docker/web/nspanelmanager/web/react-components/dist/sortable-DCj6uSpL.js rename to docker/web/nspanelmanager/web/react-components/dist/sortable-Ke3drO00.js index 1d3b32775..a5e1a28ee 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/sortable-DCj6uSpL.js +++ b/docker/web/nspanelmanager/web/react-components/dist/sortable-Ke3drO00.js @@ -1,4 +1,4 @@ -import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-GTPFHy3s.js"; +import { c as __toESM, n as require_react_dom, r as require_react, t as require_jsx_runtime } from "./main-FKp56mKw.js"; //#region node_modules/@preact/signals-core/dist/signals-core.module.js var import_react = /* @__PURE__ */ __toESM(require_react(), 1); var i = Symbol.for("preact-signals"); diff --git a/docker/web/nspanelmanager/web/react-components/dist/use-spring-BVI2O33U.js b/docker/web/nspanelmanager/web/react-components/dist/use-spring-BsypnnSW.js similarity index 98% rename from docker/web/nspanelmanager/web/react-components/dist/use-spring-BVI2O33U.js rename to docker/web/nspanelmanager/web/react-components/dist/use-spring-BsypnnSW.js index e587e8f21..2d3c69ade 100644 --- a/docker/web/nspanelmanager/web/react-components/dist/use-spring-BVI2O33U.js +++ b/docker/web/nspanelmanager/web/react-components/dist/use-spring-BsypnnSW.js @@ -1,5 +1,5 @@ -import { c as __toESM, r as require_react } from "./main-GTPFHy3s.js"; -import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-DUfbqFkY.js"; +import { c as __toESM, r as require_react } from "./main-FKp56mKw.js"; +import { a as isMotionValue, c as JSAnimation, d as frame, l as interpolate, m as useConstant, o as collectMotionValues, p as useIsomorphicLayoutEffect, r as MotionConfigContext, s as motionValue, u as cancelFrame } from "./proxy-BQYsYRjY.js"; //#region node_modules/motion-dom/dist/es/utils/transform.mjs function transform(...args) { const useImmediate = !Array.isArray(args[0]); diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx index 52344e52b..268e0add2 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/InitialSetup.tsx @@ -1,4 +1,5 @@ -import { useState, useRef, useEffect } from "react"; +import { useState, useRef, useEffect, useCallback } from "react"; +import { useForm } from "react-hook-form"; import Step1_Welcome from "./Step1_Welcome"; import Step2_Theme from "./Step2_Theme"; import Step3_ManagerSettings from "./Step3_ManagerSettings"; @@ -7,25 +8,16 @@ import Step5_HomeAssistantSettings from "./Step5_HomeAssistantSettings"; import Step6_OpenhabSettings from "./Step6_OpenhabSettings"; import { AnimatePresence } from "framer-motion"; import { motion } from "framer-motion"; -import { useSettingsStore } from "../../stores/SettingsStore"; import Step7_Finished from "./Step7_Finished"; +import { api, type Settings } from "../../api/client"; +import { type InitialSetupFormValues, toFormValues } from "./form"; +import { Alert } from "../common/layout"; export type nextStepType = () => void; export type handleChangeType = (input: string) => (e: React.ChangeEvent) => void; export type handleButtonSelectEvent = (input: string, value: string) => () => void; -export interface formDataType { - theme: string; - manager_address: string; - manager_port: number; - mqtt_server: string; - mqtt_port: number; - mqtt_username: string; - mqtt_password: string; - home_assistant_address: string; - home_assistant_token: string; - openhab_address: string; - openhab_token: string; -} + +type LoadState = { status: "loading" } | { status: "error"; message: string } | { status: "loaded"; settings: Settings }; const InitialSetup = ({ opened, @@ -39,44 +31,93 @@ const InitialSetup = ({ onComplete?: () => void; opened: boolean; isHomeAssistantAddon: boolean; +}) => { + const [state, setState] = useState({ status: "loading" }); + + // Sets the state only once the request finishes. + const fetchSettings = useCallback(() => { + api + .GET("/rest/v2/settings") + .then(({ data, response }) => setState(data ? { status: "loaded", settings: data } : { status: "error", message: `HTTP ${response.status}` })) + .catch((error) => setState({ status: "error", message: error instanceof Error ? error.message : String(error) })); + }, []); + + useEffect(fetchSettings, [fetchSettings]); + + const retry = () => { + setState({ status: "loading" }); + fetchSettings(); + }; + + const dialogRef = useRef(null); + const contentRef = useRef(null); + + // Automatically switch between overflow-y-visible and overflow-y-auto depending on content height and max height + const checkOverflow = () => { + if (contentRef.current) { + const maxHeightString = window.getComputedStyle(contentRef.current).maxHeight; + let maxHeight = parseFloat(maxHeightString); + if (maxHeightString.endsWith("%")) { + // Convert percentage to pixels based on window height + maxHeight = Math.trunc((window.innerHeight * maxHeight) / 100); + } + contentRef.current.classList.toggle("overflow-y-auto", contentRef.current.scrollHeight > maxHeight); + contentRef.current.classList.toggle("overflow-y-visible", contentRef.current.scrollHeight <= maxHeight); + } + }; + + useEffect(() => { + const observer = new ResizeObserver((entries) => { + entries.forEach(() => { + checkOverflow(); + }); + }); + + if (contentRef.current) { + observer.observe(contentRef.current); + } + }, [contentRef]); + + return ( + + {state.status === "loading" && ( +
+ + Initializing first setup +
+ )} + {state.status === "error" && ( + <> + Couldn't load settings: {state.message} + + + )} + {state.status === "loaded" && dialogRef != null && ( + + )} + +
+
+ ); +}; + +const InitialSetupForm = ({ + dialogRef, + isHomeAssistantAddon, + settings, +}: { + dialogRef: React.RefObject; + isHomeAssistantAddon: boolean; + settings: Settings; }) => { const [step, setStep] = useState(1); - const [hasPopulatedFromExistingSettings, setHasPopulatedFromExistingSettings] = useState(false); - const [formData, setFormData] = useState({ - theme: "default", - manager_address: "", - manager_port: 8000, - mqtt_server: "", - mqtt_port: 1883, - mqtt_username: "", - mqtt_password: "", - home_assistant_address: "", - home_assistant_token: "", - openhab_address: "", - openhab_token: "", - }); - - const settingsStoreStatus = useSettingsStore((state) => state.status); - if (settingsStoreStatus == "none") { - useSettingsStore.getState().fetchData(); - } else if (settingsStoreStatus == "loaded" && !hasPopulatedFromExistingSettings) { - console.log("Settings loaded, updating formData for initial setup."); - setFormData((prev) => ({ - ...prev, - theme: useSettingsStore.getState().settings?.theme ?? "default", - manager_address: useSettingsStore.getState().settings?.manager_address ?? "", - manager_port: useSettingsStore.getState().settings?.manager_port ?? 8000, - mqtt_server: useSettingsStore.getState().settings?.mqtt_server ?? "", - mqtt_port: useSettingsStore.getState().settings?.mqtt_port ?? 1883, - home_assistant_address: useSettingsStore.getState().settings?.home_assistant_address ?? "", - openhab_address: useSettingsStore.getState().settings?.openhab_address ?? "", - })); - setHasPopulatedFromExistingSettings(true); - } + const form = useForm({ defaultValues: toFormValues(settings) }); + const { register, setValue, getValues, watch } = form; const nextStep = () => setStep((prev) => prev + 1); const prevStep = () => setStep((prev) => prev - 1); - const dialogRef = useRef(null); const contentRef = useRef(null); // const prevStep = () => setStep((prev) => prev - 1); @@ -107,7 +148,7 @@ const InitialSetup = ({ }, [contentRef]); return ( - + <>
{(() => { return ( @@ -187,32 +228,34 @@ const InitialSetup = ({ if (step == 1) { return ; } else if (step == 2) { - return ; + return ; } else if (step == 3) { - return ; + return ; } else if (step == 4) { - return ; + return ( + + ); } else if (step == 5) { return ( ); } else if (step == 6) { - return ; + return ; } else if (step == 7) { - return ; + return ; } })()}
-
+ ); }; diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx index f4243454b..cb5e6b9ae 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step2_Theme.tsx @@ -1,18 +1,17 @@ -import { useState } from "react"; -import { type formDataType } from "./InitialSetup"; +import { type UseFormSetValue, type UseFormWatch } from "react-hook-form"; +import { type InitialSetupFormValues } from "./form"; const Step2_Theme = ({ - setFormData, - formData, + setValue, nextStep, prevStep, + watch, }: { - setFormData: (data: formDataType) => void; - formData: formDataType; + setValue: UseFormSetValue; nextStep: () => void; prevStep: () => void; + watch: UseFormWatch; }) => { - const [selectedTheme, setSelectedTheme] = useState("default"); const themes = { default: "Default", light: "Light", @@ -49,6 +48,7 @@ const Step2_Theme = ({ nord: "Nord", sunset: "Sunset", }; + const selectedTheme = watch("theme"); return (
@@ -58,8 +58,11 @@ const Step2_Theme = ({ className="bg-neutral text-neutral-content grid grid-cols-3 w-full h-20 rounded-box overflow-hidden cursor-pointer" data-theme={theme_option} onClick={() => { - setSelectedTheme(theme_option); - setFormData({ ...formData, theme: theme_option }); + setValue("theme", theme_option, { shouldDirty: true }); + + // Update the navbar theme selector as to keep the theme when pressing the next button. + const radio = document.querySelector(`#theme-radio-${CSS.escape(theme_option)}`); + if (radio) radio.checked = true; }} >
@@ -74,7 +77,7 @@ const Step2_Theme = ({ name="theme-dropdown" className="theme-controller radio radio-xs radio-accent p-0 m-0 absolute top-1 right-1" value={theme_option} - checked={theme_option === selectedTheme} + checked={theme_option == selectedTheme} /> {display_name} @@ -90,10 +93,10 @@ const Step2_Theme = ({ ))}
- -
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx index d034cda73..f94383e1d 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step3_ManagerSettings.tsx @@ -1,21 +1,20 @@ -import { useRef } from "react"; -import { type formDataType } from "./InitialSetup"; import { Notify } from "../NSPanelToastContainer"; +import { type UseFormSetValue, type UseFormGetValues, type UseFormRegister } from "react-hook-form"; +import { type InitialSetupFormValues } from "./form"; const Step3_ManagerSettings = ({ - formData, - setFormData, + setValue, + getValues, + register, nextStep, prevStep, }: { - formData: formDataType; - setFormData: (data: formDataType) => void; + setValue: UseFormSetValue; + getValues: UseFormGetValues; + register: UseFormRegister; nextStep: () => void; prevStep: () => void; }) => { - const managerAddressRef = useRef(null); - const managerPortRef = useRef(null); - const getIPFromURL = () => { fetch("/rest/get_ip_by_hostname", { method: "POST", @@ -27,10 +26,7 @@ const Step3_ManagerSettings = ({ .then((response) => response.json()) .then((data) => { if (data.ip) { - if (managerAddressRef.current) { - managerAddressRef.current.value = data.ip; - setFormData({ ...formData, manager_address: data.ip }); - } + setValue("manager_address", data.ip, { shouldDirty: true }); } else { Notify({ message: 'Failed to get IP from URL. No "ip" field in response.', level: "error" }); } @@ -41,14 +37,28 @@ const Step3_ManagerSettings = ({ }; const testManagerAddressAndPort = () => { + const address = getValues("manager_address"); + const port = getValues("manager_port"); + + if (address == null) { + Notify({ message: "Manager address is required to test the connection", level: "error", duration: 5000 }); + return; + } + + if (port == null) { + Notify({ message: "Manager port is required to test the connection", level: "error", duration: 5000 }); + return; + } + const params = { - address: formData.manager_address, - port: formData.manager_port.toString(), + address: address, + port: port.toString(), }; const queryString = new URLSearchParams(params).toString(); fetch("/rest/mqttmanager/test?" + queryString, { method: "GET", + signal: AbortSignal.timeout(2000), }) .then((response) => { if (response.ok) { @@ -77,10 +87,8 @@ const Step3_ManagerSettings = ({ setFormData({ ...formData, manager_address: e.target.value })} - value={formData.manager_address} + {...register("manager_address")} required - ref={managerAddressRef} /> @@ -122,10 +126,10 @@ const Step3_ManagerSettings = ({
- -
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx index 9a80579d7..c43904d3c 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step4_MqttSettings.tsx @@ -1,20 +1,28 @@ -import { type formDataType } from "./InitialSetup"; import { Icon } from "@mdi/react"; import { mdiInformationOutline } from "@mdi/js"; import { useState } from "react"; +import { type UseFormSetValue, type UseFormGetValues, type UseFormRegister, type UseFormWatch } from "react-hook-form"; +import { type InitialSetupFormValues } from "./form"; + const Step4_MqttSettings = ({ - formData, - setFormData, + setValue, + getValues, + register, + watch, nextStep, prevStep, }: { - formData: formDataType; - setFormData: (data: formDataType) => void; + setValue: UseFormSetValue; + getValues: UseFormGetValues; + register: UseFormRegister; + watch: UseFormWatch; nextStep: () => void; prevStep: () => void; }) => { - const [anonymousLogin, setAnonymousLogin] = useState(formData.mqtt_username === ""); + const [noLogin, setNoLogin] = useState(getValues("mqtt_username") == "" && getValues("mqtt_password") == ""); + const address = watch("mqtt_server"); + const port = watch("mqtt_port"); return (
@@ -36,8 +44,7 @@ const Step4_MqttSettings = ({ setFormData({ ...formData, mqtt_server: e.target.value })} - value={formData.mqtt_server} + {...register("mqtt_server")} required />
@@ -53,8 +60,7 @@ const Step4_MqttSettings = ({ setFormData({ ...formData, mqtt_port: parseInt(e.target.value) })} - value={formData.mqtt_port} + {...register("mqtt_port", { valueAsNumber: true })} required /> @@ -66,16 +72,22 @@ const Step4_MqttSettings = ({ { - setAnonymousLogin(!anonymousLogin); - setFormData({ ...formData, mqtt_username: "", mqtt_password: "" }); + checked={noLogin} + onChange={(e) => { + if (e.currentTarget.checked) { + setValue("mqtt_username", "", { shouldDirty: true }); + setValue("mqtt_password", "", { shouldDirty: true }); + setValue("clear_mqtt_password", true, { shouldDirty: true }); + setNoLogin(true); + } else { + setNoLogin(false); + } }} /> Anonymous login - - -
+ -
+
-
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx index f9795f2b9..cb5914766 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step6_OpenhabSettings.tsx @@ -1,23 +1,37 @@ -import { type formDataType } from "./InitialSetup"; import { Icon } from "@mdi/react"; import { mdiInformationOutline } from "@mdi/js"; import { Notify } from "../NSPanelToastContainer"; +import { type UseFormGetValues, type UseFormRegister } from "react-hook-form"; +import { type InitialSetupFormValues } from "./form"; const Step6_OpenhabSettings = ({ - formData, - setFormData, + getValues, + register, nextStep, prevStep, }: { - formData: formDataType; - setFormData: (data: formDataType) => void; + getValues: UseFormGetValues; + register: UseFormRegister; nextStep: () => void; prevStep: () => void; }) => { const testOpenhab = () => { + const address = getValues("openhab_address"); + const token = getValues("openhab_token"); + + if (address == null) { + Notify({ message: "OpenHAB address is required to test the connection", level: "error", duration: 5000 }); + return; + } + + if (token == null) { + Notify({ message: "OpenHAB token is required to test the connection", level: "error", duration: 5000 }); + return; + } + const params = { - address: formData.openhab_address, - token: formData.openhab_token, + address: address, + token: token, }; const queryString = new URLSearchParams(params).toString(); @@ -62,8 +76,7 @@ const Step6_OpenhabSettings = ({ setFormData({ ...formData, openhab_address: e.target.value })} - value={formData.openhab_address} + {...register("openhab_address")} required />
@@ -79,8 +92,7 @@ const Step6_OpenhabSettings = ({ setFormData({ ...formData, openhab_token: e.target.value })} - value={formData.openhab_token} + {...register("openhab_token")} required />
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx index 0dd4d69bd..228bdc02f 100644 --- a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/Step7_Finished.tsx @@ -1,44 +1,59 @@ -import { type formDataType } from "./InitialSetup"; import { Notify } from "../NSPanelToastContainer"; +import { type UseFormReturn } from "react-hook-form"; +import { type InitialSetupFormValues, buildPatch, toFormValues } from "./form"; +import { api } from "../../api/client"; -const Step7_Finished = ({ formData, prevStep }: { formData: formDataType; prevStep: () => void }) => { - function getCookie(name: string) { - let cookieValue = ""; - if (document.cookie && document.cookie !== "") { - const cookies = document.cookie.split(";"); - for (let i = 0; i < cookies.length; i++) { - const cookie = cookies[i].trim(); - if (cookie.substring(0, name.length + 1) === name + "=") { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } +const Step7_Finished = ({ + form, + prevStep, + isHomeAssistantAddon, + dialogRef, +}: { + form: UseFormReturn; + prevStep: () => void; + isHomeAssistantAddon: boolean; + dialogRef: React.RefObject; +}) => { + const saveSettings = async () => { + const { + getValues, + reset, + formState: { dirtyFields }, + } = form; + + const body = buildPatch(getValues(), dirtyFields, isHomeAssistantAddon); + try { + const { data, error, response } = await api.PATCH("/rest/v2/settings", { body }); + if (data) { + reset(toFormValues(data)); + Notify({ message: "Settings saved.", level: "success", duration: 5000 }); + dialogRef.current?.close(); + return; } - } - return cookieValue; - } + if (response.status === 400 && error && !("detail" in error && error.detail)) { + console.error("Got error ", error); - const saveSettings = () => { - fetch("/rest/settings", { - method: "POST", - headers: { - "Content-Type": "application/json", - "X-CSRFToken": getCookie("csrftoken"), - }, - body: JSON.stringify({ settings: formData }), - }) - .then((response) => { - if (response.ok) { - Notify({ message: "Settings saved successfully.", level: "success", duration: 5000 }); - window.location.reload(); - } else { - response.json().then((data) => { - Notify({ message: "Failed to save settings. Error: " + data.message, level: "error", duration: 5000 }); - }); + const fieldErrors = Object.entries(error as Record); + if (fieldErrors.length === 0) { + Notify({ message: "Nothing was saved.", level: "error", duration: 8000 }); } - }) - .catch((error) => { - Notify({ message: "Failed to save settings. Error: " + error.message, level: "error", duration: 5000 }); - }); + + for (const [field, messages] of fieldErrors) { + for (const message of Array.isArray(messages) ? messages : [messages]) { + Notify({ + message: `${field}: ${message}`, + level: "error", + duration: 8000, + }); + } + } + } else { + const detail = error && "detail" in error ? error.detail : `HTTP ${response.status}`; + Notify({ message: `Couldn't save the settings: ${detail}`, level: "error" }); + } + } catch (failure) { + Notify({ message: `Couldn't save the settings: ${failure instanceof Error ? failure.message : String(failure)}`, level: "error" }); + } }; return ( @@ -59,7 +74,7 @@ const Step7_Finished = ({ formData, prevStep }: { formData: formDataType; prevSt case they do not, there is the documentation and also a discord where you can get help. There is also the Github page where you can report issues and contribute.

-

Thank you for your support and trust and have fun!

+

Thank you for your support and trust. Have fun and enjoy!

- -
diff --git a/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts new file mode 100644 index 000000000..deb6804b2 --- /dev/null +++ b/docker/web/nspanelmanager/web/react-components/src/components/InitialSetup/form.ts @@ -0,0 +1,68 @@ +import type { Settings, SettingsUpdateRequest } from "../../api/client"; + +// The settings this initial setup guide edits. +export const INITIAL_SETUP_FIELDS = [ + "manager_address", + "manager_port", + "mqtt_server", + "mqtt_port", + "mqtt_username", + "home_assistant_address", + "openhab_address", + "theme", +] as const satisfies readonly (keyof Settings & keyof SettingsUpdateRequest)[]; + +export const SECRETS = ["mqtt_password", "home_assistant_token", "openhab_token"] as const; + +export type PageField = (typeof INITIAL_SETUP_FIELDS)[number]; +export type Secret = (typeof SECRETS)[number]; + +// Values are null when nothing valid is stored; such a field is left blank and sent only if filled in. +export type InitialSetupFormValues = { [K in PageField]: Settings[K] } & { [K in Secret]: string } & { [K in Secret as `clear_${K}`]: boolean }; + +// Set by the Home Assistant add-on, so read-only there. +export const ADDON_MANAGED: readonly string[] = ["home_assistant_address", "home_assistant_token"]; + +// The screensaver shows the outside temperature only in the modes without weather. +export const MODES_WITH_OUTSIDE_TEMPERATURE: readonly string[] = ["datetime_with_background", "datetime_without_background"]; + +export function toFormValues(settings: Settings): InitialSetupFormValues { + const values = {} as Record; + for (const name of INITIAL_SETUP_FIELDS) { + values[name] = settings[name]; + } + for (const secret of SECRETS) { + values[secret] = ""; + values[`clear_${secret}`] = false; + } + return values as InitialSetupFormValues; +} + +/** + * The PATCH body for a submitted form: only the settings that changed. Secrets are sent when a new + * value is typed, or as "" when "clear" is ticked. Add-on managed settings are never sent in the add-on. + */ +export function buildPatch( + values: InitialSetupFormValues, + dirty: Partial>, + isHomeAssistantAddon: boolean, +): SettingsUpdateRequest { + const body: Record = {}; + const allowed = (name: string) => !(isHomeAssistantAddon && ADDON_MANAGED.includes(name)); + for (const name of INITIAL_SETUP_FIELDS) { + if (dirty[name] && allowed(name)) { + body[name] = values[name]; + } + } + for (const secret of SECRETS) { + if (!allowed(secret)) { + continue; + } + if (values[`clear_${secret}`]) { + body[secret] = ""; + } else if (values[secret]) { + body[secret] = values[secret]; + } + } + return body as SettingsUpdateRequest; +} diff --git a/docker/web/nspanelmanager/web/react-components/templates/scripts.html b/docker/web/nspanelmanager/web/react-components/templates/scripts.html index 254bccac9..356d79050 100644 --- a/docker/web/nspanelmanager/web/react-components/templates/scripts.html +++ b/docker/web/nspanelmanager/web/react-components/templates/scripts.html @@ -1,2 +1,2 @@ {% load static %} - + diff --git a/docker/web/nspanelmanager/web/static/css/main.css b/docker/web/nspanelmanager/web/static/css/main.css index ef4ee45a8..9007eb758 100644 --- a/docker/web/nspanelmanager/web/static/css/main.css +++ b/docker/web/nspanelmanager/web/static/css/main.css @@ -7,24 +7,15 @@ --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --color-red-50: oklch(97.1% 0.013 17.38); - --color-red-100: oklch(93.6% 0.032 17.717); - --color-red-300: oklch(80.8% 0.114 19.571); --color-red-500: oklch(63.7% 0.237 25.331); - --color-red-600: oklch(57.7% 0.245 27.325); --color-red-700: oklch(50.5% 0.213 27.518); --color-red-800: oklch(44.4% 0.177 26.899); --color-yellow-50: oklch(98.7% 0.026 102.212); --color-yellow-300: oklch(90.5% 0.182 98.111); --color-yellow-500: oklch(79.5% 0.184 86.047); - --color-yellow-600: oklch(68.1% 0.162 75.834); --color-yellow-800: oklch(47.6% 0.114 61.907); - --color-green-100: oklch(96.2% 0.044 156.743); - --color-green-300: oklch(87.1% 0.15 154.449); --color-green-500: oklch(72.3% 0.219 149.579); - --color-green-700: oklch(52.7% 0.154 150.069); - --color-green-800: oklch(44.8% 0.119 151.328); --color-blue-50: oklch(97% 0.014 254.604); - --color-blue-100: oklch(93.2% 0.032 255.585); --color-blue-300: oklch(80.9% 0.105 251.813); --color-blue-500: oklch(62.3% 0.214 259.815); --color-blue-600: oklch(54.6% 0.245 262.881); @@ -35,9 +26,7 @@ --color-indigo-600: oklch(51.1% 0.262 276.966); --color-pink-500: oklch(65.6% 0.241 354.308); --color-pink-800: oklch(45.9% 0.187 3.815); - --color-slate-100: oklch(96.8% 0.007 247.896); --color-slate-500: oklch(55.4% 0.046 257.417); - --color-slate-950: oklch(12.9% 0.042 264.695); --color-gray-50: oklch(98.5% 0.002 247.839); --color-gray-100: oklch(96.7% 0.003 264.542); --color-gray-200: oklch(92.8% 0.006 264.531); @@ -86,7 +75,6 @@ --ease-in: cubic-bezier(0.4, 0, 1, 1); --ease-out: cubic-bezier(0, 0, 0.2, 1); --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1); - --animate-spin: spin 1s linear infinite; --animate-ping: ping 1s cubic-bezier(0, 0, 0.2, 1) infinite; --animate-pulse: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; --blur-sm: 8px; @@ -3630,9 +3618,6 @@ .top-2\/3 { top: calc(2/3 * 100%); } - .top-3 { - top: calc(var(--spacing) * 3); - } .top-3\/3 { top: calc(3/3 * 100%); } @@ -3703,9 +3688,6 @@ .left-0 { left: calc(var(--spacing) * 0); } - .left-1 { - left: calc(var(--spacing) * 1); - } .left-1\/8 { left: calc(1/8 * 100%); } @@ -3715,39 +3697,21 @@ .left-2\/8 { left: calc(2/8 * 100%); } - .left-3 { - left: calc(var(--spacing) * 3); - } .left-3\/8 { left: calc(3/8 * 100%); } - .left-4 { - left: calc(var(--spacing) * 4); - } .left-4\/8 { left: calc(4/8 * 100%); } - .left-5 { - left: calc(var(--spacing) * 5); - } .left-5\/8 { left: calc(5/8 * 100%); } - .left-6 { - left: calc(var(--spacing) * 6); - } .left-6\/8 { left: calc(6/8 * 100%); } - .left-7 { - left: calc(var(--spacing) * 7); - } .left-7\/8 { left: calc(7/8 * 100%); } - .left-8 { - left: calc(var(--spacing) * 8); - } .left-8\/8 { left: calc(8/8 * 100%); } @@ -4066,83 +4030,6 @@ } } } - .stack\! { - display: inline-grid !important; - grid-template-columns: 3px 4px 1fr 4px 3px !important; - grid-template-rows: 3px 4px 1fr 4px 3px !important; - & > * { - height: 100% !important; - width: 100% !important; - &:nth-child(n + 2) { - width: 100% !important; - opacity: 70% !important; - } - &:nth-child(2) { - z-index: 2 !important; - opacity: 90% !important; - } - &:nth-child(1) { - z-index: 3 !important; - width: 100% !important; - } - } - &, &.stack-bottom { - > * { - grid-column: 3 / 4 !important; - grid-row: 3 / 6 !important; - &:nth-child(2) { - grid-column: 2 / 5 !important; - grid-row: 2 / 5 !important; - } - &:nth-child(1) { - grid-column: 1 / 6 !important; - grid-row: 1 / 4 !important; - } - } - } - &.stack-top { - > * { - grid-column: 3 / 4 !important; - grid-row: 1 / 4 !important; - &:nth-child(2) { - grid-column: 2 / 5 !important; - grid-row: 2 / 5 !important; - } - &:nth-child(1) { - grid-column: 1 / 6 !important; - grid-row: 3 / 6 !important; - } - } - } - &.stack-start { - > * { - grid-column: 1 / 4 !important; - grid-row: 3 / 4 !important; - &:nth-child(2) { - grid-column: 2 / 5 !important; - grid-row: 2 / 5 !important; - } - &:nth-child(1) { - grid-column: 3 / 6 !important; - grid-row: 1 / 6 !important; - } - } - } - &.stack-end { - > * { - grid-column: 3 / 6 !important; - grid-row: 3 / 4 !important; - &:nth-child(2) { - grid-column: 2 / 5 !important; - grid-row: 2 / 5 !important; - } - &:nth-child(1) { - grid-column: 1 / 4 !important; - grid-row: 1 / 6 !important; - } - } - } - } .modal-backdrop { grid-column-start: 1; grid-row-start: 1; @@ -5084,9 +4971,6 @@ .me-2 { margin-inline-end: calc(var(--spacing) * 2); } - .me-3 { - margin-inline-end: calc(var(--spacing) * 3); - } .me-6 { margin-inline-end: calc(var(--spacing) * 6); } @@ -5111,15 +4995,9 @@ .mt-2 { margin-top: calc(var(--spacing) * 2); } - .mt-3 { - margin-top: calc(var(--spacing) * 3); - } .mt-4 { margin-top: calc(var(--spacing) * 4); } - .mt-5 { - margin-top: calc(var(--spacing) * 5); - } .mt-8 { margin-top: calc(var(--spacing) * 8); } @@ -5874,9 +5752,6 @@ .h-10 { height: calc(var(--spacing) * 10); } - .h-11 { - height: calc(var(--spacing) * 11); - } .h-12 { height: calc(var(--spacing) * 12); } @@ -5916,9 +5791,6 @@ .h-\[500px\] { height: 500px; } - .h-\[calc\(100\%-1rem\)\] { - height: calc(100% - 1rem); - } .h-auto { height: auto; } @@ -5934,9 +5806,6 @@ .max-h-0 { max-height: calc(var(--spacing) * 0); } - .max-h-11 { - max-height: calc(var(--spacing) * 11); - } .max-h-11\/12 { max-height: calc(11/12 * 100%); } @@ -5961,6 +5830,9 @@ .min-h-10 { min-height: calc(var(--spacing) * 10); } + .min-h-60 { + min-height: calc(var(--spacing) * 60); + } .min-h-auto { min-height: auto; } @@ -6076,9 +5948,6 @@ .loading-xs { width: calc(var(--size-selector, 0.25rem) * 4); } - .w-1 { - width: calc(var(--spacing) * 1); - } .w-1\/2 { width: calc(1/2 * 100%); } @@ -6109,9 +5978,6 @@ .w-10 { width: calc(var(--spacing) * 10); } - .w-11 { - width: calc(var(--spacing) * 11); - } .w-12 { width: calc(var(--spacing) * 12); } @@ -6160,9 +6026,6 @@ .max-w-4xl { max-width: var(--container-4xl); } - .max-w-6 { - max-width: calc(var(--spacing) * 6); - } .max-w-6\/12 { max-width: calc(6/12 * 100%); } @@ -6372,9 +6235,6 @@ .animate-rotate-border { animation: var(--animate-rotate-border); } - .animate-spin { - animation: var(--animate-spin); - } .link { cursor: pointer; text-decoration-line: underline; @@ -6780,22 +6640,12 @@ .gap-2 { gap: calc(var(--spacing) * 2); } - .gap-3 { - gap: calc(var(--spacing) * 3); - } .gap-4 { gap: calc(var(--spacing) * 4); } .gap-6 { gap: calc(var(--spacing) * 6); } - .space-y-1 { - :where(& > :not(:last-child)) { - --tw-space-y-reverse: 0; - margin-block-start: calc(calc(var(--spacing) * 1) * var(--tw-space-y-reverse)); - margin-block-end: calc(calc(var(--spacing) * 1) * calc(1 - var(--tw-space-y-reverse))); - } - } .space-y-4 { :where(& > :not(:last-child)) { --tw-space-y-reverse: 0; @@ -7285,10 +7135,6 @@ border-bottom-right-radius: var(--radius-field); border-bottom-left-radius: var(--radius-field); } - .rounded-b-md { - border-bottom-right-radius: var(--radius-md); - border-bottom-left-radius: var(--radius-md); - } .rounded-b-selector { border-bottom-left-radius: var(--radius-selector); border-bottom-right-radius: var(--radius-selector); @@ -7363,10 +7209,6 @@ border-inline-style: var(--tw-border-style); border-inline-width: 0px; } - .border-x-2 { - border-inline-style: var(--tw-border-style); - border-inline-width: 2px; - } .border-y { border-block-style: var(--tw-border-style); border-block-width: 1px; @@ -7546,12 +7388,6 @@ .border-black { border-color: var(--color-black); } - .border-blue-500 { - border-color: var(--color-blue-500); - } - .border-blue-800 { - border-color: var(--color-blue-800); - } .border-gray-200 { border-color: var(--color-gray-200); } @@ -7576,9 +7412,6 @@ .border-transparent { border-color: transparent; } - .border-warning { - border-color: var(--color-warning); - } .border-warning\/50 { border-color: color-mix(in oklab, var(--color-warning) 50%, transparent); } @@ -7714,15 +7547,6 @@ .bg-blue-50 { background-color: var(--color-blue-50); } - .bg-blue-100 { - background-color: var(--color-blue-100); - } - .bg-blue-300 { - background-color: var(--color-blue-300); - } - .bg-blue-500 { - background-color: var(--color-blue-500); - } .bg-blue-700 { background-color: var(--color-blue-700); } @@ -7741,15 +7565,6 @@ .bg-gray-200 { background-color: var(--color-gray-200); } - .bg-gray-800 { - background-color: var(--color-gray-800); - } - .bg-green-100 { - background-color: var(--color-green-100); - } - .bg-green-700 { - background-color: var(--color-green-700); - } .bg-info { background-color: var(--color-info); } @@ -7768,9 +7583,6 @@ .bg-red-50 { background-color: var(--color-red-50); } - .bg-red-100 { - background-color: var(--color-red-100); - } .bg-red-500 { background-color: var(--color-red-500); } @@ -7780,18 +7592,9 @@ .bg-red-500\/\[50\%\] { background-color: color-mix(in oklab, var(--color-red-500) 50%, transparent); } - .bg-red-600 { - background-color: var(--color-red-600); - } - .bg-red-700 { - background-color: var(--color-red-700); - } .bg-slate-500 { background-color: var(--color-slate-500); } - .bg-slate-950 { - background-color: var(--color-slate-950); - } .bg-success { background-color: var(--color-success); } @@ -7807,12 +7610,6 @@ .bg-yellow-50 { background-color: var(--color-yellow-50); } - .bg-yellow-300 { - background-color: var(--color-yellow-300); - } - .bg-yellow-600 { - background-color: var(--color-yellow-600); - } .divider-accent { &:before, &:after { background-color: var(--color-accent); @@ -7882,11 +7679,6 @@ .from-30\% { --tw-gradient-from-position: 30%; } - .via-accent { - --tw-gradient-via: var(--color-accent); - --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position); - --tw-gradient-stops: var(--tw-gradient-via-stops); - } .via-accent\/50 { --tw-gradient-via: color-mix(in oklab, var(--color-accent) 50%, transparent); --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position); @@ -8204,9 +7996,6 @@ font-size: 0.625rem; padding-inline: calc(0.25rem * 2 - var(--border)); } - .px-0 { - padding-inline: calc(var(--spacing) * 0); - } .px-0\.5 { padding-inline: calc(var(--spacing) * 0.5); } @@ -8267,9 +8056,6 @@ .pt-2 { padding-top: calc(var(--spacing) * 2); } - .pt-4 { - padding-top: calc(var(--spacing) * 4); - } .pt-5 { padding-top: calc(var(--spacing) * 5); } @@ -8881,9 +8667,6 @@ .text-black { color: var(--color-black); } - .text-blue-600 { - color: var(--color-blue-600); - } .text-blue-800 { color: var(--color-blue-800); } @@ -8893,12 +8676,6 @@ .text-error-content { color: var(--color-error-content); } - .text-gray-50 { - color: var(--color-gray-50); - } - .text-gray-200 { - color: var(--color-gray-200); - } .text-gray-400 { color: var(--color-gray-400); } @@ -8911,18 +8688,12 @@ .text-gray-700 { color: var(--color-gray-700); } - .text-gray-800 { - color: var(--color-gray-800); - } .text-gray-900 { color: var(--color-gray-900); } .text-green-500 { color: var(--color-green-500); } - .text-green-800 { - color: var(--color-green-800); - } .text-indigo-600 { color: var(--color-indigo-600); } @@ -8959,9 +8730,6 @@ .text-red-800 { color: var(--color-red-800); } - .text-slate-100 { - color: var(--color-slate-100); - } .text-success { color: var(--color-success); } @@ -9172,9 +8940,6 @@ .opacity-80 { opacity: 80%; } - .opacity-90 { - opacity: 90%; - } .mix-blend-plus-darker { mix-blend-mode: plus-darker; } @@ -9232,9 +8997,6 @@ .shadow-initial { --tw-shadow-color: initial; } - .shadow-neutral { - --tw-shadow-color: var(--color-neutral); - } .shadow-neutral\/3 { --tw-shadow-color: color-mix(in oklab, var(--color-neutral) 3%, transparent); } @@ -9910,9 +9672,6 @@ .\[animation-name\:tile-background\] { animation-name: tile-background; } - .\[idx\:\%d\] { - idx: %d; - } .backface-hidden { backface-visibility: hidden; } @@ -10420,11 +10179,6 @@ border-bottom-left-radius: var(--radius-md); } } - .last\:rounded-md { - &:last-child { - border-radius: var(--radius-md); - } - } .last\:rounded-r-md { &:last-child { border-top-right-radius: var(--radius-md); @@ -10502,13 +10256,6 @@ } } } - .hover\:bg-green-800 { - &:hover { - @media (hover: hover) { - background-color: var(--color-green-800); - } - } - } .hover\:bg-home-assistant\/10 { &:hover { @media (hover: hover) { @@ -10523,13 +10270,6 @@ } } } - .hover\:bg-red-800 { - &:hover { - @media (hover: hover) { - background-color: var(--color-red-800); - } - } - } .hover\:bg-yellow-500\/10 { &:hover { @media (hover: hover) { @@ -10764,21 +10504,11 @@ --tw-ring-color: var(--color-gray-500); } } - .focus\:ring-green-300 { - &:focus { - --tw-ring-color: var(--color-green-300); - } - } .focus\:ring-indigo-200 { &:focus { --tw-ring-color: var(--color-indigo-200); } } - .focus\:ring-red-300 { - &:focus { - --tw-ring-color: var(--color-red-300); - } - } .focus\:ring-offset-0 { &:focus { --tw-ring-offset-width: 0px; @@ -10914,11 +10644,6 @@ position: sticky; } } - .md\:inset-0 { - @media (width >= 48rem) { - inset: calc(var(--spacing) * 0); - } - } .md\:top-4 { @media (width >= 48rem) { top: calc(var(--spacing) * 4); @@ -11039,15 +10764,6 @@ justify-content: space-between; } } - .md\:space-y-0 { - @media (width >= 48rem) { - :where(& > :not(:last-child)) { - --tw-space-y-reverse: 0; - margin-block-start: calc(calc(var(--spacing) * 0) * var(--tw-space-y-reverse)); - margin-block-end: calc(calc(var(--spacing) * 0) * calc(1 - var(--tw-space-y-reverse))); - } - } - } .md\:space-x-0 { @media (width >= 48rem) { :where(& > :not(:last-child)) { @@ -11057,15 +10773,6 @@ } } } - .md\:space-x-2 { - @media (width >= 48rem) { - :where(& > :not(:last-child)) { - --tw-space-x-reverse: 0; - margin-inline-start: calc(calc(var(--spacing) * 2) * var(--tw-space-x-reverse)); - margin-inline-end: calc(calc(var(--spacing) * 2) * calc(1 - var(--tw-space-x-reverse))); - } - } - } .md\:space-x-8 { @media (width >= 48rem) { :where(& > :not(:last-child)) { @@ -11136,11 +10843,6 @@ } } } - .rtl\:text-right { - &:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) { - text-align: right; - } - } .dark\:border-gray-600 { @media (prefers-color-scheme: dark) { border-color: var(--color-gray-600); @@ -13009,11 +12711,6 @@ initial-value: ""; inherits: false; } -@keyframes spin { - to { - transform: rotate(360deg); - } -} @keyframes ping { 75%, 100% { transform: scale(2); diff --git a/docker/web/nspanelmanager/web/templates/navbar.html b/docker/web/nspanelmanager/web/templates/navbar.html index 79785b7ba..0d13a76b8 100644 --- a/docker/web/nspanelmanager/web/templates/navbar.html +++ b/docker/web/nspanelmanager/web/templates/navbar.html @@ -36,6 +36,7 @@