ZHA channel changing dialog and settings redesign (#16381)

src/data/zha.ts

@@ -432,6 +432,15 @@ export const listZHANetworkBackups = (
     type: "zha/network/backups/list",
   });
 
+export const changeZHANetworkChannel = (
+  hass: HomeAssistant,
+  newChannel: "auto" | number
+): Promise<void> =>
+  hass.callWS({
+    type: "zha/network/change_channel",
+    new_channel: newChannel,
+  });
+
 export const INITIALIZED = "INITIALIZED";
 export const INTERVIEW_COMPLETE = "INTERVIEW_COMPLETE";
 export const CONFIGURED = "CONFIGURED";

src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts

@@ -0,0 +1,149 @@
+import { html, LitElement, TemplateResult, nothing } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { fireEvent } from "../../../../../common/dom/fire_event";
+import { stopPropagation } from "../../../../../common/dom/stop_propagation";
+import { HassDialog } from "../../../../../dialogs/make-dialog-manager";
+import { changeZHANetworkChannel } from "../../../../../data/zha";
+import { showAlertDialog } from "../../../../../dialogs/generic/show-dialog-box";
+import { createCloseHeading } from "../../../../../components/ha-dialog";
+import { HomeAssistant } from "../../../../../types";
+import "../../../../../components/buttons/ha-progress-button";
+import "../../../../../components/ha-button";
+import "../../../../../components/ha-select";
+import "../../../../../components/ha-list-item";
+import { ZHAChangeChannelDialogParams } from "./show-dialog-zha-change-channel";
+
+const VALID_CHANNELS = [
+  "auto",
+  11,
+  12,
+  13,
+  14,
+  15,
+  16,
+  17,
+  18,
+  19,
+  20,
+  21,
+  22,
+  23,
+  24,
+  25,
+];
+
+@customElement("dialog-zha-change-channel")
+class DialogZHAChangeChannel extends LitElement implements HassDialog {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @state() private _migrationInProgress = false;
+
+  @state() private _params?: ZHAChangeChannelDialogParams;
+
+  @state() private _newChannel?: "auto" | number;
+
+  public async showDialog(params: ZHAChangeChannelDialogParams): Promise<void> {
+    this._params = params;
+    this._newChannel = params.currentChannel;
+  }
+
+  public closeDialog(): void {
+    this._params = undefined;
+    this._newChannel = undefined;
+    fireEvent(this, "dialog-closed", { dialog: this.localName });
+  }
+
+  protected render(): TemplateResult | typeof nothing {
+    if (!this._params) {
+      return nothing;
+    }
+
+    return html`
+      <ha-dialog
+        open
+        scrimClickAction
+        escapeKeyAction
+        @closed=${this.closeDialog}
+        .heading=${createCloseHeading(
+          this.hass,
+          this.hass.localize("ui.panel.config.zha.change_channel_dialog.title")
+        )}
+      >
+        <p>
+          ${this.hass.localize(
+            "ui.panel.config.zha.change_channel_dialog.migration_warning"
+          )}
+        </p>
+
+        <p>
+          <ha-select
+            .label=${this.hass.localize(
+              "ui.panel.config.zha.change_channel_dialog.new_channel"
+            )}
+            fixedMenuPosition
+            naturalMenuWidth
+            @selected=${this._newChannelChosen}
+            @closed=${stopPropagation}
+            .value=${String(this._newChannel)}
+          >
+            ${VALID_CHANNELS.map(
+              (newChannel) =>
+                html`<ha-list-item .value=${String(newChannel)}
+                  >${newChannel}</ha-list-item
+                >`
+            )}
+          </ha-select>
+        </p>
+
+        <ha-progress-button
+          slot="primaryAction"
+          .progress=${this._migrationInProgress}
+          .disabled=${this._migrationInProgress}
+          @click=${this._changeNetworkChannel}
+        >
+          ${this.hass.localize(
+            "ui.panel.config.zha.change_channel_dialog.change_channel"
+          )}
+        </ha-progress-button>
+
+        <ha-button
+          slot="secondaryAction"
+          @click=${this.closeDialog}
+          .disabled=${this._migrationInProgress}
+          >${this.hass.localize("ui.dialogs.generic.cancel")}</ha-button
+        >
+      </ha-dialog>
+    `;
+  }
+
+  private _newChannelChosen(evt: Event): void {
+    const value: string = (evt.target! as HTMLSelectElement).value;
+    this._newChannel = value === "auto" ? "auto" : parseInt(value, 10);
+  }
+
+  private async _changeNetworkChannel(): Promise<void> {
+    try {
+      this._migrationInProgress = true;
+      await changeZHANetworkChannel(this.hass, this._newChannel!);
+    } finally {
+      this._migrationInProgress = false;
+    }
+
+    await showAlertDialog(this, {
+      title: this.hass.localize(
+        "ui.panel.config.zha.change_channel_dialog.channel_has_been_changed"
+      ),
+      text: this.hass.localize(
+        "ui.panel.config.zha.change_channel_dialog.devices_will_rejoin"
+      ),
+    });
+
+    this.closeDialog();
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "dialog-zha-change-channel": DialogZHAChangeChannel;
+  }
+}

src/panels/config/integrations/integration-panels/zha/show-dialog-zha-change-channel.ts

@@ -0,0 +1,19 @@
+import { fireEvent } from "../../../../../common/dom/fire_event";
+
+export interface ZHAChangeChannelDialogParams {
+  currentChannel: number;
+}
+
+export const loadZHAChangeChannelDialog = () =>
+  import("./dialog-zha-change-channel");
+
+export const showZHAChangeChannelDialog = (
+  element: HTMLElement,
+  zhaChangeChannelParams: ZHAChangeChannelDialogParams
+): void => {
+  fireEvent(element, "show-dialog", {
+    dialogTag: "dialog-zha-change-channel",
+    dialogImport: loadZHAChangeChannelDialog,
+    dialogParams: zhaChangeChannelParams,
+  });
+};

src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts

@@ -1,5 +1,11 @@
 import "@material/mwc-button/mwc-button";
-import { mdiFolderMultipleOutline, mdiLan, mdiNetwork, mdiPlus } from "@mdi/js";
+import {
+  mdiFolderMultipleOutline,
+  mdiLan,
+  mdiNetwork,
+  mdiPlus,
+  mdiPencil,
+} from "@mdi/js";
 import {
   css,
   CSSResultGroup,
@@ -16,6 +22,7 @@ import {
 import { computeRTL } from "../../../../../common/util/compute_rtl";
 import "../../../../../components/ha-card";
 import "../../../../../components/ha-fab";
+import "../../../../../components/ha-icon-button";
 import { fileDownload } from "../../../../../util/file_download";
 import "../../../../../components/ha-icon-next";
 import "../../../../../layouts/hass-tabs-subpage";
@@ -26,6 +33,8 @@ import type { HomeAssistant, Route } from "../../../../../types";
 import "../../../ha-config-section";
 import "../../../../../components/ha-form/ha-form";
 import "../../../../../components/buttons/ha-progress-button";
+import "../../../../../components/ha-settings-row";
+import { showZHAChangeChannelDialog } from "./show-dialog-zha-change-channel";
 import {
   fetchZHAConfiguration,
   updateZHAConfiguration,
@@ -126,31 +135,52 @@ class ZHAConfigDashboard extends LitElement {
           )}
         >
           ${this._networkSettings
-            ? html`<div class="card-content network-settings">
+            ? html`<div class="card-content">
-                <div>
+                <ha-settings-row>
-                  <strong>PAN ID:</strong>
+                  <span slot="description">PAN ID</span>
-                  ${this._networkSettings.settings.network_info.pan_id}
+                  <span slot="heading"
-                </div>
+                    >${this._networkSettings.settings.network_info.pan_id}</span
-                <div>
+                  >
-                  <strong>Extended PAN ID:</strong>
+                </ha-settings-row>
-                  ${this._networkSettings.settings.network_info.extended_pan_id}
+
-                </div>
+                <ha-settings-row>
-                <div>
+                  <span slot="heading"
-                  <strong>Channel:</strong>
+                    >${this._networkSettings.settings.network_info
-                  ${this._networkSettings.settings.network_info.channel}
+                      .extended_pan_id}</span
-                </div>
+                  >
-                <div>
+                  <span slot="description">Extended PAN ID</span>
-                  <strong>Coordinator IEEE:</strong>
+                </ha-settings-row>
-                  ${this._networkSettings.settings.node_info.ieee}
+
-                </div>
+                <ha-settings-row>
-                <div>
+                  <span slot="description">Channel</span>
-                  <strong>Network key:</strong>
+                  <span slot="heading"
-                  ${this._networkSettings.settings.network_info.network_key.key}
+                    >${this._networkSettings.settings.network_info
-                </div>
+                      .channel}</span
-                <div>
+                  >
-                  <strong>Radio type:</strong>
+
-                  ${this._networkSettings.radio_type}
+                  <ha-icon-button
-                </div>
+                    .label=${this.hass.localize(
+                      "ui.panel.config.zha.configuration_page.change_channel"
+                    )}
+                    .path=${mdiPencil}
+                    @click=${this._showChannelMigrationDialog}
+                  >
+                  </ha-icon-button>
+                </ha-settings-row>
+
+                <ha-settings-row>
+                  <span slot="description">Coordinator IEEE</span>
+                  <span slot="heading"
+                    >${this._networkSettings.settings.node_info.ieee}</span
+                  >
+                </ha-settings-row>
+
+                <ha-settings-row>
+                  <span slot="description">Radio type</span>
+                  <span slot="heading"
+                    >${this._networkSettings.radio_type}</span
+                  >
+                </ha-settings-row>
               </div>`
             : ""}
           <div class="card-actions">
@@ -224,6 +254,12 @@ class ZHAConfigDashboard extends LitElement {
     this._networkSettings = await fetchZHANetworkSettings(this.hass!);
   }
 
+  private async _showChannelMigrationDialog(): Promise<void> {
+    showZHAChangeChannelDialog(this, {
+      currentChannel: this._networkSettings!.settings.network_info.channel,
+    });
+  }
+
   private async _createAndDownloadBackup(): Promise<void> {
     let backup_and_metadata: ZHANetworkBackupAndMetadata;
 
@@ -310,10 +346,16 @@ class ZHAConfigDashboard extends LitElement {
           margin-top: 2px;
         }
 
-        .network-settings > .card-actions {
+        .network-settings ha-settings-row {
-          display: flex;
+          padding-left: 0;
-          justify-content: space-between;
+          padding-right: 0;
-          align-items: center;
+
+          --paper-item-body-two-line-min-height: 55px;
+        }
+
+        .network-settings ha-settings-row ha-icon-button {
+          margin-top: -16px;
+          margin-bottom: -16px;
         }
       `,
     ];

src/translations/en.json

@@ -3463,7 +3463,8 @@
             "update_button": "Update Configuration",
             "download_backup": "Download Backup",
             "migrate_radio": "Migrate Radio",
-            "network_settings_title": "Network Settings"
+            "network_settings_title": "Network Settings",
+            "change_channel": "Change channel"
           },
           "add_device_page": {
             "spinner": "Searching for Zigbee devices…",
@@ -3557,6 +3558,14 @@
             "lqi": "LQI",
             "relationship": "Relationship",
             "depth": "Depth"
+          },
+          "change_channel_dialog": {
+            "title": "Change network channel",
+            "new_channel": "New channel",
+            "change_channel": "Change channel",
+            "migration_warning": "Zigbee channel migration is an experimental feature and relies on devices on your network to support it. Device support for this feature varies and only a portion of your network may end up migrating!",
+            "channel_has_been_changed": "Network channel has been changed",
+            "devices_will_rejoin": "Devices will re-join the network over time. This may take a few minutes."
           }
         },
         "zwave_js": {