Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add basic nodes list & node metadata to OZW config panel #6719

Merged
merged 16 commits into from
Sep 4, 2020
Merged

Add basic nodes list & node metadata to OZW config panel #6719

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
156dcaa
WIP: OZW config panel nodes list
cgarwood Aug 27, 2020
cc2e4e7
Comments
bramkragten Aug 29, 2020
c8ab8fb
Tweaks
cgarwood Aug 29, 2020
8e38a51
Cleanup
cgarwood Aug 29, 2020
34c2f4e
Update function declaration
cgarwood Aug 31, 2020
608140b
Tweak column sizes and add translations
cgarwood Aug 31, 2020
21765e2
Add basic node info to node dashboard page
cgarwood Aug 31, 2020
33ebdf6
Add click handler
cgarwood Aug 31, 2020
c8545e8
Simplify node-level routing
cgarwood Sep 3, 2020
a559579
Finish cleaning up routers
cgarwood Sep 3, 2020
f681268
Review comments
cgarwood Sep 3, 2020
bb25144
lint
cgarwood Sep 3, 2020
69b74ae
Update ozwInstance and nodeId handling
cgarwood Sep 4, 2020
f7ca57a
Guard for node not found
cgarwood Sep 4, 2020
11052d1
Improve handling of node not found errors
cgarwood Sep 4, 2020
547292c
Review comments
cgarwood Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
126 changes: 71 additions & 55 deletions src/panels/config/integrations/integration-panels/ozw/ozw-node-dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
OZWDevice,
OZWDeviceMetaDataResponse,
} from "../../../../../data/ozw";
import { ERR_NOT_FOUND } from "../../../../../data/websocket_api";
import { showOZWRefreshNodeDialog } from "./show-dialog-ozw-refresh-node";
import { ozwNetworkTabs } from "./ozw-network-router";

Expand All @@ -47,6 +48,8 @@ class OZWNodeDashboard extends LitElement {

@internalProperty() private _metadata?: OZWDeviceMetaDataResponse;

@internalProperty() private _not_found = false;

protected firstUpdated() {
if (!this.ozwInstance) {
navigate(this, "/config/ozw/dashboard", true);
Expand All @@ -58,7 +61,7 @@ class OZWNodeDashboard extends LitElement {
}

protected render(): TemplateResult {
if (!this._node) {
if (this._not_found) {
return html`
<hass-error-screen
error="${this.hass.localize("ui.panel.config.ozw.node.not_found")}"
cgarwood marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -81,55 +84,60 @@ class OZWNodeDashboard extends LitElement {
<div slot="introduction">
View the status of a node and manage its configuration.
</div>

<ha-card class="content">
<div class="card-content">
<b
>${this._node.node_manufacturer_name}
${this._node.node_product_name}</b
><br />
Node ID: ${this._node.node_id}<br />
Query Stage: ${this._node.node_query_stage}
${this._metadata?.metadata.ProductManualURL
? html` <a href="${this._metadata.metadata.ProductManualURL}">
<p>Product Manual</p>
</a>`
: ``}
</div>
<div class="card-actions">
<mwc-button @click=${this._refreshNodeClicked}>
Refresh Node
</mwc-button>
</div>
</ha-card>

${this._metadata
${this._node
? html`
<ha-card class="content" header="Description">
<div class="card-content">
${this._metadata.metadata.Description}
</div>
</ha-card>
<ha-card class="content" header="Inclusion">
<ha-card class="content">
<div class="card-content">
${this._metadata.metadata.InclusionHelp}
<b
>${this._node.node_manufacturer_name}
${this._node.node_product_name}</b
><br />
Node ID: ${this._node.node_id}<br />
Query Stage: ${this._node.node_query_stage}
${this._metadata?.metadata.ProductManualURL
? html` <a
href="${this._metadata.metadata.ProductManualURL}"
>
<p>Product Manual</p>
</a>`
: ``}
</div>
</ha-card>
<ha-card class="content" header="Exclusion">
<div class="card-content">
${this._metadata.metadata.ExclusionHelp}
</div>
</ha-card>
<ha-card class="content" header="Reset">
<div class="card-content">
${this._metadata.metadata.ResetHelp}
</div>
</ha-card>
<ha-card class="content" header="WakeUp">
<div class="card-content">
${this._metadata.metadata.WakeupHelp}
<div class="card-actions">
<mwc-button @click=${this._refreshNodeClicked}>
Refresh Node
</mwc-button>
</div>
</ha-card>

${this._metadata
? html`
<ha-card class="content" header="Description">
<div class="card-content">
${this._metadata.metadata.Description}
</div>
</ha-card>
<ha-card class="content" header="Inclusion">
<div class="card-content">
${this._metadata.metadata.InclusionHelp}
</div>
</ha-card>
<ha-card class="content" header="Exclusion">
<div class="card-content">
${this._metadata.metadata.ExclusionHelp}
</div>
</ha-card>
<ha-card class="content" header="Reset">
<div class="card-content">
${this._metadata.metadata.ResetHelp}
</div>
</ha-card>
<ha-card class="content" header="WakeUp">
<div class="card-content">
${this._metadata.metadata.WakeupHelp}
</div>
</ha-card>
`
: ``}
`
: ``}
</ha-config-section>
Expand All @@ -140,16 +148,24 @@ class OZWNodeDashboard extends LitElement {
private async _fetchData() {
if (!this.ozwInstance || !this.nodeId) return;
cgarwood marked this conversation as resolved.
Show resolved Hide resolved

this._node = await fetchOZWNodeStatus(
this.hass!,
this.ozwInstance,
this.nodeId
);
this._metadata = await fetchOZWNodeMetadata(
this.hass!,
this.ozwInstance,
this.nodeId
);
try {
this._node = await fetchOZWNodeStatus(
this.hass!,
this.ozwInstance,
this.nodeId
);
this._metadata = await fetchOZWNodeMetadata(
this.hass!,
this.ozwInstance,
this.nodeId
);
} catch (err) {
if (err.code === ERR_NOT_FOUND) {
this._not_found = true;
return;
}
throw err;
}
}

private async _refreshNodeClicked() {
Expand Down