diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts index 85ce2e856e..4805c40a71 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts @@ -50,7 +50,6 @@ import "../../../../../layouts/hass-tabs-subpage"; import { SubscribeMixin } from "../../../../../mixins/subscribe-mixin"; import { haStyle } from "../../../../../resources/styles"; import type { HomeAssistant, Route } from "../../../../../types"; -import "../../../ha-config-section"; import { showZWaveJSAddNodeDialog } from "./show-dialog-zwave_js-add-node"; import { showZWaveJSRebuildNetworkRoutesDialog } from "./show-dialog-zwave_js-rebuild-network-routes"; import { showZWaveJSRemoveNodeDialog } from "./show-dialog-zwave_js-remove-node"; @@ -128,358 +127,345 @@ class ZWaveJSConfigDashboard extends SubscribeMixin(LitElement) { .path=${mdiRefresh} .label=${this.hass!.localize("ui.common.refresh")} > - -
- ${this.hass.localize("ui.panel.config.zwave_js.dashboard.header")} -
- -
- ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.introduction" - )} -
- ${this._network && - this._status === "connected" && - (this._network?.controller.inclusion_state === - InclusionState.Including || - this._network?.controller.inclusion_state === - InclusionState.Excluding) - ? html` - - ${this.hass.localize( - `ui.panel.config.zwave_js.common.in_progress_inclusion_exclusion` + ${this._network && + this._status === "connected" && + (this._network?.controller.inclusion_state === + InclusionState.Including || + this._network?.controller.inclusion_state === + InclusionState.Excluding) + ? html` + + ${this.hass.localize( + `ui.panel.config.zwave_js.common.in_progress_inclusion_exclusion` + )} + - - - ` - : ""} - ${this._network - ? html` - -
-
-
- ${this._status === "disconnected" - ? html`` - : html` - - `} -
- ${this._status !== "disconnected" - ? html` -
- ${this.hass.localize( - "ui.panel.config.zwave_js.common.network" - )} - ${this.hass.localize( - `ui.panel.config.zwave_js.network_status.${this._status}` - )}
- - ${this.hass.localize( - `ui.panel.config.zwave_js.dashboard.devices`, - { - count: - this._network.controller.nodes.length, - } - )} - ${notReadyDevices > 0 - ? html`(${this.hass.localize( - `ui.panel.config.zwave_js.dashboard.not_ready`, - { count: notReadyDevices } - )})` - : ""} - -
- ` - : ``} -
-
- -
- -
-
- - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.driver_version" - )}: - - ${this._network.client.driver_version} -
-
- - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.server_version" - )}: - - ${this._network.client.server_version} -
-
- - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.home_id" - )}: - - ${this._network.controller.home_id} -
-
- - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.server_url" - )}: - - ${this._network.client.ws_server_url} -
-
- - - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.messages_tx.label" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.messages_tx.tooltip" - )} - - ${this._statistics?.messages_tx ?? 0} - - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.messages_rx.label" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.messages_rx.tooltip" - )} - - ${this._statistics?.messages_rx ?? 0} - - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.messages_dropped_tx.label" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.messages_dropped_tx.tooltip" - )} - - ${this._statistics?.messages_dropped_tx ?? 0} - - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.messages_dropped_rx.label" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.messages_dropped_rx.tooltip" - )} - - ${this._statistics?.messages_dropped_rx ?? 0} - - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.nak.label" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.nak.tooltip" - )} - - ${this._statistics?.nak ?? 0} - - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.can.label" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.can.tooltip" - )} - - ${this._statistics?.can ?? 0} - - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.timeout_ack.label" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.timeout_ack.tooltip" - )} - - ${this._statistics?.timeout_ack ?? 0} - - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.timeout_response.label" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.timeout_response.tooltip" - )} - - ${this._statistics?.timeout_response ?? 0} - - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.timeout_callback.label" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.dashboard.statistics.timeout_callback.tooltip" - )} - - ${this._statistics?.timeout_callback ?? 0} - - - -
-
- - ${this.hass.localize( - "ui.panel.config.zwave_js.common.remove_node" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.common.rebuild_network_routes" - )} - - - ${this.hass.localize( - "ui.panel.config.zwave_js.common.reconfigure_server" - )} - -
-
- -
-

Third-Party Data Reporting

- ${this._dataCollectionOptIn !== undefined - ? html` - - ` - : html` - + + + ` + : ""} + ${this._network + ? html` + +
+
+
+ ${this._status === "disconnected" + ? html` - `} + >` + : html` + + `} +
+ ${this._status !== "disconnected" + ? html` +
+ Z-Wave + ${this.hass.localize( + "ui.panel.config.zwave_js.common.network" + )} + ${this.hass.localize( + `ui.panel.config.zwave_js.network_status.${this._status}` + )}
+ + ${this.hass.localize( + `ui.panel.config.zwave_js.dashboard.devices`, + { + count: this._network.controller.nodes.length, + } + )} + ${notReadyDevices > 0 + ? html`(${this.hass.localize( + `ui.panel.config.zwave_js.dashboard.not_ready`, + { count: notReadyDevices } + )})` + : ""} + +
+ ` + : ``}
-
-

- Enable the reporting of anonymized telemetry and - statistics to the Z-Wave JS organization. This - data will be used to focus development efforts and improve - the user experience. Information about the data that is - collected and how it is used, including an example of the - data collected, can be found in the - Z-Wave JS data collection documentation. -

+
+ + + +
+
+ + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.driver_version" + )}: + + ${this._network.client.driver_version}
- - ` - : ``} - +
+ + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.server_version" + )}: + + ${this._network.client.server_version} +
+
+ + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.home_id" + )}: + + ${this._network.controller.home_id} +
+
+ + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.server_url" + )}: + + ${this._network.client.ws_server_url} +
+
+ + + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.messages_tx.label" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.messages_tx.tooltip" + )} + + ${this._statistics?.messages_tx ?? 0} + + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.messages_rx.label" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.messages_rx.tooltip" + )} + + ${this._statistics?.messages_rx ?? 0} + + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.messages_dropped_tx.label" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.messages_dropped_tx.tooltip" + )} + + ${this._statistics?.messages_dropped_tx ?? 0} + + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.messages_dropped_rx.label" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.messages_dropped_rx.tooltip" + )} + + ${this._statistics?.messages_dropped_rx ?? 0} + + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.nak.label" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.nak.tooltip" + )} + + ${this._statistics?.nak ?? 0} + + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.can.label" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.can.tooltip" + )} + + ${this._statistics?.can ?? 0} + + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.timeout_ack.label" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.timeout_ack.tooltip" + )} + + ${this._statistics?.timeout_ack ?? 0} + + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.timeout_response.label" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.timeout_response.tooltip" + )} + + ${this._statistics?.timeout_response ?? 0} + + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.timeout_callback.label" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.dashboard.statistics.timeout_callback.tooltip" + )} + + ${this._statistics?.timeout_callback ?? 0} + + + +
+
+ + ${this.hass.localize( + "ui.panel.config.zwave_js.common.remove_node" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.common.rebuild_network_routes" + )} + + + ${this.hass.localize( + "ui.panel.config.zwave_js.common.reconfigure_server" + )} + +
+
+ +
+

Third-Party Data Reporting

+ ${this._dataCollectionOptIn !== undefined + ? html` + + ` + : html` + + `} +
+
+

+ Enable the reporting of anonymized telemetry and statistics + to the Z-Wave JS organization. This data will be + used to focus development efforts and improve the user + experience. Information about the data that is collected and + how it is used, including an example of the data collected, + can be found in the + Z-Wave JS data collection documentation. +

+
+
+ ` + : ``}