- Hello world!
-
+ Hello world!
-
`
- : ""}
+ ${!overlay
+ ? ""
+ : html`
+
+ ${this._result === "success"
+ ? html`
+ `}
`;
}
public actionSuccess(): void {
- this._tempClass("success");
+ this._setResult("success");
}
public actionError(): void {
- this._tempClass("error");
+ this._setResult("error");
}
- private _tempClass(className: string): void {
- this._button!.classList.add(className);
+ private _setResult(result: "success" | "error"): void {
+ this._result = result;
setTimeout(() => {
- this._button!.classList.remove(className);
- }, 1000);
+ this._result = undefined;
+ }, 2000);
}
private _buttonTapped(ev: Event): void {
@@ -69,6 +85,7 @@ export class HaProgressButton extends LitElement {
background-color: var(--success-color);
transition: none;
border-radius: 4px;
+ pointer-events: none;
}
mwc-button[raised].success {
@@ -81,6 +98,7 @@ export class HaProgressButton extends LitElement {
background-color: var(--error-color);
transition: none;
border-radius: 4px;
+ pointer-events: none;
}
mwc-button[raised].error {
@@ -89,13 +107,21 @@ export class HaProgressButton extends LitElement {
}
.progress {
- bottom: 0;
- margin-top: 4px;
+ bottom: 4px;
position: absolute;
text-align: center;
- top: 0;
+ top: 4px;
width: 100%;
}
+
+ ha-svg-icon {
+ color: white;
+ }
+
+ mwc-button.success slot,
+ mwc-button.error slot {
+ visibility: hidden;
+ }
`;
}
}
diff --git a/src/components/date-range-picker.ts b/src/components/date-range-picker.ts
index f0c0951a77..e6a5c6479f 100644
--- a/src/components/date-range-picker.ts
+++ b/src/components/date-range-picker.ts
@@ -115,7 +115,7 @@ class DateRangePickerElement extends WrappedElement {
color: var(--primary-text-color);
min-width: initial !important;
}
- .daterangepicker:after {
+ .daterangepicker:before {
display: none;
}
.daterangepicker:after {
diff --git a/src/components/device/ha-device-picker.ts b/src/components/device/ha-device-picker.ts
index d1a7d2b55a..ea62482637 100644
--- a/src/components/device/ha-device-picker.ts
+++ b/src/components/device/ha-device-picker.ts
@@ -86,6 +86,8 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
@property({ type: Boolean }) public disabled?: boolean;
+ @property({ type: Boolean }) public required?: boolean;
+
@state() private _opened?: boolean;
@query("ha-combo-box", true) public comboBox!: HaComboBox;
@@ -269,6 +271,7 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
.value=${this._value}
.renderer=${rowRenderer}
.disabled=${this.disabled}
+ .required=${this.required}
item-value-path="id"
item-label-path="name"
@opened-changed=${this._openedChanged}
diff --git a/src/components/device/ha-devices-picker.ts b/src/components/device/ha-devices-picker.ts
index 1b437da780..9ca65e20a5 100644
--- a/src/components/device/ha-devices-picker.ts
+++ b/src/components/device/ha-devices-picker.ts
@@ -1,4 +1,4 @@
-import { html, LitElement, TemplateResult } from "lit";
+import { css, html, LitElement, TemplateResult } from "lit";
import { customElement, property } from "lit/decorators";
import { fireEvent } from "../../common/dom/fire_event";
import { PolymerChangedEvent } from "../../polymer-types";
@@ -11,6 +11,8 @@ class HaDevicesPicker extends LitElement {
@property() public value?: string[];
+ @property({ type: Boolean }) public required?: boolean;
+
/**
* Show entities from specific domains.
* @type {string}
@@ -66,6 +68,7 @@ class HaDevicesPicker extends LitElement {
.excludeDomains=${this.excludeDomains}
.includeDeviceClasses=${this.includeDeviceClasses}
.label=${this.pickDeviceLabel}
+ .required=${this.required}
@value-changed=${this._addDevice}
>
@@ -116,6 +119,12 @@ class HaDevicesPicker extends LitElement {
this._updateDevices([...currentDevices, toAdd]);
}
+
+ static override styles = css`
+ div {
+ margin-top: 8px;
+ }
+ `;
}
declare global {
diff --git a/src/components/entity/ha-entities-picker.ts b/src/components/entity/ha-entities-picker.ts
index 35e21dc950..75002c51d4 100644
--- a/src/components/entity/ha-entities-picker.ts
+++ b/src/components/entity/ha-entities-picker.ts
@@ -14,6 +14,8 @@ class HaEntitiesPickerLight extends LitElement {
@property({ type: Array }) public value?: string[];
+ @property({ type: Boolean }) public required?: boolean;
+
/**
* Show entities from specific domains.
* @type {string}
@@ -46,11 +48,29 @@ class HaEntitiesPickerLight extends LitElement {
@property({ type: Array, attribute: "include-unit-of-measurement" })
public includeUnitOfMeasurement?: string[];
+ /**
+ * List of allowed entities to show. Will ignore all other filters.
+ * @type {Array}
+ * @attr include-entities
+ */
+ @property({ type: Array, attribute: "include-entities" })
+ public includeEntities?: string[];
+
+ /**
+ * List of entities to be excluded.
+ * @type {Array}
+ * @attr exclude-entities
+ */
+ @property({ type: Array, attribute: "exclude-entities" })
+ public excludeEntities?: string[];
+
@property({ attribute: "picked-entity-label" })
public pickedEntityLabel?: string;
@property({ attribute: "pick-entity-label" }) public pickEntityLabel?: string;
+ @property() public entityFilter?: HaEntityPickerEntityFilterFunc;
+
protected render(): TemplateResult {
if (!this.hass) {
return html``;
@@ -67,6 +87,8 @@ class HaEntitiesPickerLight extends LitElement {
.hass=${this.hass}
.includeDomains=${this.includeDomains}
.excludeDomains=${this.excludeDomains}
+ .includeEntities=${this.includeEntities}
+ .excludeEntities=${this.excludeEntities}
.includeDeviceClasses=${this.includeDeviceClasses}
.includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
.entityFilter=${this._entityFilter}
@@ -82,10 +104,13 @@ class HaEntitiesPickerLight extends LitElement {
.hass=${this.hass}
.includeDomains=${this.includeDomains}
.excludeDomains=${this.excludeDomains}
+ .includeEntities=${this.includeEntities}
+ .excludeEntities=${this.excludeEntities}
.includeDeviceClasses=${this.includeDeviceClasses}
.includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
.entityFilter=${this._entityFilter}
.label=${this.pickEntityLabel}
+ .required=${this.required}
@value-changed=${this._addEntity}
>
@@ -94,7 +119,9 @@ class HaEntitiesPickerLight extends LitElement {
private _entityFilter: HaEntityPickerEntityFilterFunc = (
stateObj: HassEntity
- ) => !this.value || !this.value.includes(stateObj.entity_id);
+ ) =>
+ (!this.value || !this.value.includes(stateObj.entity_id)) &&
+ (!this.entityFilter || this.entityFilter(stateObj));
private get _currentEntities() {
return this.value || [];
diff --git a/src/components/entity/ha-entity-attribute-picker.ts b/src/components/entity/ha-entity-attribute-picker.ts
index 291d30da5e..49bfd1db33 100644
--- a/src/components/entity/ha-entity-attribute-picker.ts
+++ b/src/components/entity/ha-entity-attribute-picker.ts
@@ -19,6 +19,8 @@ class HaEntityAttributePicker extends LitElement {
@property({ type: Boolean }) public disabled = false;
+ @property({ type: Boolean }) public required = false;
+
@property({ type: Boolean, attribute: "allow-custom-value" })
public allowCustomValue;
@@ -61,6 +63,7 @@ class HaEntityAttributePicker extends LitElement {
"ui.components.entity.entity-attribute-picker.attribute"
)}
.disabled=${this.disabled || !this.entityId}
+ .required=${this.required}
.allowCustomValue=${this.allowCustomValue}
item-value-path="value"
item-label-path="label"
diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts
index d24f6fbac4..c8f288ad70 100644
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -7,6 +7,7 @@ import memoizeOne from "memoize-one";
import { fireEvent } from "../../common/dom/fire_event";
import { computeDomain } from "../../common/entity/compute_domain";
import { computeStateName } from "../../common/entity/compute_state_name";
+import { caseInsensitiveStringCompare } from "../../common/string/compare";
import { PolymerChangedEvent } from "../../polymer-types";
import { HomeAssistant } from "../../types";
import "../ha-combo-box";
@@ -15,18 +16,21 @@ import "../ha-icon-button";
import "../ha-svg-icon";
import "./state-badge";
+interface HassEntityWithCachedName extends HassEntity {
+ friendly_name: string;
+}
+
export type HaEntityPickerEntityFilterFunc = (entityId: HassEntity) => boolean;
// eslint-disable-next-line lit/prefer-static-styles
-const rowRenderer: ComboBoxLitRenderer
+
+ `
+ )}
+
+
+ `;
+ }
+
+ private get _currentAreas(): string[] {
+ return this.value || [];
+ }
+
+ private async _updateAreas(areas) {
+ this.value = areas;
+
+ fireEvent(this, "value-changed", {
+ value: areas,
+ });
+ }
+
+ private _areaChanged(ev: CustomEvent) {
+ ev.stopPropagation();
+ const curValue = (ev.currentTarget as any).curValue;
+ const newValue = ev.detail.value;
+ if (newValue === curValue) {
+ return;
+ }
+ const currentAreas = this._currentAreas;
+ if (!newValue || currentAreas.includes(newValue)) {
+ this._updateAreas(currentAreas.filter((ent) => ent !== curValue));
+ return;
+ }
+ this._updateAreas(
+ currentAreas.map((ent) => (ent === curValue ? newValue : ent))
+ );
+ }
+
+ private _addArea(ev: CustomEvent) {
+ ev.stopPropagation();
+
+ const toAdd = ev.detail.value;
+ if (!toAdd) {
+ return;
+ }
+ (ev.currentTarget as any).value = "";
+ const currentAreas = this._currentAreas;
+ if (currentAreas.includes(toAdd)) {
+ return;
+ }
+
+ this._updateAreas([...currentAreas, toAdd]);
+ }
+
+ static override styles = css`
+ div {
+ margin-top: 8px;
+ }
+ `;
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "ha-areas-picker": HaAreasPicker;
+ }
+}
diff --git a/src/components/ha-base-time-input.ts b/src/components/ha-base-time-input.ts
index 64b12f18e2..c54739d65d 100644
--- a/src/components/ha-base-time-input.ts
+++ b/src/components/ha-base-time-input.ts
@@ -1,12 +1,13 @@
-import { LitElement, html, TemplateResult, css } from "lit";
-import { customElement, property } from "lit/decorators";
-import "./ha-select";
import "@material/mwc-list/mwc-list-item";
-import "./ha-textfield";
+import { css, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
import { fireEvent } from "../common/dom/fire_event";
import { stopPropagation } from "../common/dom/stop_propagation";
+import "./ha-select";
+import "./ha-textfield";
export interface TimeChangedEvent {
+ days?: number;
hours: number;
minutes: number;
seconds: number;
@@ -21,6 +22,11 @@ export class HaBaseTimeInput extends LitElement {
*/
@property() label?: string;
+ /**
+ * Helper for the input
+ */
+ @property() helper?: string;
+
/**
* auto validate time inputs
*/
@@ -41,6 +47,11 @@ export class HaBaseTimeInput extends LitElement {
*/
@property({ type: Boolean }) disabled = false;
+ /**
+ * day
+ */
+ @property({ type: Number }) days = 0;
+
/**
* hour
*/
@@ -61,6 +72,11 @@ export class HaBaseTimeInput extends LitElement {
*/
@property({ type: Number }) milliseconds = 0;
+ /**
+ * Label for the day input
+ */
+ @property() dayLabel = "";
+
/**
* Label for the hour input
*/
@@ -91,6 +107,11 @@ export class HaBaseTimeInput extends LitElement {
*/
@property({ type: Boolean }) enableMillisecond = false;
+ /**
+ * show the day field
+ */
+ @property({ type: Boolean }) enableDay = false;
+
/**
* limit hours input
*/
@@ -108,8 +129,33 @@ export class HaBaseTimeInput extends LitElement {
protected render(): TemplateResult {
return html`
- ${this.label ? html`` : ""}
+ ${this.label
+ ? html``
+ : ""}
+ ${this.enableDay
+ ? html`
+
+
+ `
+ : ""}
+
PM
`}
+ ${this.helper ? html`${this.helper}
` : ""}
`;
}
@@ -303,6 +350,13 @@ export class HaBaseTimeInput extends LitElement {
color: var(--mdc-theme-text-primary-on-background, rgba(0, 0, 0, 0.87));
padding-left: 4px;
}
+
+ .helper {
+ color: var(--mdc-text-field-label-ink-color, rgba(0, 0, 0, 0.6));
+ font-size: 0.75rem;
+ padding-left: 16px;
+ padding-right: 16px;
+ }
`;
}
diff --git a/src/components/ha-chip-set.ts b/src/components/ha-chip-set.ts
index 2e659c8353..699f1b0a73 100644
--- a/src/components/ha-chip-set.ts
+++ b/src/components/ha-chip-set.ts
@@ -25,13 +25,7 @@ export class HaChipSet extends LitElement {
${unsafeCSS(chipStyles)}
slot::slotted(ha-chip) {
- margin: 4px;
- }
- slot::slotted(ha-chip:first-of-type) {
- margin-left: -4px;
- }
- slot::slotted(ha-chip:last-of-type) {
- margin-right: -4px;
+ margin: 4px 4px 4px 0;
}
`;
}
diff --git a/src/components/ha-chip.ts b/src/components/ha-chip.ts
index 2a41ffc760..f22e0e29ad 100644
--- a/src/components/ha-chip.ts
+++ b/src/components/ha-chip.ts
@@ -14,6 +14,8 @@ import { customElement, property } from "lit/decorators";
export class HaChip extends LitElement {
@property({ type: Boolean }) public hasIcon = false;
+ @property({ type: Boolean }) public hasTrailingIcon = false;
+
@property({ type: Boolean }) public noText = false;
protected render(): TemplateResult {
@@ -30,6 +32,11 @@ export class HaChip extends LitElement {
+
`
+ : null}
`;
}
@@ -53,14 +60,20 @@ export class HaChip extends LitElement {
color: var(--ha-chip-text-color, var(--primary-text-color));
}
- .mdc-chip__icon--leading {
- --mdc-icon-size: 20px;
+ .mdc-chip__icon--leading,
+ .mdc-chip__icon--trailing {
+ --mdc-icon-size: 18px;
+ line-height: 14px;
color: var(--ha-chip-icon-color, var(--ha-chip-text-color));
}
.mdc-chip.no-text
.mdc-chip__icon--leading:not(.mdc-chip__icon--leading-hidden) {
margin-right: -4px;
}
+
+ span[role="gridcell"] {
+ line-height: 14px;
+ }
`;
}
}
diff --git a/src/components/ha-combo-box.ts b/src/components/ha-combo-box.ts
index f8f1bd5cde..c1bc266ed9 100644
--- a/src/components/ha-combo-box.ts
+++ b/src/components/ha-combo-box.ts
@@ -87,6 +87,8 @@ export class HaComboBox extends LitElement {
@property({ type: Boolean }) public disabled?: boolean;
+ @property({ type: Boolean }) public required?: boolean;
+
@property({ type: Boolean, reflect: true, attribute: "opened" })
private _opened?: boolean;
@@ -108,17 +110,22 @@ export class HaComboBox extends LitElement {
return this._comboBox.selectedItem;
}
+ public setInputValue(value: string) {
+ this._comboBox.value = value;
+ }
+
protected render(): TemplateResult {
return html`
- ${this.label}
- ${this.schema.options.map(
- ([value, label]) => html`
-
-
- `
- )}
-
- `;
- }
-
return html`
- [[caption]]
+ [[_getTitle()]]
${this.label}
` : ""} + ${this.label ? html`${this.label}${this.required ? "*" : ""}
` : ""}
+ ${["form", "menu", "external"].includes(
+ this._step?.type as any
+ )
+ ? html`
+
${this._step === null
? this._handler
? html`${this.flowConfig.renderMenuHeader(this.hass, this.step)}
+ ${description ? html`${description}
` : ""}
+
+ `;
+ }
+
+ private _handleStep(ev) {
+ fireEvent(this, "flow-update", {
+ stepPromise: this.flowConfig.handleFlowStep(
+ this.hass,
+ this.step.flow_id,
+ {
+ next_step_id: ev.currentTarget.step,
+ }
+ ),
+ });
+ }
+
+ static styles = [
+ configFlowContentStyles,
+ css`
+ .options {
+ margin-top: 20px;
+ margin-bottom: 8px;
+ }
+ .content {
+ padding-bottom: 16px;
+ border-bottom: 1px solid var(--divider-color);
+ }
+ .content + .options {
+ margin-top: 8px;
+ }
+ mwc-list-item {
+ --mdc-list-side-padding: 24px;
+ }
+ `,
+ ];
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "step-flow-menu": StepFlowMenu;
+ }
+}
diff --git a/src/dialogs/config-flow/step-flow-pick-handler.ts b/src/dialogs/config-flow/step-flow-pick-handler.ts
index 9f2a7e6740..e40158dd97 100644
--- a/src/dialogs/config-flow/step-flow-pick-handler.ts
+++ b/src/dialogs/config-flow/step-flow-pick-handler.ts
@@ -26,11 +26,13 @@ import { HomeAssistant } from "../../types";
import { brandsUrl } from "../../util/brands-url";
import { documentationUrl } from "../../util/documentation-url";
import { configFlowContentStyles } from "./styles";
+import { FlowHandlers } from "./show-dialog-data-entry-flow";
interface HandlerObj {
name: string;
slug: string;
is_add?: boolean;
+ is_helper?: boolean;
}
declare global {
@@ -46,7 +48,7 @@ declare global {
class StepFlowPickHandler extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
- @property({ attribute: false }) public handlers!: string[];
+ @property({ attribute: false }) public handlers!: FlowHandlers;
@property() public initialFilter?: string;
@@ -57,8 +59,12 @@ class StepFlowPickHandler extends LitElement {
private _height?: number;
private _filterHandlers = memoizeOne(
- (h: string[], filter?: string, _localize?: LocalizeFunc) => {
- const handlers: HandlerObj[] = h.map((handler) => ({
+ (
+ h: FlowHandlers,
+ filter?: string,
+ _localize?: LocalizeFunc
+ ): [HandlerObj[], HandlerObj[]] => {
+ const integrations: HandlerObj[] = h.integrations.map((handler) => ({
name: domainToName(this.hass.localize, handler),
slug: handler,
}));
@@ -70,17 +76,31 @@ class StepFlowPickHandler extends LitElement {
minMatchCharLength: 2,
threshold: 0.2,
};
- const fuse = new Fuse(handlers, options);
- return fuse.search(filter).map((result) => result.item);
+ const helpers: HandlerObj[] = h.helpers.map((handler) => ({
+ name: domainToName(this.hass.localize, handler),
+ slug: handler,
+ is_helper: true,
+ }));
+ return [
+ new Fuse(integrations, options)
+ .search(filter)
+ .map((result) => result.item),
+ new Fuse(helpers, options)
+ .search(filter)
+ .map((result) => result.item),
+ ];
}
- return handlers.sort((a, b) =>
- caseInsensitiveStringCompare(a.name, b.name)
- );
+ return [
+ integrations.sort((a, b) =>
+ caseInsensitiveStringCompare(a.name, b.name)
+ ),
+ [],
+ ];
}
);
protected render(): TemplateResult {
- const handlers = this._getHandlers();
+ const [integrations, helpers] = this._getHandlers();
const addDeviceRows: HandlerObj[] = ["zha", "zwave_js"]
.filter((domain) => isComponentLoaded(this.hass, domain))
@@ -115,8 +135,8 @@ class StepFlowPickHandler extends LitElement {
`
: ""}
- ${handlers.length
- ? handlers.map((handler) => this._renderRow(handler))
+ ${integrations.length
+ ? integrations.map((handler) => this._renderRow(handler))
: html`
${this.hass.localize( @@ -139,6 +159,12 @@ class StepFlowPickHandler extends LitElement { >.
`} + ${helpers.length + ? html` + + ${helpers.map((handler) => this._renderRow(handler))} + ` + : ""} `; } @@ -162,7 +188,7 @@ class StepFlowPickHandler extends LitElement { })} referrerpolicy="no-referrer" /> - ${handler.name} + ${handler.name} ${handler.is_helper ? " (helper)" : ""} ${handler.is_add ? "" : html`
@@ -202,6 +203,7 @@ class MoreInfoMediaPlayer extends LitElement {
}
.basic-controls {
+ display: inline-flex;
flex-grow: 1;
}
@@ -231,12 +233,10 @@ class MoreInfoMediaPlayer extends LitElement {
}
private _handleClick(e: MouseEvent): void {
- this.hass!.callService(
- "media_player",
- (e.currentTarget! as HTMLElement).getAttribute("action")!,
- {
- entity_id: this.stateObj!.entity_id,
- }
+ handleMediaControlClick(
+ this.hass!,
+ this.stateObj!,
+ (e.currentTarget as HTMLElement).getAttribute("action")!
);
}
diff --git a/src/dialogs/more-info/controls/more-info-timer.ts b/src/dialogs/more-info/controls/more-info-timer.ts
index 55dbe3168a..63be3032f9 100644
--- a/src/dialogs/more-info/controls/more-info-timer.ts
+++ b/src/dialogs/more-info/controls/more-info-timer.ts
@@ -46,7 +46,7 @@ class MoreInfoTimer extends LitElement {
${this._error} `
+ : ""}
+
+
+
+ `
+ : this.stateObj.attributes.release_summary
+ ? html`
+
+
+ `
+ : ""}
+
+ = {
+ entity_id: this.stateObj!.entity_id,
+ };
+
+ if (this._shouldCreateBackup) {
+ installData.backup = true;
+ }
+
+ if (
+ supportsFeature(this.stateObj!, UPDATE_SUPPORT_SPECIFIC_VERSION) &&
+ this.stateObj!.attributes.latest_version
+ ) {
+ installData.version = this.stateObj!.attributes.latest_version;
+ }
+
+ this.hass.callService("update", "install", installData);
+ }
+
+ private _handleSkip(): void {
+ this.hass.callService("update", "skip", {
+ entity_id: this.stateObj!.entity_id,
+ });
+ }
+
+ static get styles(): CSSResultGroup {
+ return css`
+ hr {
+ border-color: var(--divider-color);
+ border-bottom: none;
+ margin: 16px 0;
+ }
+ ha-expansion-panel {
+ margin: 16px 0;
+ }
+ .row {
+ margin: 0;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ }
+ .actions {
+ margin: 8px 0 0;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: center;
+ }
+
+ .actions mwc-button {
+ margin: 0 4px 4px;
+ }
+ a {
+ color: var(--primary-color);
+ }
+ ha-circular-progress {
+ width: 100%;
+ justify-content: center;
+ }
+ `;
+ }
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "more-info-update": MoreInfoUpdate;
+ }
+}
diff --git a/src/dialogs/more-info/state_more_info_control.ts b/src/dialogs/more-info/state_more_info_control.ts
index 02abe5e731..3df5e85b4b 100644
--- a/src/dialogs/more-info/state_more_info_control.ts
+++ b/src/dialogs/more-info/state_more_info_control.ts
@@ -25,6 +25,7 @@ const LAZY_LOADED_MORE_INFO_CONTROL = {
script: () => import("./controls/more-info-script"),
sun: () => import("./controls/more-info-sun"),
timer: () => import("./controls/more-info-timer"),
+ update: () => import("./controls/more-info-update"),
vacuum: () => import("./controls/more-info-vacuum"),
water_heater: () => import("./controls/more-info-water_heater"),
weather: () => import("./controls/more-info-weather"),
diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts
index 1e44c0fafd..5085aba824 100644
--- a/src/layouts/hass-tabs-subpage-data-table.ts
+++ b/src/layouts/hass-tabs-subpage-data-table.ts
@@ -132,6 +132,12 @@ export class HaTabsSubpageDataTable extends LitElement {
*/
@property() public tabs!: PageNavigation[];
+ /**
+ * Force hides the filter menu.
+ * @type {Boolean}
+ */
+ @property({ type: Boolean }) public hideFilterMenu = false;
+
@query("ha-data-table", true) private _dataTable!: HaDataTable;
public clearSelection() {
@@ -195,16 +201,24 @@ export class HaTabsSubpageDataTable extends LitElement {
.mainPage=${this.mainPage}
.supervisor=${this.supervisor}
>
-
${this.stateObj.attributes.title}
` + : ""} + ${this._error + ? html`
+
+
+ ${this.hass.localize(
+ "ui.dialogs.more_info_control.update.current_version"
+ )}
+
+
+ ${this.stateObj.attributes.current_version ??
+ this.hass.localize("state.default.unavailable")}
+
+
+
+
+ ${this.stateObj.attributes.release_url
+ ? html``
+ : ""}
+ ${supportsFeature(this.stateObj!, UPDATE_SUPPORT_RELEASE_NOTES) &&
+ !this._error
+ ? this._releaseNotes === undefined
+ ? html`
+ ${this.hass.localize(
+ "ui.dialogs.more_info_control.update.latest_version"
+ )}
+
+
+ ${this.stateObj.attributes.latest_version ??
+ this.hass.localize("state.default.unavailable")}
+
+ +
+
+
+
+
+ ${this.hass.localize("ui.dialogs.more_info_control.update.skip")}
+
+ ${supportsFeature(this.stateObj, UPDATE_SUPPORT_INSTALL)
+ ? html`
+
+ ${this.hass.localize(
+ "ui.dialogs.more_info_control.update.install"
+ )}
+
+ `
+ : ""}
+
+ `;
+ }
+
+ protected firstUpdated(): void {
+ if (supportsFeature(this.stateObj!, UPDATE_SUPPORT_RELEASE_NOTES)) {
+ updateReleaseNotes(this.hass, this.stateObj!.entity_id)
+ .then((result) => {
+ this._releaseNotes = result;
+ })
+ .catch((err) => {
+ this._error = err.message;
+ });
+ }
+ }
+
+ get _shouldCreateBackup(): boolean | null {
+ if (!supportsFeature(this.stateObj!, UPDATE_SUPPORT_BACKUP)) {
+ return null;
+ }
+ const checkbox = this.shadowRoot?.querySelector("ha-checkbox");
+ if (checkbox) {
+ return checkbox.checked;
+ }
+ return true;
+ }
+
+ private _handleInstall(): void {
+ const installData: Record
- ${this.narrow
- ? html``
- : ""}
+ ${!this.hideFilterMenu
+ ? html`
+
+ ${this.narrow
+ ? html`
+
+ `
+ : ""}
+ `
+ : ""}
${this.narrow
? html`
diff --git a/src/onboarding/onboarding-integrations.ts b/src/onboarding/onboarding-integrations.ts
index 6ac3504e5e..9fc15b0c07 100644
--- a/src/onboarding/onboarding-integrations.ts
+++ b/src/onboarding/onboarding-integrations.ts
@@ -169,8 +169,8 @@ class OnboardingIntegrations extends LitElement {
}
private async _loadConfigEntries() {
- const entries = await getConfigEntries(this.hass!);
- // We filter out the config entry for the local weather and rpi_power.
+ const entries = await getConfigEntries(this.hass!, { type: "integration" });
+ // We filter out the config entries that are automatically created during onboarding.
// It is one that we create automatically and it will confuse the user
// if it starts showing up during onboarding.
this._entries = entries.filter(
diff --git a/src/panels/config/automation/blueprint-automation-editor.ts b/src/panels/config/automation/blueprint-automation-editor.ts
index 907ee3bb03..37b08264de 100644
--- a/src/panels/config/automation/blueprint-automation-editor.ts
+++ b/src/panels/config/automation/blueprint-automation-editor.ts
@@ -326,12 +326,9 @@ export class HaBlueprintAutomationEditor extends LitElement {
}
ha-settings-row {
--paper-time-input-justify-content: flex-end;
+ --settings-row-content-width: 100%;
border-top: 1px solid var(--divider-color);
}
- :host(:not([narrow])) ha-settings-row ha-textfield,
- :host(:not([narrow])) ha-settings-row ha-selector {
- width: 60%;
- }
`,
];
}
diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts
index 4bce08a441..8585e232e9 100644
--- a/src/panels/config/automation/condition/ha-automation-condition-row.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts
@@ -7,12 +7,18 @@ import { fireEvent } from "../../../../common/dom/fire_event";
import { handleStructError } from "../../../../common/structs/handle-errors";
import "../../../../components/ha-button-menu";
import "../../../../components/ha-card";
+import "../../../../components/buttons/ha-progress-button";
+import type { HaProgressButton } from "../../../../components/buttons/ha-progress-button";
import "../../../../components/ha-icon-button";
-import { Condition } from "../../../../data/automation";
-import { showConfirmationDialog } from "../../../../dialogs/generic/show-dialog-box";
+import { Condition, testCondition } from "../../../../data/automation";
+import {
+ showAlertDialog,
+ showConfirmationDialog,
+} from "../../../../dialogs/generic/show-dialog-box";
import { haStyle } from "../../../../resources/styles";
import { HomeAssistant } from "../../../../types";
import "./ha-automation-condition-editor";
+import { validateConfig } from "../../../../data/config";
export interface ConditionElement extends LitElement {
condition: Condition;
@@ -61,6 +67,11 @@ export default class HaAutomationConditionRow extends LitElement {
${this.hass.localize(
"ui.panel.config.automation.editor.triggers.triggered"
@@ -288,7 +293,7 @@ export default class HaAutomationTriggerRow extends LitElement {
}
const validateResult = await validateConfig(this.hass, {
- trigger: this.trigger,
+ trigger,
});
// Don't do anything if trigger not valid or if trigger changed.
@@ -298,16 +303,16 @@ export default class HaAutomationTriggerRow extends LitElement {
const triggerUnsub = subscribeTrigger(
this.hass,
- () => {
+ (result) => {
if (untriggerTimeout !== undefined) {
clearTimeout(untriggerTimeout);
this._triggerColor = !this._triggerColor;
} else {
this._triggerColor = false;
}
- this._triggered = true;
+ this._triggered = result;
untriggerTimeout = window.setTimeout(() => {
- this._triggered = false;
+ this._triggered = undefined;
untriggerTimeout = undefined;
}, showTriggeredTime);
},
@@ -416,6 +421,18 @@ export default class HaAutomationTriggerRow extends LitElement {
this._yamlMode = !this._yamlMode;
}
+ private _showTriggeredInfo() {
+ showAlertDialog(this, {
+ text: html`
+ this._downloadBackup(backup),
+ },
+ // Delete button
+ {
+ path: mdiDelete,
+ label: this.hass.localize(
+ "ui.panel.config.backup.remove_backup"
+ ),
+ action: () => this._removeBackup(backup),
+ },
+ ]}
+ style="color: var(--secondary-text-color)"
+ >
+ `,
+ },
+ })
+ );
+
+ private _getItems = memoize((backupItems: BackupContent[]) =>
+ backupItems.map((backup) => ({
+ name: backup.name,
+ slug: backup.slug,
+ date: backup.date,
+ size: backup.size,
+ path: backup.path,
+ }))
+ );
+
+ protected render(): TemplateResult {
+ if (!this.hass || this._backupData === undefined) {
+ return html`
+
+ ${this._backupData.backing_up
+ ? html`
+
+ `;
+ }
+
+ protected firstUpdated(changedProps: PropertyValues) {
+ super.firstUpdated(changedProps);
+ this._getBackups();
+ }
+
+ private async _getBackups(): Promise {
+ this._backupData = await fetchBackupInfo(this.hass);
+ }
+
+ private async _downloadBackup(backup: BackupContent): Promise {
+ const signedUrl = await getSignedPath(
+ this.hass,
+ getBackupDownloadUrl(backup.slug)
+ );
+ fileDownload(signedUrl.path);
+ }
+
+ private async _generateBackup(): Promise {
+ const confirm = await showConfirmationDialog(this, {
+ title: this.hass.localize("ui.panel.config.backup.create.title"),
+ text: this.hass.localize("ui.panel.config.backup.create.description"),
+ confirmText: this.hass.localize("ui.panel.config.backup.create.confirm"),
+ });
+ if (!confirm) {
+ return;
+ }
+
+ generateBackup(this.hass)
+ .then(() => this._getBackups())
+ .catch((err) => showAlertDialog(this, { text: (err as Error).message }));
+
+ await this._getBackups();
+ }
+
+ private async _removeBackup(backup: BackupContent): Promise {
+ const confirm = await showConfirmationDialog(this, {
+ title: this.hass.localize("ui.panel.config.backup.remove.title"),
+ text: this.hass.localize("ui.panel.config.backup.remove.description", {
+ name: backup.name,
+ }),
+ confirmText: this.hass.localize("ui.panel.config.backup.remove.confirm"),
+ });
+ if (!confirm) {
+ return;
+ }
+
+ await removeBackup(this.hass, backup.slug);
+ await this._getBackups();
+ }
+
+ static get styles(): CSSResultGroup {
+ return [
+ css`
+ ha-fab[disabled] {
+ --mdc-theme-secondary: var(--disabled-text-color) !important;
+ }
+ `,
+ ];
+ }
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "ha-config-backup": HaConfigBackup;
+ }
+}
diff --git a/src/panels/config/core/ha-config-url-form.ts b/src/panels/config/core/ha-config-url-form.ts
index df25744fea..e74546ce7b 100644
--- a/src/panels/config/core/ha-config-url-form.ts
+++ b/src/panels/config/core/ha-config-url-form.ts
@@ -1,12 +1,25 @@
import "@material/mwc-button/mwc-button";
-import "@polymer/paper-input/paper-input";
-import type { PaperInputElement } from "@polymer/paper-input/paper-input";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import {
+ css,
+ CSSResultGroup,
+ html,
+ LitElement,
+ PropertyValues,
+ TemplateResult,
+} from "lit";
import { customElement, property, state } from "lit/decorators";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
import "../../../components/ha-card";
+import "../../../components/ha-switch";
+import "../../../components/ha-alert";
+import "../../../components/ha-formfield";
+import "../../../components/ha-textfield";
+import type { HaTextField } from "../../../components/ha-textfield";
+import { CloudStatus, fetchCloudStatus } from "../../../data/cloud";
import { saveCoreConfig } from "../../../data/core";
import type { PolymerChangedEvent } from "../../../polymer-types";
import type { HomeAssistant } from "../../../types";
+import { isIPAddress } from "../../../common/string/is_ip_address";
@customElement("ha-config-url-form")
class ConfigUrlForm extends LitElement {
@@ -20,18 +33,48 @@ class ConfigUrlForm extends LitElement {
@state() private _internal_url?: string;
+ @state() private _cloudStatus?: CloudStatus | null;
+
+ @state() private _showCustomExternalUrl = false;
+
+ @state() private _showCustomInternalUrl = false;
+
protected render(): TemplateResult {
const canEdit = ["storage", "default"].includes(
this.hass.config.config_source
);
const disabled = this._working || !canEdit;
- if (!this.hass.userData?.showAdvanced) {
+ if (!this.hass.userData?.showAdvanced || this._cloudStatus === undefined) {
return html``;
}
+ const internalUrl = this._internalUrlValue;
+ const externalUrl = this._externalUrlValue;
+ let hasCloud: boolean;
+ let remoteEnabled: boolean;
+ let httpUseHttps: boolean;
+
+ if (this._cloudStatus === null) {
+ hasCloud = false;
+ remoteEnabled = false;
+ httpUseHttps = false;
+ } else {
+ httpUseHttps = this._cloudStatus.http_use_ssl;
+
+ if (this._cloudStatus.logged_in) {
+ hasCloud = true;
+ remoteEnabled =
+ this._cloudStatus.active_subscription &&
+ this._cloudStatus.prefs.remote_enabled;
+ } else {
+ hasCloud = false;
+ remoteEnabled = false;
+ }
+ }
+
return html`
-
+
${backup.path}
`,
+ },
+ size: {
+ title: this.hass.localize("ui.panel.config.backup.size"),
+ width: "15%",
+ hidden: narrow,
+ filterable: true,
+ sortable: true,
+ template: (entry: number) => Math.ceil(entry * 10) / 10 + " MB",
+ },
+ date: {
+ title: this.hass.localize("ui.panel.config.backup.created"),
+ width: "15%",
+ direction: "desc",
+ hidden: narrow,
+ filterable: true,
+ sortable: true,
+ template: (entry: string) =>
+ relativeTime(new Date(entry), this.hass.locale),
+ },
+
+ actions: {
+ title: "",
+ width: "15%",
+ template: (_: string, backup: BackupContent) =>
+ html`
${!canEdit
? html`
@@ -43,46 +86,147 @@ class ConfigUrlForm extends LitElement {
`
: ""}
${this._error ? html`
@@ -95,6 +239,24 @@ class ConfigUrlForm extends LitElement {
`;
}
+ protected override firstUpdated(changedProps: PropertyValues) {
+ super.firstUpdated(changedProps);
+
+ this._showCustomInternalUrl = this._internalUrlValue !== null;
+
+ if (isComponentLoaded(this.hass, "cloud")) {
+ fetchCloudStatus(this.hass).then((cloudStatus) => {
+ if (cloudStatus.logged_in) {
+ this._cloudStatus = cloudStatus;
+ this._showCustomExternalUrl = this._externalUrlValue !== null;
+ }
+ });
+ } else {
+ this._cloudStatus = null;
+ this._showCustomExternalUrl = true;
+ }
+ }
+
private get _internalUrlValue() {
return this._internal_url !== undefined
? this._internal_url
@@ -107,9 +269,17 @@ class ConfigUrlForm extends LitElement {
: this.hass.config.external_url;
}
+ private _toggleCloud(ev) {
+ this._showCustomExternalUrl = !ev.currentTarget.checked;
+ }
+
+ private _toggleInternalAutomatic(ev) {
+ this._showCustomInternalUrl = !ev.currentTarget.checked;
+ }
+
private _handleChange(ev: PolymerChangedEvent) {
- const target = ev.currentTarget as PaperInputElement;
- this[`_${target.name}`] = target.value;
+ const target = ev.currentTarget as HaTextField;
+ this[`_${target.name}`] = target.value || null;
}
private async _save() {
@@ -117,8 +287,12 @@ class ConfigUrlForm extends LitElement {
this._error = undefined;
try {
await saveCoreConfig(this.hass, {
- external_url: this._external_url || null,
- internal_url: this._internal_url || null,
+ external_url: this._showCustomExternalUrl
+ ? this._external_url || null
+ : null,
+ internal_url: this._showCustomInternalUrl
+ ? this._internal_url || null
+ : null,
});
} catch (err: any) {
this._error = err.message || err;
@@ -129,11 +303,15 @@ class ConfigUrlForm extends LitElement {
static get styles(): CSSResultGroup {
return css`
+ .description {
+ margin-bottom: 1em;
+ }
.row {
display: flex;
flex-direction: row;
margin: 0 -8px;
align-items: center;
+ padding: 8px 0;
}
.secondary {
@@ -154,6 +332,10 @@ class ConfigUrlForm extends LitElement {
.card-actions {
text-align: right;
}
+
+ a {
+ color: var(--primary-color);
+ }
`;
}
}
diff --git a/src/panels/config/dashboard/ha-config-dashboard.ts b/src/panels/config/dashboard/ha-config-dashboard.ts
index 731a5c7079..3f0e3e4849 100644
--- a/src/panels/config/dashboard/ha-config-dashboard.ts
+++ b/src/panels/config/dashboard/ha-config-dashboard.ts
@@ -1,3 +1,5 @@
+import type { ActionDetail } from "@material/mwc-list";
+import "@material/mwc-list/mwc-list-item";
import {
mdiCloudLock,
mdiDotsVertical,
@@ -5,10 +7,9 @@ import {
mdiMagnify,
mdiNewBox,
} from "@mdi/js";
-import "@material/mwc-list/mwc-list-item";
-import type { ActionDetail } from "@material/mwc-list";
import "@polymer/app-layout/app-header/app-header";
import "@polymer/app-layout/app-toolbar/app-toolbar";
+import type { HassEntities } from "home-assistant-js-websocket";
import {
css,
CSSResultGroup,
@@ -18,30 +19,29 @@ import {
TemplateResult,
} from "lit";
import { customElement, property, state } from "lit/decorators";
+import memoizeOne from "memoize-one";
import { isComponentLoaded } from "../../../common/config/is_component_loaded";
-import "../../../components/ha-card";
-import "../../../components/ha-icon-next";
-import "../../../components/ha-icon-button";
-import "../../../components/ha-menu-button";
+import { computeStateDomain } from "../../../common/entity/compute_state_domain";
+import { caseInsensitiveStringCompare } from "../../../common/string/compare";
import "../../../components/ha-button-menu";
+import "../../../components/ha-card";
+import "../../../components/ha-icon-button";
+import "../../../components/ha-icon-next";
+import "../../../components/ha-menu-button";
import "../../../components/ha-svg-icon";
import { CloudStatus } from "../../../data/cloud";
-import {
- refreshSupervisorAvailableUpdates,
- SupervisorAvailableUpdates,
-} from "../../../data/supervisor/root";
+import { updateCanInstall, UpdateEntity } from "../../../data/update";
+import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
import { showQuickBar } from "../../../dialogs/quick-bar/show-dialog-quick-bar";
import "../../../layouts/ha-app-layout";
import { haStyle } from "../../../resources/styles";
import { HomeAssistant } from "../../../types";
+import { documentationUrl } from "../../../util/documentation-url";
+import { showToast } from "../../../util/toast";
import "../ha-config-section";
import { configSections } from "../ha-panel-config";
import "./ha-config-navigation";
import "./ha-config-updates";
-import { fireEvent } from "../../../common/dom/fire_event";
-import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
-import { showToast } from "../../../util/toast";
-import { documentationUrl } from "../../../util/documentation-url";
const randomTip = (hass: HomeAssistant) => {
const weighted: string[] = [];
@@ -113,9 +113,6 @@ class HaConfigDashboard extends LitElement {
@property() public cloudStatus?: CloudStatus;
- // null means not available
- @property() public supervisorUpdates?: SupervisorAvailableUpdates[] | null;
-
@property() public showAdvanced!: boolean;
@state() private _tip?: string;
@@ -123,6 +120,9 @@ class HaConfigDashboard extends LitElement {
private _notifyUpdates = false;
protected render(): TemplateResult {
+ const canInstallUpdates = this._filterUpdateEntitiesWithInstall(
+ this.hass.states
+ );
return html`
@@ -160,50 +160,47 @@ class HaConfigDashboard extends LitElement {
.isWide=${this.isWide}
full-width
>
- ${this.supervisorUpdates === undefined
- ? // Hide everything until updates loaded
- html``
- : html`${this.supervisorUpdates?.length
- ? html`
- `
- : ""}
-
- ${this.narrow && this.supervisorUpdates?.length
- ? html`
+ `
+ : ""}
+
+ ${this.narrow && canInstallUpdates.length
+ ? html` `}
+ `
+ : ""}
+
) {
+ const _entities = this._filterUpdateEntities(this.hass.states).map(
+ (entity) => entity.entity_id
+ );
switch (ev.detail.index) {
case 0:
- if (isComponentLoaded(this.hass, "hassio")) {
+ if (_entities.length) {
this._notifyUpdates = true;
- await refreshSupervisorAvailableUpdates(this.hass);
- fireEvent(this, "ha-refresh-supervisor");
+ await this.hass.callService("homeassistant", "update_entity", {
+ entity_id: _entities,
+ });
return;
}
showAlertDialog(this, {
title: this.hass.localize(
- "ui.panel.config.updates.check_unavailable.title"
+ "ui.panel.config.updates.no_update_entities.title"
),
text: this.hass.localize(
- "ui.panel.config.updates.check_unavailable.description"
+ "ui.panel.config.updates.no_update_entities.description"
),
warning: true,
});
diff --git a/src/panels/config/dashboard/ha-config-updates.ts b/src/panels/config/dashboard/ha-config-updates.ts
index 8c11e4325e..cae7397e58 100644
--- a/src/panels/config/dashboard/ha-config-updates.ts
+++ b/src/panels/config/dashboard/ha-config-updates.ts
@@ -1,21 +1,14 @@
import "@material/mwc-button/mwc-button";
-import { mdiPackageVariant } from "@mdi/js";
import "@polymer/paper-item/paper-icon-item";
import "@polymer/paper-item/paper-item-body";
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators";
+import { fireEvent } from "../../../common/dom/fire_event";
+import "../../../components/entity/state-badge";
import "../../../components/ha-alert";
-import "../../../components/ha-logo-svg";
-import "../../../components/ha-svg-icon";
-import { SupervisorAvailableUpdates } from "../../../data/supervisor/root";
-import { HomeAssistant } from "../../../types";
import "../../../components/ha-icon-next";
-
-export const SUPERVISOR_UPDATE_NAMES = {
- core: "Home Assistant Core",
- os: "Home Assistant Operating System",
- supervisor: "Home Assistant Supervisor",
-};
+import type { UpdateEntity } from "../../../data/update";
+import { HomeAssistant } from "../../../types";
@customElement("ha-config-updates")
class HaConfigUpdates extends LitElement {
@@ -24,62 +17,60 @@ class HaConfigUpdates extends LitElement {
@property({ type: Boolean }) public narrow!: boolean;
@property({ attribute: false })
- public supervisorUpdates?: SupervisorAvailableUpdates[] | null;
+ public updateEntities?: UpdateEntity[];
@state() private _showAll = false;
protected render(): TemplateResult {
- if (!this.supervisorUpdates?.length) {
+ if (!this.updateEntities?.length) {
return html``;
}
const updates =
- this._showAll || this.supervisorUpdates.length <= 3
- ? this.supervisorUpdates
- : this.supervisorUpdates.slice(0, 2);
+ this._showAll || this.updateEntities.length <= 3
+ ? this.updateEntities
+ : this.updateEntities.slice(0, 2);
return html`
-
- ${update.update_type === "addon"
- ? update.icon
- ? html`
`
- : html`
- ${update.update_type === "addon"
- ? update.name
- : SUPERVISOR_UPDATE_NAMES[update.update_type!]}
-
- ${!this.narrow ? html`
-
+ (entity) => html`
+
+
+
+ ${entity.attributes.title || entity.attributes.friendly_name}
+
+ ${!this.narrow ? html`
`
)}
- ${!this._showAll && this.supervisorUpdates.length >= 4
+ ${!this._showAll && this.updateEntities.length >= 4
? html`
`
@@ -87,6 +78,12 @@ class HaConfigUpdates extends LitElement {
`;
}
+ private _openMoreInfo(ev: MouseEvent): void {
+ fireEvent(this, "hass-more-info", {
+ entityId: (ev.currentTarget as any).entity_id,
+ });
+ }
+
private _showAllClicked() {
this._showAll = true;
}
@@ -99,25 +96,11 @@ class HaConfigUpdates extends LitElement {
padding: 16px;
padding-bottom: 0;
}
- a {
- text-decoration: none;
- color: var(--primary-text-color);
- }
.icon {
display: inline-flex;
height: 100%;
align-items: center;
}
- img,
- ha-svg-icon,
- ha-logo-svg {
- --mdc-icon-size: 32px;
- max-height: 32px;
- width: 32px;
- }
- ha-logo-svg {
- color: var(--secondary-text-color);
- }
ha-icon-next {
color: var(--secondary-text-color);
height: 24px;
@@ -139,6 +122,9 @@ class HaConfigUpdates extends LitElement {
outline: none;
text-decoration: underline;
}
+ paper-icon-item {
+ cursor: pointer;
+ }
`,
];
}
diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
index ebfbd159dd..19e60da9ee 100644
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -40,7 +40,7 @@ export class HaDeviceEntitiesCard extends LitElement {
@property() public entities!: EntityRegistryStateEntry[];
- @property() public showDisabled = false;
+ @property() public showHidden = false;
@state() private _extDisabledEntityEntries?: Record<
string,
@@ -60,77 +60,77 @@ export class HaDeviceEntitiesCard extends LitElement {
}
protected render(): TemplateResult {
- const disabledEntities: EntityRegistryStateEntry[] = [];
+ if (!this.entities.length) {
+ return html`
+
+
+ `;
+ }
+
+ const shownEntities: EntityRegistryStateEntry[] = [];
+ const hiddenEntities: EntityRegistryStateEntry[] = [];
this._entityRows = [];
+
+ this.entities.forEach((entry) => {
+ if (entry.disabled_by || entry.hidden_by) {
+ if (this._extDisabledEntityEntries) {
+ hiddenEntities.push(
+ this._extDisabledEntityEntries[entry.entity_id] || entry
+ );
+ } else {
+ hiddenEntities.push(entry);
+ }
+ } else {
+ shownEntities.push(entry);
+ }
+ });
+
return html`
- ${this.entities.length
- ? html`
-
`;
}
- private _toggleShowDisabled() {
- this.showDisabled = !this.showDisabled;
- if (!this.showDisabled || this._extDisabledEntityEntries !== undefined) {
+ private _toggleShowHidden() {
+ this.showHidden = !this.showHidden;
+ if (!this.showHidden || this._extDisabledEntityEntries !== undefined) {
return;
}
this._extDisabledEntityEntries = {};
diff --git a/src/panels/config/devices/device-detail/integration-elements/ozw/ha-device-actions-ozw.ts b/src/panels/config/devices/device-detail/integration-elements/ozw/ha-device-actions-ozw.ts
deleted file mode 100644
index 8b9f4309a9..0000000000
--- a/src/panels/config/devices/device-detail/integration-elements/ozw/ha-device-actions-ozw.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import {
- css,
- CSSResultGroup,
- html,
- LitElement,
- PropertyValues,
- TemplateResult,
-} from "lit";
-import { customElement, property } from "lit/decorators";
-import { navigate } from "../../../../../../common/navigate";
-import { DeviceRegistryEntry } from "../../../../../../data/device_registry";
-import {
- getIdentifiersFromDevice,
- OZWNodeIdentifiers,
-} from "../../../../../../data/ozw";
-import { haStyle } from "../../../../../../resources/styles";
-import { HomeAssistant } from "../../../../../../types";
-import { showOZWRefreshNodeDialog } from "../../../../integrations/integration-panels/ozw/show-dialog-ozw-refresh-node";
-
-@customElement("ha-device-actions-ozw")
-export class HaDeviceActionsOzw extends LitElement {
- @property({ attribute: false }) public hass!: HomeAssistant;
-
- @property() public device!: DeviceRegistryEntry;
-
- @property()
- private node_id = 0;
-
- @property()
- private ozw_instance = 1;
-
- protected updated(changedProperties: PropertyValues) {
- if (changedProperties.has("device")) {
- const identifiers: OZWNodeIdentifiers | undefined =
- getIdentifiersFromDevice(this.device);
- if (!identifiers) {
- return;
- }
- this.ozw_instance = identifiers.ozw_instance;
- this.node_id = identifiers.node_id;
- }
- }
-
- protected render(): TemplateResult {
- if (!this.ozw_instance || !this.node_id) {
- return html``;
- }
- return html`
-
- ${this.hass.localize("ui.panel.config.ozw.node.button")}
-
-
- ${this.hass.localize("ui.panel.config.ozw.refresh_node.button")}
-
- `;
- }
-
- private async _refreshNodeClicked() {
- showOZWRefreshNodeDialog(this, {
- node_id: this.node_id,
- ozw_instance: this.ozw_instance,
- });
- }
-
- private async _nodeDetailsClicked() {
- navigate(
- `/config/ozw/network/${this.ozw_instance}/node/${this.node_id}/dashboard`
- );
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyle,
- css`
- :host {
- display: flex;
- flex-direction: column;
- align-items: flex-start;
- }
- `,
- ];
- }
-}
diff --git a/src/panels/config/devices/device-detail/integration-elements/ozw/ha-device-info-ozw.ts b/src/panels/config/devices/device-detail/integration-elements/ozw/ha-device-info-ozw.ts
deleted file mode 100644
index 4717d235b8..0000000000
--- a/src/panels/config/devices/device-detail/integration-elements/ozw/ha-device-info-ozw.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import {
- css,
- CSSResultGroup,
- html,
- LitElement,
- PropertyValues,
- TemplateResult,
-} from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { DeviceRegistryEntry } from "../../../../../../data/device_registry";
-import {
- fetchOZWNodeStatus,
- getIdentifiersFromDevice,
- OZWDevice,
- OZWNodeIdentifiers,
-} from "../../../../../../data/ozw";
-import { haStyle } from "../../../../../../resources/styles";
-import { HomeAssistant } from "../../../../../../types";
-
-@customElement("ha-device-info-ozw")
-export class HaDeviceInfoOzw extends LitElement {
- @property({ attribute: false }) public hass!: HomeAssistant;
-
- @property() public device!: DeviceRegistryEntry;
-
- @property()
- private node_id = 0;
-
- @property()
- private ozw_instance = 1;
-
- @state() private _ozwDevice?: OZWDevice;
-
- protected updated(changedProperties: PropertyValues) {
- if (changedProperties.has("device")) {
- const identifiers: OZWNodeIdentifiers | undefined =
- getIdentifiersFromDevice(this.device);
- if (!identifiers) {
- return;
- }
- this.ozw_instance = identifiers.ozw_instance;
- this.node_id = identifiers.node_id;
-
- this._fetchNodeDetails();
- }
- }
-
- protected async _fetchNodeDetails() {
- this._ozwDevice = await fetchOZWNodeStatus(
- this.hass,
- this.ozw_instance,
- this.node_id
- );
- }
-
- protected render(): TemplateResult {
- if (!this._ozwDevice) {
- return html``;
- }
- return html`
- => {
+ if (entry.state !== "loaded") {
+ return false;
+ }
+ let info: DiagnosticInfo;
+ try {
+ info = await fetchDiagnosticHandler(this.hass, entry.domain);
+ } catch (err: any) {
+ if (err.code === "not_found") {
+ return false;
+ }
+ throw err;
+ }
- if (!info.handlers.device && !info.handlers.config_entry) {
- return false;
+ if (!info.handlers.device && !info.handlers.config_entry) {
+ return false;
+ }
+ return {
+ link: info.handlers.device
+ ? getDeviceDiagnosticsDownloadUrl(entry.entry_id, this.deviceId)
+ : getConfigEntryDiagnosticsDownloadUrl(entry.entry_id),
+ domain: entry.domain,
+ };
}
- return {
- link: info.handlers.device
- ? getDeviceDiagnosticsDownloadUrl(entry.entry_id, this.deviceId)
- : getConfigEntryDiagnosticsDownloadUrl(entry.entry_id),
- domain: entry.domain,
- };
- })
+ )
);
links = links.filter(Boolean);
@@ -557,7 +568,7 @@ export class HaConfigDevicePage extends LitElement {
)}
.deviceName=${deviceName}
.entities=${entitiesByCategory[category]}
- .showDisabled=${device.disabled_by !== null}
+ .showHidden=${device.disabled_by !== null}
>
`
@@ -902,22 +913,6 @@ export class HaConfigDevicePage extends LitElement {
>
`);
}
- if (domains.includes("ozw")) {
- import("./device-detail/integration-elements/ozw/ha-device-actions-ozw");
- import("./device-detail/integration-elements/ozw/ha-device-info-ozw");
- deviceInfo.push(html`
- ![]()
- `
- : ""}
+ `}
`;
}
private async _fetchCO2SignalConfigEntries() {
- this._configEntries = (await getConfigEntries(this.hass)).filter(
- (entry) => entry.domain === "co2signal"
- );
+ const entries = await getConfigEntries(this.hass, { domain: "co2signal" });
+ this._co2ConfigEntry = entries.length ? entries[0] : undefined;
}
private _addCO2Sensor() {
diff --git a/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts
index 1f2acaf624..8ec83a64b8 100644
--- a/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts
+++ b/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts
@@ -176,9 +176,17 @@ export class DialogEnergySolarSettings
private async _fetchSolarForecastConfigEntries() {
const domains = this._params!.info.solar_forecast_domains;
- this._configEntries = (await getConfigEntries(this.hass)).filter((entry) =>
- domains.includes(entry.domain)
- );
+ this._configEntries =
+ domains.length === 0
+ ? []
+ : domains.length === 1
+ ? await getConfigEntries(this.hass, {
+ type: "integration",
+ domain: domains[0],
+ })
+ : (await getConfigEntries(this.hass, { type: "integration" })).filter(
+ (entry) => domains.includes(entry.domain)
+ );
}
private _handleForecastChanged(ev: CustomEvent) {
diff --git a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts
index 913bcd8353..210d931a6c 100644
--- a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts
+++ b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts
@@ -10,50 +10,11 @@ import { customElement, property, state, query } from "lit/decorators";
import { isComponentLoaded } from "../../../../../common/config/is_component_loaded";
import { dynamicElement } from "../../../../../common/dom/dynamic-element-directive";
import { fireEvent } from "../../../../../common/dom/fire_event";
-import {
- deleteCounter,
- fetchCounter,
- updateCounter,
-} from "../../../../../data/counter";
import {
ExtEntityRegistryEntry,
removeEntityRegistryEntry,
} from "../../../../../data/entity_registry";
-import {
- deleteInputBoolean,
- fetchInputBoolean,
- updateInputBoolean,
-} from "../../../../../data/input_boolean";
-import {
- deleteInputButton,
- fetchInputButton,
- updateInputButton,
-} from "../../../../../data/input_button";
-import {
- deleteInputDateTime,
- fetchInputDateTime,
- updateInputDateTime,
-} from "../../../../../data/input_datetime";
-import {
- deleteInputNumber,
- fetchInputNumber,
- updateInputNumber,
-} from "../../../../../data/input_number";
-import {
- deleteInputSelect,
- fetchInputSelect,
- updateInputSelect,
-} from "../../../../../data/input_select";
-import {
- deleteInputText,
- fetchInputText,
- updateInputText,
-} from "../../../../../data/input_text";
-import {
- deleteTimer,
- fetchTimer,
- updateTimer,
-} from "../../../../../data/timer";
+import { HELPERS_CRUD } from "../../../../../data/helpers_crud";
import { showConfirmationDialog } from "../../../../../dialogs/generic/show-dialog-box";
import { haStyle } from "../../../../../resources/styles";
import type { HomeAssistant } from "../../../../../types";
@@ -69,49 +30,6 @@ import "../../../helpers/forms/ha-timer-form";
import "../../entity-registry-basic-editor";
import type { HaEntityRegistryBasicEditor } from "../../entity-registry-basic-editor";
-const HELPERS = {
- input_boolean: {
- fetch: fetchInputBoolean,
- update: updateInputBoolean,
- delete: deleteInputBoolean,
- },
- input_button: {
- fetch: fetchInputButton,
- update: updateInputButton,
- delete: deleteInputButton,
- },
- input_text: {
- fetch: fetchInputText,
- update: updateInputText,
- delete: deleteInputText,
- },
- input_number: {
- fetch: fetchInputNumber,
- update: updateInputNumber,
- delete: deleteInputNumber,
- },
- input_datetime: {
- fetch: fetchInputDateTime,
- update: updateInputDateTime,
- delete: deleteInputDateTime,
- },
- input_select: {
- fetch: fetchInputSelect,
- update: updateInputSelect,
- delete: deleteInputSelect,
- },
- counter: {
- fetch: fetchCounter,
- update: updateCounter,
- delete: deleteCounter,
- },
- timer: {
- fetch: fetchTimer,
- update: updateTimer,
- delete: deleteTimer,
- },
-};
-
@customElement("entity-settings-helper-tab")
export class EntityRegistrySettingsHelper extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
@@ -198,7 +116,7 @@ export class EntityRegistrySettingsHelper extends LitElement {
}
private async _getItem() {
- const items = await HELPERS[this.entry.platform].fetch(this.hass!);
+ const items = await HELPERS_CRUD[this.entry.platform].fetch(this.hass!);
this._item = items.find((item) => item.id === this.entry.unique_id) || null;
}
@@ -206,7 +124,7 @@ export class EntityRegistrySettingsHelper extends LitElement {
this._submitting = true;
try {
if (this._componentLoaded && this._item) {
- await HELPERS[this.entry.platform].update(
+ await HELPERS_CRUD[this.entry.platform].update(
this.hass!,
this._item.id,
this._item
@@ -236,7 +154,10 @@ export class EntityRegistrySettingsHelper extends LitElement {
try {
if (this._componentLoaded && this._item) {
- await HELPERS[this.entry.platform].delete(this.hass!, this._item.id);
+ await HELPERS_CRUD[this.entry.platform].delete(
+ this.hass!,
+ this._item.id
+ );
} else {
const stateObj = this.hass.states[this.entry.entity_id];
if (!stateObj?.attributes.restored) {
diff --git a/src/panels/config/entities/entity-registry-basic-editor.ts b/src/panels/config/entities/entity-registry-basic-editor.ts
index 52240794b3..de7d374318 100644
--- a/src/panels/config/entities/entity-registry-basic-editor.ts
+++ b/src/panels/config/entities/entity-registry-basic-editor.ts
@@ -1,11 +1,13 @@
+import "@material/mwc-formfield/mwc-formfield";
import { UnsubscribeFunc } from "home-assistant-js-websocket";
import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators";
import { computeDomain } from "../../../common/entity/compute_domain";
import "../../../components/ha-area-picker";
+import "../../../components/ha-expansion-panel";
+import "../../../components/ha-radio";
import "../../../components/ha-switch";
import "../../../components/ha-textfield";
-import type { HaSwitch } from "../../../components/ha-switch";
import {
DeviceRegistryEntry,
subscribeDeviceRegistry,
@@ -33,6 +35,8 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
@state() private _disabledBy!: string | null;
+ @state() private _hiddenBy!: string | null;
+
private _deviceLookup?: Record;
@state() private _device?: DeviceRegistryEntry;
@@ -51,6 +55,12 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
) {
params.disabled_by = this._disabledBy;
}
+ if (
+ this.entry.hidden_by !== this._hiddenBy &&
+ (this._hiddenBy === null || this._hiddenBy === "user")
+ ) {
+ params.hidden_by = this._hiddenBy;
+ }
try {
const result = await updateEntityRegistryEntry(
this.hass!,
@@ -101,6 +111,7 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
this._origEntityId = this.entry.entity_id;
this._entityId = this.entry.entity_id;
this._disabledBy = this.entry.disabled_by;
+ this._hiddenBy = this.entry.hidden_by;
this._areaId = this.entry.area_id;
this._device =
this.entry.device_id && this._deviceLookup
@@ -138,37 +149,104 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
.placeholder=${this._device?.area_id}
@value-changed=${this._areaPicked}
>
-
${this._error}
` : ""}
-
-
-
+
+ ${this.hass.localize(
+ "ui.panel.config.url.ha_cloud_remote_not_enabled"
+ )}
+
+ `}
+ `
+ : ""}
+
-
+
+ ${this.hass.localize(
+ "ui.panel.config.url.internal_url_https_error_description"
+ )}
+
+ `
+ : ""
+ }
- ${this.hass.localize(
- "ui.panel.config.core.section.core.core_config.external_url"
- )}
-
-
+ ${this.hass.localize("ui.panel.config.url.description")}
+ ${hasCloud
+ ? html`
+
+
+
+
+ `
+ : ""}
+ ${!this._showCustomExternalUrl
+ ? ""
+ : html`
+
+ ${this.hass.localize(
+ "ui.panel.config.url.external_url_label"
+ )}
+
+
+
+
+
+ `}
+ ${hasCloud || !isComponentLoaded(this.hass, "cloud")
+ ? ""
+ : html`
+
+ `}
+ ${!this._showCustomExternalUrl && hasCloud
+ ? html`
+ ${remoteEnabled
+ ? ""
+ : html`
+
+ ${hasCloud
+ ? ""
+ : this.hass.localize(
+ "ui.panel.config.url.external_url_label"
+ )}
+
+
- ${this.hass.localize(
- "ui.panel.config.core.section.core.core_config.internal_url"
- )}
+ ${this.hass.localize("ui.panel.config.url.internal_url_label")}
-
+
+
+
+
+ `}
+ ${
+ // If the user has configured a cert, show an error if
+ httpUseHttps && // there is no internal url configured
+ (!internalUrl ||
+ // the internal url does not start with https
+ !internalUrl.startsWith("https://") ||
+ // the internal url points at an IP address
+ isIPAddress(new URL(internalUrl).hostname))
+ ? html`
+
- ${this.hass.localize("panel.config")}
-
`
- : ""}
- ${this.cloudStatus && isComponentLoaded(this.hass, "cloud")
- ? html`
-
+ ${this.hass.localize("panel.config")}
+
`
+ : ""}
+ ${this.cloudStatus && isComponentLoaded(this.hass, "cloud")
+ ? html`
${this.hass.localize("ui.panel.config.updates.title", {
- count: this.supervisorUpdates.length,
+ count: this.updateEntities.length,
})}
${updates.map(
- (update) => html`
-
-
- ${this.hass.localize(
- "ui.panel.config.updates.version_available",
- {
- version_available: update.version_latest,
- }
- )}
-
-
+ ${this.hass.localize(
+ "ui.panel.config.updates.version_available",
+ {
+ version_available: entity.attributes.latest_version,
+ }
+ )}
+
+
+ ${this.hass.localize("ui.panel.config.devices.entities.none")}
+
+
- ${this.entities.map((entry: EntityRegistryStateEntry) => {
- if (entry.disabled_by) {
- if (this._extDisabledEntityEntries) {
- disabledEntities.push(
- this._extDisabledEntityEntries[entry.entity_id] || entry
- );
- } else {
- disabledEntities.push(entry);
- }
- return "";
- }
- return this.hass.states[entry.entity_id]
- ? this._renderEntity(entry)
- : this._renderEntry(entry);
- })}
-
- ${disabledEntities.length
- ? !this.showDisabled
- ? html`
-
- `
- : html`
- ${disabledEntities.map((entry) =>
- this._renderEntry(entry)
- )}
-
- `
- : ""}
-
-
+
-
- `
- : html`
-
+ ${shownEntities.map((entry) =>
+ this.hass.states[entry.entity_id]
+ ? this._renderEntity(entry)
+ : this._renderEntry(entry)
+ )}
+
+ ${hiddenEntities.length
+ ? !this.showHidden
+ ? html`
+
- ${this.hass.localize("ui.panel.config.devices.entities.none")}
-
- `}
+
+ `
+ : html`
+ ${hiddenEntities.map((entry) => this._renderEntry(entry))}
+
+ `
+ : ""}
+
+
+ ${this.hass.localize(
+ "ui.panel.config.devices.entities.add_entities_lovelace"
+ )}
+
+
- ${this.hass.localize("ui.panel.config.ozw.device_info.zwave_info")} -
-
- ${this.hass.localize("ui.panel.config.ozw.common.node_id")}:
- ${this._ozwDevice.node_id}
-
-
- ${this.hass.localize("ui.panel.config.ozw.device_info.stage")}:
- ${this._ozwDevice.node_query_stage}
-
-
- ${this.hass.localize("ui.panel.config.ozw.common.ozw_instance")}:
- ${this._ozwDevice.ozw_instance}
-
-
- ${this.hass.localize("ui.panel.config.ozw.device_info.node_failed")}:
- ${this._ozwDevice.is_failed
- ? this.hass.localize("ui.common.yes")
- : this.hass.localize("ui.common.no")}
-
- `;
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyle,
- css`
- h4 {
- margin-bottom: 4px;
- }
- div {
- word-break: break-all;
- margin-top: 2px;
- }
- `,
- ];
- }
-}
diff --git a/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts b/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
index 32a732662f..78d56a0b1b 100644
--- a/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
@@ -27,7 +27,7 @@ import { HomeAssistant } from "../../../../../../types";
export class HaDeviceInfoZWaveJS extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
- @property() public device!: DeviceRegistryEntry;
+ @property({ attribute: false }) public device!: DeviceRegistryEntry;
@state() private _entryId?: string;
@@ -58,12 +58,11 @@ export class HaDeviceInfoZWaveJS extends LitElement {
return;
}
- const configEntries = await getConfigEntries(this.hass);
+ const configEntries = await getConfigEntries(this.hass, {
+ domain: "zwave_js",
+ });
let zwaveJsConfEntries = 0;
for (const entry of configEntries) {
- if (entry.domain !== "zwave_js") {
- continue;
- }
if (zwaveJsConfEntries) {
this._multipleConfigEntries = true;
}
@@ -173,3 +172,9 @@ export class HaDeviceInfoZWaveJS extends LitElement {
];
}
}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "ha-device-info-zwave_js": HaDeviceInfoZWaveJS;
+ }
+}
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index 5572834106..b1b8064359 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -33,6 +33,7 @@ import {
fetchDiagnosticHandler,
getDeviceDiagnosticsDownloadUrl,
getConfigEntryDiagnosticsDownloadUrl,
+ DiagnosticInfo,
} from "../../../data/diagnostics";
import {
EntityRegistryEntry,
@@ -219,22 +220,32 @@ export class HaConfigDevicePage extends LitElement {
}
let links = await Promise.all(
- this._integrations(device, this.entries).map(async (entry) => {
- if (entry.state !== "loaded") {
- return false;
- }
- const info = await fetchDiagnosticHandler(this.hass, entry.domain);
+ this._integrations(device, this.entries).map(
+ async (entry): Promise
-
-
-
-
- ${this.hass.localize(
+
+
+
`;
}
@@ -180,8 +258,21 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
this._entityId = ev.target.value;
}
- private _disabledByChanged(ev: Event): void {
- this._disabledBy = (ev.target as HaSwitch).checked ? null : "user";
+ private _viewStatusChanged(ev: CustomEvent): void {
+ switch ((ev.target as any).value) {
+ case "enabled":
+ this._disabledBy = null;
+ this._hiddenBy = null;
+ break;
+ case "disabled":
+ this._disabledBy = "user";
+ this._hiddenBy = null;
+ break;
+ case "hidden":
+ this._hiddenBy = "user";
+ this._disabledBy = null;
+ break;
+ }
}
static get styles() {
@@ -202,6 +293,12 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
display: block;
margin-bottom: 8px;
}
+ ha-expansion-panel {
+ margin-top: 8px;
+ }
+ .label {
+ margin-top: 16px;
+ }
`;
}
}
diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index 72854d8389..48ebb5df49 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -1,4 +1,5 @@
import "@material/mwc-button/mwc-button";
+import "@material/mwc-formfield/mwc-formfield";
import "@material/mwc-list/mwc-list-item";
import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
import {
@@ -18,10 +19,20 @@ import "../../../components/ha-alert";
import "../../../components/ha-area-picker";
import "../../../components/ha-expansion-panel";
import "../../../components/ha-icon-picker";
+import "../../../components/ha-radio";
import "../../../components/ha-select";
import "../../../components/ha-switch";
-import type { HaSwitch } from "../../../components/ha-switch";
import "../../../components/ha-textfield";
+import {
+ ConfigEntry,
+ deleteConfigEntry,
+ getConfigEntries,
+} from "../../../data/config_entries";
+import {
+ createConfigFlow,
+ handleConfigFlowStep,
+} from "../../../data/config_flow";
+import { DataEntryFlowStepCreateEntry } from "../../../data/data_entry_flow";
import {
DeviceRegistryEntry,
subscribeDeviceRegistry,
@@ -30,9 +41,12 @@ import {
import {
EntityRegistryEntryUpdateParams,
ExtEntityRegistryEntry,
+ fetchEntityRegistry,
removeEntityRegistryEntry,
updateEntityRegistryEntry,
} from "../../../data/entity_registry";
+import { domainToName } from "../../../data/integration";
+import { showOptionsFlowDialog } from "../../../dialogs/config-flow/show-dialog-options-flow";
import {
showAlertDialog,
showConfirmationDialog,
@@ -41,12 +55,49 @@ import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
import { haStyle } from "../../../resources/styles";
import type { HomeAssistant } from "../../../types";
import { showDeviceRegistryDetailDialog } from "../devices/device-registry-detail/show-dialog-device-registry-detail";
+import { showEntityEditorDialog } from "./show-dialog-entity-editor";
const OVERRIDE_DEVICE_CLASSES = {
- cover: ["window", "door", "garage", "gate"],
- binary_sensor: ["window", "door", "garage_door", "opening"],
+ cover: [
+ [
+ "awning",
+ "blind",
+ "curtain",
+ "damper",
+ "door",
+ "garage",
+ "gate",
+ "shade",
+ "shutter",
+ "window",
+ ],
+ ],
+ binary_sensor: [
+ ["lock"], // Lock
+ ["window", "door", "garage_door", "opening"], // Door
+ ["battery", "battery_charging"], // Battery
+ ["cold", "gas", "heat"], // Climate
+ ["running", "motion", "moving", "occupancy", "presence", "vibration"], // Presence
+ ["power", "plug", "light"], // Power
+ [
+ "smoke",
+ "safety",
+ "sound",
+ "problem",
+ "tamper",
+ "carbon_monoxide",
+ "moisture",
+ ], // Alarm
+ ],
};
+const OVERRIDE_SENSOR_UNITS = {
+ temperature: ["°C", "°F", "K"],
+ pressure: ["hPa", "Pa", "kPa", "bar", "cbar", "mbar", "mmHg", "inHg", "psi"],
+};
+
+const SWITCH_AS_DOMAINS = ["light", "lock", "cover", "fan", "siren"];
+
@customElement("entity-registry-settings")
export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
@property({ attribute: false }) public hass!: HomeAssistant;
@@ -61,20 +112,30 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
@state() private _deviceClass?: string;
+ @state() private _switchAs = "switch";
+
@state() private _areaId?: string | null;
@state() private _disabledBy!: string | null;
- private _deviceLookup?: Record;
+ @state() private _hiddenBy!: string | null;
@state() private _device?: DeviceRegistryEntry;
+ @state() private _helperConfigEntry?: ConfigEntry;
+
+ @state() private _unit_of_measurement?: string | null;
+
@state() private _error?: string;
@state() private _submitting?: boolean;
private _origEntityId!: string;
+ private _deviceLookup?: Record;
+
+ private _deviceClassOptions?: string[][];
+
public hassSubscribe(): UnsubscribeFunc[] {
return [
subscribeDeviceRegistry(this.hass.connection!, (devices) => {
@@ -89,22 +150,62 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
];
}
- protected updated(changedProperties: PropertyValues) {
- super.updated(changedProperties);
- if (changedProperties.has("entry")) {
- this._error = undefined;
- this._name = this.entry.name || "";
- this._icon = this.entry.icon || "";
- this._deviceClass =
- this.entry.device_class || this.entry.original_device_class;
- this._origEntityId = this.entry.entity_id;
- this._areaId = this.entry.area_id;
- this._entityId = this.entry.entity_id;
- this._disabledBy = this.entry.disabled_by;
- this._device =
- this.entry.device_id && this._deviceLookup
- ? this._deviceLookup[this.entry.device_id]
- : undefined;
+ protected firstUpdated(changedProps: PropertyValues): void {
+ super.firstUpdated(changedProps);
+ if (this.entry.config_entry_id) {
+ getConfigEntries(this.hass, {
+ type: "helper",
+ domain: this.entry.platform,
+ }).then((entries) => {
+ this._helperConfigEntry = entries.find(
+ (ent) => ent.entry_id === this.entry.config_entry_id
+ );
+ });
+ }
+ }
+
+ protected willUpdate(changedProperties: PropertyValues) {
+ super.willUpdate(changedProperties);
+ if (!changedProperties.has("entry")) {
+ return;
+ }
+
+ this._error = undefined;
+ this._name = this.entry.name || "";
+ this._icon = this.entry.icon || "";
+ this._deviceClass =
+ this.entry.device_class || this.entry.original_device_class;
+ this._origEntityId = this.entry.entity_id;
+ this._areaId = this.entry.area_id;
+ this._entityId = this.entry.entity_id;
+ this._disabledBy = this.entry.disabled_by;
+ this._hiddenBy = this.entry.hidden_by;
+ this._device =
+ this.entry.device_id && this._deviceLookup
+ ? this._deviceLookup[this.entry.device_id]
+ : undefined;
+
+ const domain = computeDomain(this.entry.entity_id);
+
+ if (domain === "sensor") {
+ const stateObj: HassEntity | undefined =
+ this.hass.states[this.entry.entity_id];
+ this._unit_of_measurement = stateObj?.attributes?.unit_of_measurement;
+ }
+
+ const deviceClasses: string[][] = OVERRIDE_DEVICE_CLASSES[domain];
+
+ if (!deviceClasses) {
+ return;
+ }
+
+ this._deviceClassOptions = [[], []];
+ for (const deviceClass of deviceClasses) {
+ if (deviceClass.includes(this.entry.original_device_class!)) {
+ this._deviceClassOptions[0] = deviceClass;
+ } else {
+ this._deviceClassOptions[1].push(...deviceClass);
+ }
}
}
@@ -160,24 +261,81 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
: undefined}
.disabled=${this._submitting}
>
- ${OVERRIDE_DEVICE_CLASSES[domain]?.includes(this._deviceClass) ||
- (domain === "cover" && this.entry.original_device_class === null)
+ ${this._deviceClassOptions
+ ? html`
+
+ ${this._deviceClassOptions[0].map(
+ (deviceClass: string) => html`
+
+ ${this.hass.localize(
+ `ui.dialogs.entity_registry.editor.device_classes.${domain}.${deviceClass}`
+ )}
+
+ `
+ )}
+
+ ${this._deviceClassOptions[1].map(
+ (deviceClass: string) => html`
+
+ ${this.hass.localize(
+ `ui.dialogs.entity_registry.editor.device_classes.${domain}.${deviceClass}`
+ )}
+
+ `
+ )}
+
+ `
+ : ""}
+ ${this._deviceClass &&
+ stateObj.attributes.unit_of_measurement &&
+ OVERRIDE_SENSOR_UNITS[this._deviceClass]?.includes(
+ stateObj.attributes.unit_of_measurement
+ )
+ ? html`
+
+ ${OVERRIDE_SENSOR_UNITS[this._deviceClass].map(
+ (unit: string) => html`
+ ${unit}
+ `
+ )}
+
+ `
+ : ""}
+ ${domain === "switch"
? html`
- ${OVERRIDE_DEVICE_CLASSES[domain].map(
- (deviceClass: string) => html`
-
- ${this.hass.localize(
- `ui.dialogs.entity_registry.editor.device_classes.${domain}.${deviceClass}`
- )}
+
+ ${domainToName(this.hass.localize, "switch")}
+ ${SWITCH_AS_DOMAINS.map(
+ (as_domain) => html`
+
+ ${domainToName(this.hass.localize, as_domain)}
`
)}
@@ -200,82 +358,156 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
@value-changed=${this._areaPicked}
>`
: ""}
-
${this.hass.localize("ui.dialogs.entity_registry.editor.delete")}
@@ -309,14 +541,38 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
this._deviceClass = ev.target.value;
}
+ private _unitChanged(ev): void {
+ this._error = undefined;
+ this._unit_of_measurement = ev.target.value;
+ }
+
+ private _switchAsChanged(ev): void {
+ if (ev.target.value === "") {
+ return;
+ }
+ this._switchAs = ev.target.value;
+ }
+
private _areaPicked(ev: CustomEvent) {
this._error = undefined;
this._areaId = ev.detail.value;
}
- private _clearArea() {
- this._error = undefined;
- this._areaId = null;
+ private _viewStatusChanged(ev: CustomEvent): void {
+ switch ((ev.target as any).value) {
+ case "enabled":
+ this._disabledBy = null;
+ this._hiddenBy = null;
+ break;
+ case "disabled":
+ this._disabledBy = "user";
+ this._hiddenBy = null;
+ break;
+ case "hidden":
+ this._hiddenBy = "user";
+ this._disabledBy = null;
+ break;
+ }
}
private _openDeviceSettings() {
@@ -330,6 +586,9 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
private async _updateEntry(): Promise {
this._submitting = true;
+
+ const parent = (this.getRootNode() as ShadowRoot).host as HTMLElement;
+
const params: Partial = {
name: this._name.trim() || null,
icon: this._icon.trim() || null,
@@ -337,12 +596,30 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
device_class: this._deviceClass || null,
new_entity_id: this._entityId.trim(),
};
+
+ const stateObj: HassEntity | undefined =
+ this.hass.states[this.entry.entity_id];
+ const domain = computeDomain(this.entry.entity_id);
+
if (
this.entry.disabled_by !== this._disabledBy &&
(this._disabledBy === null || this._disabledBy === "user")
) {
params.disabled_by = this._disabledBy;
}
+ if (
+ this.entry.hidden_by !== this._hiddenBy &&
+ (this._hiddenBy === null || this._hiddenBy === "user")
+ ) {
+ params.hidden_by = this._hiddenBy;
+ }
+ if (
+ domain === "sensor" &&
+ stateObj?.attributes?.unit_of_measurement !== this._unit_of_measurement
+ ) {
+ params.options_domain = "sensor";
+ params.options = { unit_of_measurement: this._unit_of_measurement };
+ }
try {
const result = await updateEntityRegistryEntry(
this.hass!,
@@ -371,6 +648,46 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
} finally {
this._submitting = false;
}
+
+ if (this._switchAs !== "switch") {
+ if (
+ !(await showConfirmationDialog(this, {
+ text: this.hass!.localize(
+ "ui.dialogs.entity_registry.editor.switch_as_x_confirm",
+ "domain",
+ this._switchAs
+ ),
+ }))
+ ) {
+ return;
+ }
+ const configFlow = await createConfigFlow(this.hass, "switch_as_x");
+ const result = (await handleConfigFlowStep(
+ this.hass,
+ configFlow.flow_id,
+ {
+ entity_id: this._entityId.trim(),
+ target_domain: this._switchAs,
+ }
+ )) as DataEntryFlowStepCreateEntry;
+ if (!result.result?.entry_id) {
+ return;
+ }
+ const unsub = await this.hass.connection.subscribeEvents(() => {
+ unsub();
+ fetchEntityRegistry(this.hass.connection).then((entityRegistry) => {
+ const entity = entityRegistry.find(
+ (reg) => reg.config_entry_id === result.result!.entry_id
+ );
+ if (!entity) {
+ return;
+ }
+ showEntityEditorDialog(parent, {
+ entity_id: entity.entity_id,
+ });
+ });
+ }, "entity_registry_updated");
+ }
}
private async _confirmDeleteEntry(): Promise {
@@ -387,15 +704,19 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
this._submitting = true;
try {
- await removeEntityRegistryEntry(this.hass!, this._origEntityId);
+ if (this._helperConfigEntry) {
+ await deleteConfigEntry(this.hass, this._helperConfigEntry.entry_id);
+ } else {
+ await removeEntityRegistryEntry(this.hass!, this._origEntityId);
+ }
fireEvent(this, "close-dialog");
} finally {
this._submitting = false;
}
}
- private _disabledByChanged(ev: Event): void {
- this._disabledBy = (ev.target as HaSwitch).checked ? null : "user";
+ private async _showOptionsFlow() {
+ showOptionsFlowDialog(this, this._helperConfigEntry!);
}
static get styles(): CSSResultGroup {
@@ -435,14 +756,25 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
display: block;
margin: 8px 0;
}
+ ha-area-picker {
+ margin: 8px 0;
+ display: block;
+ }
.row {
margin: 8px 0;
color: var(--primary-text-color);
display: flex;
align-items: center;
}
- p {
+ .label {
+ margin-top: 16px;
+ }
+ .secondary {
margin: 8px 0;
+ width: 340px;
+ }
+ li[divider] {
+ border-bottom-color: var(--divider-color);
}
`,
];
diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index f93930d2d3..9cfb164d8f 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -3,6 +3,7 @@ import {
mdiAlertCircle,
mdiCancel,
mdiDelete,
+ mdiEyeOff,
mdiFilterVariant,
mdiPencilOff,
mdiPlus,
@@ -28,9 +29,9 @@ import type {
SelectionChangedEvent,
} from "../../../components/data-table/ha-data-table";
import "../../../components/ha-button-menu";
+import "../../../components/ha-check-list-item";
import "../../../components/ha-icon-button";
import "../../../components/ha-svg-icon";
-import "../../../components/ha-check-list-item";
import {
AreaRegistryEntry,
subscribeAreaRegistry,
@@ -101,6 +102,8 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
@state() private _showDisabled = false;
+ @state() private _showHidden = false;
+
@state() private _showUnavailable = true;
@state() private _showReadOnly = true;
@@ -249,7 +252,10 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
filterable: true,
width: "68px",
template: (_status, entity: EntityRow) =>
- entity.unavailable || entity.disabled_by || entity.readonly
+ entity.unavailable ||
+ entity.disabled_by ||
+ entity.hidden_by ||
+ entity.readonly
? html`
@@ -280,6 +288,10 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
? this.hass.localize(
"ui.panel.config.entities.picker.status.disabled"
)
+ : entity.hidden_by
+ ? this.hass.localize(
+ "ui.panel.config.entities.picker.status.hidden"
+ )
: this.hass.localize(
"ui.panel.config.entities.picker.status.readonly"
)}
@@ -301,6 +313,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
showDisabled: boolean,
showUnavailable: boolean,
showReadOnly: boolean,
+ showHidden: boolean,
entries?: ConfigEntry[]
) => {
const result: EntityRow[] = [];
@@ -362,6 +375,12 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
);
}
+ if (!showHidden) {
+ filteredEntities = filteredEntities.filter(
+ (entity) => !entity.hidden_by
+ );
+ }
+
for (const entry of filteredEntities) {
const entity = this.hass.states[entry.entity_id];
const unavailable = entity?.state === UNAVAILABLE;
@@ -465,6 +484,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
this._showDisabled,
this._showUnavailable,
this._showReadOnly,
+ this._showHidden,
this._entries
);
@@ -487,6 +507,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
.data=${filteredEntities}
.activeFilters=${activeFilters}
.numHidden=${this._numHiddenEntities}
+ .hideFilterMenu=${this._selectedEntities.length > 0}
.searchLabel=${this.hass.localize(
"ui.panel.config.entities.picker.search"
)}
@@ -506,124 +527,155 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
.hasFab=${includeZHAFab}
>
${this._selectedEntities.length
- ? html`(
+ items: T[],
+ keySelector: (item: T) => string
+): Record => {
+ const result: Record = {};
+ for (const item of items) {
+ result[keySelector(item)] = item;
+ }
+ return result;
+};
+
+const getConfigEntry = (
+ entityEntries: Record,
+ configEntries: Record,
+ entityId: string
+) => {
+ const configEntryId = entityEntries![entityId]?.config_entry_id;
+ return configEntryId ? configEntries![configEntryId] : undefined;
+};
@customElement("ha-config-helpers")
-export class HaConfigHelpers extends LitElement {
+export class HaConfigHelpers extends SubscribeMixin(LitElement) {
@property({ attribute: false }) public hass!: HomeAssistant;
@property() public isWide!: boolean;
@@ -33,98 +71,122 @@ export class HaConfigHelpers extends LitElement {
@state() private _stateItems: HassEntity[] = [];
- private _columns = memoize((narrow, _language): DataTableColumnContainer => {
- const columns: DataTableColumnContainer = {
- icon: {
+ @state() private _entityEntries?: Record;
+
+ @state() private _configEntries?: Record;
+
+ private _columns = memoizeOne(
+ (narrow: boolean, localize: LocalizeFunc): DataTableColumnContainer => {
+ const columns: DataTableColumnContainer = {
+ icon: {
+ title: "",
+ label: localize("ui.panel.config.helpers.picker.headers.icon"),
+ type: "icon",
+ template: (icon, helper: any) =>
+ icon
+ ? html` ,
+ configEntries: Record
+ ) =>
+ stateItems.map((entityState) => {
+ const configEntry = getConfigEntry(
+ entityEntries,
+ configEntries,
+ entityState.entity_id
+ );
+
+ return {
+ id: entityState.entity_id,
+ icon: entityState.attributes.icon,
+ name: entityState.attributes.friendly_name || "",
+ entity_id: entityState.entity_id,
+ editable:
+ configEntry !== undefined || entityState.attributes.editable,
+ type: configEntry
+ ? configEntry.domain
+ : computeStateDomain(entityState),
+ configEntry,
+ };
+ })
);
protected render(): TemplateResult {
- if (!this.hass || this._stateItems === undefined) {
+ if (
+ !this.hass ||
+ this._stateItems === undefined ||
+ this._entityEntries === undefined ||
+ this._configEntries === undefined
+ ) {
return html` ();
+
+ for (const entityEntry of Object.values(this._entityEntries)) {
+ if (
+ entityEntry.config_entry_id &&
+ entityEntry.config_entry_id in this._configEntries
+ ) {
+ extraEntities.add(entityEntry.entity_id);
+ }
+ }
+
+ const newStates = Object.values(this.hass!.states).filter(
+ (entity) =>
+ extraEntities.has(entity.entity_id) ||
+ HELPER_DOMAINS.includes(computeStateDomain(entity))
+ );
+
+ if (
+ this._stateItems.length !== newStates.length ||
+ !this._stateItems.every((val, idx) => newStates[idx] === val)
+ ) {
+ this._stateItems = newStates;
+ }
+ }
+
+ public hassSubscribe(): UnsubscribeFunc[] {
+ return [
+ subscribeEntityRegistry(this.hass.connection!, (entries) => {
+ this._entityEntries = groupByOne(entries, (entry) => entry.entity_id);
+ }),
+ ];
+ }
+
+ private async _getConfigEntries() {
+ this._configEntries = groupByOne(
+ await getConfigEntries(this.hass, { type: "helper" }),
+ (entry) => entry.entry_id
+ );
}
private async _openEditDialog(ev: CustomEvent): Promise {
@@ -196,6 +358,12 @@ export class HaConfigHelpers extends LitElement {
}
private _createHelpler() {
- showHelperDetailDialog(this);
+ showHelperDetailDialog(this, {
+ dialogClosedCallback: (params) => {
+ if (params.flowFinished) {
+ this._getConfigEntries();
+ }
+ },
+ });
}
}
diff --git a/src/panels/config/helpers/show-dialog-helper-detail.ts b/src/panels/config/helpers/show-dialog-helper-detail.ts
index 959f92ad75..bbee0bc619 100644
--- a/src/panels/config/helpers/show-dialog-helper-detail.ts
+++ b/src/panels/config/helpers/show-dialog-helper-detail.ts
@@ -1,11 +1,21 @@
import { fireEvent } from "../../../common/dom/fire_event";
+import { DataEntryFlowDialogParams } from "../../../dialogs/config-flow/show-dialog-data-entry-flow";
export const loadHelperDetailDialog = () => import("./dialog-helper-detail");
-export const showHelperDetailDialog = (element: HTMLElement) => {
+export interface ShowDialogHelperDetailParams {
+ domain?: string;
+ // Only used for config entries
+ dialogClosedCallback?: DataEntryFlowDialogParams["dialogClosedCallback"];
+}
+
+export const showHelperDetailDialog = (
+ element: HTMLElement,
+ params: ShowDialogHelperDetailParams
+) => {
fireEvent(element, "show-dialog", {
dialogTag: "dialog-helper-detail",
dialogImport: loadHelperDetailDialog,
- dialogParams: {},
+ dialogParams: params,
});
};
diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts
index 5255d1197e..a78eb0e94b 100644
--- a/src/panels/config/integrations/ha-config-integrations.ts
+++ b/src/panels/config/integrations/ha-config-integrations.ts
@@ -67,6 +67,7 @@ import "./ha-ignored-config-entry-card";
import "./ha-integration-card";
import type { HaIntegrationCard } from "./ha-integration-card";
import { fetchDiagnosticHandlers } from "../../../data/diagnostics";
+import { HELPER_DOMAINS } from "../helpers/const";
export interface ConfigEntryUpdatedEvent {
entry: ConfigEntry;
@@ -521,24 +522,26 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
}
private _loadConfigEntries() {
- getConfigEntries(this.hass).then((configEntries) => {
- this._configEntries = configEntries
- .map(
- (entry: ConfigEntry): ConfigEntryExtended => ({
- ...entry,
- localized_domain_name: domainToName(
- this.hass.localize,
- entry.domain
- ),
- })
- )
- .sort((conf1, conf2) =>
- caseInsensitiveStringCompare(
- conf1.localized_domain_name + conf1.title,
- conf2.localized_domain_name + conf2.title
+ getConfigEntries(this.hass, { type: "integration" }).then(
+ (configEntries) => {
+ this._configEntries = configEntries
+ .map(
+ (entry: ConfigEntry): ConfigEntryExtended => ({
+ ...entry,
+ localized_domain_name: domainToName(
+ this.hass.localize,
+ entry.domain
+ ),
+ })
)
- );
- });
+ .sort((conf1, conf2) =>
+ caseInsensitiveStringCompare(
+ conf1.localized_domain_name + conf1.title,
+ conf2.localized_domain_name + conf2.title
+ )
+ );
+ }
+ );
}
private async _scanUSBDevices() {
@@ -656,9 +659,22 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
if (!domain) {
return;
}
- const handlers = await getConfigFlowHandlers(this.hass);
+ const handlers = await getConfigFlowHandlers(this.hass, "integration");
if (!handlers.includes(domain)) {
+ if (HELPER_DOMAINS.includes(domain)) {
+ navigate(`/config/helpers/add?domain=${domain}`, {
+ replace: true,
+ });
+ return;
+ }
+ const helpers = await getConfigFlowHandlers(this.hass, "helper");
+ if (helpers.includes(domain)) {
+ navigate(`/config/helpers/add?domain=${domain}`, {
+ replace: true,
+ });
+ return;
+ }
showAlertDialog(this, {
title: this.hass.localize(
"ui.panel.config.integrations.config_flow.error"
diff --git a/src/panels/config/integrations/ha-integration-card.ts b/src/panels/config/integrations/ha-integration-card.ts
index 4af887d59a..28154e279c 100644
--- a/src/panels/config/integrations/ha-integration-card.ts
+++ b/src/panels/config/integrations/ha-integration-card.ts
@@ -55,8 +55,6 @@ const integrationsWithPanel = {
hassio: "/hassio/dashboard",
mqtt: "/config/mqtt",
zha: "/config/zha/dashboard",
- ozw: "/config/ozw/dashboard",
- zwave: "/config/zwave",
zwave_js: "/config/zwave_js/dashboard",
};
diff --git a/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts b/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts
index 9337854c8e..eaa03dc98f 100644
--- a/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts
+++ b/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts
@@ -111,7 +111,9 @@ class HaPanelDevMqtt extends LitElement {
return;
}
const configEntryId = searchParams.get("config_entry") as string;
- const configEntries = await getConfigEntries(this.hass);
+ const configEntries = await getConfigEntries(this.hass, {
+ domain: "mqtt",
+ });
const configEntry = configEntries.find(
(entry) => entry.entry_id === configEntryId
);
diff --git a/src/panels/config/integrations/integration-panels/ozw/dialog-ozw-refresh-node.ts b/src/panels/config/integrations/integration-panels/ozw/dialog-ozw-refresh-node.ts
deleted file mode 100644
index 54ee3ce9d6..0000000000
--- a/src/panels/config/integrations/integration-panels/ozw/dialog-ozw-refresh-node.ts
+++ /dev/null
@@ -1,269 +0,0 @@
-import {
- css,
- CSSResultGroup,
- html,
- LitElement,
- PropertyValues,
- TemplateResult,
-} from "lit";
-import { customElement, property, state } from "lit/decorators";
-import "../../../../../components/ha-circular-progress";
-import "../../../../../components/ha-code-editor";
-import { createCloseHeading } from "../../../../../components/ha-dialog";
-import {
- fetchOZWNodeMetadata,
- nodeQueryStages,
- OZWDevice,
- OZWDeviceMetaData,
-} from "../../../../../data/ozw";
-import { haStyleDialog } from "../../../../../resources/styles";
-import { HomeAssistant } from "../../../../../types";
-import { OZWRefreshNodeDialogParams } from "./show-dialog-ozw-refresh-node";
-
-@customElement("dialog-ozw-refresh-node")
-class DialogOZWRefreshNode extends LitElement {
- @property({ attribute: false }) public hass!: HomeAssistant;
-
- @state() private _node_id?: number;
-
- @state() private _ozw_instance = 1;
-
- @state() private _nodeMetaData?: OZWDeviceMetaData;
-
- @state() private _node?: OZWDevice;
-
- @state() private _active = false;
-
- @state() private _complete = false;
-
- private _refreshDevicesTimeoutHandle?: number;
-
- private _subscribed?: Promise<() => Promise>;
-
- public disconnectedCallback(): void {
- super.disconnectedCallback();
- this._unsubscribe();
- }
-
- protected updated(changedProperties: PropertyValues): void {
- super.update(changedProperties);
- if (changedProperties.has("node_id")) {
- this._fetchData();
- }
- }
-
- private async _fetchData() {
- if (!this._node_id) {
- return;
- }
- const metaDataResponse = await fetchOZWNodeMetadata(
- this.hass,
- this._ozw_instance,
- this._node_id
- );
-
- this._nodeMetaData = metaDataResponse.metadata;
- }
-
- public async showDialog(params: OZWRefreshNodeDialogParams): Promise {
- this._node_id = params.node_id;
- this._ozw_instance = params.ozw_instance;
- this._fetchData();
- }
-
- protected render(): TemplateResult {
- if (!this._node_id) {
- return html``;
- }
-
- return html`
-
- ${this._complete
- ? html`
-
- ${this.hass.localize("ui.common.close")}
-
- `
- : html`
- ${this._active
- ? html`
-
- ${this.hass.localize(
- "ui.panel.config.ozw.refresh_node.start_refresh_button"
- )}
-
- `
- : html``}
- `}
-
- `;
- }
-
- private _startRefresh(): void {
- this._subscribe();
- }
-
- private _handleMessage(message: any): void {
- if (message.type === "node_updated") {
- this._node = message;
- if (message.node_query_stage === "Complete") {
- this._unsubscribe();
- this._complete = true;
- }
- }
- }
-
- private _unsubscribe(): void {
- this._active = false;
- if (this._refreshDevicesTimeoutHandle) {
- clearTimeout(this._refreshDevicesTimeoutHandle);
- }
- if (this._subscribed) {
- this._subscribed.then((unsub) => unsub());
- this._subscribed = undefined;
- }
- }
-
- private _subscribe(): void {
- if (!this.hass) {
- return;
- }
- this._active = true;
- this._subscribed = this.hass.connection.subscribeMessage(
- (message) => this._handleMessage(message),
- {
- type: "ozw/refresh_node_info",
- node_id: this._node_id,
- ozw_instance: this._ozw_instance,
- }
- );
- this._refreshDevicesTimeoutHandle = window.setTimeout(
- () => this._unsubscribe(),
- 120000
- );
- }
-
- private _close(): void {
- this._complete = false;
- this._node_id = undefined;
- this._node = undefined;
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyleDialog,
- css`
- blockquote {
- display: block;
- background-color: #ddd;
- padding: 8px;
- margin: 8px 0;
- font-size: 0.9em;
- }
-
- blockquote em {
- font-size: 0.9em;
- margin-top: 6px;
- }
-
- .flex-container {
- display: flex;
- align-items: center;
- }
-
- .flex-container ha-circular-progress {
- margin-right: 20px;
- }
- `,
- ];
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "dialog-ozw-refresh-node": DialogOZWRefreshNode;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-config-dashboard.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-config-dashboard.ts
deleted file mode 100644
index dcdb81518d..0000000000
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-config-dashboard.ts
+++ /dev/null
@@ -1,260 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import { mdiCheckCircle, mdiCircle, mdiCloseCircle, mdiZWave } from "@mdi/js";
-import "@polymer/paper-item/paper-icon-item";
-import "@polymer/paper-item/paper-item-body";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { navigate } from "../../../../../common/navigate";
-import "../../../../../components/ha-card";
-import "../../../../../components/ha-icon-next";
-import {
- fetchOZWInstances,
- networkOfflineStatuses,
- networkOnlineStatuses,
- networkStartingStatuses,
- OZWInstance,
-} from "../../../../../data/ozw";
-import "../../../../../layouts/hass-error-screen";
-import "../../../../../layouts/hass-loading-screen";
-import "../../../../../layouts/hass-tabs-subpage";
-import type { PageNavigation } from "../../../../../layouts/hass-tabs-subpage";
-import { haStyle } from "../../../../../resources/styles";
-import type { HomeAssistant, Route } from "../../../../../types";
-import "../../../ha-config-section";
-import "../../../../../components/ha-alert";
-
-export const ozwTabs: PageNavigation[] = [];
-
-@customElement("ozw-config-dashboard")
-class OZWConfigDashboard extends LitElement {
- @property({ type: Object }) public hass!: HomeAssistant;
-
- @property({ type: Object }) public route!: Route;
-
- @property({ type: Boolean }) public narrow!: boolean;
-
- @property({ type: Boolean }) public isWide!: boolean;
-
- @property() public configEntryId?: string;
-
- @state() private _instances?: OZWInstance[];
-
- protected firstUpdated() {
- this._fetchData();
- }
-
- protected render(): TemplateResult {
- if (!this._instances) {
- return html`
-
- The OpenZWave integration is deprecated and will no longer receive any
- updates. The technical dependencies will render this integration
- unusable in the near future. We strongly advise you to migrate to the
- new
- Z-Wave JS integration.
-
- learn more
-
-
-
-
-
-
-
-
-
-
- ${this.hass.localize(
- "ui.panel.config.ozw.common.instance"
- )}
- ${instance.ozw_instance}
-
-
-
-
- `;
- })}
- `
- : ""}
-
-
- `;
- }
-
- private async _fetchData() {
- this._instances = await fetchOZWInstances(this.hass!);
- if (this._instances.length === 1) {
- navigate(`/config/ozw/network/${this._instances[0].ozw_instance}`, {
- replace: true,
- });
- }
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyle,
- css`
- ha-card:last-child {
- margin-bottom: 24px;
- }
- ha-config-section {
- margin-top: -12px;
- }
- :host([narrow]) ha-config-section {
- margin-top: -20px;
- }
- ha-alert {
- display: block;
- margin: 16px;
- }
- ha-alert a {
- text-decoration: none;
- }
- ha-card {
- overflow: hidden;
- }
- ha-card a {
- text-decoration: none;
- color: var(--primary-text-color);
- }
- paper-item-body {
- margin: 16px 0;
- }
- a {
- text-decoration: none;
- color: var(--primary-text-color);
- position: relative;
- display: block;
- outline: 0;
- }
- ha-svg-icon.network-status-icon {
- height: 14px;
- width: 14px;
- }
- .online {
- color: green;
- }
- .starting {
- color: orange;
- }
- .offline {
- color: red;
- }
- ha-svg-icon,
- ha-icon-next {
- color: var(--secondary-text-color);
- }
- .iron-selected paper-item::before,
- a:not(.iron-selected):focus::before {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- pointer-events: none;
- content: "";
- transition: opacity 15ms linear;
- will-change: opacity;
- }
- a:not(.iron-selected):focus::before {
- background-color: currentColor;
- opacity: var(--dark-divider-opacity);
- }
- .iron-selected paper-item:focus::before,
- .iron-selected:focus paper-item::before {
- opacity: 0.2;
- }
- `,
- ];
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "ozw-config-dashboard": OZWConfigDashboard;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-config-router.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-config-router.ts
deleted file mode 100644
index ad2d2e38fe..0000000000
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-config-router.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import {
- HassRouterPage,
- RouterOptions,
-} from "../../../../../layouts/hass-router-page";
-import { HomeAssistant, Route } from "../../../../../types";
-
-export const computeTail = memoizeOne((route: Route) => {
- const dividerPos = route.path.indexOf("/", 1);
- return dividerPos === -1
- ? {
- prefix: route.prefix + route.path,
- path: "",
- }
- : {
- prefix: route.prefix + route.path.substr(0, dividerPos),
- path: route.path.substr(dividerPos),
- };
-});
-
-@customElement("ozw-config-router")
-class OZWConfigRouter extends HassRouterPage {
- @property({ attribute: false }) public hass!: HomeAssistant;
-
- @property() public isWide!: boolean;
-
- @property() public narrow!: boolean;
-
- private _configEntry = new URLSearchParams(window.location.search).get(
- "config_entry"
- );
-
- protected routerOptions: RouterOptions = {
- defaultPage: "dashboard",
- showLoading: true,
- routes: {
- dashboard: {
- tag: "ozw-config-dashboard",
- load: () => import("./ozw-config-dashboard"),
- },
- network: {
- tag: "ozw-network-router",
- load: () => import("./ozw-network-router"),
- },
- },
- };
-
- protected updatePageEl(el): void {
- el.route = this.routeTail;
- el.hass = this.hass;
- el.isWide = this.isWide;
- el.narrow = this.narrow;
- el.configEntryId = this._configEntry;
- if (this._currentPage === "network") {
- const path = this.routeTail.path.split("/");
- el.ozwInstance = path[1];
- el.route = computeTail(this.routeTail);
- }
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "ozw-config-router": OZWConfigRouter;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-network-dashboard.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-network-dashboard.ts
deleted file mode 100644
index 7dc5478939..0000000000
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-network-dashboard.ts
+++ /dev/null
@@ -1,245 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import { mdiCheckCircle, mdiCircle, mdiCloseCircle } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
-import { navigate } from "../../../../../common/navigate";
-import "../../../../../components/buttons/ha-call-service-button";
-import "../../../../../components/ha-card";
-import {
- fetchOZWNetworkStatistics,
- fetchOZWNetworkStatus,
- networkOfflineStatuses,
- networkOnlineStatuses,
- networkStartingStatuses,
- OZWInstance,
- OZWNetworkStatistics,
-} from "../../../../../data/ozw";
-import "../../../../../layouts/hass-tabs-subpage";
-import { haStyle } from "../../../../../resources/styles";
-import type { HomeAssistant, Route } from "../../../../../types";
-import "../../../ha-config-section";
-import { ozwNetworkTabs } from "./ozw-network-router";
-
-@customElement("ozw-network-dashboard")
-class OZWNetworkDashboard extends LitElement {
- @property({ type: Object }) public hass!: HomeAssistant;
-
- @property({ type: Object }) public route!: Route;
-
- @property({ type: Boolean }) public narrow!: boolean;
-
- @property({ type: Boolean }) public isWide!: boolean;
-
- @property() public configEntryId?: string;
-
- @property() public ozwInstance?: number;
-
- @state() private _network?: OZWInstance;
-
- @state() private _statistics?: OZWNetworkStatistics;
-
- @state() private _status = "unknown";
-
- @state() private _icon = mdiCircle;
-
- protected firstUpdated() {
- if (!this.ozwInstance) {
- navigate("/config/ozw/dashboard", { replace: true });
- } else if (this.hass) {
- this._fetchData();
- }
- }
-
- protected render(): TemplateResult {
- return html`
-
-
-
-
- `
- : ``}
-
-
- `;
- }
-
- private async _fetchData() {
- if (!this.ozwInstance) return;
- this._network = await fetchOZWNetworkStatus(this.hass!, this.ozwInstance);
- this._statistics = await fetchOZWNetworkStatistics(
- this.hass!,
- this.ozwInstance
- );
- if (networkOnlineStatuses.includes(this._network!.Status)) {
- this._status = "online";
- this._icon = mdiCheckCircle;
- }
- if (networkStartingStatuses.includes(this._network!.Status)) {
- this._status = "starting";
- }
- if (networkOfflineStatuses.includes(this._network!.Status)) {
- this._status = "offline";
- this._icon = mdiCloseCircle;
- }
- }
-
- private _generateServiceButton(service: string) {
- const serviceData = { instance_id: this.ozwInstance };
- return html`
-
- ${this.hass!.localize(`ui.panel.config.ozw.services.${service}`)}
-
- `;
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyle,
- css`
- .secondary {
- color: var(--secondary-text-color);
- }
- .online {
- color: green;
- }
- .starting {
- color: orange;
- }
- .offline {
- color: red;
- }
- .content {
- margin-top: 24px;
- }
-
- .sectionHeader {
- position: relative;
- padding-right: 40px;
- }
-
- .network-status {
- text-align: center;
- }
-
- .network-status div.details {
- font-size: 1.5rem;
- margin-bottom: 16px;
- }
-
- .network-status ha-svg-icon {
- display: block;
- margin: 0px auto 16px;
- width: 48px;
- height: 48px;
- }
-
- .network-status small {
- font-size: 1rem;
- }
-
- ha-card {
- margin: 0 auto;
- max-width: 600px;
- }
-
- .card-actions.warning ha-call-service-button {
- color: var(--error-color);
- }
-
- .toggle-help-icon {
- position: absolute;
- top: -6px;
- right: 0;
- color: var(--primary-color);
- }
-
- ha-service-description {
- display: block;
- color: grey;
- padding: 0 8px 12px;
- }
-
- [hidden] {
- display: none;
- }
- `,
- ];
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "ozw-network-dashboard": OZWNetworkDashboard;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-network-nodes.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-network-nodes.ts
deleted file mode 100644
index 8547058884..0000000000
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-network-nodes.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import { mdiAlert, mdiCheck } from "@mdi/js";
-import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { HASSDomEvent } from "../../../../../common/dom/fire_event";
-import { navigate } from "../../../../../common/navigate";
-import "../../../../../components/buttons/ha-call-service-button";
-import {
- DataTableColumnContainer,
- RowClickedEvent,
-} from "../../../../../components/data-table/ha-data-table";
-import "../../../../../components/ha-card";
-import { fetchOZWNodes, OZWDevice } from "../../../../../data/ozw";
-import "../../../../../layouts/hass-tabs-subpage";
-import "../../../../../layouts/hass-tabs-subpage-data-table";
-import { haStyle } from "../../../../../resources/styles";
-import type { HomeAssistant, Route } from "../../../../../types";
-import "../../../ha-config-section";
-import { ozwNetworkTabs } from "./ozw-network-router";
-
-export interface NodeRowData extends OZWDevice {
- node?: NodeRowData;
- id?: number;
-}
-
-@customElement("ozw-network-nodes")
-class OZWNetworkNodes extends LitElement {
- @property({ type: Object }) public hass!: HomeAssistant;
-
- @property({ type: Object }) public route!: Route;
-
- @property({ type: Boolean }) public narrow!: boolean;
-
- @property({ type: Boolean }) public isWide!: boolean;
-
- @property() public configEntryId?: string;
-
- @property() public ozwInstance = 0;
-
- @state() private _nodes: OZWDevice[] = [];
-
- private _columns = memoizeOne(
- (narrow: boolean): DataTableColumnContainer => ({
- node_id: {
- title: this.hass.localize("ui.panel.config.ozw.nodes_table.id"),
- sortable: true,
- type: "numeric",
- width: "72px",
- filterable: true,
- direction: "asc",
- },
- node_product_name: {
- title: this.hass.localize("ui.panel.config.ozw.nodes_table.model"),
- sortable: true,
- width: narrow ? "75%" : "25%",
- },
- node_manufacturer_name: {
- title: this.hass.localize(
- "ui.panel.config.ozw.nodes_table.manufacturer"
- ),
- sortable: true,
- hidden: narrow,
- width: "25%",
- },
- node_query_stage: {
- title: this.hass.localize(
- "ui.panel.config.ozw.nodes_table.query_stage"
- ),
- sortable: true,
- width: narrow ? "25%" : "15%",
- },
- is_zwave_plus: {
- title: this.hass.localize("ui.panel.config.ozw.nodes_table.zwave_plus"),
- hidden: narrow,
- template: (value: boolean) =>
- value ? html`
-
- `;
- }
-
- private async _fetchData() {
- this._nodes = await fetchOZWNodes(this.hass!, this.ozwInstance!);
- }
-
- private _handleRowClicked(ev: HASSDomEvent) {
- const nodeId = ev.detail.id;
- navigate(`/config/ozw/network/${this.ozwInstance}/node/${nodeId}`);
- }
-
- static get styles(): CSSResultGroup {
- return haStyle;
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "ozw-network-nodes": OZWNetworkNodes;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-network-router.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-network-router.ts
deleted file mode 100644
index 0294ff9b0f..0000000000
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-network-router.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { mdiNetwork, mdiServerNetwork } from "@mdi/js";
-import { customElement, property } from "lit/decorators";
-import {
- HassRouterPage,
- RouterOptions,
-} from "../../../../../layouts/hass-router-page";
-import { PageNavigation } from "../../../../../layouts/hass-tabs-subpage";
-import { HomeAssistant } from "../../../../../types";
-import { computeTail } from "./ozw-config-router";
-
-export const ozwNetworkTabs = (instance: number): PageNavigation[] => [
- {
- translationKey: "ui.panel.config.ozw.navigation.network",
- path: `/config/ozw/network/${instance}/dashboard`,
- iconPath: mdiServerNetwork,
- },
- {
- translationKey: "ui.panel.config.ozw.navigation.nodes",
- path: `/config/ozw/network/${instance}/nodes`,
- iconPath: mdiNetwork,
- },
-];
-
-@customElement("ozw-network-router")
-class OZWNetworkRouter extends HassRouterPage {
- @property({ attribute: false }) public hass!: HomeAssistant;
-
- @property() public isWide!: boolean;
-
- @property() public narrow!: boolean;
-
- @property() public ozwInstance!: number;
-
- private _configEntry = new URLSearchParams(window.location.search).get(
- "config_entry"
- );
-
- protected routerOptions: RouterOptions = {
- defaultPage: "dashboard",
- showLoading: true,
- routes: {
- dashboard: {
- tag: "ozw-network-dashboard",
- load: () => import("./ozw-network-dashboard"),
- },
- nodes: {
- tag: "ozw-network-nodes",
- load: () => import("./ozw-network-nodes"),
- },
- node: {
- tag: "ozw-node-router",
- load: () => import("./ozw-node-router"),
- },
- },
- };
-
- protected updatePageEl(el): void {
- el.route = computeTail(this.routeTail);
- el.hass = this.hass;
- el.isWide = this.isWide;
- el.narrow = this.narrow;
- el.configEntryId = this._configEntry;
- el.ozwInstance = this.ozwInstance;
- if (this._currentPage === "node") {
- el.nodeId = this.routeTail.path.split("/")[1];
- }
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "ozw-network-router": OZWNetworkRouter;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-node-config.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-node-config.ts
deleted file mode 100644
index 7c29bf2cbc..0000000000
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-node-config.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { navigate } from "../../../../../common/navigate";
-import "../../../../../components/buttons/ha-call-service-button";
-import "../../../../../components/ha-card";
-import {
- fetchOZWNodeConfig,
- fetchOZWNodeMetadata,
- fetchOZWNodeStatus,
- OZWDevice,
- OZWDeviceConfig,
- OZWDeviceMetaDataResponse,
-} from "../../../../../data/ozw";
-import { ERR_NOT_FOUND } from "../../../../../data/websocket_api";
-import "../../../../../layouts/hass-tabs-subpage";
-import { haStyle } from "../../../../../resources/styles";
-import type { HomeAssistant, Route } from "../../../../../types";
-import "../../../ha-config-section";
-import { ozwNodeTabs } from "./ozw-node-router";
-import { showOZWRefreshNodeDialog } from "./show-dialog-ozw-refresh-node";
-
-@customElement("ozw-node-config")
-class OZWNodeConfig extends LitElement {
- @property({ type: Object }) public hass!: HomeAssistant;
-
- @property({ type: Object }) public route!: Route;
-
- @property({ type: Boolean }) public narrow!: boolean;
-
- @property({ type: Boolean }) public isWide!: boolean;
-
- @property() public configEntryId?: string;
-
- @property() public ozwInstance?;
-
- @property() public nodeId?;
-
- @state() private _node?: OZWDevice;
-
- @state() private _metadata?: OZWDeviceMetaDataResponse;
-
- @state() private _config?: OZWDeviceConfig[];
-
- @state() private _error?: string;
-
- protected firstUpdated() {
- if (!this.ozwInstance) {
- navigate("/config/ozw/dashboard", { replace: true });
- } else if (!this.nodeId) {
- navigate(`/config/ozw/network/${this.ozwInstance}/nodes`, {
- replace: true,
- });
- } else {
- this._fetchData();
- }
- }
-
- protected render(): TemplateResult {
- if (this._error) {
- return html`
-
-
-
-
-
- ${this._metadata?.metadata.WakeupHelp
- ? html`
-
-
- `
- : ``}
- ${this._config
- ? html`
- ${this._config.map(
- (item) => html`
-
-
- `
- )}
- `
- : ``}
- `
- : ``}
-
-
- `;
- }
-
- private async _fetchData() {
- if (!this.ozwInstance || !this.nodeId) {
- return;
- }
-
- try {
- const nodeProm = fetchOZWNodeStatus(
- this.hass!,
- this.ozwInstance,
- this.nodeId
- );
- const metadataProm = fetchOZWNodeMetadata(
- this.hass!,
- this.ozwInstance,
- this.nodeId
- );
- const configProm = fetchOZWNodeConfig(
- this.hass!,
- this.ozwInstance,
- this.nodeId
- );
- [this._node, this._metadata, this._config] = await Promise.all([
- nodeProm,
- metadataProm,
- configProm,
- ]);
- } catch (err: any) {
- if (err.code === ERR_NOT_FOUND) {
- this._error = ERR_NOT_FOUND;
- return;
- }
- throw err;
- }
- }
-
- private async _refreshNodeClicked() {
- showOZWRefreshNodeDialog(this, {
- node_id: this.nodeId,
- ozw_instance: this.ozwInstance,
- });
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyle,
- css`
- .secondary {
- color: var(--secondary-text-color);
- font-size: 0.9em;
- }
-
- .content {
- margin-top: 24px;
- }
-
- .sectionHeader {
- position: relative;
- padding-right: 40px;
- }
-
- ha-card {
- margin: 0 auto;
- max-width: 600px;
- }
-
- [hidden] {
- display: none;
- }
-
- blockquote {
- display: block;
- background-color: #ddd;
- padding: 8px;
- margin: 8px 0;
- font-size: 0.9em;
- }
-
- blockquote em {
- font-size: 0.9em;
- margin-top: 6px;
- }
- `,
- ];
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "ozw-node-config": OZWNodeConfig;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-node-dashboard.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-node-dashboard.ts
deleted file mode 100644
index ec45071c16..0000000000
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-node-dashboard.ts
+++ /dev/null
@@ -1,254 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { navigate } from "../../../../../common/navigate";
-import "../../../../../components/buttons/ha-call-service-button";
-import "../../../../../components/ha-card";
-import {
- fetchOZWNodeMetadata,
- fetchOZWNodeStatus,
- OZWDevice,
- OZWDeviceMetaDataResponse,
-} from "../../../../../data/ozw";
-import { ERR_NOT_FOUND } from "../../../../../data/websocket_api";
-import "../../../../../layouts/hass-tabs-subpage";
-import { haStyle } from "../../../../../resources/styles";
-import type { HomeAssistant, Route } from "../../../../../types";
-import "../../../ha-config-section";
-import { ozwNodeTabs } from "./ozw-node-router";
-import { showOZWRefreshNodeDialog } from "./show-dialog-ozw-refresh-node";
-
-@customElement("ozw-node-dashboard")
-class OZWNodeDashboard extends LitElement {
- @property({ type: Object }) public hass!: HomeAssistant;
-
- @property({ type: Object }) public route!: Route;
-
- @property({ type: Boolean }) public narrow!: boolean;
-
- @property({ type: Boolean }) public isWide!: boolean;
-
- @property() public configEntryId?: string;
-
- @property() public ozwInstance?;
-
- @property() public nodeId?;
-
- @state() private _node?: OZWDevice;
-
- @state() private _metadata?: OZWDeviceMetaDataResponse;
-
- @state() private _not_found = false;
-
- protected firstUpdated() {
- if (!this.ozwInstance) {
- navigate("/config/ozw/dashboard", { replace: true });
- } else if (!this.nodeId) {
- navigate(`/config/ozw/network/${this.ozwInstance}/nodes`, {
- replace: true,
- });
- } else if (this.hass) {
- this._fetchData();
- }
- }
-
- protected render(): TemplateResult {
- if (this._not_found) {
- return html`
-
-
-
-
-
- ${this._metadata
- ? html`
-
-
-
-
-
-
-
-
- ${this._metadata.metadata.WakeupHelp
- ? html`
-
-
- `
- : ``}
- `
- : ``}
- `
- : ``}
-
-
- `;
- }
-
- private async _fetchData() {
- if (!this.ozwInstance || !this.nodeId) {
- return;
- }
-
- try {
- this._node = await fetchOZWNodeStatus(
- this.hass!,
- this.ozwInstance,
- this.nodeId
- );
- this._metadata = await fetchOZWNodeMetadata(
- this.hass!,
- this.ozwInstance,
- this.nodeId
- );
- } catch (err: any) {
- if (err.code === ERR_NOT_FOUND) {
- this._not_found = true;
- return;
- }
- throw err;
- }
- }
-
- private async _refreshNodeClicked() {
- showOZWRefreshNodeDialog(this, {
- node_id: this.nodeId,
- ozw_instance: this.ozwInstance,
- });
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyle,
- css`
- .secondary {
- color: var(--secondary-text-color);
- }
-
- .content {
- margin-top: 24px;
- }
-
- .content:last-child {
- margin-bottom: 24px;
- }
-
- .sectionHeader {
- position: relative;
- padding-right: 40px;
- }
-
- ha-card {
- margin: 0 auto;
- max-width: 600px;
- }
-
- .flex {
- display: flex;
- justify-content: space-between;
- }
-
- .card-actions.warning ha-call-service-button {
- color: var(--error-color);
- }
-
- .toggle-help-icon {
- position: absolute;
- top: -6px;
- right: 0;
- color: var(--primary-color);
- }
-
- ha-service-description {
- display: block;
- color: grey;
- padding: 0 8px 12px;
- }
-
- [hidden] {
- display: none;
- }
-
- .product-image {
- padding: 12px;
- max-height: 140px;
- max-width: 140px;
- }
- .card-actions {
- clear: right;
- }
- `,
- ];
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "ozw-node-dashboard": OZWNodeDashboard;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-node-router.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-node-router.ts
deleted file mode 100644
index f5676bdcaa..0000000000
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-node-router.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { mdiNetwork, mdiWrench } from "@mdi/js";
-import { customElement, property } from "lit/decorators";
-import { navigate } from "../../../../../common/navigate";
-import {
- HassRouterPage,
- RouterOptions,
-} from "../../../../../layouts/hass-router-page";
-import { PageNavigation } from "../../../../../layouts/hass-tabs-subpage";
-import { HomeAssistant } from "../../../../../types";
-
-export const ozwNodeTabs = (
- instance: number,
- node: number
-): PageNavigation[] => [
- {
- translationKey: "ui.panel.config.ozw.navigation.node.dashboard",
- path: `/config/ozw/network/${instance}/node/${node}/dashboard`,
- iconPath: mdiNetwork,
- },
- {
- translationKey: "ui.panel.config.ozw.navigation.node.config",
- path: `/config/ozw/network/${instance}/node/${node}/config`,
- iconPath: mdiWrench,
- },
-];
-
-@customElement("ozw-node-router")
-class OZWNodeRouter extends HassRouterPage {
- @property({ attribute: false }) public hass!: HomeAssistant;
-
- @property() public isWide!: boolean;
-
- @property() public narrow!: boolean;
-
- @property() public ozwInstance!: number;
-
- @property() public nodeId!: number;
-
- private _configEntry = new URLSearchParams(window.location.search).get(
- "config_entry"
- );
-
- protected routerOptions: RouterOptions = {
- defaultPage: "dashboard",
- showLoading: true,
- routes: {
- dashboard: {
- tag: "ozw-node-dashboard",
- load: () => import("./ozw-node-dashboard"),
- },
- config: {
- tag: "ozw-node-config",
- load: () => import("./ozw-node-config"),
- },
- },
- };
-
- protected updatePageEl(el): void {
- el.route = this.routeTail;
- el.hass = this.hass;
- el.isWide = this.isWide;
- el.narrow = this.narrow;
- el.configEntryId = this._configEntry;
- el.ozwInstance = this.ozwInstance;
- el.nodeId = this.nodeId;
-
- const searchParams = new URLSearchParams(window.location.search);
- if (this._configEntry && !searchParams.has("config_entry")) {
- searchParams.append("config_entry", this._configEntry);
- navigate(
- `${this.routeTail.prefix}${
- this.routeTail.path
- }?${searchParams.toString()}`,
- { replace: true }
- );
- }
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "ozw-node-router": OZWNodeRouter;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/ozw/show-dialog-ozw-refresh-node.ts b/src/panels/config/integrations/integration-panels/ozw/show-dialog-ozw-refresh-node.ts
deleted file mode 100644
index e3ecd75e47..0000000000
--- a/src/panels/config/integrations/integration-panels/ozw/show-dialog-ozw-refresh-node.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { fireEvent } from "../../../../../common/dom/fire_event";
-
-export interface OZWRefreshNodeDialogParams {
- ozw_instance: number;
- node_id: number;
-}
-
-export const loadRefreshNodeDialog = () => import("./dialog-ozw-refresh-node");
-
-export const showOZWRefreshNodeDialog = (
- element: HTMLElement,
- refreshNodeDialogParams: OZWRefreshNodeDialogParams
-): void => {
- fireEvent(element, "show-dialog", {
- dialogTag: "dialog-ozw-refresh-node",
- dialogImport: loadRefreshNodeDialog,
- dialogParams: refreshNodeDialogParams,
- });
-};
diff --git a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
deleted file mode 100644
index 58caa941af..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
+++ /dev/null
@@ -1,765 +0,0 @@
-import "@polymer/app-layout/app-header/app-header";
-import "@polymer/app-layout/app-toolbar/app-toolbar";
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
-import "@polymer/paper-input/paper-input";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-listbox/paper-listbox";
-import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-/* eslint-plugin-disable lit */
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-import { computeStateDomain } from "../../../../../common/entity/compute_state_domain";
-import { computeStateName } from "../../../../../common/entity/compute_state_name";
-import { sortStatesByName } from "../../../../../common/entity/states_sort_by_name";
-import "../../../../../components/buttons/ha-call-service-button";
-import "../../../../../components/ha-card";
-import "../../../../../components/ha-alert";
-import "../../../../../components/ha-icon";
-import "../../../../../components/ha-icon-button";
-import "../../../../../components/ha-icon-button-arrow-prev";
-import "../../../../../components/ha-menu-button";
-import "../../../../../components/ha-service-description";
-import "../../../../../layouts/ha-app-layout";
-import { EventsMixin } from "../../../../../mixins/events-mixin";
-import LocalizeMixin from "../../../../../mixins/localize-mixin";
-import "../../../../../styles/polymer-ha-style";
-import "../../../ha-config-section";
-import "../../../ha-form-style";
-import "./zwave-groups";
-import "./zwave-log";
-import "./zwave-network";
-import "./zwave-node-config";
-import "./zwave-node-protection";
-import "./zwave-usercodes";
-import "./zwave-values";
-
-/*
- * @appliesMixin LocalizeMixin
- * @appliesMixin EventsMixin
- */
-class HaConfigZwave extends LocalizeMixin(EventsMixin(PolymerElement)) {
- static get template() {
- return html`
-
-
-
-
-
-
-
-
- This Z-Wave integration is deprecated and will no longer receive any
- updates. The technical dependencies will render this integration
- unusable in the near future. We strongly advise you to migrate to the
- new
- Z-Wave JS integration.
-
- learn more
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- `;
- }
-
- static get properties() {
- return {
- hass: Object,
-
- isWide: Boolean,
-
- nodes: {
- type: Array,
- computed: "computeNodes(hass)",
- },
-
- selectedNode: {
- type: Number,
- value: -1,
- observer: "selectedNodeChanged",
- },
-
- nodeFailed: {
- type: Boolean,
- value: false,
- },
-
- config: {
- type: Array,
- value: () => [],
- },
-
- entities: {
- type: Array,
- computed: "computeEntities(selectedNode)",
- },
-
- selectedEntity: {
- type: Number,
- value: -1,
- observer: "selectedEntityChanged",
- },
-
- values: {
- type: Array,
- },
-
- groups: {
- type: Array,
- },
-
- userCodes: {
- type: Array,
- value: () => [],
- },
-
- hasNodeUserCodes: {
- type: Boolean,
- value: false,
- },
-
- showHelp: {
- type: Boolean,
- value: false,
- },
-
- entityIgnored: Boolean,
-
- entityPollingIntensity: {
- type: Number,
- value: 0,
- },
-
- _protection: {
- type: Array,
- value: () => [],
- },
-
- _protectionNode: {
- type: Boolean,
- value: false,
- },
- };
- }
-
- ready() {
- super.ready();
- import("web-animations-js/web-animations-next-lite.min");
- this.addEventListener("hass-service-called", (ev) =>
- this.serviceCalled(ev)
- );
- }
-
- attached() {
- setCancelSyntheticClickEvents(true);
- }
-
- detached() {
- setCancelSyntheticClickEvents(false);
- }
-
- serviceCalled(ev) {
- if (ev.detail.success && ev.detail.service === "set_poll_intensity") {
- this._saveEntity();
- }
- }
-
- computeNodes(hass) {
- return Object.keys(hass.states)
- .map((key) => hass.states[key])
- .filter((ent) => ent.entity_id.match("zwave[.]"))
- .sort(sortStatesByName);
- }
-
- computeEntities(selectedNode) {
- if (!this.nodes || selectedNode === -1) {
- return -1;
- }
- const nodeid = this.nodes[this.selectedNode].attributes.node_id;
- const hass = this.hass;
- return Object.keys(this.hass.states)
- .map((key) => hass.states[key])
- .filter((ent) => {
- if (ent.attributes.node_id === undefined) {
- return false;
- }
- return (
- "node_id" in ent.attributes &&
- ent.attributes.node_id === nodeid &&
- !ent.entity_id.match("zwave[.]")
- );
- })
- .sort(sortStatesByName);
- }
-
- selectedNodeChanged(selectedNode) {
- if (selectedNode === -1) {
- return;
- }
- this.selectedEntity = -1;
-
- this.hass
- .callApi(
- "GET",
- `zwave/config/${this.nodes[selectedNode].attributes.node_id}`
- )
- .then((configs) => {
- this.config = this._objToArray(configs);
- });
-
- this.hass
- .callApi(
- "GET",
- `zwave/values/${this.nodes[selectedNode].attributes.node_id}`
- )
- .then((values) => {
- this.values = this._objToArray(values);
- });
-
- this.hass
- .callApi(
- "GET",
- `zwave/groups/${this.nodes[selectedNode].attributes.node_id}`
- )
- .then((groups) => {
- this.groups = this._objToArray(groups);
- });
-
- this.hasNodeUserCodes = false;
- this.notifyPath("hasNodeUserCodes");
- this.hass
- .callApi(
- "GET",
- `zwave/usercodes/${this.nodes[selectedNode].attributes.node_id}`
- )
- .then((usercodes) => {
- this.userCodes = this._objToArray(usercodes);
- this.hasNodeUserCodes = this.userCodes.length > 0;
- this.notifyPath("hasNodeUserCodes");
- });
- this.hass
- .callApi(
- "GET",
- `zwave/protection/${this.nodes[selectedNode].attributes.node_id}`
- )
- .then((protections) => {
- this._protection = this._objToArray(protections);
- if (this._protection) {
- if (this._protection.length === 0) {
- return;
- }
- this._protectionNode = true;
- }
- });
-
- this.nodeFailed = this.nodes[selectedNode].attributes.is_failed;
- }
-
- selectedEntityChanged(selectedEntity) {
- if (selectedEntity === -1) {
- return;
- }
- this.hass
- .callApi(
- "GET",
- `zwave/values/${this.nodes[this.selectedNode].attributes.node_id}`
- )
- .then((values) => {
- this.values = this._objToArray(values);
- });
-
- const valueId = this.entities[selectedEntity].attributes.value_id;
- const valueData = this.values.find((obj) => obj.key === valueId);
- const valueIndex = this.values.indexOf(valueData);
- this.hass
- .callApi(
- "GET",
- `config/zwave/device_config/${this.entities[selectedEntity].entity_id}`
- )
- .then((data) => {
- this.setProperties({
- entityIgnored: data.ignored || false,
- entityPollingIntensity: this.values[valueIndex].value.poll_intensity,
- });
- })
- .catch(() => {
- this.setProperties({
- entityIgnored: false,
- entityPollingIntensity: this.values[valueIndex].value.poll_intensity,
- });
- });
- }
-
- computeSelectCaption(stateObj) {
- return (
- computeStateName(stateObj) +
- " (Node:" +
- stateObj.attributes.node_id +
- " " +
- stateObj.attributes.query_stage +
- ")"
- );
- }
-
- computeSelectCaptionEnt(stateObj) {
- return computeStateDomain(stateObj) + "." + computeStateName(stateObj);
- }
-
- computeIsNodeSelected() {
- return this.nodes && this.selectedNode !== -1;
- }
-
- computeIsEntitySelected(selectedEntity) {
- return selectedEntity === -1;
- }
-
- computeNodeServiceData(selectedNode) {
- return { node_id: this.nodes[selectedNode].attributes.node_id };
- }
-
- computeHealNodeServiceData(selectedNode) {
- return {
- node_id: this.nodes[selectedNode].attributes.node_id,
- return_routes: true,
- };
- }
-
- computeRefreshEntityServiceData(selectedEntity) {
- if (selectedEntity === -1) {
- return -1;
- }
- return { entity_id: this.entities[selectedEntity].entity_id };
- }
-
- computePollIntensityServiceData(entityPollingIntensity) {
- if (this.selectedNode === -1 || this.selectedEntity === -1) {
- return -1;
- }
- return {
- node_id: this.nodes[this.selectedNode].attributes.node_id,
- value_id: this.entities[this.selectedEntity].attributes.value_id,
- poll_intensity: parseInt(entityPollingIntensity),
- };
- }
-
- _nodeMoreInfo() {
- this.fire("hass-more-info", {
- entityId: this.nodes[this.selectedNode].entity_id,
- });
- }
-
- _entityMoreInfo() {
- this.fire("hass-more-info", {
- entityId: this.entities[this.selectedEntity].entity_id,
- });
- }
-
- _saveEntity() {
- const data = {
- ignored: this.entityIgnored,
- polling_intensity: parseInt(this.entityPollingIntensity),
- };
- return this.hass.callApi(
- "POST",
- `config/zwave/device_config/${
- this.entities[this.selectedEntity].entity_id
- }`,
- data
- );
- }
-
- toggleHelp() {
- this.showHelp = !this.showHelp;
- }
-
- _objToArray(obj) {
- const array = [];
- Object.keys(obj).forEach((key) => {
- array.push({
- key,
- value: obj[key],
- });
- });
- return array;
- }
-
- _backTapped() {
- history.back();
- }
-
- entityIgnoredChanged(ev) {
- this.entityIgnored = ev.target.checked;
- }
-}
-
-customElements.define("ha-config-zwave", HaConfigZwave);
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-config-router.ts b/src/panels/config/integrations/integration-panels/zwave/zwave-config-router.ts
deleted file mode 100644
index 4ebb4b9970..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-config-router.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { customElement, property } from "lit/decorators";
-import { navigate } from "../../../../../common/navigate";
-import {
- HassRouterPage,
- RouterOptions,
-} from "../../../../../layouts/hass-router-page";
-import { HomeAssistant } from "../../../../../types";
-
-@customElement("zwave-config-router")
-class ZWaveConfigRouter extends HassRouterPage {
- @property({ attribute: false }) public hass!: HomeAssistant;
-
- @property() public isWide!: boolean;
-
- @property() public narrow!: boolean;
-
- private _configEntry = new URLSearchParams(window.location.search).get(
- "config_entry"
- );
-
- protected routerOptions: RouterOptions = {
- defaultPage: "dashboard",
- showLoading: true,
- routes: {
- dashboard: {
- tag: "ha-config-zwave",
- load: () =>
- import(/* webpackChunkName: "ha-config-zwave" */ "./ha-config-zwave"),
- },
- migration: {
- tag: "zwave-migration",
- load: () =>
- import(/* webpackChunkName: "zwave-migration" */ "./zwave-migration"),
- },
- },
- };
-
- protected updatePageEl(el): void {
- el.route = this.routeTail;
- el.hass = this.hass;
- el.isWide = this.isWide;
- el.narrow = this.narrow;
- el.configEntryId = this._configEntry;
-
- const searchParams = new URLSearchParams(window.location.search);
- if (this._configEntry && !searchParams.has("config_entry")) {
- searchParams.append("config_entry", this._configEntry);
- navigate(
- `${this.routeTail.prefix}${
- this.routeTail.path
- }?${searchParams.toString()}`,
- { replace: true }
- );
- }
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "zwave-config-router": ZWaveConfigRouter;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-groups.js b/src/panels/config/integrations/integration-panels/zwave/zwave-groups.js
deleted file mode 100644
index 129587fcfb..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-groups.js
+++ /dev/null
@@ -1,380 +0,0 @@
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-listbox/paper-listbox";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-/* eslint-plugin-disable lit */
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-import { computeStateName } from "../../../../../common/entity/compute_state_name";
-import "../../../../../components/buttons/ha-call-service-button";
-import "../../../../../components/ha-card";
-import LocalizeMixin from "../../../../../mixins/localize-mixin";
-import "../../../../../styles/polymer-ha-style";
-
-class ZwaveGroups extends LocalizeMixin(PolymerElement) {
- static get template() {
- return html`
-
-
-
-
- `;
- }
-
- static get properties() {
- return {
- hass: Object,
-
- nodes: Array,
-
- groups: Array,
-
- selectedNode: {
- type: Number,
- observer: "_selectedNodeChanged",
- },
-
- _selectedTargetNode: {
- type: Number,
- value: -1,
- observer: "_selectedTargetNodeChanged",
- },
-
- _selectedGroup: {
- type: Number,
- value: -1,
- },
-
- _otherGroupNodes: {
- type: Array,
- value: -1,
- computed: "_computeOtherGroupNodes(_selectedGroup)",
- },
-
- _maxAssociations: {
- type: String,
- value: "",
- computed: "_computeMaxAssociations(_selectedGroup)",
- },
-
- _noAssociationsLeft: {
- type: Boolean,
- value: true,
- computed: "_computeAssociationsLeft(_selectedGroup)",
- },
-
- _addAssocServiceData: {
- type: String,
- value: "",
- },
-
- _removeAssocServiceData: {
- type: String,
- value: "",
- },
-
- _removeBroadcastNodeServiceData: {
- type: String,
- value: "",
- },
-
- _isBroadcastNodeInGroup: {
- type: Boolean,
- value: false,
- },
- };
- }
-
- static get observers() {
- return ["_selectedGroupChanged(groups, _selectedGroup)"];
- }
-
- ready() {
- super.ready();
- this.addEventListener("hass-service-called", (ev) =>
- this.serviceCalled(ev)
- );
- }
-
- serviceCalled(ev) {
- if (ev.detail.success) {
- setTimeout(() => {
- this._refreshGroups(this.selectedNode);
- }, 5000);
- }
- }
-
- _computeAssociationsLeft(selectedGroup) {
- if (selectedGroup === -1) return true;
- return this._maxAssociations === this._otherGroupNodes.length;
- }
-
- _computeMaxAssociations(selectedGroup) {
- if (selectedGroup === -1) return -1;
- const maxAssociations = this.groups[selectedGroup].value.max_associations;
- if (!maxAssociations) return "None";
- return maxAssociations;
- }
-
- _computeOtherGroupNodes(selectedGroup) {
- if (selectedGroup === -1) return -1;
- this.setProperties({ _isBroadcastNodeInGroup: false });
- const associations = Object.values(
- this.groups[selectedGroup].value.association_instances
- );
- if (!associations.length) return ["None"];
- return associations.map((assoc) => {
- if (!assoc.length || assoc.length !== 2) {
- return `Unknown Node: ${assoc}`;
- }
- const id = assoc[0];
- const instance = assoc[1];
- const node = this.nodes.find((n) => n.attributes.node_id === id);
- if (id === 255) {
- this.setProperties({
- _isBroadcastNodeInGroup: true,
- _removeBroadcastNodeServiceData: {
- node_id: this.nodes[this.selectedNode].attributes.node_id,
- association: "remove",
- target_node_id: 255,
- group: this.groups[selectedGroup].key,
- },
- });
- }
- if (!node) {
- return `Unknown Node (${id}: (${instance} ? ${id}.${instance} : ${id}))`;
- }
- let caption = this._computeSelectCaption(node);
- if (instance) {
- caption += `/ Instance: ${instance}`;
- }
- return caption;
- });
- }
-
- _computeTargetInGroup(selectedGroup, selectedTargetNode) {
- if (selectedGroup === -1 || selectedTargetNode === -1) return false;
- const associations = Object.values(
- this.groups[selectedGroup].value.associations
- );
- if (!associations.length) return false;
- return (
- associations.indexOf(
- this.nodes[selectedTargetNode].attributes.node_id
- ) !== -1
- );
- }
-
- _computeSelectCaption(stateObj) {
- return `${computeStateName(stateObj)}
- (Node: ${stateObj.attributes.node_id}
- ${stateObj.attributes.query_stage})`;
- }
-
- _computeSelectCaptionGroup(stateObj) {
- return `${stateObj.key}: ${stateObj.value.label}`;
- }
-
- _computeIsTargetNodeSelected(selectedTargetNode) {
- return this.nodes && selectedTargetNode !== -1;
- }
-
- _computeIsGroupSelected(selectedGroup) {
- return this.nodes && this.selectedNode !== -1 && selectedGroup !== -1;
- }
-
- _computeAssocServiceData(selectedGroup, type) {
- if (
- !this.groups ||
- selectedGroup === -1 ||
- this.selectedNode === -1 ||
- this._selectedTargetNode === -1
- ) {
- return -1;
- }
- return {
- node_id: this.nodes[this.selectedNode].attributes.node_id,
- association: type,
- target_node_id: this.nodes[this._selectedTargetNode].attributes.node_id,
- group: this.groups[selectedGroup].key,
- };
- }
-
- async _refreshGroups(selectedNode) {
- const groupData = [];
- const groups = await this.hass.callApi(
- "GET",
- `zwave/groups/${this.nodes[selectedNode].attributes.node_id}`
- );
- Object.keys(groups).forEach((key) => {
- groupData.push({
- key,
- value: groups[key],
- });
- });
- this.setProperties({
- groups: groupData,
- _maxAssociations: groupData[this._selectedGroup].value.max_associations,
- _otherGroupNodes: Object.values(
- groupData[this._selectedGroup].value.associations
- ),
- _isBroadcastNodeInGroup: false,
- });
- const oldGroup = this._selectedGroup;
- this.setProperties({ _selectedGroup: -1 });
- this.setProperties({ _selectedGroup: oldGroup });
- }
-
- _selectedGroupChanged() {
- if (this._selectedGroup === -1) return;
- this.setProperties({
- _maxAssociations: this.groups[this._selectedGroup].value.max_associations,
- _otherGroupNodes: Object.values(
- this.groups[this._selectedGroup].value.associations
- ),
- });
- }
-
- _selectedTargetNodeChanged() {
- if (this._selectedGroup === -1) return;
- if (
- this._computeTargetInGroup(this._selectedGroup, this._selectedTargetNode)
- ) {
- this.setProperties({
- _removeAssocServiceData: this._computeAssocServiceData(
- this._selectedGroup,
- "remove"
- ),
- });
- } else {
- this.setProperties({
- _addAssocServiceData: this._computeAssocServiceData(
- this._selectedGroup,
- "add"
- ),
- });
- }
- }
-
- _selectedNodeChanged() {
- if (this.selectedNode === -1) return;
- this.setProperties({ _selectedTargetNode: -1, _selectedGroup: -1 });
- }
-}
-
-customElements.define("zwave-groups", ZwaveGroups);
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-log-dialog.js b/src/panels/config/integrations/integration-panels/zwave/zwave-log-dialog.js
deleted file mode 100644
index df5acc95d1..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-log-dialog.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-/* eslint-plugin-disable lit */
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-import { EventsMixin } from "../../../../../mixins/events-mixin";
-import "../../../../../styles/polymer-ha-style-dialog";
-import "../../../../../components/ha-dialog";
-
-class ZwaveLogDialog extends EventsMixin(PolymerElement) {
- static get template() {
- return html`
-
-
-
+ ${this.hass.localize(
+ "ui.dialogs.entity_registry.editor.entity_status"
+ )}:
+
+
+ ${this._disabledBy && this._disabledBy !== "user"
+ ? this.hass.localize(
+ "ui.dialogs.entity_registry.editor.enabled_cause",
+ "cause",
+ this.hass.localize(
+ `config_entry.disabled_by.${this._disabledBy}`
+ )
+ )
+ : ""}
+
+
+
-
+
+ ${this._disabledBy !== null
+ ? html`
+
- ${this._disabledBy && this._disabledBy !== "user"
- ? this.hass.localize(
- "ui.dialogs.entity_registry.editor.enabled_cause",
- "cause",
- this.hass.localize(
- `config_entry.disabled_by.${this._disabledBy}`
- )
- )
- : ""}
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.enabled_description"
+ >
+
+ >
+
-
+ ${this.hass.localize(
+ "ui.dialogs.entity_registry.editor.enabled_description"
+ )}
+
+ `
+ : this._hiddenBy !== null
+ ? html`
+
+ ${this.hass.localize(
+ "ui.dialogs.entity_registry.editor.hidden_description"
+ )}
+
+ `
+ : ""}
+
-
-
-
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.follow_device_area"
- )} `
- : this._device
- ? html`${this.hass.localize(
- "ui.dialogs.entity_registry.editor.change_device_area"
- )} `
- : ""}
- `
- : ""}
+
+
+
+
+
+
+ ${this._disabledBy !== null
+ ? html`
+
- ${this.hass.localize(
+ ${this._helperConfigEntry
+ ? html`
+
+
-
- ${this.entry.device_id
- ? html`
+
+ ${this.hass.localize(
+ "ui.dialogs.entity_registry.editor.configure_state"
+ )}
+
+
+ `
+ : ""}
+
+
+ ${this.hass.localize(
+ "ui.dialogs.entity_registry.editor.entity_status"
+ )}:
+
+
+ ${this._disabledBy &&
+ this._disabledBy !== "user" &&
+ this._disabledBy !== "integration"
+ ? this.hass.localize(
+ "ui.dialogs.entity_registry.editor.enabled_cause",
+ "cause",
+ this.hass.localize(
+ `config_entry.disabled_by.${this._disabledBy}`
+ )
+ )
+ : ""}
+
+
+
-
-
- ${this._disabledBy && this._disabledBy !== "user"
- ? this.hass.localize(
- "ui.dialogs.entity_registry.editor.enabled_cause",
- "cause",
- this.hass.localize(
- `config_entry.disabled_by.${this._disabledBy}`
- )
- )
- : ""}
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.enabled_description"
- )}
-
${this.hass.localize( - "ui.dialogs.entity_registry.editor.note" - )} -
- ${this.hass.localize( - "ui.dialogs.entity_registry.editor.note" - )} -
- ${this.hass.localize( - "ui.dialogs.entity_registry.editor.area_note" - )} -
- ${this._areaId - ? html`
+ ${this.hass.localize(
+ "ui.dialogs.entity_registry.editor.enabled_description"
+ )}
+
+ `
+ : this._hiddenBy !== null
+ ? html`
+
+ ${this.hass.localize(
+ "ui.dialogs.entity_registry.editor.hidden_description"
+ )}
+
+ `
+ : ""}
+ ${this.entry.device_id
+ ? html`
+
+ ${this.hass.localize(
+ "ui.dialogs.entity_registry.editor.change_area"
+ )}:
+
+
+ ${this.hass.localize(
+ "ui.dialogs.entity_registry.editor.area_note"
+ )}
+ ${this._device
+ ? html`
+
+ `
+ : ""}
+
+ `
+ : ""}
+
-
- ${this.hass.localize(
- "ui.components.data-table.filtering_by"
- )}
- ${activeFilters.join(", ")}
- Clear `
- : ""}
-
- ${this.hass!.localize(
- "ui.panel.config.entities.picker.filter.show_disabled"
- )}
-
-
- ${this.hass!.localize(
- "ui.panel.config.entities.picker.filter.show_unavailable"
- )}
-
-
- ${this.hass!.localize(
- "ui.panel.config.entities.picker.filter.show_readonly"
- )}
-
- `}
+ `
+ : html`
+
+ ${this.hass.localize(
+ "ui.components.data-table.filtering_by"
+ )}
+ ${activeFilters.join(", ")}
+ Clear `
+ : ""}
+
+ ${this.hass!.localize(
+ "ui.panel.config.entities.picker.filter.show_disabled"
+ )}
+
+
+ ${this.hass!.localize(
+ "ui.panel.config.entities.picker.filter.show_hidden"
+ )}
+
+
+ ${this.hass!.localize(
+ "ui.panel.config.entities.picker.filter.show_unavailable"
+ )}
+
+
+ ${this.hass!.localize(
+ "ui.panel.config.entities.picker.filter.show_readonly"
+ )}
+
+
+ `}
${includeZHAFab
? html`
) {
+ if (ev.detail.source !== "property") {
+ return;
+ }
+ this._showHidden = ev.detail.selected;
+ }
+
private _showRestoredChanged(ev: CustomEvent) {
if (ev.detail.source !== "property") {
return;
@@ -791,6 +851,29 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
});
}
+ private _hideSelected() {
+ showConfirmationDialog(this, {
+ title: this.hass.localize(
+ "ui.panel.config.entities.picker.hide_selected.confirm_title",
+ "number",
+ this._selectedEntities.length
+ ),
+ text: this.hass.localize(
+ "ui.panel.config.entities.picker.hide_selected.confirm_text"
+ ),
+ confirmText: this.hass.localize("ui.common.hide"),
+ dismissText: this.hass.localize("ui.common.cancel"),
+ confirm: () => {
+ this._selectedEntities.forEach((entity) =>
+ updateEntityRegistryEntry(this.hass, entity, {
+ hidden_by: "user",
+ })
+ );
+ this._clearSelection();
+ },
+ });
+ }
+
private _removeSelected() {
const removeableEntities = this._selectedEntities.filter((entity) => {
const stateObj = this.hass.states[entity];
@@ -898,6 +981,9 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
.header-toolbar .header-btns {
margin-right: -12px;
}
+ .header-btns {
+ display: flex;
+ }
.header-btns > mwc-button,
.header-btns > ha-icon-button {
margin: 8px;
diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts
index c938ca0975..7483960acd 100644
--- a/src/panels/config/ha-panel-config.ts
+++ b/src/panels/config/ha-panel-config.ts
@@ -1,5 +1,6 @@
import {
mdiAccount,
+ mdiBackupRestore,
mdiBadgeAccountHorizontal,
mdiCellphoneCog,
mdiCog,
@@ -27,10 +28,6 @@ import { customElement, property, state } from "lit/decorators";
import { isComponentLoaded } from "../../common/config/is_component_loaded";
import { listenMediaQuery } from "../../common/dom/media_query";
import { CloudStatus, fetchCloudStatus } from "../../data/cloud";
-import {
- fetchSupervisorAvailableUpdates,
- SupervisorAvailableUpdates,
-} from "../../data/supervisor/root";
import "../../layouts/hass-loading-screen";
import { HassRouterPage, RouterOptions } from "../../layouts/hass-router-page";
import { PageNavigation } from "../../layouts/hass-tabs-subpage";
@@ -67,6 +64,13 @@ export const configSections: { [name: string]: PageNavigation[] } = {
iconColor: "#64B5F6",
component: "blueprint",
},
+ {
+ path: "/config/backup",
+ translationKey: "backup",
+ iconPath: mdiBackupRestore,
+ iconColor: "#4084CD",
+ component: "backup",
+ },
{
path: "/hassio",
translationKey: "supervisor",
@@ -109,6 +113,15 @@ export const configSections: { [name: string]: PageNavigation[] } = {
core: true,
},
],
+ backup: [
+ {
+ path: "/config/backup",
+ translationKey: "ui.panel.config.backup.caption",
+ iconPath: mdiBackupRestore,
+ iconColor: "#4084CD",
+ component: "backup",
+ },
+ ],
devices: [
{
component: "integrations",
@@ -291,6 +304,10 @@ class HaPanelConfig extends HassRouterPage {
tag: "ha-config-automation",
load: () => import("./automation/ha-config-automation"),
},
+ backup: {
+ tag: "ha-config-backup",
+ load: () => import("./backup/ha-config-backup"),
+ },
blueprint: {
tag: "ha-config-blueprint",
load: () => import("./blueprint/ha-config-blueprint"),
@@ -376,21 +393,11 @@ class HaPanelConfig extends HassRouterPage {
"./integrations/integration-panels/zha/zha-config-dashboard-router"
),
},
- zwave: {
- tag: "zwave-config-router",
- load: () =>
- import("./integrations/integration-panels/zwave/zwave-config-router"),
- },
mqtt: {
tag: "mqtt-config-panel",
load: () =>
import("./integrations/integration-panels/mqtt/mqtt-config-panel"),
},
- ozw: {
- tag: "ozw-config-router",
- load: () =>
- import("./integrations/integration-panels/ozw/ozw-config-router"),
- },
zwave_js: {
tag: "zwave_js-config-router",
load: () =>
@@ -407,8 +414,6 @@ class HaPanelConfig extends HassRouterPage {
@state() private _cloudStatus?: CloudStatus;
- @state() private _supervisorUpdates?: SupervisorAvailableUpdates[] | null;
-
private _listeners: Array<() => void> = [];
public connectedCallback() {
@@ -443,19 +448,7 @@ class HaPanelConfig extends HassRouterPage {
}
});
}
- if (isComponentLoaded(this.hass, "hassio")) {
- this._loadSupervisorUpdates();
- this.addEventListener("ha-refresh-supervisor", () => {
- this._loadSupervisorUpdates();
- });
- this.addEventListener("connection-status", (ev) => {
- if (ev.detail === "connected") {
- this._loadSupervisorUpdates();
- }
- });
- } else {
- this._supervisorUpdates = null;
- }
+
this.addEventListener("ha-refresh-cloud-status", () =>
this._updateCloudStatus()
);
@@ -486,7 +479,6 @@ class HaPanelConfig extends HassRouterPage {
isWide,
narrow: this.narrow,
cloudStatus: this._cloudStatus,
- supervisorUpdates: this._supervisorUpdates,
});
} else {
el.route = this.routeTail;
@@ -495,7 +487,6 @@ class HaPanelConfig extends HassRouterPage {
el.isWide = isWide;
el.narrow = this.narrow;
el.cloudStatus = this._cloudStatus;
- el.supervisorUpdates = this._supervisorUpdates;
}
}
@@ -513,16 +504,6 @@ class HaPanelConfig extends HassRouterPage {
setTimeout(() => this._updateCloudStatus(), 5000);
}
}
-
- private async _loadSupervisorUpdates(): Promise {
- try {
- this._supervisorUpdates = await fetchSupervisorAvailableUpdates(
- this.hass
- );
- } catch (err) {
- this._supervisorUpdates = null;
- }
- }
}
declare global {
diff --git a/src/panels/config/helpers/const.ts b/src/panels/config/helpers/const.ts
index 2e927f66ad..c103332573 100644
--- a/src/panels/config/helpers/const.ts
+++ b/src/panels/config/helpers/const.ts
@@ -1,11 +1,11 @@
-import { Counter } from "../../../data/counter";
-import { InputBoolean } from "../../../data/input_boolean";
-import { InputButton } from "../../../data/input_button";
-import { InputDateTime } from "../../../data/input_datetime";
-import { InputNumber } from "../../../data/input_number";
-import { InputSelect } from "../../../data/input_select";
-import { InputText } from "../../../data/input_text";
-import { Timer } from "../../../data/timer";
+import type { Counter } from "../../../data/counter";
+import type { InputBoolean } from "../../../data/input_boolean";
+import type { InputButton } from "../../../data/input_button";
+import type { InputDateTime } from "../../../data/input_datetime";
+import type { InputNumber } from "../../../data/input_number";
+import type { InputSelect } from "../../../data/input_select";
+import type { InputText } from "../../../data/input_text";
+import type { Timer } from "../../../data/timer";
export const HELPER_DOMAINS = [
"input_boolean",
diff --git a/src/panels/config/helpers/dialog-helper-detail.ts b/src/panels/config/helpers/dialog-helper-detail.ts
index bbd0b645e1..a1e303c06b 100644
--- a/src/panels/config/helpers/dialog-helper-detail.ts
+++ b/src/panels/config/helpers/dialog-helper-detail.ts
@@ -6,8 +6,9 @@ import { customElement, property, query, state } from "lit/decorators";
import { classMap } from "lit/directives/class-map";
import { isComponentLoaded } from "../../../common/config/is_component_loaded";
import { dynamicElement } from "../../../common/dom/dynamic-element-directive";
-import { domainIcon } from "../../../common/entity/domain_icon";
import "../../../components/ha-dialog";
+import "../../../components/ha-circular-progress";
+import { getConfigFlowHandlers } from "../../../data/config_flow";
import { createCounter } from "../../../data/counter";
import { createInputBoolean } from "../../../data/input_boolean";
import { createInputButton } from "../../../data/input_button";
@@ -16,6 +17,7 @@ import { createInputNumber } from "../../../data/input_number";
import { createInputSelect } from "../../../data/input_select";
import { createInputText } from "../../../data/input_text";
import { createTimer } from "../../../data/timer";
+import { showConfigFlowDialog } from "../../../dialogs/config-flow/show-dialog-config-flow";
import { haStyleDialog } from "../../../resources/styles";
import { HomeAssistant } from "../../../types";
import { Helper } from "./const";
@@ -27,6 +29,9 @@ import "./forms/ha-input_number-form";
import "./forms/ha-input_select-form";
import "./forms/ha-input_text-form";
import "./forms/ha-timer-form";
+import { domainToName } from "../../../data/integration";
+import type { ShowDialogHelperDetailParams } from "./show-dialog-helper-detail";
+import { brandsUrl } from "../../../util/brands-url";
const HELPERS = {
input_boolean: createInputBoolean,
@@ -47,7 +52,7 @@ export class DialogHelperDetail extends LitElement {
@state() private _opened = false;
- @state() private _platform?: string;
+ @state() private _domain?: string;
@state() private _error?: string;
@@ -55,102 +60,142 @@ export class DialogHelperDetail extends LitElement {
@query(".form") private _form?: HTMLDivElement;
- public async showDialog(): Promise {
- this._platform = undefined;
+ @state() private _helperFlows?: string[];
+
+ private _params?: ShowDialogHelperDetailParams;
+
+ public async showDialog(params: ShowDialogHelperDetailParams): Promise {
+ this._params = params;
+ this._domain = params.domain;
this._item = undefined;
this._opened = true;
await this.updateComplete;
+ Promise.all([
+ getConfigFlowHandlers(this.hass, "helper"),
+ // Ensure the titles are loaded before we render the flows.
+ this.hass.loadBackendTranslation("title", undefined, true),
+ ]).then(([flows]) => {
+ this._helperFlows = flows;
+ });
}
public closeDialog(): void {
this._opened = false;
this._error = "";
+ this._params = undefined;
}
protected render(): TemplateResult {
+ let content: TemplateResult;
+
+ if (this._domain) {
+ content = html`
+
+ ${this.hass!.localize("ui.panel.config.helpers.dialog.create")}
+
+
+ ${this.hass!.localize("ui.common.back")}
+
+ `;
+ } else if (this._helperFlows === undefined) {
+ content = html`
+ 
+ ${label}
+
+ ${!isLoaded
+ ? html`
+ ${this.hass.localize(
+ "ui.dialogs.helper_settings.platform_not_loaded",
+ "platform",
+ domain
+ )}
+ `
+ : ""}
+ `;
+ })}
+
+ ${this.hass!.localize("ui.common.cancel")}
+
+ `;
+ }
+
return html`
- ${this._platform
- ? html`
-
- ${this.hass!.localize("ui.panel.config.helpers.dialog.create")}
-
-
- ${this.hass!.localize("ui.common.back")}
-
- `
- : html`
- ${Object.keys(HELPERS).map((platform: string) => {
- const isLoaded = isComponentLoaded(this.hass, platform);
- return html`
-
-
- ${!isLoaded
- ? html`
- ${this.hass.localize(
- "ui.dialogs.helper_settings.platform_not_loaded",
- "platform",
- platform
- )}
- `
- : ""}
- `;
- })}
-
- ${this.hass!.localize("ui.common.cancel")}
-
- `}
+ ${content}
`;
}
@@ -160,13 +205,13 @@ export class DialogHelperDetail extends LitElement {
}
private async _createItem(): Promise {
- if (!this._platform || !this._item) {
+ if (!this._domain || !this._item) {
return;
}
this._submitting = true;
this._error = "";
try {
- await HELPERS[this._platform](this.hass, this._item);
+ await HELPERS[this._domain](this.hass, this._item);
this.closeDialog();
} catch (err: any) {
this._error = err.message || "Unknown error";
@@ -181,12 +226,22 @@ export class DialogHelperDetail extends LitElement {
}
ev.stopPropagation();
ev.preventDefault();
- this._platformPicked(ev);
+ this._domainPicked(ev);
}
- private _platformPicked(ev: Event): void {
- this._platform = (ev.currentTarget! as any).platform;
- this._focusForm();
+ private _domainPicked(ev: Event): void {
+ const domain = (ev.currentTarget! as any).domain;
+
+ if (domain in HELPERS) {
+ this._domain = domain;
+ this._focusForm();
+ } else {
+ showConfigFlowDialog(this, {
+ startFlowHandler: domain,
+ dialogClosedCallback: this._params!.dialogClosedCallback,
+ });
+ this.closeDialog();
+ }
}
private async _focusForm(): Promise {
@@ -195,7 +250,7 @@ export class DialogHelperDetail extends LitElement {
}
private _goBack() {
- this._platform = undefined;
+ this._domain = undefined;
this._item = undefined;
this._error = undefined;
}
diff --git a/src/panels/config/helpers/forms/ha-timer-form.ts b/src/panels/config/helpers/forms/ha-timer-form.ts
index 5d7b13cfad..5aef7ca212 100644
--- a/src/panels/config/helpers/forms/ha-timer-form.ts
+++ b/src/panels/config/helpers/forms/ha-timer-form.ts
@@ -21,16 +21,20 @@ class HaTimerForm extends LitElement {
@state() private _duration!: string | number | DurationDict;
+ @state() private _restore!: boolean;
+
set item(item: Timer) {
this._item = item;
if (item) {
this._name = item.name || "";
this._icon = item.icon || "";
this._duration = item.duration || "00:00:00";
+ this._restore = item.restore || false;
} else {
this._name = "";
this._icon = "";
this._duration = "00:00:00";
+ this._restore = false;
}
}
@@ -79,6 +83,18 @@ class HaTimerForm extends LitElement {
"ui.dialogs.helper_settings.timer.duration"
)}
>
+
+
+
+
`;
}
@@ -104,6 +120,13 @@ class HaTimerForm extends LitElement {
});
}
+ private _toggleRestore() {
+ this._restore = !this._restore;
+ fireEvent(this, "value-changed", {
+ value: { ...this._item, restore: this._restore },
+ });
+ }
+
static get styles(): CSSResultGroup {
return [
haStyle,
diff --git a/src/panels/config/helpers/ha-config-helpers.ts b/src/panels/config/helpers/ha-config-helpers.ts
index ac58f83e44..4173fd69ef 100644
--- a/src/panels/config/helpers/ha-config-helpers.ts
+++ b/src/panels/config/helpers/ha-config-helpers.ts
@@ -1,28 +1,66 @@
import { mdiPencilOff, mdiPlus } from "@mdi/js";
import "@polymer/paper-tooltip/paper-tooltip";
-import { HassEntity } from "home-assistant-js-websocket";
+import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
import { html, LitElement, PropertyValues, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators";
-import memoize from "memoize-one";
+import memoizeOne from "memoize-one";
import { computeStateDomain } from "../../../common/entity/compute_state_domain";
import { domainIcon } from "../../../common/entity/domain_icon";
+import { LocalizeFunc } from "../../../common/translations/localize";
import {
DataTableColumnContainer,
RowClickedEvent,
} from "../../../components/data-table/ha-data-table";
import "../../../components/ha-fab";
+import "../../../components/ha-icon-overflow-menu";
import "../../../components/ha-icon";
import "../../../components/ha-svg-icon";
+import { ConfigEntry, getConfigEntries } from "../../../data/config_entries";
+import {
+ EntityRegistryEntry,
+ subscribeEntityRegistry,
+} from "../../../data/entity_registry";
+import { domainToName } from "../../../data/integration";
import "../../../layouts/hass-loading-screen";
import "../../../layouts/hass-tabs-subpage-data-table";
+import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
import { HomeAssistant, Route } from "../../../types";
import { showEntityEditorDialog } from "../entities/show-dialog-entity-editor";
import { configSections } from "../ha-panel-config";
import { HELPER_DOMAINS } from "./const";
import { showHelperDetailDialog } from "./show-dialog-helper-detail";
+import { navigate } from "../../../common/navigate";
+import { extractSearchParam } from "../../../common/url/search-params";
+import { getConfigFlowHandlers } from "../../../data/config_flow";
+import { showConfigFlowDialog } from "../../../dialogs/config-flow/show-dialog-config-flow";
+import {
+ showAlertDialog,
+ showConfirmationDialog,
+} from "../../../dialogs/generic/show-dialog-box";
+
+// This groups items by a key but only returns last entry per key.
+const groupByOne = - ${this.hass.localize( - "ui.panel.config.entities.picker.selected", - "number", - this._selectedEntities.length - )} -
-
- ${!this.narrow
- ? html`
- ${this.hass.localize(
- "ui.panel.config.entities.picker.enable_selected.button"
- )}
- ${this.hass.localize(
- "ui.panel.config.entities.picker.disable_selected.button"
- )}
- ${this.hass.localize(
- "ui.panel.config.entities.picker.remove_selected.button"
- )}
- `
- : html`
-
- ${this.hass.localize(
- "ui.panel.config.entities.picker.enable_selected.button"
- )}
-
-
- ${this.hass.localize(
- "ui.panel.config.entities.picker.disable_selected.button"
- )}
-
-
- ${this.hass.localize(
- "ui.panel.config.entities.picker.remove_selected.button"
- )}
-
- `}
+ ? html`
+
`
- : html`
+
- + ${this.hass.localize( + "ui.panel.config.entities.picker.selected", + "number", + this._selectedEntities.length + )} +
+
+ ${!this.narrow
+ ? html`
+ ${this.hass.localize(
+ "ui.panel.config.entities.picker.enable_selected.button"
+ )}
+ ${this.hass.localize(
+ "ui.panel.config.entities.picker.disable_selected.button"
+ )}
+ ${this.hass.localize(
+ "ui.panel.config.entities.picker.hide_selected.button"
+ )}
+ ${this.hass.localize(
+ "ui.panel.config.entities.picker.remove_selected.button"
+ )}
+ `
+ : html`
+
+ ${this.hass.localize(
+ "ui.panel.config.entities.picker.enable_selected.button"
+ )}
+
+
+ ${this.hass.localize(
+ "ui.panel.config.entities.picker.disable_selected.button"
+ )}
+
+
+ ${this.hass.localize(
+ "ui.panel.config.entities.picker.hide_selected.button"
+ )}
+
+
+ ${this.hass.localize(
+ "ui.panel.config.entities.picker.remove_selected.button"
+ )}
+
+ `}
+
+ ${this._error ? html`
+ ${this._error}
` : ""}
+ ${dynamicElement(`ha-${this._domain}-form`, {
+ hass: this.hass,
+ item: this._item,
+ new: true,
+ })}
+
- ${this._error
- ? html`
- ${this._error}
`
- : ""}
- ${dynamicElement(`ha-${this._platform}-form`, {
- hass: this.hass,
- item: this._item,
- new: true,
- })}
- ${item.entity_id}
`
+ : ""}
+ `,
+ },
+ };
+ if (!narrow) {
+ columns.entity_id = {
+ title: localize("ui.panel.config.helpers.picker.headers.entity_id"),
+ sortable: true,
+ filterable: true,
+ width: "25%",
+ };
+ }
+ columns.type = {
+ title: localize("ui.panel.config.helpers.picker.headers.type"),
+ sortable: true,
+ width: "25%",
+ filterable: true,
+ template: (type, row) =>
+ row.configEntry
+ ? domainToName(localize, type)
+ : html`
+ ${localize(`ui.panel.config.helpers.types.${type}`) || type}
+ `,
+ };
+ columns.editable = {
title: "",
label: this.hass.localize(
- "ui.panel.config.helpers.picker.headers.icon"
+ "ui.panel.config.helpers.picker.headers.editable"
),
type: "icon",
- template: (icon, helper: any) =>
- icon
- ? html` ${item.entity_id}
`
- : ""}
- `,
- },
- };
- if (!narrow) {
- columns.entity_id = {
- title: this.hass.localize(
- "ui.panel.config.helpers.picker.headers.entity_id"
- ),
- sortable: true,
- filterable: true,
- width: "25%",
- };
- }
- columns.type = {
- title: this.hass.localize("ui.panel.config.helpers.picker.headers.type"),
- sortable: true,
- width: "25%",
- filterable: true,
- template: (type) =>
- html`
- ${this.hass.localize(`ui.panel.config.helpers.types.${type}`) || type}
+ template: (editable) => html`
+ ${!editable
+ ? html`
+
+
+ ${this.hass.localize(
+ "ui.panel.config.entities.picker.status.readonly"
+ )}
+
+
+ `
+ : ""}
`,
- };
- columns.editable = {
- title: "",
- label: this.hass.localize(
- "ui.panel.config.helpers.picker.headers.editable"
- ),
- type: "icon",
- template: (editable) => html`
- ${!editable
- ? html`
-
-
- ${this.hass.localize(
- "ui.panel.config.entities.picker.status.readonly"
- )}
-
-
- `
- : ""}
- `,
- };
- return columns;
- });
+ };
+ return columns;
+ }
+ );
- private _getItems = memoize((stateItems: HassEntity[]) =>
- stateItems.map((entityState) => ({
- id: entityState.entity_id,
- icon: entityState.attributes.icon,
- name: entityState.attributes.friendly_name || "",
- entity_id: entityState.entity_id,
- editable: entityState.attributes.editable,
- type: computeStateDomain(entityState),
- }))
+ private _getItems = memoizeOne(
+ (
+ stateItems: HassEntity[],
+ entityEntries: Record- ${this.hass.localize( - "ui.panel.config.ozw.refresh_node.complete" - )} -
-
-
- `
- : html`
- ${this.hass.localize(
- "ui.panel.config.ozw.refresh_node.description"
- )}
-
-
- - - ${this.hass.localize( - "ui.panel.config.ozw.refresh_node.refreshing_description" - )} - -
- ${this._node - ? html` -- ${this.hass.localize( - "ui.panel.config.ozw.refresh_node.node_status" - )}: - ${this._node.node_query_stage} - (${this.hass.localize( - "ui.panel.config.ozw.refresh_node.step" - )} - ${nodeQueryStages.indexOf( - this._node.node_query_stage - ) + 1}/17) -
-- - ${this.hass.localize( - "ui.panel.config.ozw.node_query_stages." + - this._node.node_query_stage.toLowerCase() - )} -
- ` - : ``} -- ${this.hass.localize( - "ui.panel.config.ozw.refresh_node.battery_note" - )} -
- `} - ${this._nodeMetaData?.WakeupHelp !== "" - ? html` - - ${this.hass.localize( - "ui.panel.config.ozw.refresh_node.wakeup_header" - )} - ${this._nodeMetaData!.Name} - -- ${this._nodeMetaData!.WakeupHelp} -- ` - : ""} - ${!this._active - ? html` -
- - ${this.hass.localize( - "ui.panel.config.ozw.refresh_node.wakeup_instructions_source" - )} - -
- ${this.hass.localize("ui.panel.config.ozw.select_instance.header")}
-
-
-
- ${this.hass.localize(
- "ui.panel.config.ozw.select_instance.introduction"
- )}
-
- ${this._instances.length > 0
- ? html`
- ${this._instances.map((instance) => {
- let status = "unknown";
- let icon = mdiCircle;
- if (networkOnlineStatuses.includes(instance.Status)) {
- status = "online";
- icon = mdiCheckCircle;
- }
- if (networkStartingStatuses.includes(instance.Status)) {
- status = "starting";
- }
- if (networkOfflineStatuses.includes(instance.Status)) {
- status = "offline";
- icon = mdiCloseCircle;
- }
-
- return html`
-
-
- ${this.hass.localize( - "ui.panel.config.ozw.common.controller" - )} - : ${instance.getControllerPath}
- OZWDaemon ${instance.OZWDaemon_Version} (OpenZWave - ${instance.OpenZWave_Version}) -
- - ${this.hass.localize( - "ui.panel.config.ozw.common.controller" - )} - : ${instance.getControllerPath}
- OZWDaemon ${instance.OZWDaemon_Version} (OpenZWave - ${instance.OpenZWave_Version}) -
- ${this.hass.localize("ui.panel.config.ozw.network.header")}
-
-
-
- ${this.hass.localize("ui.panel.config.ozw.network.introduction")}
-
- ${this._network
- ? html`
-
-
-
-
- - ${this.hass.localize( - `ui.panel.config.ozw.network_status.details.${this._network.Status.toLowerCase()}` - )} - -
- - - ${this.hass.localize( - `ui.panel.config.ozw.network_status.details.${this._network.Status.toLowerCase()}` - )} - -
- ${this.hass.localize(
- "ui.panel.config.ozw.common.ozw_instance"
- )}
- ${this._network.ozw_instance}
- ${this._statistics
- ? html`
- •
- ${this.hass.localize(
- "ui.panel.config.ozw.network.node_count",
- "count",
- this._statistics.node_count
- )}
- `
- : ``}
-
- ${this.hass.localize( - "ui.panel.config.ozw.common.controller" - )}: - ${this._network.getControllerPath}
- OZWDaemon ${this._network.OZWDaemon_Version} (OpenZWave - ${this._network.OpenZWave_Version}) -
- - ${this.hass.localize( - "ui.panel.config.ozw.common.controller" - )}: - ${this._network.getControllerPath}
- OZWDaemon ${this._network.OZWDaemon_Version} (OpenZWave - ${this._network.OpenZWave_Version}) -
- ${this._generateServiceButton("add_node")}
- ${this._generateServiceButton("remove_node")}
- ${this._generateServiceButton("cancel_command")}
-
-
- ${this.hass.localize("ui.panel.config.ozw.node_config.header")}
-
-
-
- ${this.hass.localize(
- "ui.panel.config.ozw.node_config.introduction"
- )}
-
- ${this._node
- ? html`
- - - ${this.hass.localize( - "ui.panel.config.ozw.node_config.help_source" - )} - -
-- Note: This panel is currently read-only. The ability to change - values will come in a later update. -
-
-
- ${this._node.node_manufacturer_name}
- ${this._node.node_product_name}
- ${this.hass.localize("ui.panel.config.ozw.common.node_id")}: - ${this._node.node_id}
- ${this.hass.localize( - "ui.panel.config.ozw.common.query_stage" - )}: - ${this._node.node_query_stage} - ${this._metadata?.metadata.ProductManualURL - ? html` -
- - ${this.hass.localize("ui.panel.config.ozw.common.node_id")}: - ${this._node.node_id}
- ${this.hass.localize( - "ui.panel.config.ozw.common.query_stage" - )}: - ${this._node.node_query_stage} - ${this._metadata?.metadata.ProductManualURL - ? html` -
- ${this.hass.localize( - "ui.panel.config.ozw.node_metadata.product_manual" - )} -
- ` - : ``} -
-
- ${this.hass.localize(
- "ui.panel.config.ozw.refresh_node.button"
- )}
-
-
-
-
- ${this.hass.localize(
- "ui.panel.config.ozw.node_config.wakeup_help"
- )}
-
-
- ${this._metadata.metadata.WakeupHelp}
-
- ${item.label}
- ${item.help} -
- - ${item.help} -
${item.value}
-Node Management
-
-
- View the status of a node and manage its configuration.
-
- ${this._node
- ? html`
-
- 
`
- : ``}
-
-
-
- ${this._node.node_manufacturer_name}
- ${this._node.node_product_name}
-
-
- Node ID: ${this._node.node_id}
- Query Stage: ${this._node.node_query_stage} - ${this._metadata?.metadata.ProductManualURL - ? html` -
- ${this._metadata?.metadata.ProductPicBase64
- ? html`- Node ID: ${this._node.node_id}
- Query Stage: ${this._node.node_query_stage} - ${this._metadata?.metadata.ProductManualURL - ? html` -
Product Manual
- ` - : ``} -`
- : ``}
-
-
- Refresh Node
-
-
-
- ${this._metadata.metadata.Description}
-
-
- ${this._metadata.metadata.InclusionHelp}
-
-
- ${this._metadata.metadata.ExclusionHelp}
-
-
- ${this._metadata.metadata.ResetHelp}
-
-
- ${this._metadata.metadata.WakeupHelp}
-
- [[localize('component.zwave.title')]]
-
- [[localize('ui.panel.config.zwave.migration.zwave_js.introduction')]]
-
-
-
- [[localize('ui.panel.config.zwave.node_management.header')]]
-
-
-
-
- [[localize('ui.panel.config.zwave.node_management.introduction')]]
-
-
-
-
-
-
- [[computeSelectCaption(state)]]
-
-
-
-
-
-
-
- [[localize('ui.panel.config.zwave.node_management.introduction')]]
-
-
-
-
-
-
-
- [[localize('ui.panel.config.zwave.services.refresh_node')]]
-
-
-
-
-
-
- [[localize('ui.panel.config.zwave.services.remove_failed_node')]]
-
-
-
-
-
- [[localize('ui.panel.config.zwave.services.replace_failed_node')]]
-
-
-
-
-
-
- [[localize('ui.panel.config.zwave.services.print_node')]]
-
-
-
-
-
- [[localize('ui.panel.config.zwave.services.heal_node')]]
-
-
-
-
-
- [[localize('ui.panel.config.zwave.services.test_node')]]
-
-
-
- [[localize('ui.panel.config.zwave.services.node_info')]]
-
-
-
-
-
-
- [[state.entity_id]]
-
-
-
-
-
-
-
- [[localize('ui.panel.config.zwave.services.refresh_entity')]]
-
-
-
- [[localize('ui.panel.config.zwave.node_management.entity_info')]]
-
-
-
-
-
-
-
-
-
-
-
- [[localize('ui.common.save')]]
-
-
-
-
-
-
-
-
- [[_computeSelectCaptionGroup(state)]]
-
-
-
-
-
-
-
-
-
- [[_computeSelectCaption(state)]]
-
-
-
-
-
-
- [[localize('ui.panel.config.zwave.node_management.nodes_in_group')]]
-
-
- [[state]]
-
-
- [[localize('ui.panel.config.zwave.node_management.max_associations')]]
- [[_maxAssociations]]
-
-
-
-
-
-
-
- [[localize('ui.panel.config.zwave.node_management.add_to_group')]]
-
-
-
-
- [[localize('ui.panel.config.zwave.node_management.remove_from_group')]]
-
-
-
-
- [[localize('ui.panel.config.zwave.node_management.remove_broadcast')]]
-
-
-
-
-
-
[[_ozwLog]]-
-
- `;
- }
-
- static get properties() {
- return {
- hass: Object,
- _ozwLog: String,
-
- _dialogClosedCallback: Function,
-
- _opened: {
- type: Boolean,
- value: false,
- },
-
- _intervalId: String,
-
- _numLogLines: {
- type: Number,
- },
- };
- }
-
- ready() {
- super.ready();
- this.addEventListener("iron-overlay-closed", (ev) =>
- this._dialogClosed(ev)
- );
- }
-
- showDialog({ _ozwLog, hass, _tail, _numLogLines, dialogClosedCallback }) {
- this.hass = hass;
- this._ozwLog = _ozwLog;
- this._opened = true;
- this._dialogClosedCallback = dialogClosedCallback;
- this._numLogLines = _numLogLines;
- if (_tail) {
- this.setProperties({
- _intervalId: setInterval(() => {
- this._refreshLog();
- }, 1500),
- });
- }
- }
-
- closeDialog() {
- clearInterval(this._intervalId);
- this._opened = false;
- const closedEvent = true;
- this._dialogClosedCallback({ closedEvent });
- this._dialogClosedCallback = null;
- }
-
- async _refreshLog() {
- const info = await this.hass.callApi(
- "GET",
- "zwave/ozwlog?lines=" + this._numLogLines
- );
- this.setProperties({ _ozwLog: info });
- }
-}
-
-customElements.define("zwave-log-dialog", ZwaveLogDialog);
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-log.js b/src/panels/config/integrations/integration-panels/zwave/zwave-log.js
deleted file mode 100755
index c55e153f00..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-log.js
+++ /dev/null
@@ -1,160 +0,0 @@
-import "@material/mwc-button";
-import "@polymer/paper-input/paper-input";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-/* eslint-plugin-disable lit */
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-import isPwa from "../../../../../common/config/is_pwa";
-import "../../../../../components/ha-card";
-import { EventsMixin } from "../../../../../mixins/events-mixin";
-import LocalizeMixin from "../../../../../mixins/localize-mixin";
-import "../../../../../styles/polymer-ha-style";
-import "../../../ha-config-section";
-
-let registeredDialog = false;
-
-class OzwLog extends LocalizeMixin(EventsMixin(PolymerElement)) {
- static get template() {
- return html`
-
-
-
- [[localize('ui.panel.config.zwave.ozw_log.header')]]
-
-
- [[localize('ui.panel.config.zwave.ozw_log.introduction')]]
-
-
-
-
-
-
-
- [[localize('ui.panel.config.zwave.ozw_log.load')]]
- [[localize('ui.panel.config.zwave.ozw_log.tail')]]
-
-
-`;
- }
-
- static get properties() {
- return {
- hass: Object,
-
- isWide: {
- type: Boolean,
- value: false,
- },
-
- _ozwLogs: String,
-
- _completeLog: {
- type: Boolean,
- value: true,
- },
-
- numLogLines: {
- type: Number,
- value: 0,
- observer: "_isCompleteLog",
- },
-
- _intervalId: String,
-
- tail: Boolean,
- };
- }
-
- async _tailLog() {
- this.setProperties({ tail: true });
- const ozwWindow = await this._openLogWindow();
- if (!isPwa()) {
- this.setProperties({
- _intervalId: setInterval(() => {
- this._refreshLog(ozwWindow);
- }, 1500),
- });
- }
- }
-
- async _openLogWindow() {
- const info = await this.hass.callApi(
- "GET",
- "zwave/ozwlog?lines=" + this.numLogLines
- );
- this.setProperties({ _ozwLogs: info });
- if (isPwa()) {
- this._showOzwlogDialog();
- return -1;
- }
- const ozwWindow = open("", "ozwLog", "toolbar");
- ozwWindow.document.body.innerHTML = `[];
-
- private _unsub?: Promise;
-
- private _unsubDevices?: UnsubscribeFunc;
-
- public disconnectedCallback(): void {
- this._unsubscribe();
- if (this._unsubDevices) {
- this._unsubDevices();
- this._unsubDevices = undefined;
- }
- }
-
- protected render(): TemplateResult {
- return html`
-
-
-
-
- `
- : this._step === 1
- ? html`
-
-
- `
- : this._step === 2
- ? html`
-
-
- `
- : this._step === 3
- ? html`
-
-
- `
- : this._step === 4
- ? html`
- `
- : ""}
- `}
-
-
- `;
- }
-
- private async _getMigrationConfig(): Promise {
- this._migrationConfig = await fetchMigrationConfig(this.hass!);
- }
-
- private async _unsubscribe(): Promise {
- if (this._unsub) {
- (await this._unsub)();
- this._unsub = undefined;
- }
- }
-
- private _continue(): void {
- this._step++;
- }
-
- private async _stopNetwork(): Promise {
- this._stoppingNetwork = true;
- await this._getNetworkStatus();
- if (this._networkStatus?.state === ZWAVE_NETWORK_STATE_STOPPED) {
- this._networkStopped();
- return;
- }
-
- this._unsub = this.hass!.connection.subscribeEvents(
- () => this._networkStopped(),
- "zwave.network_stop"
- );
- this.hass!.callService("zwave", "stop_network");
- }
-
- private async _setupZwaveJs() {
- const zwaveJsConfigFlow = await startZwaveJsConfigFlow(this.hass);
- showConfigFlowDialog(this, {
- continueFlowId: zwaveJsConfigFlow.flow_id,
- dialogClosedCallback: (params) => {
- if (params.entryId) {
- this._zwaveJsEntryId = params.entryId;
- this._getZwaveJSNodesStatus();
- this._step = 3;
- }
- },
- showAdvanced: this.hass.userData?.showAdvanced,
- });
- this.hass.loadBackendTranslation("title", "zwave_js", true);
- }
-
- private async _getZwaveJSNodesStatus() {
- if (this._nodeReadySubscriptions?.length) {
- const unsubs = await Promise.all(this._nodeReadySubscriptions);
- unsubs.forEach((unsub) => {
- unsub();
- });
- }
- this._nodeReadySubscriptions = [];
- const networkStatus = await fetchZwaveJsNetworkStatus(
- this.hass,
- this._zwaveJsEntryId!
- );
- const nodeStatePromisses = networkStatus.controller.nodes.map((nodeId) =>
- fetchZwaveNodeStatus(this.hass, this._zwaveJsEntryId!, nodeId)
- );
- const nodesNotReady = (await Promise.all(nodeStatePromisses)).filter(
- (node) => !node.ready
- );
-
- // eslint-disable-next-line no-console
- console.log("waiting for nodes to be ready", nodesNotReady);
-
- this._getMigrationData();
- if (nodesNotReady.length === 0) {
- this._waitingOnDevices = [];
- return;
- }
- this._nodeReadySubscriptions = nodesNotReady.map((node) =>
- subscribeZwaveNodeReady(
- this.hass,
- this._zwaveJsEntryId!,
- node.node_id,
- () => {
- this._getZwaveJSNodesStatus();
- }
- )
- );
- const deviceReg: DeviceRegistryEntry[] = await fetchDeviceRegistry(
- this.hass.connection
- );
- this._waitingOnDevices = deviceReg.filter((device) => {
- const identifiers = getZwaveJsIdentifiersFromDevice(device);
- if (
- !identifiers ||
- Number(identifiers.home_id) !== networkStatus.controller.home_id
- ) {
- return false;
- }
- return nodesNotReady.some((node) => identifiers.node_id === node.node_id);
- });
- }
-
- private async _getMigrationData() {
- try {
- this._migrationData = await migrateZwave(
- this.hass,
- this._zwaveJsEntryId!,
- true
- );
- } catch (err: any) {
- showAlertDialog(this, {
- title: "Failed to get migration data!",
- text:
- err.code === "unknown_command"
- ? "Restart Home Assistant and try again."
- : err.message,
- });
- return;
- }
- this._migratedZwaveEntities = Object.keys(
- this._migrationData.migration_entity_map
- );
- if (Object.keys(this._migrationData.migration_device_map).length) {
- this._fetchDevices();
- }
- }
-
- private _fetchDevices() {
- this._unsubDevices = subscribeDeviceRegistry(
- this.hass.connection,
- (devices) => {
- if (!this._migrationData) {
- return;
- }
- const migrationDevices = Object.keys(
- this._migrationData.migration_device_map
- );
- const deviceNameLookup = {};
- devices.forEach((device) => {
- if (migrationDevices.includes(device.id)) {
- deviceNameLookup[device.id] = computeDeviceName(device, this.hass);
- }
- });
- this._deviceNameLookup = deviceNameLookup;
- }
- );
- }
-
- private async _doMigrate() {
- const data = await migrateZwave(this.hass, this._zwaveJsEntryId!, false);
- if (!data.migrated) {
- showAlertDialog(this, { title: "Migration failed!" });
- return;
- }
- this._step = 4;
- }
-
- private _networkStopped(): void {
- this._unsubscribe();
- this._getMigrationConfig();
- this._stoppingNetwork = false;
- this._step = 2;
- }
-
- private async _getNetworkStatus(): Promise {
- this._networkStatus = await fetchNetworkStatus(this.hass!);
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyle,
- css`
- .content {
- margin-top: 24px;
- }
-
- .flex-container {
- display: flex;
- align-items: center;
- }
-
- .flex-container ha-circular-progress {
- margin-right: 20px;
- }
-
- blockquote {
- display: block;
- background-color: var(--secondary-background-color);
- color: var(--primary-text-color);
- padding: 8px;
- margin: 8px 0;
- font-size: 0.9em;
- font-family: monospace;
- }
-
- ha-card {
- margin: 0 auto;
- max-width: 600px;
- }
- `,
- ];
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "zwave-migration": ZwaveMigration;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-network.ts b/src/panels/config/integrations/integration-panels/zwave/zwave-network.ts
deleted file mode 100644
index f49090c2ad..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-network.ts
+++ /dev/null
@@ -1,302 +0,0 @@
-import { mdiCheckboxMarkedCircle, mdiClose, mdiHelpCircle } from "@mdi/js";
-import { UnsubscribeFunc } from "home-assistant-js-websocket";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import "../../../../../components/buttons/ha-call-api-button";
-import "../../../../../components/buttons/ha-call-service-button";
-import "../../../../../components/ha-card";
-import "../../../../../components/ha-circular-progress";
-import "../../../../../components/ha-svg-icon";
-import "../../../../../components/ha-icon-button";
-import "../../../../../components/ha-service-description";
-import {
- fetchNetworkStatus,
- ZWaveNetworkStatus,
- ZWAVE_NETWORK_STATE_AWAKED,
- ZWAVE_NETWORK_STATE_READY,
- ZWAVE_NETWORK_STATE_STARTED,
- ZWAVE_NETWORK_STATE_STOPPED,
-} from "../../../../../data/zwave";
-import { haStyle } from "../../../../../resources/styles";
-import { HomeAssistant } from "../../../../../types";
-import { documentationUrl } from "../../../../../util/documentation-url";
-import "../../../ha-config-section";
-
-@customElement("zwave-network")
-export class ZwaveNetwork extends LitElement {
- @property({ attribute: false }) public hass!: HomeAssistant;
-
- @property() public isWide!: boolean;
-
- @state() private _showHelp = false;
-
- @state() private _networkStatus?: ZWaveNetworkStatus;
-
- @state() private _unsubs: Array> = [];
-
- public disconnectedCallback(): void {
- this._unsubscribe();
- }
-
- protected firstUpdated(changedProps): void {
- super.firstUpdated(changedProps);
- this._getNetworkStatus();
- this._subscribe();
- }
-
- protected render(): TemplateResult {
- return html`
-
-
-
- ${this._networkStatus.state >= ZWAVE_NETWORK_STATE_AWAKED
- ? html`
-
-
- `
- : ""}
- `
- : ""}
-
- `;
- }
-
- private async _getNetworkStatus(): Promise {
- this._networkStatus = await fetchNetworkStatus(this.hass!);
- }
-
- private _subscribe(): void {
- this._unsubs = [
- "zwave.network_start",
- "zwave.network_stop",
- "zwave.network_ready",
- "zwave.network_complete",
- "zwave.network_complete_some_dead",
- ].map((e) =>
- this.hass!.connection.subscribeEvents(
- (event) => this._handleEvent(event),
- e
- )
- );
- }
-
- private _unsubscribe(): void {
- while (this._unsubs.length) {
- this._unsubs.pop()!.then((unsub) => unsub());
- }
- }
-
- private _handleEvent(event) {
- if (event.event_type === "zwave.network_start") {
- // Optimistically set the state, wait 1s and poll the backend
- // The backend will still report a state of 0 when the 'network_start'
- // event is first fired.
- if (this._networkStatus) {
- this._networkStatus = { ...this._networkStatus, state: 5 };
- }
- setTimeout(() => this._getNetworkStatus, 1000);
- } else {
- this._getNetworkStatus();
- }
- }
-
- private _onHelpTap(): void {
- this._showHelp = !this._showHelp;
- }
-
- private _generateServiceButton(service: string) {
- return html`
-
- ${this.hass!.localize("ui.panel.config.zwave.services." + service)}
-
-
-
- `;
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyle,
- css`
- .content {
- margin-top: 24px;
- }
-
- .sectionHeader {
- position: relative;
- padding-right: 40px;
- }
-
- .network-status {
- text-align: center;
- }
-
- .network-status div.details {
- font-size: 1.5rem;
- padding: 24px;
- }
-
- .network-status ha-svg-icon {
- display: block;
- margin: 0px auto 16px;
- width: 48px;
- height: 48px;
- }
-
- .network-status small {
- font-size: 1rem;
- }
-
- ha-card {
- margin: 0 auto;
- max-width: 600px;
- }
-
- .card-actions.warning ha-call-service-button {
- color: var(--error-color);
- }
-
- .toggle-help-icon {
- position: absolute;
- top: -6px;
- right: 0;
- color: var(--primary-color);
- }
-
- ha-service-description {
- display: block;
- color: grey;
- padding: 0 8px 12px;
- }
-
- [hidden] {
- display: none;
- }
- `,
- ];
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "zwave-network": ZwaveNetwork;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-node-config.ts b/src/panels/config/integrations/integration-panels/zwave/zwave-node-config.ts
deleted file mode 100644
index 975862c679..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-node-config.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
-import "@polymer/paper-input/paper-input";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-listbox/paper-listbox";
-import {
- css,
- CSSResultGroup,
- html,
- LitElement,
- PropertyValues,
- TemplateResult,
-} from "lit";
-import { customElement, property, state } from "lit/decorators";
-import "../../../../../components/buttons/ha-call-service-button";
-import "../../../../../components/ha-card";
-import {
- fetchNodeConfig,
- ZWaveConfigItem,
- ZWaveConfigServiceData,
- ZWaveNode,
-} from "../../../../../data/zwave";
-import { haStyle } from "../../../../../resources/styles";
-import { HomeAssistant } from "../../../../../types";
-
-@customElement("zwave-node-config")
-export class ZwaveNodeConfig extends LitElement {
- @property({ attribute: false }) public hass!: HomeAssistant;
-
- @property() public nodes: ZWaveNode[] = [];
-
- @property() public config: ZWaveConfigItem[] = [];
-
- @property() public selectedNode = -1;
-
- @state() private _configItem?: ZWaveConfigItem;
-
- @state() private _wakeupInput = -1;
-
- @state() private _selectedConfigParameter = -1;
-
- @state() private _selectedConfigValue: number | string = -1;
-
- protected render(): TemplateResult {
- return html`
- {
- const configData: ZWaveConfigItem[] = [];
- const config = await fetchNodeConfig(
- this.hass,
- this.nodes[selectedNode].attributes.node_id
- );
-
- Object.keys(config).forEach((key) => {
- configData.push({
- key: parseInt(key, 10),
- value: config[key],
- });
- });
-
- this.config = configData;
- this._configItem = this.config[this._selectedConfigParameter];
- }
-}
-
-export interface ChangeEvent {
- detail?: {
- value?: any;
- };
- target?: EventTarget;
-}
-
-export interface PickerTarget extends EventTarget {
- selected: number;
- selectedItem?: any;
-}
-
-export interface ItemSelectedEvent {
- target?: PickerTarget;
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "zwave-node-config": ZwaveNodeConfig;
- }
-}
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-node-protection.js b/src/panels/config/integrations/integration-panels/zwave/zwave-node-protection.js
deleted file mode 100644
index 693ed425fb..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-node-protection.js
+++ /dev/null
@@ -1,179 +0,0 @@
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
-import "@polymer/paper-input/paper-input";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-listbox/paper-listbox";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-/* eslint-plugin-disable lit */
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-import "../../../../../components/buttons/ha-call-api-button";
-import "../../../../../components/ha-card";
-import LocalizeMixin from "../../../../../mixins/localize-mixin";
-import "../../../../../styles/polymer-ha-style";
-
-class ZwaveNodeProtection extends LocalizeMixin(PolymerElement) {
- static get template() {
- return html`
-
-
+ ${content}
+
+ `;
+ }
+
+ protected shouldUpdate(changedProps: PropertyValues): boolean {
+ if (changedProps.size !== 1 || !changedProps.has("hass")) {
+ return true;
+ }
+ // We only respond to hass changes if the translations changed
+ const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+ return !oldHass || oldHass.localize !== this.hass.localize;
+ }
+
+ private _renderPickStatistic() {
+ let stats: TemplateResult;
+
+ if (!this._stats5min || !this._statsHour) {
+ stats = html` {
+ this._chosenStat = stat;
+ this._origAmount = growth;
+ this._amount = growth;
+ }}
+ >
+ ${growth} ${unit}
+
+ ${formatDateTime(new Date(stat.start), this.hass.locale)}
+
+
+ `);
+ }
+ stats = html`${rows}`;
+ }
+
+ return html`
+ {
+ this._amount = ev.detail.value;
+ }}
+ >
+
+ {
+ this._fixIssue();
+ }}
+ >
+ {
+ this._chosenStat = undefined;
+ }}
+ >
+ `;
+ }
+
+ private async _fetchStats(): Promise {
+ this._stats5min = undefined;
+ this._statsHour = undefined;
+ const statId = this._params!.statistic.statistic_id;
+ const moment = new Date(this._moment!);
+
+ // Search 3 hours before and 3 hours after chosen time
+ const hourStatStart = new Date(moment.getTime());
+ hourStatStart.setTime(hourStatStart.getTime() - 3 * 3600 * 1000);
+ const hourStatEnd = new Date(moment.getTime());
+ hourStatEnd.setTime(hourStatEnd.getTime() + 3 * 3600 * 1000);
+
+ const statsHourData = await fetchStatistics(
+ this.hass,
+ hourStatStart,
+ hourStatEnd,
+ [statId],
+ "hour"
+ );
+ this._statsHour =
+ statId in statsHourData ? statsHourData[statId].slice(0, 6) : [];
+
+ // Can't have 5 min data if no hourly data
+ if (this._statsHour.length === 0) {
+ this._stats5min = [];
+ return;
+ }
+
+ // Search 15 minutes before and 15 minutes after chosen time
+ const minStatStart = new Date(moment.getTime());
+ minStatStart.setTime(minStatStart.getTime() - 15 * 60 * 1000);
+ const minStatEnd = new Date(moment.getTime());
+ minStatEnd.setTime(minStatEnd.getTime() + 15 * 60 * 1000);
+
+ const stats5MinData = await fetchStatistics(
+ this.hass,
+ minStatStart,
+ minStatEnd,
+ [statId],
+ "5minute"
+ );
+
+ this._stats5min =
+ statId in stats5MinData ? stats5MinData[statId].slice(0, 6) : [];
+ }
+
+ private async _fixIssue(): Promise {
+ this._busy = true;
+ try {
+ await adjustStatisticsSum(
+ this.hass,
+ this._params!.statistic.statistic_id,
+ this._chosenStat!.start,
+ this._amount! - this._origAmount!
+ );
+ } catch (err: any) {
+ this._busy = false;
+ showAlertDialog(this, {
+ text: `Error adjusting sum: ${err.message || err}`,
+ });
+ return;
+ }
+ showToast(this, {
+ message: "Statistic sum adjusted",
+ });
+ this.closeDialog();
+ }
+
+ static get styles(): CSSResultGroup {
+ return [
+ haStyle,
+ haStyleDialog,
+ css`
+ @media all and (max-width: 450px), all and (max-height: 500px) {
+ /* overrule the ha-style-dialog max-height on small screens */
+ ha-dialog {
+ --mdc-dialog-max-height: 100%;
+ height: 100%;
+ }
+ }
+
+ @media all and (min-width: 850px) {
+ ha-dialog {
+ --mdc-dialog-max-height: 80%;
+ --mdc-dialog-max-height: 80%;
+ }
+ }
+
+ @media all and (min-width: 451px) and (min-height: 501px) {
+ ha-dialog {
+ --mdc-dialog-max-width: 480px;
+ }
+ }
+
+ .text-content,
+ ha-selector-datetime,
+ ha-selector-number {
+ margin-bottom: 20px;
+ }
+ mwc-list-item {
+ margin: 0 -24px;
+ --mdc-list-side-padding: 24px;
+ }
+ .table-row {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ }
+ .stat-list {
+ min-height: 360px;
+ display: flex;
+ flex-direction: column;
+ }
+ .stat-list ha-circular-progress {
+ margin: 0 auto;
+ }
+ `,
+ ];
+ }
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "dialog-statistics-adjust-sum": DialogStatisticsFixUnsupportedUnitMetadata;
+ }
+}
diff --git a/src/panels/developer-tools/statistics/dialog-statistics-fix-units-changed.ts b/src/panels/developer-tools/statistics/dialog-statistics-fix-units-changed.ts
index 1ce0c607ce..3168bffc9f 100644
--- a/src/panels/developer-tools/statistics/dialog-statistics-fix-units-changed.ts
+++ b/src/panels/developer-tools/statistics/dialog-statistics-fix-units-changed.ts
@@ -11,7 +11,7 @@ import {
} from "../../../data/history";
import "../../../components/ha-formfield";
import "../../../components/ha-radio";
-import { DialogStatisticsUnitsChangedParams } from "./show-dialog-statistics-fix-units-changed";
+import type { DialogStatisticsUnitsChangedParams } from "./show-dialog-statistics-fix-units-changed";
@customElement("dialog-statistics-fix-units-changed")
export class DialogStatisticsFixUnitsChanged extends LitElement {
diff --git a/src/panels/developer-tools/statistics/dialog-statistics-fix-unsupported-unit-meta.ts b/src/panels/developer-tools/statistics/dialog-statistics-fix-unsupported-unit-meta.ts
index 93d1e320b1..4bfaebe489 100644
--- a/src/panels/developer-tools/statistics/dialog-statistics-fix-unsupported-unit-meta.ts
+++ b/src/panels/developer-tools/statistics/dialog-statistics-fix-unsupported-unit-meta.ts
@@ -8,7 +8,7 @@ import { HomeAssistant } from "../../../types";
import { updateStatisticsMetadata } from "../../../data/history";
import "../../../components/ha-formfield";
import "../../../components/ha-radio";
-import { DialogStatisticsUnsupportedUnitMetaParams } from "./show-dialog-statistics-fix-unsupported-unit-meta";
+import type { DialogStatisticsUnsupportedUnitMetaParams } from "./show-dialog-statistics-fix-unsupported-unit-meta";
@customElement("dialog-statistics-fix-unsupported-unit-meta")
export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
diff --git a/src/panels/developer-tools/statistics/show-dialog-statistics-adjust-sum.ts b/src/panels/developer-tools/statistics/show-dialog-statistics-adjust-sum.ts
new file mode 100644
index 0000000000..1db2c76307
--- /dev/null
+++ b/src/panels/developer-tools/statistics/show-dialog-statistics-adjust-sum.ts
@@ -0,0 +1,20 @@
+import { fireEvent } from "../../../common/dom/fire_event";
+import { StatisticsMetaData } from "../../../data/history";
+
+export const loadAdjustSumDialog = () =>
+ import("./dialog-statistics-adjust-sum");
+
+export interface DialogStatisticsAdjustSumParams {
+ statistic: StatisticsMetaData;
+}
+
+export const showStatisticsAdjustSumDialog = (
+ element: HTMLElement,
+ detailParams: DialogStatisticsAdjustSumParams
+): void => {
+ fireEvent(element, "show-dialog", {
+ dialogTag: "dialog-statistics-adjust-sum",
+ dialogImport: loadAdjustSumDialog,
+ dialogParams: detailParams,
+ });
+};
diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts
index 50e26074f2..f1d2793ae0 100644
--- a/src/panels/lovelace/cards/hui-media-control-card.ts
+++ b/src/panels/lovelace/cards/hui-media-control-card.ts
@@ -28,6 +28,7 @@ import {
computeMediaControls,
computeMediaDescription,
getCurrentProgress,
+ handleMediaControlClick,
MediaPickedEvent,
MediaPlayerEntity,
SUPPORT_BROWSE_MEDIA,
@@ -174,7 +175,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard {
UNAVAILABLE_STATES.includes(entityState) ||
(entityState === "off" && !supportsFeature(stateObj, SUPPORT_TURN_ON));
const hasNoImage = !this._image;
- const controls = computeMediaControls(stateObj);
+ const controls = computeMediaControls(stateObj, false);
const showControls =
controls &&
(!this._veryNarrow ||
@@ -504,10 +505,11 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard {
}
private _handleClick(e: MouseEvent): void {
- const action = (e.currentTarget! as HTMLElement).getAttribute("action")!;
- this.hass!.callService("media_player", action, {
- entity_id: this._config!.entity,
- });
+ handleMediaControlClick(
+ this.hass!,
+ this._stateObj!,
+ (e.currentTarget as HTMLElement).getAttribute("action")!
+ );
}
private _updateProgressBar(): void {
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index 0d3fd0cb9a..8ffdd43709 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -238,7 +238,10 @@ const computeDefaultViewStates = (
const hiddenEntities = new Set(
entityEntries
.filter(
- (entry) => entry.entity_category || HIDE_PLATFORM.has(entry.platform)
+ (entry) =>
+ entry.entity_category ||
+ HIDE_PLATFORM.has(entry.platform) ||
+ entry.hidden_by
)
.map((entry) => entry.entity_id)
);
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index aef797e278..7e34b16c70 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -116,7 +116,7 @@ export class HuiCardOptions extends LitElement {
outline: 2px solid var(--primary-color);
}
- :host:not(.panel) ::slotted(*) {
+ :host(:not(.panel)) ::slotted(*) {
display: block;
}
diff --git a/src/panels/lovelace/editor/config-elements/config-elements-style.ts b/src/panels/lovelace/editor/config-elements/config-elements-style.ts
index 061d3aff36..2f068a1f91 100644
--- a/src/panels/lovelace/editor/config-elements/config-elements-style.ts
+++ b/src/panels/lovelace/editor/config-elements/config-elements-style.ts
@@ -1,6 +1,10 @@
import { css } from "lit";
export const configElementStyle = css`
+ .card-config {
+ /* Cancels overlapping Margins for HAForm + Card Config options */
+ overflow: auto;
+ }
ha-switch {
padding: 16px 6px;
}
@@ -19,11 +23,11 @@ export const configElementStyle = css`
.suffix {
margin: 0 8px;
}
- hui-theme-select-editor,
hui-action-editor,
ha-select,
ha-textfield,
ha-icon-picker {
margin-top: 8px;
+ display: block;
}
`;
diff --git a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
index ae8f79bd27..96f98fbbc2 100644
--- a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
@@ -99,6 +99,14 @@ export class HuiAlarmPanelCardEditor
return this.hass!.localize(`ui.panel.lovelace.editor.card.generic.name`);
}
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+
return this.hass!.localize(
`ui.panel.lovelace.editor.card.alarm-panel.${
schema.name === "states" ? "available_states" : schema.name
diff --git a/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts
index 447c1ccd2e..ed4114bda5 100644
--- a/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-area-card-editor.ts
@@ -69,6 +69,12 @@ export class HuiAreaCardEditor
private _computeLabelCallback = (schema: HaFormSchema) => {
switch (schema.name) {
+ case "theme":
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
case "area":
return this.hass!.localize("ui.panel.lovelace.editor.card.area.name");
case "navigation_path":
diff --git a/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
index e5f8525d99..90bc7e51d3 100644
--- a/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
@@ -1,22 +1,22 @@
+import type { HassEntity } from "home-assistant-js-websocket";
import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators";
-import { assert, boolean, object, optional, string, assign } from "superstruct";
-import type { HassEntity } from "home-assistant-js-websocket";
import memoizeOne from "memoize-one";
+import { assert, assign, boolean, object, optional, string } from "superstruct";
import { fireEvent } from "../../../../common/dom/fire_event";
+import { computeDomain } from "../../../../common/entity/compute_domain";
+import { domainIcon } from "../../../../common/entity/domain_icon";
+import "../../../../components/ha-form/ha-form";
+import type { HaFormSchema } from "../../../../components/ha-form/types";
import { ActionConfig } from "../../../../data/lovelace";
import type { HomeAssistant } from "../../../../types";
import type { ButtonCardConfig } from "../../cards/types";
import "../../components/hui-action-editor";
-import "../../../../components/ha-form/ha-form";
import type { LovelaceCardEditor } from "../../types";
import { actionConfigStruct } from "../structs/action-struct";
+import { baseLovelaceCardConfig } from "../structs/base-card-struct";
import type { EditorTarget } from "../types";
import { configElementStyle } from "./config-elements-style";
-import { baseLovelaceCardConfig } from "../structs/base-card-struct";
-import { computeDomain } from "../../../../common/entity/compute_domain";
-import { domainIcon } from "../../../../common/entity/domain_icon";
-import type { HaFormSchema } from "../../../../components/ha-form/types";
const cardConfigStruct = assign(
baseLovelaceCardConfig,
@@ -149,38 +149,36 @@ export class HuiButtonCardEditor
@value-changed=${this._valueChanged}
>
- this.hass!.localize(
- `ui.panel.lovelace.editor.card.glance.${schema.name}`
- ) ||
- this.hass!.localize(`ui.panel.lovelace.editor.card.generic.${schema.name}`);
+ private _computeLabelCallback = (schema: HaFormSchema) => {
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+ return (
+ this.hass!.localize(
+ `ui.panel.lovelace.editor.card.glance.${schema.name}`
+ ) ||
+ this.hass!.localize(
+ `ui.panel.lovelace.editor.card.generic.${schema.name}`
+ )
+ );
+ };
}
declare global {
diff --git a/src/panels/lovelace/editor/config-elements/hui-graph-footer-editor.ts b/src/panels/lovelace/editor/config-elements/hui-graph-footer-editor.ts
index 736b9ed5a8..ef8c6f7989 100644
--- a/src/panels/lovelace/editor/config-elements/hui-graph-footer-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-graph-footer-editor.ts
@@ -4,8 +4,8 @@ import { assert } from "superstruct";
import { fireEvent, HASSDomEvent } from "../../../../common/dom/fire_event";
import "../../../../components/entity/ha-entity-picker";
import "../../../../components/ha-formfield";
-import "../../../../components/ha-textfield";
import "../../../../components/ha-switch";
+import "../../../../components/ha-textfield";
import type { HomeAssistant } from "../../../../types";
import { graphHeaderFooterConfigStruct } from "../../header-footer/structs";
import { GraphHeaderFooterConfig } from "../../header-footer/types";
@@ -50,15 +50,14 @@ export class HuiGraphFooterEditor
${this._ozwLogs}`;
- return ozwWindow;
- }
-
- async _refreshLog(ozwWindow) {
- if (ozwWindow.closed === true) {
- clearInterval(this._intervalId);
- this.setProperties({ _intervalId: null });
- } else {
- const info = await this.hass.callApi(
- "GET",
- "zwave/ozwlog?lines=" + this.numLogLines
- );
- this.setProperties({ _ozwLogs: info });
- ozwWindow.document.body.innerHTML = `${this._ozwLogs}`;
- }
- }
-
- _isCompleteLog() {
- if (this.numLogLines !== "0") {
- this.setProperties({ _completeLog: false });
- } else {
- this.setProperties({ _completeLog: true });
- }
- }
-
- connectedCallback() {
- super.connectedCallback();
- if (!registeredDialog) {
- registeredDialog = true;
- this.fire("register-dialog", {
- dialogShowEvent: "show-ozwlog-dialog",
- dialogTag: "zwave-log-dialog",
- dialogImport: () => import("./zwave-log-dialog"),
- });
- }
- }
-
- _showOzwlogDialog() {
- this.fire("show-ozwlog-dialog", {
- hass: this.hass,
- _numLogLines: this.numLogLines,
- _ozwLog: this._ozwLogs,
- _tail: this.tail,
- dialogClosedCallback: () => this._dialogClosed(),
- });
- }
-
- _dialogClosed() {
- this.setProperties({
- tail: false,
- });
- }
-}
-customElements.define("ozw-log", OzwLog);
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts b/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts
deleted file mode 100644
index 2272bd884e..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts
+++ /dev/null
@@ -1,573 +0,0 @@
-import "@material/mwc-button/mwc-button";
-import "@polymer/app-layout/app-header/app-header";
-import "@polymer/app-layout/app-toolbar/app-toolbar";
-import { UnsubscribeFunc } from "home-assistant-js-websocket";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { isComponentLoaded } from "../../../../../common/config/is_component_loaded";
-import { computeStateDomain } from "../../../../../common/entity/compute_state_domain";
-import { computeStateName } from "../../../../../common/entity/compute_state_name";
-import "../../../../../components/buttons/ha-call-api-button";
-import "../../../../../components/buttons/ha-call-service-button";
-import "../../../../../components/ha-alert";
-import "../../../../../components/ha-card";
-import "../../../../../components/ha-circular-progress";
-import "../../../../../components/ha-icon";
-import "../../../../../components/ha-icon-button";
-import {
- computeDeviceName,
- DeviceRegistryEntry,
- fetchDeviceRegistry,
- subscribeDeviceRegistry,
-} from "../../../../../data/device_registry";
-import {
- fetchMigrationConfig,
- fetchNetworkStatus,
- startZwaveJsConfigFlow,
- ZWaveMigrationConfig,
- ZWaveNetworkStatus,
- ZWAVE_NETWORK_STATE_STOPPED,
-} from "../../../../../data/zwave";
-import {
- fetchZwaveNetworkStatus as fetchZwaveJsNetworkStatus,
- fetchZwaveNodeStatus,
- getZwaveJsIdentifiersFromDevice,
- migrateZwave,
- subscribeZwaveNodeReady,
- ZWaveJsMigrationData,
-} from "../../../../../data/zwave_js";
-import { showConfigFlowDialog } from "../../../../../dialogs/config-flow/show-dialog-config-flow";
-import { showAlertDialog } from "../../../../../dialogs/generic/show-dialog-box";
-import "../../../../../layouts/hass-subpage";
-import { haStyle } from "../../../../../resources/styles";
-import type { HomeAssistant, Route } from "../../../../../types";
-import "../../../ha-config-section";
-
-@customElement("zwave-migration")
-export class ZwaveMigration extends LitElement {
- @property({ type: Object }) public hass!: HomeAssistant;
-
- @property({ type: Object }) public route!: Route;
-
- @property({ type: Boolean }) public narrow!: boolean;
-
- @property({ type: Boolean }) public isWide!: boolean;
-
- @state() private _networkStatus?: ZWaveNetworkStatus;
-
- @state() private _step = 0;
-
- @state() private _stoppingNetwork = false;
-
- @state() private _migrationConfig?: ZWaveMigrationConfig;
-
- @state() private _migrationData?: ZWaveJsMigrationData;
-
- @state() private _migratedZwaveEntities?: string[];
-
- @state() private _deviceNameLookup: { [id: string]: string } = {};
-
- @state() private _waitingOnDevices?: DeviceRegistryEntry[];
-
- private _zwaveJsEntryId?: string;
-
- private _nodeReadySubscriptions?: Promise
- ${this.hass.localize(
- "ui.panel.config.zwave.migration.zwave_js.header"
- )}
-
-
-
- ${this.hass.localize(
- "ui.panel.config.zwave.migration.zwave_js.introduction"
- )}
-
- ${html`
- ${this._step === 0
- ? html`
-
-
- - This wizard will walk through the following steps to - migrate from the legacy Z-Wave integration to Z-Wave JS. -
--
-
- Stop the Z-Wave network - ${!isComponentLoaded(this.hass, "hassio") - ? html`
- Configure and start Z-Wave JS ` - : ""} -
- Set up the Z-Wave JS integration -
- - Migrate entities and devices to the new integration - -
- Remove legacy Z-Wave integration -
- - ${isComponentLoaded(this.hass, "hassio") - ? html`Please - make a backup - before proceeding.` - : "Please make a backup of your installation before proceeding."} - -
-
-
- Continue
-
-
-
-
- Device ${computeStateName(entityState)}
- (${entityState.entity_id}) is not ready yet! For
- the best result, wake the device up if it is
- battery powered and wait for this device to become
- ready.
- `
- )}
- ${this._stoppingNetwork
- ? html`
-
- - We need to stop the Z-Wave network to perform the - migration. Home Assistant will not be able to control - Z-Wave devices while the network is stopped. -
- ${Object.values(this.hass.states) - .filter( - (entityState) => - computeStateDomain(entityState) === "zwave" && - !["ready", "sleeping"].includes(entityState.state) - ) - .map( - (entityState) => - html`
-
- `
- : ``}
- Stopping Z-Wave Network...
-
- Stop Network
-
-
-
-
- Now it's time to set up the Z-Wave JS integration.
- ${isComponentLoaded(this.hass, "hassio") - ? html` -- Z-Wave JS runs as a Home Assistant add-on that - will be setup next. Make sure to check the - checkbox to use the add-on. -
- ` - : html` -- You are not running Home Assistant OS (the default - installation type) or Home Assistant Supervised, - so we can not setup Z-Wave JS automaticaly. Follow - the - advanced installation instructions - to install Z-Wave JS. -
-- Here's the current Z-Wave configuration. You'll - need these values when setting up Z-Wave JS. -
- ${this._migrationConfig - ? html`- USB Path: ${this._migrationConfig.usb_path}` - : ``} -
- Network Key: - ${this._migrationConfig.network_key} -
- Once Z-Wave JS is installed and running, click - 'Continue' to set up the Z-Wave JS integration and - migrate your devices and entities. -
- `} -
-
- Continue
-
-
-
-
- Device ${computeDeviceName(device, this.hass)} is
- not ready yet! For the best result, wake the device
- up if it is battery powered and wait for this device
- to become ready.
- `
- )}
- ${this._migrationData
- ? html`
-
- The following entities will not be migrated
- and might need manual adjustments to your
- config:
-
-
- - Now it's time to migrate your devices and entities from - the legacy Z-Wave integration to the Z-Wave JS - integration, to make sure all your UI's and automations - keep working. -
- ${this._waitingOnDevices?.map( - (device) => - html`Below is a list of what will be migrated.
- ${this._migratedZwaveEntities!.length !== - this._migrationData.zwave_entity_ids.length - ? html`-
- ${this._migrationData.zwave_entity_ids.map(
- (entity_id) =>
- !this._migratedZwaveEntities!.includes(
- entity_id
- )
- ? html`
- - ${entity_id in this.hass.states - ? computeStateName( - this.hass.states[entity_id] - ) - : ""} - (${entity_id}) - ` - : "" - )} -
Devices that will be migrated:
--
- ${Object.keys(
- this._migrationData.migration_device_map
- ).map(
- (device_id) =>
- html`
- - ${this._deviceNameLookup[device_id] || - device_id} - ` - )} -
Entities that will be migrated:
--
- ${Object.keys(
- this._migrationData.migration_entity_map
- ).map(
- (entity_id) => html`
- - ${entity_id in this.hass.states - ? computeStateName( - this.hass.states[entity_id] - ) - : ""} - (${entity_id}) - ` - )} -
-
-
-
`}
- Loading migration data...
-
-
- Migrate
-
-
-
- That was all! You are now migrated to the new Z-Wave JS
- integration, check if all your devices and entities are back
- the way they where, if not all entities could be migrated
- you might have to change those manually.
-
-
- - If you have 'zwave' in your configurtion.yaml file, you - should remove it now. -
-
-
- ${this.hass!.localize(
- "ui.panel.config.zwave.network_management.header"
- )}
-
-
-
- ${this.hass!.localize(
- "ui.panel.config.zwave.network_management.introduction"
- )}
-
-
- ${this._networkStatus
- ? html`
- - - ${this.hass!.localize("ui.panel.config.zwave.learn_more")} - -
-
- ${this._networkStatus.state === ZWAVE_NETWORK_STATE_STOPPED
- ? html`
-
- - ${this.hass!.localize( - "ui.panel.config.zwave.network_status.network_starting_note" - )} - - ` - : this._networkStatus.state === ZWAVE_NETWORK_STATE_AWAKED - ? html` -
- - ${this.hass!.localize( - "ui.panel.config.zwave.network_status.network_started_note_some_queried" - )} - - ` - : this._networkStatus.state === ZWAVE_NETWORK_STATE_READY - ? html` - ${this.hass!.localize( - "ui.panel.config.zwave.network_status.network_started" - )}
- - ${this.hass!.localize( - "ui.panel.config.zwave.network_status.network_started_note_all_queried" - )} - - ` - : ""} -
- - - ${this.hass!.localize( - "ui.panel.config.zwave.network_status.network_starting_note" - )} - - ` - : this._networkStatus.state === ZWAVE_NETWORK_STATE_AWAKED - ? html` -
- - ${this.hass!.localize( - "ui.panel.config.zwave.network_status.network_started_note_some_queried" - )} - - ` - : this._networkStatus.state === ZWAVE_NETWORK_STATE_READY - ? html` - ${this.hass!.localize( - "ui.panel.config.zwave.network_status.network_started" - )}
- - ${this.hass!.localize( - "ui.panel.config.zwave.network_status.network_started_note_all_queried" - )} - - ` - : ""} -
- ${this._networkStatus.state >= ZWAVE_NETWORK_STATE_AWAKED
- ? html`
- ${this._generateServiceButton("stop_network")}
- ${this._generateServiceButton("heal_network")}
- ${this._generateServiceButton("test_network")}
- `
- : html` ${this._generateServiceButton("start_network")} `}
-
- ${this._networkStatus.state >= ZWAVE_NETWORK_STATE_AWAKED
- ? html`
-
- ${this._generateServiceButton("soft_reset")}
-
- ${this.hass!.localize(
- "ui.panel.config.zwave.services.save_config"
- )}
-
-
- `
- : ""}
-
- ${this._generateServiceButton("add_node_secure")}
- ${this._generateServiceButton("add_node")}
- ${this._generateServiceButton("remove_node")}
-
-
- ${this._generateServiceButton("cancel_command")}
-
-
-
- ${"wake_up_interval" in this.nodes[this.selectedNode].attributes
- ? html`
-
-
- `;
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyle,
- css`
- .content {
- margin-top: 24px;
- }
-
- ha-card {
- margin: 0 auto;
- max-width: 600px;
- }
-
- .device-picker {
- @apply --layout-horizontal;
- @apply --layout-center-center;
- display: -ms-flexbox;
- display: -webkit-flex;
- display: flex;
- -ms-flex-direction: row;
- -webkit-flex-direction: row;
- flex-direction: row;
- -ms-flex-align: center;
- -webkit-align-items: center;
- align-items: center;
- padding-left: 24px;
- padding-right: 24px;
- padding-bottom: 24px;
- }
-
- .help-text {
- padding-left: 24px;
- padding-right: 24px;
- }
-
- .flex {
- -ms-flex: 1 1 0.000000001px;
- -webkit-flex: 1;
- flex: 1;
- -webkit-flex-basis: 0.000000001px;
- flex-basis: 0.000000001px;
- }
- `,
- ];
- }
-
- protected firstUpdated(changedProps: PropertyValues): void {
- super.firstUpdated(changedProps);
- this.addEventListener("hass-service-called", (ev) =>
- this.serviceCalled(ev)
- );
- }
-
- protected updated(changedProps: PropertyValues): void {
- super.updated(changedProps);
- if (changedProps.has("selectedNode")) {
- this._nodesChanged();
- }
- }
-
- private serviceCalled(ev): void {
- if (ev.detail.success) {
- setTimeout(() => {
- this._refreshConfig(this.selectedNode);
- }, 5000);
- }
- }
-
- private _nodesChanged(): void {
- if (!this.nodes) {
- return;
- }
- this._configItem = undefined;
- this._wakeupInput =
- this.nodes[this.selectedNode].attributes.wake_up_interval || -1;
- }
-
- private _onWakeupIntervalChanged(value: ChangeEvent): void {
- this._wakeupInput = value.detail!.value;
- }
-
- private _computeWakeupServiceData(wakeupInput: number) {
- return {
- node_id: this.nodes[this.selectedNode].attributes.node_id,
- value: wakeupInput,
- };
- }
-
- private _computeSetConfigParameterServiceData():
- | ZWaveConfigServiceData
- | boolean {
- if (this.selectedNode === -1 || typeof this._configItem === "undefined") {
- return false;
- }
- let valueData: number | string = "";
- if (["Short", "Byte", "Int"].includes(this._configItem!.value.type)) {
- valueData =
- typeof this._selectedConfigValue === "string"
- ? parseInt(this._selectedConfigValue, 10)
- : this._selectedConfigValue;
- }
- if (["Bool", "Button", "List"].includes(this._configItem!.value.type)) {
- valueData = this._selectedConfigValue;
- }
- return {
- node_id: this.nodes[this.selectedNode].attributes.node_id,
- parameter: this._configItem.key,
- value: valueData,
- };
- }
-
- private _selectedConfigParameterChanged(event: ItemSelectedEvent): void {
- if (event.target!.selected === -1) {
- return;
- }
- this._selectedConfigParameter = event.target!.selected;
- this._configItem = this.config[event.target!.selected];
- }
-
- private _configValueSelectChanged(event: ItemSelectedEvent): void {
- if (event.target!.selected === -1) {
- return;
- }
- this._selectedConfigValue = event.target!.selectedItem.textContent;
- }
-
- private _configValueInputChanged(value: ChangeEvent): void {
- this._selectedConfigValue = value.detail!.value;
- }
-
- private async _refreshConfig(selectedNode): Promise
-
-
-
- ${this.hass!.localize(
- "ui.panel.config.zwave.node_config.set_wakeup"
- )}
-
-
- `
- : ""}
-
- ${this.hass!.localize(
- "ui.panel.config.zwave.node_config.seconds"
- )}
-
-
-
-
- ${this.config.map(
- (entityState) => html`
-
- ${entityState.key}: ${entityState.value.label}
-
- `
- )}
-
-
-
- ${this._configItem
- ? html`
- ${this._configItem.value.type === "List"
- ? html`
-
-
-
- ${this._configItem.value.data_items.map(
- (entityState) => html`
- ${entityState}
- `
- )}
-
-
-
- `
- : ""}
- ${["Byte", "Short", "Int"].includes(this._configItem.value.type)
- ? html`
-
-
-
-
- `
- : ""}
- ${["Bool", "Button"].includes(this._configItem.value.type)
- ? html`
-
-
-
-
- ${this.hass!.localize(
- "ui.panel.config.zwave.node_config.true"
- )}
-
-
- ${this.hass!.localize(
- "ui.panel.config.zwave.node_config.false"
- )}
-
-
-
-
- `
- : ""}
-
- ${this._configItem.value.help}
-
- ${["Bool", "Button", "Byte", "Short", "Int", "List"].includes(
- this._configItem.value.type
- )
- ? html`
-
-
- ${this.hass!.localize(
- "ui.panel.config.zwave.node_config.set_config_parameter"
- )}
-
-
- `
- : ""}
- `
- : ""}
-
-
-
-
-`;
- }
-
- static get properties() {
- return {
- hass: Object,
-
- nodes: Array,
-
- selectedNode: {
- type: Number,
- value: -1,
- },
-
- protectionNode: {
- type: Boolean,
- value: false,
- },
-
- _protectionValueID: {
- type: Number,
- value: -1,
- },
-
- _selectedProtectionParameter: {
- type: Number,
- value: -1,
- observer: "_computeProtectionData",
- },
-
- _protectionOptions: Array,
-
- _protection: {
- type: Array,
- value: () => [],
- },
-
- _loadedProtectionValue: {
- type: String,
- value: "",
- },
-
- _protectionData: {
- type: Object,
- value: {},
- },
-
- _nodePath: String,
- };
- }
-
- static get observers() {
- return ["_nodesChanged(nodes, selectedNode)"];
- }
-
- ready() {
- super.ready();
- this.addEventListener("hass-api-called", (ev) => this.apiCalled(ev));
- }
-
- apiCalled(ev) {
- if (ev.detail.success) {
- setTimeout(() => {
- this._refreshProtection(this.selectedNode);
- }, 5000);
- }
- }
-
- _nodesChanged() {
- if (!this.nodes) return;
- if (this.protection) {
- if (this.protection.length === 0) {
- return;
- }
- let options = [];
- let value_id = -1;
- let selected = -1;
- this.protection.forEach((item) => {
- if (item.key === "options") options = item.value;
- else if (item.key === "value_id") value_id = item.value;
- else if (item.key === "selected") selected = item.value;
- });
- this.setProperties({
- protectionNode: true,
- _protectionOptions: options,
- _loadedProtectionValue: selected,
- _protectionValueID: value_id,
- });
- }
- }
-
- async _refreshProtection(selectedNode) {
- const protectionValues = [];
- const protections = await this.hass.callApi(
- "GET",
- `zwave/protection/${this.nodes[selectedNode].attributes.node_id}`
- );
- Object.keys(protections).forEach((key) => {
- protectionValues.push({
- key,
- value: protections[key],
- });
- });
- this.setProperties({
- _protection: protectionValues,
- _selectedProtectionParameter: -1,
- _loadedProtectionValue: this.protection[1].value,
- });
- }
-
- _computeProtectionData(selectedProtectionParameter) {
- if (this.selectedNode === -1 || selectedProtectionParameter === -1) return;
- this._protectionData = {
- selection: this._protectionOptions[selectedProtectionParameter],
- value_id: this._protectionValueID,
- };
- this._nodePath = `zwave/protection/${
- this.nodes[this.selectedNode].attributes.node_id
- }`;
- }
-}
-
-customElements.define("zwave-node-protection", ZwaveNodeProtection);
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-usercodes.js b/src/panels/config/integrations/integration-panels/zwave/zwave-usercodes.js
deleted file mode 100644
index 7180f8d880..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-usercodes.js
+++ /dev/null
@@ -1,226 +0,0 @@
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
-import "@polymer/paper-input/paper-input";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-listbox/paper-listbox";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-/* eslint-plugin-disable lit */
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-import "../../../../../components/buttons/ha-call-service-button";
-import "../../../../../components/ha-card";
-import "../../../../../styles/polymer-ha-style";
-
-class ZwaveUsercodes extends PolymerElement {
- static get template() {
- return html`
-
-
-
-
-
- [[state]]
-
-
-
-
-
-
- [[localize('ui.panel.config.zwave.node_management.set_protection')]]
-
-
-
-
-
-
- `;
- }
-
- static get properties() {
- return {
- hass: Object,
-
- nodes: Array,
-
- selectedNode: {
- type: Number,
- observer: "_selectedNodeChanged",
- },
-
- userCodes: Object,
-
- _selectedUserCode: {
- type: Number,
- value: -1,
- observer: "_selectedUserCodeChanged",
- },
-
- _selectedUserCodeValue: String,
-
- _computedCodeOutput: {
- type: String,
- value: "",
- },
- };
- }
-
- ready() {
- super.ready();
- this.addEventListener("hass-service-called", (ev) =>
- this.serviceCalled(ev)
- );
- }
-
- serviceCalled(ev) {
- if (ev.detail.success) {
- setTimeout(() => {
- this._refreshUserCodes(this.selectedNode);
- }, 5000);
- }
- }
-
- _isUserCodeSelected(selectedUserCode) {
- if (selectedUserCode === -1) return false;
- return true;
- }
-
- _computeSelectCaptionUserCodes(stateObj) {
- return `${stateObj.key}: ${stateObj.value.label}`;
- }
-
- _selectedUserCodeChanged(selectedUserCode) {
- if (this._selectedUserCode === -1 || selectedUserCode === -1) return;
- const value = this.userCodes[selectedUserCode].value.code;
- this.setProperties({
- _selectedUserCodeValue: this._a2hex(value),
- _computedCodeOutput: `[${this._hex2a(this._a2hex(value))}]`,
- });
- }
-
- _computeUserCodeServiceData(selectedUserCodeValue, type) {
- if (this.selectedNode === -1 || !selectedUserCodeValue) return -1;
- let serviceData = null;
- let valueData = null;
- if (type === "Add") {
- valueData = this._hex2a(selectedUserCodeValue);
- this._computedCodeOutput = `[${valueData}]`;
- serviceData = {
- node_id: this.nodes[this.selectedNode].attributes.node_id,
- code_slot: this._selectedUserCode,
- usercode: valueData,
- };
- }
- if (type === "Delete") {
- serviceData = {
- node_id: this.nodes[this.selectedNode].attributes.node_id,
- code_slot: this._selectedUserCode,
- };
- }
- return serviceData;
- }
-
- async _refreshUserCodes(selectedNode) {
- this.setProperties({ _selectedUserCodeValue: "" });
- const userCodes = [];
- const userCodeData = await this.hass.callApi(
- "GET",
- `zwave/usercodes/${this.nodes[selectedNode].attributes.node_id}`
- );
- Object.keys(userCodeData).forEach((key) => {
- userCodes.push({
- key,
- value: userCodeData[key],
- });
- });
- this.setProperties({ userCodes: userCodes });
- this._selectedUserCodeChanged(this._selectedUserCode);
- }
-
- _a2hex(str) {
- const arr = [];
- let output = "";
- for (let i = 0, l = str.length; i < l; i++) {
- const hex = Number(str.charCodeAt(i)).toString(16);
- if (hex === "0") {
- output = "00";
- } else {
- output = hex;
- }
- arr.push("\\x" + output);
- }
- return arr.join("");
- }
-
- _hex2a(hexx) {
- const hex = hexx.toString();
- const hexMod = hex.replace(/\\x/g, "");
- let str = "";
- for (let i = 0; i < hexMod.length; i += 2) {
- str += String.fromCharCode(parseInt(hexMod.substr(i, 2), 16));
- }
- return str;
- }
-
- _selectedNodeChanged() {
- if (this.selectedNode === -1) return;
- this.setProperties({ _selecteduserCode: -1 });
- }
-}
-
-customElements.define("zwave-usercodes", ZwaveUsercodes);
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-values.ts b/src/panels/config/integrations/integration-panels/zwave/zwave-values.ts
deleted file mode 100644
index 1e6750c6af..0000000000
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-values.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-listbox/paper-listbox";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import "../../../../../components/buttons/ha-call-service-button";
-import "../../../../../components/ha-card";
-import { ZWaveValue } from "../../../../../data/zwave";
-import { haStyle } from "../../../../../resources/styles";
-import { HomeAssistant } from "../../../../../types";
-
-@customElement("zwave-values")
-export class ZwaveValues extends LitElement {
- @property({ attribute: false }) public hass!: HomeAssistant;
-
- @property() public values: ZWaveValue[] = [];
-
- @state() private _selectedValue = -1;
-
- protected render(): TemplateResult {
- return html`
-
-
-
-
- [[_computeSelectCaptionUserCodes(state)]]
-
-
-
-
-
-
-
-
-
-
- Ascii: [[_computedCodeOutput]]-
-
- Set Usercode
-
-
- Delete Usercode
-
-
-
-
-
-
-
- `;
- }
-
- static get styles(): CSSResultGroup {
- return [
- haStyle,
- css`
- .content {
- margin-top: 24px;
- }
-
- ha-card {
- margin: 0 auto;
- max-width: 600px;
- }
-
- .device-picker {
- @apply --layout-horizontal;
- @apply --layout-center-center;
- display: -ms-flexbox;
- display: -webkit-flex;
- display: flex;
- -ms-flex-direction: row;
- -webkit-flex-direction: row;
- flex-direction: row;
- -ms-flex-align: center;
- -webkit-align-items: center;
- align-items: center;
- padding-left: 24px;
- padding-right: 24px;
- padding-bottom: 24px;
- }
-
- .flex {
- -ms-flex: 1 1 0.000000001px;
- -webkit-flex: 1;
- flex: 1;
- -webkit-flex-basis: 0.000000001px;
- flex-basis: 0.000000001px;
- }
-
- .help-text {
- padding-left: 24px;
- padding-right: 24px;
- }
- `,
- ];
- }
-
- private _computeCaption(item) {
- let out = `${item.value.label}`;
- out += ` (${this.hass.localize("ui.panel.config.zwave.common.instance")}:`;
- out += ` ${item.value.instance},`;
- out += ` ${this.hass.localize("ui.panel.config.zwave.common.index")}:`;
- out += ` ${item.value.index})`;
- return out;
- }
-}
-
-declare global {
- interface HTMLElementTagNameMap {
- "zwave-values": ZwaveValues;
- }
-}
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 3c75b59df0..9b5a5c8e37 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
@@ -384,7 +384,9 @@ class ZWaveJSConfigDashboard extends LitElement {
if (!this.configEntryId) {
return;
}
- const configEntries = await getConfigEntries(this.hass);
+ const configEntries = await getConfigEntries(this.hass, {
+ domain: "zwave_js",
+ });
this._configEntry = configEntries.find(
(entry) => entry.entry_id === this.configEntryId!
);
@@ -467,7 +469,9 @@ class ZWaveJSConfigDashboard extends LitElement {
if (!this.configEntryId) {
return;
}
- const configEntries = await getConfigEntries(this.hass);
+ const configEntries = await getConfigEntries(this.hass, {
+ domain: "zwave_js",
+ });
const configEntry = configEntries.find(
(entry) => entry.entry_id === this.configEntryId
);
diff --git a/src/panels/developer-tools/statistics/developer-tools-statistics.ts b/src/panels/developer-tools/statistics/developer-tools-statistics.ts
index 4b48ebb116..b9b2359dcf 100644
--- a/src/panels/developer-tools/statistics/developer-tools-statistics.ts
+++ b/src/panels/developer-tools/statistics/developer-tools-statistics.ts
@@ -1,4 +1,5 @@
import "@material/mwc-button/mwc-button";
+import { mdiSlopeUphill } from "@mdi/js";
import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
import { css, CSSResultGroup, html, LitElement } from "lit";
import { customElement, property, state } from "lit/decorators";
@@ -22,6 +23,7 @@ import {
import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
import { haStyle } from "../../../resources/styles";
import { HomeAssistant } from "../../../types";
+import { showStatisticsAdjustSumDialog } from "./show-dialog-statistics-adjust-sum";
import { showFixStatisticsUnitsChangedDialog } from "./show-dialog-statistics-fix-units-changed";
import { showFixStatisticsUnsupportedUnitMetadataDialog } from "./show-dialog-statistics-fix-unsupported-unit-meta";
@@ -111,6 +113,24 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
: ""}`,
width: "113px",
},
+ actions: {
+ title: "",
+ label: localize("ui.panel.developer-tools.tabs.statistics.adjust_sum"),
+ type: "icon-button",
+ template: (_info, statistic: StatisticsMetaData) =>
+ statistic.has_sum
+ ? html`
+
-
-
- ${this.values.map(
- (item) => html`
- ${this._computeCaption(item)}
- `
- )}
-
-
-
- No statistics found for this period.
`; + } else { + const data = + this._stats5min.length >= 2 ? this._stats5min : this._statsHour; + const unit = this._params!.statistic.unit_of_measurement; + const rows: TemplateResult[] = []; + for (let i = 1; i < data.length; i++) { + const stat = data[i]; + const growth = Math.round((stat.sum! - data[i - 1].sum!) * 100) / 100; + rows.push(html` +
+ Sometimes the statistics end up being incorrect for a specific point in
+ time. This can mess up your beautiful graphs! Select a time below to
+ find the bad moment and adjust the data.
+
+ ${stats}
+
+ ${this._params!.statistic.name || this._params!.statistic.statistic_id}
+
+
+
+ Start
+ ${formatDateTime(
+ new Date(this._chosenStat!.start),
+ this.hass.locale
+ )}
+
+
+
+ End
+ ${formatDateTime(
+ new Date(this._chosenStat!.end),
+ this.hass.locale
+ )}
+
+
+
-
`;
}
@@ -202,6 +200,14 @@ export class HuiButtonCardEditor
)}`;
}
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+
return this.hass!.localize(
`ui.panel.lovelace.editor.card.generic.${schema.name}`
);
diff --git a/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts
index 30c81af52c..b1e6baa3e5 100644
--- a/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-calendar-card-editor.ts
@@ -121,6 +121,14 @@ export class HuiCalendarCardEditor
return this.hass!.localize("ui.panel.lovelace.editor.card.generic.title");
}
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+
return this.hass!.localize(
`ui.panel.lovelace.editor.card.calendar.${schema.name}`
);
diff --git a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
index b0c418718e..536eede67c 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
@@ -31,7 +31,7 @@ import "../../../../components/ha-icon";
import "../../../../components/ha-switch";
import type { HomeAssistant } from "../../../../types";
import type { EntitiesCardConfig } from "../../cards/types";
-import "../../components/hui-theme-select-editor";
+import "../../../../components/ha-theme-picker";
import { TIMESTAMP_RENDERING_FORMATS } from "../../components/types";
import type { LovelaceRowConfig } from "../../entity-rows/types";
import { headerFooterConfigStructs } from "../../header-footer/structs";
@@ -265,12 +265,17 @@ export class HuiEntitiesCardEditor
.configValue=${"title"}
@input=${this._valueChanged}
>
-
-
+
diff --git a/src/panels/lovelace/editor/config-elements/hui-humidifier-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-humidifier-card-editor.ts
index 7f472d39a1..b5e83f7c81 100644
--- a/src/panels/lovelace/editor/config-elements/hui-humidifier-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-humidifier-card-editor.ts
@@ -75,6 +75,14 @@ export class HuiHumidifierCardEditor
);
}
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+
return this.hass!.localize(
`ui.panel.lovelace.editor.card.generic.${schema.name}`
);
diff --git a/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts
index 8995c7a6ff..42e47ef81a 100644
--- a/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts
@@ -179,6 +179,14 @@ export class HuiLightCardEditor
);
}
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+
return this.hass!.localize(
`ui.panel.lovelace.editor.card.generic.${schema.name}`
);
diff --git a/src/panels/lovelace/editor/config-elements/hui-logbook-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-logbook-card-editor.ts
index 427535e412..f789c09bbe 100644
--- a/src/panels/lovelace/editor/config-elements/hui-logbook-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-logbook-card-editor.ts
@@ -96,11 +96,24 @@ export class HuiLogbookCardEditor
fireEvent(this, "config-changed", { config: ev.detail.value });
}
- private _computeLabelCallback = (schema: HaFormSchema) =>
- this.hass!.localize(
- `ui.panel.lovelace.editor.card.generic.${schema.name}`
- ) ||
- this.hass!.localize(`ui.panel.lovelace.editor.card.logbook.${schema.name}`);
+ private _computeLabelCallback = (schema: HaFormSchema) => {
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+
+ return (
+ this.hass!.localize(
+ `ui.panel.lovelace.editor.card.generic.${schema.name}`
+ ) ||
+ this.hass!.localize(
+ `ui.panel.lovelace.editor.card.logbook.${schema.name}`
+ )
+ );
+ };
}
declare global {
diff --git a/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
index fe1b3360c4..54dc74bcd7 100644
--- a/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
@@ -58,13 +58,23 @@ export class HuiMarkdownCardEditor
fireEvent(this, "config-changed", { config: ev.detail.value });
}
- private _computeLabelCallback = (schema: HaFormSchema) =>
- this.hass!.localize(
- `ui.panel.lovelace.editor.card.generic.${schema.name}`
- ) ||
- this.hass!.localize(
- `ui.panel.lovelace.editor.card.markdown.${schema.name}`
+ private _computeLabelCallback = (schema: HaFormSchema) => {
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+ return (
+ this.hass!.localize(
+ `ui.panel.lovelace.editor.card.generic.${schema.name}`
+ ) ||
+ this.hass!.localize(
+ `ui.panel.lovelace.editor.card.markdown.${schema.name}`
+ )
);
+ };
}
declare global {
diff --git a/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts
index 012dac5a35..9470be0a78 100644
--- a/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts
@@ -3,9 +3,9 @@ import { customElement, property, state } from "lit/decorators";
import { assert, assign, object, optional, string } from "superstruct";
import { fireEvent } from "../../../../common/dom/fire_event";
import "../../../../components/entity/ha-entity-picker";
+import "../../../../components/ha-theme-picker";
import { HomeAssistant } from "../../../../types";
import { MediaControlCardConfig } from "../../cards/types";
-import "../../components/hui-theme-select-editor";
import { LovelaceCardEditor } from "../../types";
import { baseLovelaceCardConfig } from "../structs/base-card-struct";
import { EditorTarget, EntitiesEditorEvent } from "../types";
@@ -50,24 +50,28 @@ export class HuiMediaControlCardEditor
return html`
`;
}
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
index 0d315cc889..7367ac09ef 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
@@ -108,32 +108,30 @@ export class HuiPictureEntityCardEditor
@value-changed=${this._valueChanged}
>
-
+ >
+
-
`;
}
@@ -172,6 +170,14 @@ export class HuiPictureEntityCardEditor
);
}
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+
return (
this.hass!.localize(
`ui.panel.lovelace.editor.card.generic.${schema.name}`
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
index adcd07a57e..18e46b154e 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
@@ -1,13 +1,13 @@
-import "../../components/hui-action-editor";
-import "../../../../components/ha-form/ha-form";
import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators";
import { array, assert, assign, object, optional, string } from "superstruct";
import { fireEvent } from "../../../../common/dom/fire_event";
+import "../../../../components/ha-form/ha-form";
import type { HaFormSchema } from "../../../../components/ha-form/types";
import type { ActionConfig } from "../../../../data/lovelace";
import type { HomeAssistant } from "../../../../types";
import type { PictureGlanceCardConfig } from "../../cards/types";
+import "../../components/hui-action-editor";
import "../../components/hui-entity-editor";
import type { EntityConfig } from "../../entity-rows/types";
import type { LovelaceCardEditor } from "../../types";
@@ -96,28 +96,26 @@ export class HuiPictureGlanceCardEditor
@value-changed=${this._valueChanged}
>
-
+
-
-
`;
}
diff --git a/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts
index ed4ab2a61b..78d6dc3a97 100644
--- a/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts
@@ -71,6 +71,14 @@ export class HuiThermostatCardEditor
);
}
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+
return this.hass!.localize(
`ui.panel.lovelace.editor.card.generic.${schema.name}`
);
diff --git a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
index cd6c2ab227..70a310b5da 100644
--- a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
@@ -184,6 +184,14 @@ export class HuiWeatherForecastCardEditor
)})`;
}
+ if (schema.name === "theme") {
+ return `${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.generic.theme"
+ )} (${this.hass!.localize(
+ "ui.panel.lovelace.editor.card.config.optional"
+ )})`;
+ }
+
return (
this.hass!.localize(
`ui.panel.lovelace.editor.card.generic.${schema.name}`
diff --git a/src/panels/lovelace/hui-editor.ts b/src/panels/lovelace/hui-editor.ts
index 17f35b3d10..ce6c15e99e 100644
--- a/src/panels/lovelace/hui-editor.ts
+++ b/src/panels/lovelace/hui-editor.ts
@@ -148,8 +148,8 @@ class LovelaceFullConfigEditor extends LitElement {
}
app-toolbar {
- background-color: var(--dark-background-color, #455a64);
- color: var(--dark-text-color);
+ background-color: var(--app-header-edit-background-color, #455a64);
+ color: var(--app-header-edit-text-color, #fff);
}
mwc-button[disabled] {
diff --git a/src/panels/media-browser/browser-media-player.ts b/src/panels/media-browser/browser-media-player.ts
index b4096f9a7f..c4c4bddc22 100644
--- a/src/panels/media-browser/browser-media-player.ts
+++ b/src/panels/media-browser/browser-media-player.ts
@@ -84,7 +84,7 @@ export class BrowserMediaPlayer {
last_changed: now,
last_updated: now,
attributes: {},
- context: { id: "", user_id: null },
+ context: { id: "", user_id: null, parent_id: null },
};
}
diff --git a/src/panels/media-browser/ha-bar-media-player.ts b/src/panels/media-browser/ha-bar-media-player.ts
index 3e913c6e43..bfc2e63656 100644
--- a/src/panels/media-browser/ha-bar-media-player.ts
+++ b/src/panels/media-browser/ha-bar-media-player.ts
@@ -39,6 +39,7 @@ import {
computeMediaDescription,
formatMediaTime,
getCurrentProgress,
+ handleMediaControlClick,
MediaPlayerEntity,
MediaPlayerItem,
setMediaPlayerVolume,
@@ -173,7 +174,7 @@ export class BarMediaPlayer extends LitElement {
}
const controls = !this.narrow
- ? computeMediaControls(stateObj)
+ ? computeMediaControls(stateObj, true)
: (stateObj.state === "playing" &&
(supportsFeature(stateObj, SUPPORT_PAUSE) ||
supportsFeature(stateObj, SUPPORT_STOP))) ||
@@ -490,9 +491,11 @@ export class BarMediaPlayer extends LitElement {
const action = (e.currentTarget! as HTMLElement).getAttribute("action")!;
if (!this._browserPlayer) {
- this.hass!.callService("media_player", action, {
- entity_id: this.entityId,
- });
+ handleMediaControlClick(
+ this.hass!,
+ this._stateObj!,
+ (e.currentTarget as HTMLElement).getAttribute("action")!
+ );
return;
}
if (action === "media_pause") {
diff --git a/src/panels/profile/ha-pick-theme-row.ts b/src/panels/profile/ha-pick-theme-row.ts
index b0147b6842..59d9774712 100644
--- a/src/panels/profile/ha-pick-theme-row.ts
+++ b/src/panels/profile/ha-pick-theme-row.ts
@@ -173,6 +173,9 @@ export class HaPickThemeRow extends LitElement {
}
private _supportsModeSelection(themeName: string): boolean {
+ if (!(themeName in this.hass.themes.themes)) {
+ return false; // User's theme no longer exists
+ }
return "modes" in this.hass.themes.themes[themeName];
}
diff --git a/src/resources/markdown_worker.ts b/src/resources/markdown_worker.ts
index 38a069c1d7..a69bd9c02e 100644
--- a/src/resources/markdown_worker.ts
+++ b/src/resources/markdown_worker.ts
@@ -47,6 +47,7 @@ const renderMarkdown = (
input: ["type", "disabled", "checked"],
"ha-icon": ["icon"],
"ha-svg-icon": ["path"],
+ "ha-alert": ["alert-type", "title"],
};
}
diff --git a/src/translations/en.json b/src/translations/en.json
index e25991e80f..86bc60cbfc 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -102,6 +102,11 @@
"integration": "Integration",
"config_entry": "Config entry",
"device": "Device"
+ },
+ "hidden_by": {
+ "user": "User",
+ "integration": "Integration",
+ "device": "Device"
}
},
"ui": {
@@ -206,6 +211,8 @@
"media_volume_down": "Volume down",
"media_volume_mute": "Volume mute",
"media_volume_unmute": "Volume unmute",
+ "repeat_set": "Repeat mode",
+ "shuffle_set": "Shuffle",
"text_to_speak": "Text to speak",
"nothing_playing": "Nothing Playing"
},
@@ -223,6 +230,11 @@
"service": {
"run": "Run"
},
+ "update": {
+ "installing": "Installing",
+ "installing_with_progress": "Installing ({progress}%)",
+ "up_to_date": "Up-to-date"
+ },
"timer": {
"actions": {
"start": "start",
@@ -292,6 +304,7 @@
"remove": "Remove",
"enable": "Enable",
"disable": "Disable",
+ "hide": "Hide",
"close": "Close",
"clear": "Clear",
"leave": "Leave",
@@ -390,6 +403,10 @@
"add_device_id": "Choose device",
"add_entity_id": "Choose entity"
},
+ "theme-picker": {
+ "theme": "Theme",
+ "no_theme": "No theme"
+ },
"user-picker": {
"no_user": "No user",
"add_user": "Add user",
@@ -713,6 +730,14 @@
"rising": "Rising",
"setting": "Setting"
},
+ "update": {
+ "current_version": "Current version",
+ "latest_version": "Latest version",
+ "release_announcement": "Read release announcement",
+ "skip": "Skip",
+ "install": "Install",
+ "create_backup": "Create backup before updating"
+ },
"updater": {
"title": "Update Instructions"
},
@@ -761,29 +786,67 @@
"icon": "Icon",
"icon_error": "Icons should be in the format 'prefix:iconname', e.g. 'mdi:home'",
"entity_id": "Entity ID",
+ "unit_of_measurement": "Unit of Measurement",
"device_class": "Show as",
"device_classes": {
"binary_sensor": {
"door": "Door",
"garage_door": "Garage door",
"window": "Window",
- "opening": "Other"
+ "opening": "Opening",
+ "battery": "Battery",
+ "battery_charging": "Battery charging",
+ "carbon_monoxide": "Carbon monoxide",
+ "cold": "Cold",
+ "connectivity": "Connectivity",
+ "gas": "Gas",
+ "heat": "Heat",
+ "light": "Light",
+ "lock": "Lock",
+ "moisture": "Moisture",
+ "motion": "Motion",
+ "moving": "Moving",
+ "occupancy": "Occupancy",
+ "plug": "Plug",
+ "power": "Power",
+ "presence": "Presence",
+ "problem": "Problem",
+ "running": "Running",
+ "safety": "Safety",
+ "smoke": "Smoke",
+ "sound": "Sound",
+ "tamper": "Tamper",
+ "update": "Update",
+ "vibration": "Vibration"
},
"cover": {
"door": "Door",
"garage": "Garage door",
"gate": "Gate",
- "window": "Window"
+ "window": "Window",
+ "shade": "Shade",
+ "awning": "Awning",
+ "blind": "Blind",
+ "curtain": "Curtain",
+ "damper": "Damper",
+ "shutter": "Shutter"
}
},
"unavailable": "This entity is unavailable.",
- "enabled_label": "Enable entity",
- "enabled_cause": "Disabled by {cause}.",
+ "entity_status": "Entity status",
+ "change_area": "Change Area",
+ "enabled_label": "Enabled",
+ "disabled_label": "Disabled",
+ "enabled_cause": "Cannot change status. Disabled by {cause}.",
+ "hidden_label": "Hidden",
+ "hidden_cause": "Hidden by {cause}.",
"device_disabled": "The device of this entity is disabled.",
"open_device_settings": "Open device settings",
+ "switch_as_x_confirm": "This switch will be hidden and a new {domain} will be added. Your existing configurations using the switch will continue to work.",
"enabled_description": "Disabled entities will not be added to Home Assistant.",
"enabled_delay_confirm": "The enabled entities will be added to Home Assistant in {delay} seconds",
"enabled_restart_confirm": "Restart Home Assistant to finish enabling the entities",
+ "hidden_description": "Hidden entities will not be shown on your dashboard. Their history is still tracked and you can still interact with them with services.",
"delete": "Delete",
"confirm_delete": "Are you sure you want to delete this entity?",
"update": "Update",
@@ -792,7 +855,8 @@
"area": "Set entity area only",
"area_note": "By default the entities of a device are in the same area as the device. If you change the area of this entity, it will no longer follow the area of the device.",
"follow_device_area": "Follow device area",
- "change_device_area": "Change device area"
+ "change_device_area": "Change device area",
+ "configure_state": "Configure State"
}
},
"helper_settings": {
@@ -840,7 +904,8 @@
"step": "Step size"
},
"timer": {
- "duration": "Duration"
+ "duration": "Duration",
+ "restore": "Restore?"
}
},
"options_flow": {
@@ -1007,6 +1072,10 @@
"title": "Automations & Scenes",
"description": "Manage automations, scenes, scripts and helpers"
},
+ "backup": {
+ "title": "Backup",
+ "description": "Generate backups of your Home Assistant configuration"
+ },
"blueprints": {
"title": "Blueprints",
"description": "Pre-made automations and scripts by the community"
@@ -1047,9 +1116,9 @@
"learn_more": "Learn more"
},
"updates": {
- "check_unavailable": {
+ "no_update_entities": {
"title": "Unable to check for updates",
- "description": "You need to run the Home Assistant operating system to be able to check and install updates from the Home Assistant user interface."
+ "description": "You do not have any integrations that provide updates."
},
"check_updates": "Check for updates",
"no_new_updates": "No new updates found",
@@ -1097,6 +1166,27 @@
"confirmation_text": "All devices in this area will become unassigned."
}
},
+ "backup": {
+ "caption": "[%key:ui::panel::config::dashboard::backup::title%]",
+ "create_backup": "[%key:supervisor::backup::create_backup%]",
+ "creating_backup": "Backup is currently being created",
+ "download_backup": "[%key:supervisor::backup::download_backup%]",
+ "remove_backup": "[%key:supervisor::backup::delete_backup_title%]",
+ "name": "[%key:supervisor::backup::name%]",
+ "size": "[%key:supervisor::backup::size%]",
+ "created": "[%key:supervisor::backup::created%]",
+ "no_backups": "[%key:supervisor::backup::no_backups%]",
+ "create": {
+ "title": "Create backup",
+ "description": "Create a backup of your current configuration directory, this will take some time.",
+ "confirm": "create"
+ },
+ "remove": {
+ "title": "Remove backup",
+ "description": "Are you sure you want to remove the backup with the name {name}?",
+ "confirm": "[%key:ui::common::remove%]"
+ }
+ },
"tag": {
"caption": "Tags",
"description": "Trigger automations when an NFC tag, QR code, etc. is scanned",
@@ -1349,13 +1439,24 @@
"metric_example": "Celsius, kilograms",
"find_currency_value": "Find your value",
"save_button": "Save",
- "external_url": "External URL",
- "internal_url": "Internal URL",
"currency": "Currency"
}
}
}
},
+ "url": {
+ "caption": "Home Assistant URL",
+ "description": "Configure what website addresses Home Assistant should share with other devices when they need to fetch data from Home Assistant (eg. to play text-to-speech or other hosted media).",
+ "internal_url_label": "Local Network",
+ "external_url_label": "Internet",
+ "external_use_ha_cloud": "Use Home Assistant Cloud",
+ "external_get_ha_cloud": "Access from anywhere using Home Assistant Cloud",
+ "ha_cloud_remote_not_enabled": "Your Home Assistant Cloud remote connection is currently not enabled.",
+ "enable_remote": "[%key:ui::common::enable%]",
+ "internal_url_automatic": "Automatic",
+ "internal_url_https_error_title": "Invalid local network URL",
+ "internal_url_https_error_description": "You have configured an HTTPS certificate in Home Assistant. This means that your internal URL needs to be set to a domain covered by the certficate."
+ },
"info": {
"caption": "Info",
"copy_menu": "Copy menu",
@@ -1408,7 +1509,7 @@
"error_from_custom_integration": "This error originated from a custom integration."
},
"lovelace": {
- "caption": "Lovelace Dashboards",
+ "caption": "Dashboards",
"description": "Create customized sets of cards to control your home",
"dashboards": {
"default_dashboard": "This is the default dashboard",
@@ -1434,7 +1535,7 @@
"confirm_delete_title": "Delete {dashboard_title}?",
"confirm_delete_text": "Your dashboard will be permanently deleted.",
"cant_edit_yaml": "Dashboards created in YAML cannot be edited from the UI. Change them in configuration.yaml.",
- "cant_edit_default": "The default Lovelace dashboard, Overview, cannot be edited from the UI. You can hide it by setting another dashboard as default.",
+ "cant_edit_default": "The default dashboard, Overview, cannot be edited from the UI. You can hide it by setting another dashboard as default.",
"detail": {
"edit_dashboard": "Edit dashboard",
"new_dashboard": "Add new dashboard",
@@ -1472,7 +1573,7 @@
"confirm_delete": "Are you sure you want to delete this resource?",
"refresh_header": "Do you want to refresh?",
"refresh_body": "You have to refresh the page to complete the removal. Do you want to refresh now?",
- "cant_edit_yaml": "You are using Lovelace in YAML mode, therefore you cannot manage your resources through the UI. Manage them in configuration.yaml.",
+ "cant_edit_yaml": "You are using your dashboard in YAML mode, therefore you cannot manage your resources through the UI. Manage them in configuration.yaml.",
"detail": {
"new_resource": "Add new resource",
"dismiss": "Close",
@@ -1740,6 +1841,9 @@
"introduction": "Conditions are optional and will prevent the automation from running unless all conditions are satisfied.",
"learn_more": "Learn more about conditions",
"add": "Add condition",
+ "test": "Test",
+ "invalid_condition": "Invalid condition configuration",
+ "test_failed": "Error occurred while testing condition",
"duplicate": "[%key:ui::panel::config::automation::editor::triggers::duplicate%]",
"delete": "[%key:ui::panel::mailbox::delete_button%]",
"delete_confirm": "[%key:ui::panel::config::automation::editor::triggers::delete_confirm%]",
@@ -2356,10 +2460,10 @@
"sensor": "Sensors",
"diagnostic": "Diagnostic",
"config": "Configuration",
- "add_entities_lovelace": "Add to Lovelace",
+ "add_entities_lovelace": "Add to dashboard",
"none": "This device has no entities",
- "hide_disabled": "Hide disabled",
- "disabled_entities": "+{count} {count, plural,\n one {disabled entity}\n other {disabled entities}\n}"
+ "show_less": "Show less",
+ "hidden_entities": "+{count} {count, plural,\n one {entity}\n other {entities}\n} not shown"
},
"confirm_rename_entity_ids": "Do you also want to rename the entity IDs of your entities?",
"confirm_rename_entity_ids_warning": "This will not change any configuration (like automations, scripts, scenes, dashboards) that is currently using these entities! You will have to update them yourself to use the new entity IDs!",
@@ -2384,7 +2488,7 @@
"filter": {
"filter": "Filter",
"show_disabled": "Show disabled devices",
- "hidden_devices": "{number} hidden {number, plural,\n one {device}\n other {devices}\n}",
+ "hidden_devices": "{number} {number, plural,\n one {device}\n other {devices}\n} not shown",
"show_all": "Show all"
}
}
@@ -2399,10 +2503,11 @@
"search": "Search entities",
"filter": {
"filter": "Filter",
+ "show_hidden": "Show hidden entities",
"show_disabled": "Show disabled entities",
"show_unavailable": "Show unavailable entities",
"show_readonly": "Show read-only entities",
- "hidden_entities": "{number} hidden {number, plural,\n one {entity}\n other {entities}\n}",
+ "hidden_entities": "{number} {number, plural,\n one {entity}\n other {entities}\n} not shown",
"show_all": "Show all"
},
"status": {
@@ -2410,6 +2515,7 @@
"unavailable": "Unavailable",
"disabled": "Disabled",
"readonly": "Read-only",
+ "hidden": "Hidden",
"ok": "Ok"
},
"headers": {
@@ -2436,8 +2542,13 @@
"button": "Remove selected",
"confirm_title": "Do you want to remove {number} {number, plural,\n one {entity}\n other {entities}\n}?",
"confirm_partly_title": "Only {number} {number, plural,\n one {selected entity}\n other {selected entities}\n} can be removed.",
- "confirm_text": "You should remove them from your Lovelace config and automations if they contain these entities.",
+ "confirm_text": "You should remove them from your dashboard config and automations if they contain these entities.",
"confirm_partly_text": "You can only remove {removable} of the selected {selected} entities. Entities can only be removed when the integration is no longer providing the entities. Sometimes you have to restart Home Assistant before you can remove the entities of a removed integration. Are you sure you want to remove the removable entities?"
+ },
+ "hide_selected": {
+ "button": "Hide selected",
+ "confirm_title": "Do you want to hide {number} {number, plural,\n one {entity}\n other {entities}\n}?",
+ "confirm_text": "Hidden entities will not be shown on your dashboard. Their history is still tracked and you can still interact with them with services."
}
}
},
@@ -2693,120 +2804,6 @@
"stop_listening": "Stop listening",
"message_received": "Message {id} received on {topic} at {time}:"
},
- "ozw": {
- "common": {
- "zwave": "Z-Wave",
- "node_id": "Node ID",
- "ozw_instance": "OpenZWave Instance",
- "instance": "Instance",
- "controller": "Controller",
- "network": "Network",
- "wakeup_instructions": "Wake-up Instructions",
- "query_stage": "Query Stage"
- },
- "device_info": {
- "zwave_info": "Z-Wave Info",
- "stage": "Stage",
- "node_failed": "Node Failed"
- },
- "node_query_stages": {
- "protocolinfo": "Obtaining basic Z-Wave capabilities of this node from the controller",
- "probe": "Checking if the node is awake/alive",
- "wakeup": "Setting up support for wake-up queues and messages",
- "manufacturerspecific1": "Obtaining manufacturer and product ID codes from the node",
- "nodeinfo": "Obtaining supported command classes from the node",
- "nodeplusinfo": "Obtaining Z-Wave+ information from the node",
- "manufacturerspecific2": "Obtaining additional manufacturer and product ID codes from the node",
- "versions": "Obtaining information about firmware and command class versions",
- "instances": "Obtaining details about what instances or channels a device supports",
- "static": "Obtaining static values from the device",
- "cacheload": "Loading information from the OpenZWave cache file. Battery nodes will stay at this stage until the node wakes up.",
- "associations": "Refreshing association groups and memberships",
- "neighbors": "Obtaining a list of the node's neighbors",
- "session": "Obtaining infrequently changing values from the node",
- "dynamic": "Obtaining frequently changing values from the node",
- "configuration": "Obtaining configuration values from the node",
- "complete": "Interview process is complete"
- },
- "refresh_node": {
- "button": "Refresh Node",
- "title": "Refresh Node Information",
- "complete": "Node Refresh Complete",
- "description": "This will tell OpenZWave to re-interview a node and update the node's command classes, capabilities, and values.",
- "battery_note": "If the node is battery powered, be sure to wake it before proceeding",
- "wakeup_header": "Wake-up Instructions for",
- "wakeup_instructions_source": "Wake-up instructions are sourced from the OpenZWave community device database.",
- "start_refresh_button": "Start Refresh",
- "refreshing_description": "Refreshing node information…",
- "node_status": "Node Status",
- "step": "Step"
- },
- "network_status": {
- "online": "Online",
- "offline": "Offline",
- "starting": "Starting",
- "unknown": "Unknown",
- "details": {
- "driverallnodesqueried": "All nodes have been queried",
- "driverallnodesqueriedsomedead": "All nodes have been queried. Some nodes were found dead",
- "driverawakenodesqueries": "All awake nodes have been queried",
- "driverremoved": "The driver has been removed",
- "driverreset": "The driver has been reset",
- "driverfailed": "Failed to connect to Z-Wave controller",
- "driverready": "Initializing the Z-Wave controller",
- "ready": "Ready to connect",
- "stopped": "OpenZWave stopped",
- "started": "Connected to MQTT",
- "starting": "Connecting to MQTT",
- "offline": "OZWDaemon offline"
- }
- },
- "navigation": {
- "select_instance": "Select Instance",
- "network": "Network",
- "nodes": "Nodes",
- "node": {
- "dashboard": "Dashboard",
- "config": "Config"
- }
- },
- "select_instance": {
- "header": "Select an OpenZWave Instance",
- "introduction": "You have more than one OpenZWave instance running. Which instance would you like to manage?",
- "none_found": "We couldn't find an OpenZWave instance. If you believe this is incorrect, check your OpenZWave and MQTT setups and ensure that Home Assistant can communicate with your MQTT broker."
- },
- "network": {
- "header": "Network Management",
- "introduction": "Manage network-wide functions.",
- "node_count": "{count} nodes"
- },
- "nodes_table": {
- "id": "ID",
- "manufacturer": "Manufacturer",
- "model": "Model",
- "query_stage": "Query Stage",
- "zwave_plus": "Z-Wave Plus",
- "failed": "Failed"
- },
- "node": {
- "button": "Node Details",
- "not_found": "Node not found"
- },
- "node_config": {
- "header": "Node Configuration",
- "introduction": "Manage the different configuration parameters for a Z-Wave node.",
- "help_source": "Config parameter descriptions and help text are provided by the OpenZWave project.",
- "wakeup_help": "Battery powered nodes must be awake to change their configuration. If the node is not awake, OpenZWave will attempt to update the node's configuration the next time it wakes up, which could be multiple hours (or days) later. Follow these steps to wake up your device:"
- },
- "node_metadata": {
- "product_manual": "Product Manual"
- },
- "services": {
- "add_node": "Add Node",
- "remove_node": "Remove Node",
- "cancel_command": "Cancel Command"
- }
- },
"zha": {
"common": {
"clusters": "Clusters",
@@ -2900,96 +2897,6 @@
"unbind_button_help": "Unbind the selected group from the selected device clusters."
}
},
- "zwave": {
- "description": "Manage your Z-Wave network",
- "learn_more": "Learn more about Z-Wave",
- "common": {
- "value": "Value",
- "instance": "Instance",
- "index": "Index",
- "unknown": "unknown",
- "wakeup_interval": "Wake-up Interval"
- },
- "migration": {
- "zwave_js": {
- "header": "Migrate to Z-Wave JS",
- "introduction": "This integration is no longer maintained, and we advise you to move to the new Z-Wave JS integration. This wizard will help you migrate from the legacy Z-Wave integration to the new Z-Wave JS integration."
- }
- },
- "network_management": {
- "header": "Z-Wave Network Management",
- "introduction": "Run commands that affect the Z-Wave network. You won't get feedback on whether most commands succeeded, but you can check the OZW Log to try to find out."
- },
- "node_management": {
- "header": "Z-Wave Node Management",
- "introduction": "Run Z-Wave commands that affect a single node. Pick a node to see a list of available commands.",
- "nodes": "Nodes",
- "nodes_hint": "Select node to view per-node options",
- "entities": "Entities of this node",
- "entity_info": "Entity Information",
- "exclude_entity": "Exclude this entity from Home Assistant",
- "pooling_intensity": "Polling intensity",
- "node_protection": "Node protection",
- "protection": "Protection",
- "set_protection": "Set Protection",
- "node_group_associations": "Node group associations",
- "group": "Group",
- "node_to_control": "Node to control",
- "nodes_in_group": "Other nodes in this group:",
- "max_associations": "Max Associations:",
- "add_to_group": "Add to Group",
- "remove_from_group": "Remove from Group",
- "remove_broadcast": "Remove Broadcast"
- },
- "ozw_log": {
- "header": "OZW Log",
- "introduction": "View the log. 0 is the minimum (loads entire log) and 1000 is the maximum. Load will show a static log and tail will auto update with the last specified number of lines of the log.",
- "last_log_lines": "Number of last log lines",
- "load": "Load",
- "tail": "Tail"
- },
- "network_status": {
- "network_stopped": "Z-Wave Network Stopped",
- "network_starting": "Starting Z-Wave Network…",
- "network_starting_note": "This may take a while depending on the size of your network.",
- "network_started": "Z-Wave Network Started",
- "network_started_note_some_queried": "Awake nodes have been queried. Sleeping nodes will be queried when they wake.",
- "network_started_note_all_queried": "All nodes have been queried."
- },
- "node_config": {
- "header": "Node Configuration Options",
- "seconds": "seconds",
- "set_wakeup": "Set Wake-up Interval",
- "config_parameter": "Configuration Parameter",
- "config_value": "Configuration Value",
- "true": "True",
- "false": "False",
- "set_config_parameter": "Set Configuration Parameter"
- },
- "values": {
- "header": "Node Values"
- },
- "services": {
- "start_network": "Start Network",
- "stop_network": "Stop Network",
- "heal_network": "Heal Network",
- "test_network": "Test Network",
- "soft_reset": "Soft Reset",
- "save_config": "Save Configuration",
- "add_node_secure": "Add Node Secure",
- "add_node": "Add Node",
- "remove_node": "Remove Node",
- "cancel_command": "Cancel Command",
- "refresh_node": "Refresh Node",
- "remove_failed_node": "Remove Failed Node",
- "replace_failed_node": "Replace Failed Node",
- "print_node": "Print Node",
- "heal_node": "Heal Node",
- "test_node": "Test Node",
- "node_info": "Node Information",
- "refresh_entity": "Refresh Entity"
- }
- },
"zwave_js": {
"navigation": {
"network": "Network",
@@ -3281,7 +3188,7 @@
},
"unused_entities": {
"title": "Unused entities",
- "available_entities": "These are the entities that you have available, but are not in your Lovelace UI yet.",
+ "available_entities": "These are the entities that you have available, but are not in your dashboard yet.",
"select_to_add": "Select the entities you want to add to a card and then click the add card button.",
"state_icon": "State",
"entity": "Entity",
@@ -3292,9 +3199,9 @@
"no_data": "No unused entities found"
},
"add_entities": {
- "yaml_unsupported": "You cannot use this function when using Lovelace UI in YAML mode.",
- "generated_unsupported": "You can only use this function when you have taken control of the Lovelace UI.",
- "saving_failed": "Saving Lovelace UI configuration failed."
+ "yaml_unsupported": "You cannot use this function when using your dashboard in YAML mode.",
+ "generated_unsupported": "You can only use this function when you have taken control of your dashboard.",
+ "saving_failed": "Saving dashboard configuration failed."
},
"views": {
"confirm_delete": "Delete view?",
@@ -3317,7 +3224,7 @@
"editor": {
"header": "Edit UI",
"menu": {
- "open": "Open Lovelace UI menu",
+ "open": "Open dashboard menu",
"raw_editor": "Raw configuration editor",
"manage_dashboards": "Manage dashboards",
"manage_resources": "Manage resources"
@@ -3334,20 +3241,20 @@
"unsaved_changes": "Unsaved changes",
"saved": "Saved",
"reload": "Reload",
- "lovelace_changed": "The Lovelace config was updated, do you want to load the updated config in the editor and lose your current changes?",
- "confirm_remove_config_title": "Are you sure you want to remove your Lovelace UI configuration?",
- "confirm_remove_config_text": "We will automatically generate your Lovelace UI views with your areas and devices if you remove your Lovelace UI configuration.",
+ "lovelace_changed": "Your dashboard was updated, do you want to load the updated config in the editor and lose your current changes?",
+ "confirm_remove_config_title": "Are you sure you want to remove your dashboard configuration?",
+ "confirm_remove_config_text": "We will automatically generate your dashboard views with your areas and devices if you remove your dashboard configuration.",
"confirm_unsaved_changes": "You have unsaved changes, are you sure you want to exit?",
"confirm_unsaved_comments": "Your configuration might contains comment(s), these will not be saved. Do you want to continue?",
"error_parse_yaml": "Unable to parse YAML: {error}",
"error_invalid_config": "Your configuration is not valid: {error}",
"error_save_yaml": "Unable to save YAML: {error}",
"error_remove": "Unable to remove configuration: {error}",
- "resources_moved": "Resources should no longer be added to the Lovelace configuration but can be added in the Lovelace config panel."
+ "resources_moved": "Resources should no longer be added to the dashboard configuration but can be added in the dashboard config panel."
},
"edit_lovelace": {
- "header": "Title of your Lovelace UI",
- "explanation": "This title is shown above all your views in the Lovelace UI.",
+ "header": "Title of your dashboard",
+ "explanation": "This title is shown above all your views in the dashboard.",
"edit_title": "Edit title",
"title": "Title"
},
@@ -3409,13 +3316,13 @@
"suggest_card": {
"header": "We created a suggestion for you",
"create_own": "Pick different card",
- "add": "Add to Lovelace UI"
+ "add": "Add to dashboard"
},
"save_config": {
- "header": "Take control of your Lovelace UI",
- "para": "This dashboard is currently being maintained by Home Assistant. It is automatically updated when new entities or Lovelace UI components become available. If you take control, this dashboard will no longer be automatically updated. You can always create a new dashboard in configuration to play around with.",
+ "header": "Take control of your dashboard",
+ "para": "This dashboard is currently being maintained by Home Assistant. It is automatically updated when new entities or dashboard components become available. If you take control, this dashboard will no longer be automatically updated. You can always create a new dashboard in configuration to play around with.",
"para_sure": "Are you sure you want to take control of your user interface?",
- "yaml_mode": "You are using YAML mode for this dashboard, which means you cannot change your Lovelace config from the UI. If you want to manage this dashboard from the UI, remove 'mode: yaml' from your Lovelace configuration in 'configuration.yaml.'.",
+ "yaml_mode": "You are using YAML mode for this dashboard, which means you cannot change your dashboard config from the UI. If you want to manage this dashboard from the UI, remove 'mode: yaml' from your dashboard configuration in 'configuration.yaml.'.",
"yaml_control": "To take control in YAML mode, create a YAML file with the name you specified in your config for this dashboard, or the default 'ui-lovelace.yaml'.",
"yaml_config": "To help you start here is the current config of this dashboard:",
"empty_config": "Start with an empty dashboard",
@@ -3609,7 +3516,6 @@
"tap_action": "Tap Action",
"title": "Title",
"theme": "Theme",
- "no_theme": "No theme",
"unit": "Unit",
"url": "URL",
"state": "State",
@@ -3728,7 +3634,7 @@
"starting": "Home Assistant is starting, not everything may be available yet"
},
"changed_toast": {
- "message": "The Lovelace UI configuration for this dashboard was updated. Refresh to see changes?"
+ "message": "Your dashboard was updated. Refresh to see changes?"
},
"components": {
"timestamp-display": {
@@ -4527,7 +4433,8 @@
"privileged": "Supervisor is not privileged",
"software": "Unsupported software detected",
"source_mods": "Source modifications",
- "systemd": "Systemd"
+ "systemd": "Systemd",
+ "systemd_resolved": "Systemd-Resolved"
},
"unhealthy_reason": {
"privileged": "Supervisor is not privileged",
diff --git a/yarn.lock b/yarn.lock
index 10cde4b7b8..7701804f4f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2975,17 +2975,17 @@ __metadata:
languageName: node
linkType: hard
-"@mdi/js@npm:6.5.95":
- version: 6.5.95
- resolution: "@mdi/js@npm:6.5.95"
- checksum: b1db7713d216c119f584bf973514a2f9d8f2e671e91bf19ce8e56cfa7a9843c0a060328e794507ac31f2bded1032123294f39ff8e987ea5acb2719ab522ef146
+"@mdi/js@npm:6.6.95":
+ version: 6.6.95
+ resolution: "@mdi/js@npm:6.6.95"
+ checksum: 4cf8c48156f0e9ff67e4394cd428158bd164b1a6b7ca1aa70fc6a6aee91cfede9eba56720eb7d13fa57315ac636e9519a62dedd3cd2a9708aa11f2e3624ddbff
languageName: node
linkType: hard
-"@mdi/svg@npm:6.5.95":
- version: 6.5.95
- resolution: "@mdi/svg@npm:6.5.95"
- checksum: 2d45221d042d52d54c85eaf672a5f3697ed5201607fa38a6e235ee2e60d1c3c25d456a284f19ce47b5f06418cacfee29e8fecf6580b8c28538fd26044becaf1a
+"@mdi/svg@npm:6.6.95":
+ version: 6.6.95
+ resolution: "@mdi/svg@npm:6.6.95"
+ checksum: 59b79db945847a3d981351418e0e7a457b831e09846fa751d44e80df8fb4cd19ef12bc889538ed2945d2638e522aa7ea5b1f97997e19dd68345f5d7bf5cad5e6
languageName: node
linkType: hard
@@ -3136,19 +3136,7 @@ __metadata:
languageName: node
linkType: hard
-"@polymer/iron-dropdown@npm:^3.0.0-pre.26":
- version: 3.0.1
- resolution: "@polymer/iron-dropdown@npm:3.0.1"
- dependencies:
- "@polymer/iron-behaviors": ^3.0.0-pre.26
- "@polymer/iron-overlay-behavior": ^3.0.0-pre.27
- "@polymer/neon-animation": ^3.0.0-pre.26
- "@polymer/polymer": ^3.0.0
- checksum: 2c1ba429c8f5553f8493f256691efa8a338e8c038c1102f482ecb612b61c079b5019f6c362aefb31b44d3429661152c1b6912408a69c67e9d6fff62914ad801f
- languageName: node
- linkType: hard
-
-"@polymer/iron-fit-behavior@npm:^3.0.0-pre.26, @polymer/iron-fit-behavior@npm:^3.1.0":
+"@polymer/iron-fit-behavior@npm:^3.0.0-pre.26":
version: 3.1.0
resolution: "@polymer/iron-fit-behavior@npm:3.1.0"
dependencies:
@@ -3295,17 +3283,6 @@ __metadata:
languageName: node
linkType: hard
-"@polymer/neon-animation@npm:^3.0.0-pre.26":
- version: 3.0.1
- resolution: "@polymer/neon-animation@npm:3.0.1"
- dependencies:
- "@polymer/iron-resizable-behavior": ^3.0.0-pre.26
- "@polymer/iron-selector": ^3.0.0-pre.26
- "@polymer/polymer": ^3.0.0
- checksum: c5ea5e1ef9f2017faaa5799ea108b26634dd7d986fe469369e629075efe382a5e5d4f9c537bacc77f9852453a2758c9f67e491d6ea5a1c4457f772bfdf06c707
- languageName: node
- linkType: hard
-
"@polymer/paper-behaviors@npm:^3.0.0-pre.27":
version: 3.0.1
resolution: "@polymer/paper-behaviors@npm:3.0.1"
@@ -3318,25 +3295,6 @@ __metadata:
languageName: node
linkType: hard
-"@polymer/paper-dropdown-menu@npm:^3.2.0":
- version: 3.2.0
- resolution: "@polymer/paper-dropdown-menu@npm:3.2.0"
- dependencies:
- "@polymer/iron-a11y-keys-behavior": ^3.0.0-pre.26
- "@polymer/iron-form-element-behavior": ^3.0.0-pre.26
- "@polymer/iron-icon": ^3.0.0-pre.26
- "@polymer/iron-iconset-svg": ^3.0.0-pre.26
- "@polymer/iron-validatable-behavior": ^3.0.0-pre.26
- "@polymer/paper-behaviors": ^3.0.0-pre.27
- "@polymer/paper-input": ^3.1.0
- "@polymer/paper-menu-button": ^3.1.0
- "@polymer/paper-ripple": ^3.0.0-pre.26
- "@polymer/paper-styles": ^3.0.0-pre.26
- "@polymer/polymer": ^3.3.1
- checksum: dc7f6a8e3d449f37068ad5ee1d1c6d9037c9abd855ccc1d4e433d743c6378bb25af165ea86174edd1414887cf56a011ad0adda6d24dd55765e9458d49dc3e5e3
- languageName: node
- linkType: hard
-
"@polymer/paper-icon-button@npm:^3.0.0-pre.26":
version: 3.0.2
resolution: "@polymer/paper-icon-button@npm:3.0.2"
@@ -3349,7 +3307,7 @@ __metadata:
languageName: node
linkType: hard
-"@polymer/paper-input@npm:^3.0.0-pre.26, @polymer/paper-input@npm:^3.1.0, @polymer/paper-input@npm:^3.2.1":
+"@polymer/paper-input@npm:^3.0.0-pre.26, @polymer/paper-input@npm:^3.2.1":
version: 3.2.1
resolution: "@polymer/paper-input@npm:3.2.1"
dependencies:
@@ -3388,21 +3346,6 @@ __metadata:
languageName: node
linkType: hard
-"@polymer/paper-menu-button@npm:^3.1.0":
- version: 3.1.0
- resolution: "@polymer/paper-menu-button@npm:3.1.0"
- dependencies:
- "@polymer/iron-a11y-keys-behavior": ^3.0.0-pre.26
- "@polymer/iron-behaviors": ^3.0.0-pre.26
- "@polymer/iron-dropdown": ^3.0.0-pre.26
- "@polymer/iron-fit-behavior": ^3.1.0
- "@polymer/neon-animation": ^3.0.0-pre.26
- "@polymer/paper-styles": ^3.0.0-pre.26
- "@polymer/polymer": ^3.0.0
- checksum: 9243e104bac583189c6221f2df8dffeb331868cbf8084dd488cf2ddaba25987bfb3d4d2a9bd3168e6b49f28ba6b1b07ef7163fbfcf3af97978d34608e91cc605
- languageName: node
- linkType: hard
-
"@polymer/paper-progress@npm:^3.0.0-pre.26":
version: 3.0.1
resolution: "@polymer/paper-progress@npm:3.0.1"
@@ -9105,15 +9048,14 @@ fsevents@^1.2.7:
"@material/mwc-textfield": 0.25.3
"@material/mwc-top-app-bar-fixed": ^0.25.3
"@material/top-app-bar": 14.0.0-canary.261f2db59.0
- "@mdi/js": 6.5.95
- "@mdi/svg": 6.5.95
+ "@mdi/js": 6.6.95
+ "@mdi/svg": 6.6.95
"@open-wc/dev-server-hmr": ^0.0.2
"@polymer/app-layout": ^3.1.0
"@polymer/iron-flex-layout": ^3.0.1
"@polymer/iron-icon": ^3.0.1
"@polymer/iron-input": ^3.0.1
"@polymer/iron-resizable-behavior": ^3.0.1
- "@polymer/paper-dropdown-menu": ^3.2.0
"@polymer/paper-input": ^3.2.1
"@polymer/paper-item": ^3.0.1
"@polymer/paper-listbox": ^3.0.1
@@ -9186,7 +9128,7 @@ fsevents@^1.2.7:
gulp-rename: ^2.0.0
gulp-zopfli-green: ^3.0.1
hls.js: ^1.1.5
- home-assistant-js-websocket: ^6.0.1
+ home-assistant-js-websocket: ^7.0.1
html-minifier: ^4.0.0
husky: ^1.3.1
idb-keyval: ^5.1.3
@@ -9240,7 +9182,6 @@ fsevents@^1.2.7:
vis-network: ^8.5.4
vue: ^2.6.12
vue2-daterange-picker: ^0.5.1
- web-animations-js: ^2.3.2
webpack: ^5.55.1
webpack-cli: ^4.8.0
webpack-dev-server: ^4.3.0
@@ -9257,10 +9198,10 @@ fsevents@^1.2.7:
languageName: unknown
linkType: soft
-"home-assistant-js-websocket@npm:^6.0.1":
- version: 6.0.1
- resolution: "home-assistant-js-websocket@npm:6.0.1"
- checksum: 566d6de6a4eb0e05ca434a45433cfe6fdd6b5cb2008e9a165709e08335df1c9b70903564c479ab8d48c6f5468a9784f47697192f9023170d2d86d43a461d6126
+"home-assistant-js-websocket@npm:^7.0.1":
+ version: 7.0.1
+ resolution: "home-assistant-js-websocket@npm:7.0.1"
+ checksum: c9a87f11222571226adff43f022008d35df1f78799efae43e9a36f768eef10d21aed99886c905086c42c24d85d47c78e328c1be9593c117b397a18ee86b2fe64
languageName: node
linkType: hard
@@ -15703,13 +15644,6 @@ typescript@^4.4.3:
languageName: node
linkType: hard
-"web-animations-js@npm:^2.3.2":
- version: 2.3.2
- resolution: "web-animations-js@npm:2.3.2"
- checksum: 194db111bb2f92c15100c33b63af320ccdc26066748e358a945b947c510216c78e0a1e2ae22fefbaacb585c8a0b41b62a1417d8b549636ee32e16f059bb488f2
- languageName: node
- linkType: hard
-
"web-component-analyzer@npm:~1.1.1":
version: 1.1.6
resolution: "web-component-analyzer@npm:1.1.6"
-
+