Home-Assistant/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2026-04-02 16:43:19 +01:00
Code Activity

WIP new dialog use states

Browse Source
This commit is contained in:
Wendelin
2026-04-01 08:27:22 +02:00
parent 7c52ac8ca7
commit 00bff8a16d
13 changed files with 175 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/data/zwave_js.ts
View File

@@ -1,5 +1,6 @@
import type { UnsubscribeFunc } from "home-assistant-js-websocket";
import type { Connection, UnsubscribeFunc } from "home-assistant-js-websocket";
import type { HomeAssistant } from "../types";
import { callWS } from "../util/ws-message";
export enum InclusionState {
/** The controller isn't doing anything regarding inclusion. */
@@ -325,7 +326,10 @@ export interface ZWaveJSRefreshNodeStatusMessage {
export interface ZWaveJSRebuildRoutesStatusMessage {
event: string;
rebuild_routes_status: Record<number, string>;
rebuild_routes_status: Record<
number,
"pending" | "skipped" | "done" | "failed"
>;
}
export interface ZWaveJSControllerStatisticsUpdatedMessage {
@@ -475,7 +479,7 @@ export const invokeZWaveCCApi = <T = unknown>(
});
export const fetchZwaveNetworkStatus = (
hass: HomeAssistant,
connection: Connection,
device_or_entry_id: {
device_id?: string;
entry_id?: string;
@@ -487,7 +491,7 @@ export const fetchZwaveNetworkStatus = (
if (!device_or_entry_id.device_id && !device_or_entry_id.entry_id) {
throw new Error("Either device or entry ID should be supplied.");
}
return hass.callWS({
return callWS<ZWaveJSNetwork>(connection, {
type: "zwave_js/network_status",
device_id: device_or_entry_id.device_id,
entry_id: device_or_entry_id.entry_id,
@@ -814,35 +818,32 @@ export const removeFailedZwaveNode = (
);
export const rebuildZwaveNetworkRoutes = (
hass: HomeAssistant,
connection: Connection,
entry_id: string
): Promise<UnsubscribeFunc> =>
hass.callWS({
callWS(connection, {
type: "zwave_js/begin_rebuilding_routes",
entry_id,
});
export const stopRebuildingZwaveNetworkRoutes = (
hass: HomeAssistant,
connection: Connection,
entry_id: string
): Promise<UnsubscribeFunc> =>
hass.callWS({
callWS(connection, {
type: "zwave_js/stop_rebuilding_routes",
entry_id,
});
export const subscribeRebuildZwaveNetworkRoutesProgress = (
hass: HomeAssistant,
connection: Connection,
entry_id: string,
callbackFunction: (message: ZWaveJSRebuildRoutesStatusMessage) => void
): Promise<UnsubscribeFunc> =>
hass.connection.subscribeMessage(
(message: any) => callbackFunction(message),
{
type: "zwave_js/subscribe_rebuild_routes_progress",
entry_id,
}
);
connection.subscribeMessage((message: any) => callbackFunction(message), {
type: "zwave_js/subscribe_rebuild_routes_progress",
entry_id,
});
export const subscribeZwaveControllerStatistics = (
hass: HomeAssistant,

2
src/panels/config/devices/device-detail/integration-elements/zwave_js/device-actions.ts
View File

@@ -189,7 +189,7 @@ export const getZwaveDeviceActions = async (
}
if (nodeStatus.is_controller_node) {
const networkStatus = await fetchZwaveNetworkStatus(hass, {
const networkStatus = await fetchZwaveNetworkStatus(hass.connection, {
entry_id: entryId,
});
actions.unshift({

9
src/panels/config/integrations/integration-panels/zwave_js/add-node/dialog-zwave_js-add-node.ts
View File

@@ -508,9 +508,12 @@ class DialogZWaveJSAddNode extends LitElement {
if (this._controllerSupportsLongRange === undefined) {
try {
const zwaveNetwork = await fetchZwaveNetworkStatus(this.hass, {
entry_id: this._entryId,
});
const zwaveNetwork = await fetchZwaveNetworkStatus(
this.hass.connection,
{
entry_id: this._entryId,
}
);
this._controllerSupportsLongRange =
zwaveNetwork?.controller?.supports_long_range;
} catch (err) {

0
src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-network-routes/dialog-zwave_js-rebuild-network-routes-detail.ts Normal file
View File

213
src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-network-routes.ts → src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-network-routes/dialog-zwave_js-rebuild-network-routes.ts
View File

@@ -1,79 +1,72 @@
import { consume, type ContextType } from "@lit/context";
import "@material/mwc-linear-progress/mwc-linear-progress";
import { mdiCheckCircle, mdiCloseCircle, mdiStethoscope } from "@mdi/js";
import type { UnsubscribeFunc } from "home-assistant-js-websocket";
import type { CSSResultGroup } from "lit";
import { css, html, LitElement, nothing } from "lit";
import { customElement, property, state } from "lit/decorators";
import { fireEvent } from "../../../../../common/dom/fire_event";
import "../../../../../components/ha-button";
import "../../../../../components/ha-dialog-footer";
import "../../../../../components/ha-dialog";
import { customElement, state } from "lit/decorators";
import memoizeOne from "memoize-one";
import "../../../../../../components/ha-button";
import "../../../../../../components/ha-dialog";
import "../../../../../../components/ha-dialog-footer";
import {
connectionContext,
localizeContext,
} from "../../../../../../data/context";
import type {
ZWaveJSNetwork,
ZWaveJSRebuildRoutesStatusMessage,
} from "../../../../../data/zwave_js";
} from "../../../../../../data/zwave_js";
import {
fetchZwaveNetworkStatus,
rebuildZwaveNetworkRoutes,
stopRebuildingZwaveNetworkRoutes,
subscribeRebuildZwaveNetworkRoutesProgress,
} from "../../../../../data/zwave_js";
import { haStyleDialog } from "../../../../../resources/styles";
import type { HomeAssistant } from "../../../../../types";
} from "../../../../../../data/zwave_js";
import { DialogMixin } from "../../../../../../dialogs/dialog-mixin";
import type { ZWaveJSRebuildNetworkRoutesDialogParams } from "./show-dialog-zwave_js-rebuild-network-routes";
@customElement("dialog-zwave_js-rebuild-network-routes")
class DialogZWaveJSRebuildNetworkRoutes extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
@state() private entry_id?: string;
class DialogZWaveJSRebuildNetworkRoutes extends DialogMixin<ZWaveJSRebuildNetworkRoutesDialogParams>(
LitElement
) {
@state() private _status?: string;
@state() private _progress_total = 0;
@state() private _progress_finished = 0;
@state() private _progress_in_progress = 0;
@state() private _progress?: {
pending: number[];
skipped: number[];
done: number[];
failed: number[];
};
private _subscribed?: Promise<UnsubscribeFunc>;
@state() private _open = false;
@state()
@consume({ context: localizeContext, subscribe: true })
private _localize!: ContextType<typeof localizeContext>;
public showDialog(params: ZWaveJSRebuildNetworkRoutesDialogParams): void {
this._progress_total = 0;
this.entry_id = params.entry_id;
this._open = true;
this._fetchData();
}
@state()
@consume({ context: connectionContext, subscribe: true })
private _connection!: ContextType<typeof connectionContext>;
public closeDialog(): void {
this._open = false;
}
private _dialogClosed(): void {
this.entry_id = undefined;
this._status = undefined;
this._progress_total = 0;
this._unsubscribe();
fireEvent(this, "dialog-closed", { dialog: this.localName });
connectedCallback() {
super.connectedCallback();
if (this.params?.entry_id) {
this._fetchData();
}
}
protected render() {
if (!this.entry_id) {
if (!this.params || !this.params.entry_id) {
return nothing;
}
return html`
<ha-dialog
.hass=${this.hass}
.open=${this._open}
header-title=${this.hass.localize(
open
header-title=${this._localize(
"ui.panel.config.zwave_js.rebuild_network_routes.title"
)}
@closed=${this._dialogClosed}
>
${!this._status
? html`
@@ -84,7 +77,7 @@ class DialogZWaveJSRebuildNetworkRoutes extends LitElement {
></ha-svg-icon>
<div class="status">
<p>
${this.hass.localize(
${this._localize(
"ui.panel.config.zwave_js.rebuild_network_routes.introduction"
)}
</p>
@@ -92,36 +85,36 @@ class DialogZWaveJSRebuildNetworkRoutes extends LitElement {
</div>
<p>
<em>
${this.hass.localize(
${this._localize(
"ui.panel.config.zwave_js.rebuild_network_routes.traffic_warning"
)}
</em>
</p>
`
: ``}
: nothing}
${this._status === "started"
? html`
<div class="status">
<p>
<b>
${this.hass.localize(
${this._localize(
"ui.panel.config.zwave_js.rebuild_network_routes.in_progress"
)}
</b>
</p>
<p>
${this.hass.localize(
${this._localize(
"ui.panel.config.zwave_js.rebuild_network_routes.run_in_background"
)}
</p>
</div>
${!this._progress_total
${!this._progress
? html`
<mwc-linear-progress indeterminate> </mwc-linear-progress>
`
: ""}
: nothing}
`
: ``}
: nothing}
${this._status === "failed"
? html`
<div class="flex-container">
@@ -131,14 +124,14 @@ class DialogZWaveJSRebuildNetworkRoutes extends LitElement {
></ha-svg-icon>
<div class="status">
<p>
${this.hass.localize(
${this._localize(
"ui.panel.config.zwave_js.rebuild_network_routes.rebuilding_routes_failed"
)}
</p>
</div>
</div>
`
: ``}
: nothing}
${this._status === "finished"
? html`
<div class="flex-container">
@@ -148,14 +141,14 @@ class DialogZWaveJSRebuildNetworkRoutes extends LitElement {
></ha-svg-icon>
<div class="status">
<p>
${this.hass.localize(
${this._localize(
"ui.panel.config.zwave_js.rebuild_network_routes.rebuilding_routes_complete"
)}
</p>
</div>
</div>
`
: ``}
: nothing}
${this._status === "cancelled"
? html`
<div class="flex-container">
@@ -165,24 +158,31 @@ class DialogZWaveJSRebuildNetworkRoutes extends LitElement {
></ha-svg-icon>
<div class="status">
<p>
${this.hass.localize(
${this._localize(
"ui.panel.config.zwave_js.rebuild_network_routes.rebuilding_routes_cancelled"
)}
</p>
</div>
</div>
`
: ``}
${this._progress_total && this._status !== "finished"
: nothing}
${this._progress && this._status !== "finished"
? html`
<mwc-linear-progress
determinate
.progress=${this._progress_finished}
.buffer=${this._progress_in_progress}
.progress=${this._progressPercent(this._progress)}
.buffer=${this._progress.pending.length}
>
</mwc-linear-progress>
<ul>
<li>Done: ${this._progress.done.length}</li>
<li>Skipped: ${this._progress.skipped.length}</li>
<li>Pending: ${this._progress.pending.length}</li>
<li>Failed: ${this._progress.failed.length}</li>
</ul>
`
: ""}
: nothing}
<ha-dialog-footer slot="footer">
${!this._status
? html`
@@ -190,7 +190,7 @@ class DialogZWaveJSRebuildNetworkRoutes extends LitElement {
slot="primaryAction"
@click=${this._startRebuildingRoutes}
>
${this.hass.localize(
${this._localize(
"ui.panel.config.zwave_js.rebuild_network_routes.start_rebuilding_routes"
)}
</ha-button>
@@ -203,17 +203,17 @@ class DialogZWaveJSRebuildNetworkRoutes extends LitElement {
@click=${this._stopRebuildingRoutes}
variant="danger"
>
${this.hass.localize(
${this._localize(
"ui.panel.config.zwave_js.rebuild_network_routes.stop_rebuilding_routes"
)}
</ha-button>
<ha-button slot="primaryAction" @click=${this.closeDialog}>
${this.hass.localize("ui.common.close")}
${this._localize("ui.common.close")}
</ha-button>
`
: html`
<ha-button slot="primaryAction" @click=${this.closeDialog}>
${this.hass.localize("ui.common.close")}
${this._localize("ui.common.close")}
</ha-button>
`}
</ha-dialog-footer>
@@ -222,65 +222,70 @@ class DialogZWaveJSRebuildNetworkRoutes extends LitElement {
}
private async _fetchData(): Promise<void> {
if (!this.hass) {
return;
}
const network: ZWaveJSNetwork = await fetchZwaveNetworkStatus(this.hass!, {
entry_id: this.entry_id!,
});
const network: ZWaveJSNetwork = await fetchZwaveNetworkStatus(
this._connection,
{
entry_id: this.params!.entry_id,
}
);
if (network.controller.is_rebuilding_routes) {
this._status = "started";
this._subscribed = subscribeRebuildZwaveNetworkRoutesProgress(
this.hass,
this.entry_id!,
this._handleMessage.bind(this)
);
this._startSubscribingToProgress();
}
}
private _startRebuildingRoutes(): void {
if (!this.hass) {
return;
}
rebuildZwaveNetworkRoutes(this.hass, this.entry_id!);
rebuildZwaveNetworkRoutes(this._connection, this.params!.entry_id);
this._status = "started";
this._startSubscribingToProgress();
}
private _startSubscribingToProgress() {
// TODO initial message isn't handled
this._subscribed = subscribeRebuildZwaveNetworkRoutesProgress(
this.hass,
this.entry_id!,
this._handleMessage.bind(this)
this._connection,
this.params!.entry_id,
this._handleMessage
);
}
private _stopRebuildingRoutes(): void {
if (!this.hass) {
return;
}
stopRebuildingZwaveNetworkRoutes(this.hass, this.entry_id!);
stopRebuildingZwaveNetworkRoutes(this._connection, this.params!.entry_id);
this._unsubscribe();
this._status = "cancelled";
}
private _handleMessage(message: ZWaveJSRebuildRoutesStatusMessage): void {
private _handleMessage = (message: ZWaveJSRebuildRoutesStatusMessage) => {
if (message.event === "rebuild routes progress") {
let finished = 0;
let in_progress = 0;
for (const status of Object.values(message.rebuild_routes_status)) {
if (status === "pending") {
in_progress++;
}
if (["skipped", "failed", "done"].includes(status)) {
finished++;
}
const progressNumbers: typeof this._progress = {
pending: [],
skipped: [],
done: [],
failed: [],
};
for (const [nodeId, status] of Object.entries(
message.rebuild_routes_status
)) {
progressNumbers[status].push(Number(nodeId));
}
this._progress_total = Object.keys(message.rebuild_routes_status).length;
this._progress_finished = finished / this._progress_total;
this._progress_in_progress = in_progress / this._progress_total;
this._progress = progressNumbers;
}
if (message.event === "rebuild routes done") {
this._unsubscribe();
this._status = "finished";
}
}
};
private _progressPercent = memoizeOne(
(progress: typeof this._progress) =>
(progress!.done.length +
progress!.skipped.length +
progress!.failed.length) /
(progress!.done.length +
progress!.skipped.length +
progress!.failed.length +
progress!.pending.length)
);
private _unsubscribe(): void {
if (this._subscribed) {
@@ -289,9 +294,13 @@ class DialogZWaveJSRebuildNetworkRoutes extends LitElement {
}
}
disconnectedCallback(): void {
super.disconnectedCallback();
this._unsubscribe();
}
static get styles(): CSSResultGroup {
return [
haStyleDialog,
css`
.success {
color: var(--success-color);

2
src/panels/config/integrations/integration-panels/zwave_js/show-dialog-zwave_js-rebuild-network-routes.ts → src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-network-routes/show-dialog-zwave_js-rebuild-network-routes.ts
View File

@@ -1,4 +1,4 @@
import { fireEvent } from "../../../../../common/dom/fire_event";
import { fireEvent } from "../../../../../../common/dom/fire_event";
export interface ZWaveJSRebuildNetworkRoutesDialogParams {
entry_id: string;

9
src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-rebuild-node-routes.ts
View File

@@ -209,9 +209,12 @@ class DialogZWaveJSRebuildNodeRoutes extends LitElement {
if (!this.hass) {
return;
}
const network: ZWaveJSNetwork = await fetchZwaveNetworkStatus(this.hass!, {
device_id: this.device!.id,
});
const network: ZWaveJSNetwork = await fetchZwaveNetworkStatus(
this.hass!.connection,
{
device_id: this.device!.id,
}
);
if (network.controller.is_rebuilding_routes) {
this._status = "rebuilding-routes";
}

4
src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts
View File

@@ -636,7 +636,9 @@ class ZWaveJSConfigDashboard extends SubscribeMixin(LitElement) {
}
const [network, provisioningEntries] = await Promise.all([
fetchZwaveNetworkStatus(this.hass!, { entry_id: this.configEntryId }),
fetchZwaveNetworkStatus(this.hass!.connection, {
entry_id: this.configEntryId,
}),
fetchZwaveProvisioningEntries(this.hass!, this.configEntryId),
]);

2
src/panels/config/integrations/integration-panels/zwave_js/zwave_js-network-info-page.ts
View File

@@ -27,7 +27,7 @@ class ZWaveJSNetworkInfoPage extends LitElement {
protected async firstUpdated() {
if (this.hass && this.configEntryId) {
this._network = await fetchZwaveNetworkStatus(this.hass, {
this._network = await fetchZwaveNetworkStatus(this.hass.connection, {
entry_id: this.configEntryId,
});
}

2
src/panels/config/integrations/integration-panels/zwave_js/zwave_js-network-visualization.ts
View File

@@ -114,7 +114,7 @@ export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) {
}
private async _fetchNetworkStatus() {
const network = await fetchZwaveNetworkStatus(this.hass!, {
const network = await fetchZwaveNetworkStatus(this.hass!.connection, {
entry_id: this.configEntryId,
});
const nodeStatuses: Record<number, ZWaveJSNodeStatus> = {};

4
src/panels/config/integrations/integration-panels/zwave_js/zwave_js-options-page.ts
View File

@@ -16,7 +16,7 @@ import {
import "../../../../../layouts/hass-subpage";
import { haStyle } from "../../../../../resources/styles";
import type { HomeAssistant, Route } from "../../../../../types";
import { showZWaveJSRebuildNetworkRoutesDialog } from "./show-dialog-zwave_js-rebuild-network-routes";
import { showZWaveJSRebuildNetworkRoutesDialog } from "./dialog-zwave_js-rebuild-network-routes/show-dialog-zwave_js-rebuild-network-routes";
import { showZWaveJSRemoveNodeDialog } from "./show-dialog-zwave_js-remove-node";
@customElement("zwave_js-options-page")
@@ -37,7 +37,7 @@ class ZWaveJSOptionsPage extends LitElement {
protected async firstUpdated() {
if (this.hass && this.configEntryId) {
const network = await fetchZwaveNetworkStatus(this.hass, {
const network = await fetchZwaveNetworkStatus(this.hass.connection, {
entry_id: this.configEntryId,
});
this._network = network;

22
src/state/connection-mixin.ts
View File

@@ -30,16 +30,17 @@ import { subscribeEntityRegistryDisplay } from "../data/ws-entity_registry_displ
import { subscribeFloorRegistry } from "../data/ws-floor_registry";
import { subscribePanels } from "../data/ws-panels";
import { translationMetadata } from "../resources/translations-metadata";
import type { Constructor, HomeAssistant, ServiceCallResponse } from "../types";
import {
addBrandsAuth,
clearBrandsTokenRefresh,
fetchAndScheduleBrandsAccessToken,
} from "../util/brands-url";
import type { Constructor, HomeAssistant, ServiceCallResponse } from "../types";
import { getLocalLanguage } from "../util/common-translation";
import { fetchWithAuth } from "../util/fetch-with-auth";
import { getState } from "../util/ha-pref-storage";
import hassCallApi, { hassCallApiRaw } from "../util/hass-call-api";
import { callWS } from "../util/ws-message";
import type { HassBaseEl } from "./hass-base-mixin";
export const connectionMixin = <T extends Constructor<HassBaseEl>>(
@@ -187,24 +188,7 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
conn.sendMessage(msg);
},
// For messages that expect a response
callWS: <R>(msg) => {
if (this.hass?.debugConnection) {
// eslint-disable-next-line no-console
console.log("Sending", msg);
}
const resp = conn.sendMessagePromise<R>(msg);
if (this.hass?.debugConnection) {
resp.then(
// eslint-disable-next-line no-console
(result) => console.log("Received", result),
// eslint-disable-next-line no-console
(err) => console.error("Error", err)
);
}
return resp;
},
callWS: <R>(msg) => callWS<R>(conn, msg),
loadBackendTranslation: (category, integration?, configFlow?) =>
// @ts-ignore
this._loadHassTranslations(

23
src/util/ws-message.ts Normal file
View File

@@ -0,0 +1,23 @@
import type { Connection, MessageBase } from "home-assistant-js-websocket";
export const callWS = <T>(
connection: Connection,
msg: MessageBase
): Promise<T> => {
if (__DEV__) {
// eslint-disable-next-line no-console
console.log("Sending", msg);
}
const response = connection.sendMessagePromise<T>(msg);
if (__DEV__) {
response.then(
// eslint-disable-next-line no-console
(result) => console.log("Received", result),
// eslint-disable-next-line no-console
(err) => console.error("Error", err)
);
}
return response;
};