${this.label}
+ ${this.helper + ? html`${this.helper}
` + : nothing} + `; } @@ -46,6 +54,28 @@ export class HaFormBoolean extends LitElement implements HaFormElement { value: (ev.target as HaCheckbox).checked, }); } + + static get styles(): CSSResultGroup { + return css` + ha-formfield { + display: flex; + min-height: 56px; + align-items: center; + --mdc-typography-body2-font-size: 1em; + } + p { + margin: 0; + } + .secondary { + direction: var(--direction); + padding-top: 4px; + box-sizing: border-box; + color: var(--secondary-text-color); + font-size: 0.875rem; + font-weight: var(--mdc-typography-body2-font-weight, 400); + } + `; + } } declare global { diff --git a/src/components/ha-form/types.ts b/src/components/ha-form/types.ts index 437ffd17ea73..5c5ab10643a6 100644 --- a/src/components/ha-form/types.ts +++ b/src/components/ha-form/types.ts @@ -85,6 +85,7 @@ export interface HaFormStringSchema extends HaFormBaseSchema { type: "string"; format?: string; autocomplete?: string; + autofocus?: boolean; } export interface HaFormBooleanSchema extends HaFormBaseSchema { diff --git a/src/components/ha-grid-size-picker.ts b/src/components/ha-grid-size-picker.ts index f3b5607c21d1..49a293e33d25 100644 --- a/src/components/ha-grid-size-picker.ts +++ b/src/components/ha-grid-size-picker.ts @@ -2,9 +2,7 @@ import { LitElement, css, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import "../panels/lovelace/editor/card-editor/ha-grid-layout-slider"; import "./ha-icon-button"; - import { mdiRestore } from "@mdi/js"; -import { classMap } from "lit/directives/class-map"; import { styleMap } from "lit/directives/style-map"; import { fireEvent } from "../common/dom/fire_event"; import { conditionalClamp } from "../common/number/clamp"; @@ -20,7 +18,7 @@ export class HaGridSizeEditor extends LitElement { @property({ attribute: false }) public rows = 8; - @property({ attribute: false }) public columns = 4; + @property({ attribute: false }) public columns = 12; @property({ attribute: false }) public rowMin?: number; @@ -32,6 +30,8 @@ export class HaGridSizeEditor extends LitElement { @property({ attribute: false }) public isDefault?: boolean; + @property({ attribute: false }) public step: number = 1; + @state() public _localValue?: CardGridSize = { rows: 1, columns: 1 }; protected willUpdate(changedProperties) { @@ -51,8 +51,9 @@ export class HaGridSizeEditor extends LitElement { const rowMin = this.rowMin ?? 1; const rowMax = this.rowMax ?? this.rows; - const columnMin = this.columnMin ?? 1; - const columnMax = this.columnMax ?? this.columns; + const columnMin = Math.ceil((this.columnMin ?? 1) / this.step) * this.step; + const columnMax = + Math.ceil((this.columnMax ?? this.columns) / this.step) * this.step; const rowValue = autoHeight ? rowMin : this._localValue?.rows; const columnValue = this._localValue?.columns; @@ -67,9 +68,11 @@ export class HaGridSizeEditor extends LitElement { .max=${columnMax} .range=${this.columns} .value=${fullWidth ? this.columns : this.value?.columns} + .step=${this.step} @value-changed=${this._valueChanged} @slider-moved=${this._sliderMoved} .disabled=${disabledColumns} + tooltip-mode="always" >
-
- (
+const multiplyBy = (
value: T,
multiplier: number
): T => (typeof value === "number" ? ((value * multiplier) as T) : value);
-export const divideBy = (
- value: T,
- divider: number
-): T => (typeof value === "number" ? (Math.ceil(value / divider) as T) : value);
-
export const migrateLayoutToGridOptions = (
options: LovelaceLayoutOptions
): LovelaceGridOptions => {
@@ -42,6 +37,9 @@ export type CardGridSize = {
columns: number | "full";
};
+export const isPreciseMode = (options: LovelaceGridOptions) =>
+ typeof options.columns === "number" && options.columns % 3 !== 0;
+
export const computeCardGridSize = (
options: LovelaceGridOptions
): CardGridSize => {
diff --git a/src/panels/lovelace/common/directives/action-handler-directive.ts b/src/panels/lovelace/common/directives/action-handler-directive.ts
index d39db84b6be5..ef931d895b9c 100644
--- a/src/panels/lovelace/common/directives/action-handler-directive.ts
+++ b/src/panels/lovelace/common/directives/action-handler-directive.ts
@@ -149,7 +149,10 @@ class ActionHandler extends HTMLElement implements ActionHandlerType {
element.actionHandler.end = (ev: Event) => {
// Don't respond when moved or scrolled while touch
- if (["touchend", "touchcancel"].includes(ev.type) && this.cancelled) {
+ if (
+ ev.type === "touchcancel" ||
+ (ev.type === "touchend" && this.cancelled)
+ ) {
return;
}
const target = ev.target as HTMLElement;
diff --git a/src/panels/lovelace/components/hui-card-edit-mode.ts b/src/panels/lovelace/components/hui-card-edit-mode.ts
index c599910cce71..9775e67e734a 100644
--- a/src/panels/lovelace/components/hui-card-edit-mode.ts
+++ b/src/panels/lovelace/components/hui-card-edit-mode.ts
@@ -233,7 +233,7 @@ export class HuiCardEditMode extends LitElement {
}
private _handleAction(ev) {
- switch (ev.target.action) {
+ switch (ev.currentTarget.action) {
case "edit":
this._editCard();
break;
diff --git a/src/panels/lovelace/editor/card-editor/ha-grid-layout-slider.ts b/src/panels/lovelace/editor/card-editor/ha-grid-layout-slider.ts
index 206436ce959d..e133be40c1d9 100644
--- a/src/panels/lovelace/editor/card-editor/ha-grid-layout-slider.ts
+++ b/src/panels/lovelace/editor/card-editor/ha-grid-layout-slider.ts
@@ -23,6 +23,8 @@ const A11Y_KEY_CODES = new Set([
"End",
]);
+type TooltipMode = "never" | "always" | "interaction";
+
@customElement("ha-grid-layout-slider")
export class HaGridLayoutSlider extends LitElement {
@property({ type: Boolean, reflect: true })
@@ -34,6 +36,9 @@ export class HaGridLayoutSlider extends LitElement {
@property({ attribute: "touch-action" })
public touchAction?: string;
+ @property({ attribute: "tooltip-mode" })
+ public tooltipMode: TooltipMode = "interaction";
+
@property({ type: Number })
public value?: number;
@@ -52,6 +57,9 @@ export class HaGridLayoutSlider extends LitElement {
@state()
public pressed = false;
+ @state()
+ public tooltipVisible = false;
+
private _mc?: HammerManager;
private get _range() {
@@ -135,11 +143,13 @@ export class HaGridLayoutSlider extends LitElement {
this._mc.on("panstart", () => {
if (this.disabled) return;
this.pressed = true;
+ this._showTooltip();
savedValue = this.value;
});
this._mc.on("pancancel", () => {
if (this.disabled) return;
this.pressed = false;
+ this._hideTooltip();
this.value = savedValue;
});
this._mc.on("panmove", (e) => {
@@ -152,6 +162,7 @@ export class HaGridLayoutSlider extends LitElement {
this._mc.on("panend", (e) => {
if (this.disabled) return;
this.pressed = false;
+ this._hideTooltip();
const percentage = this._getPercentageFromEvent(e);
const value = this._percentageToValue(percentage);
this.value = this._steppedValue(this._boundedValue(value));
@@ -223,6 +234,23 @@ export class HaGridLayoutSlider extends LitElement {
fireEvent(this, "value-changed", { value: this.value });
}
+ private _tooltipTimeout?: number;
+
+ _showTooltip() {
+ if (this._tooltipTimeout != null) window.clearTimeout(this._tooltipTimeout);
+ this.tooltipVisible = true;
+ }
+
+ _hideTooltip(delay?: number) {
+ if (!delay) {
+ this.tooltipVisible = false;
+ return;
+ }
+ this._tooltipTimeout = window.setTimeout(() => {
+ this.tooltipVisible = false;
+ }, delay);
+ }
+
private _getPercentageFromEvent = (e: HammerInput) => {
if (this.vertical) {
const y = e.center.y;
@@ -236,6 +264,30 @@ export class HaGridLayoutSlider extends LitElement {
return Math.max(Math.min(1, (x - offset) / total), 0);
};
+ private _renderTooltip() {
+ if (this.tooltipMode === "never") return nothing;
+
+ const position = this.vertical ? "left" : "top";
+
+ const visible =
+ this.tooltipMode === "always" ||
+ (this.tooltipVisible && this.tooltipMode === "interaction");
+
+ const value = this._boundedValue(this._steppedValue(this.value ?? 0));
+
+ return html`
+
+ `;
+ }
+
protected render(): TemplateResult {
return html`
+
+ ${Array(this._range / this.step)
+ .fill(0)
+ .map((_, i) => {
+ const percentage = i / (this._range / this.step);
+ const disabled =
+ this.min >= i * this.step || i * this.step > this.max;
+ if (disabled) {
+ return nothing;
+ }
+ return html`
+
+ `;
+ })}
${this.value !== undefined
? html``
: nothing}
+ ${this._renderTooltip()}
- ${Array(this.rows * this.columns)
+
`;
@@ -223,42 +237,40 @@ export class HaGridSizeEditor extends LitElement {
}
.reset {
grid-area: reset;
+ --mdc-icon-button-size: 36px;
}
.preview {
position: relative;
grid-area: preview;
}
- .preview > div {
- position: relative;
- display: grid;
- grid-template-columns: repeat(var(--total-columns), 1fr);
- grid-template-rows: repeat(var(--total-rows), 25px);
- gap: 4px;
+ .preview table,
+ .preview tr,
+ .preview td {
+ border: 2px dotted var(--divider-color);
+ border-collapse: collapse;
+ }
+ .preview table {
+ width: 100%;
}
- .preview .cell {
- background-color: var(--disabled-color);
- grid-column: span 1;
- grid-row: span 1;
- border-radius: 4px;
- opacity: 0.2;
+ .preview tr {
+ height: 30px;
+ }
+ .preview td {
cursor: pointer;
}
- .preview .selected {
+ .preview-card {
position: absolute;
- pointer-events: none;
top: 0;
left: 0;
- height: 100%;
- width: 100%;
- }
- .selected .cell {
background-color: var(--primary-color);
- grid-column: 1 / span min(var(--columns, 0), var(--total-columns));
- grid-row: 1 / span min(var(--rows, 0), var(--total-rows));
- opacity: 0.5;
- }
- .preview.full-width .selected .cell {
- grid-column: 1 / -1;
+ opacity: 0.3;
+ border-radius: 8px;
+ height: calc(var(--rows, 1) * 30px);
+ width: calc(var(--columns, 1) * 100% / var(--total-columns, 12));
+ pointer-events: none;
+ transition:
+ width ease-in-out 180ms,
+ height ease-in-out 180ms;
}
`,
];
diff --git a/src/components/ha-label.ts b/src/components/ha-label.ts
index 668f28017e51..1b15d914ed17 100644
--- a/src/components/ha-label.ts
+++ b/src/components/ha-label.ts
@@ -26,6 +26,7 @@ class HaLabel extends LitElement {
0.15
);
--ha-label-background-opacity: 1;
+ border: 1px solid var(--outline-color);
position: relative;
box-sizing: border-box;
display: inline-flex;
diff --git a/src/components/ha-md-dialog.ts b/src/components/ha-md-dialog.ts
index dde855e016d9..7ee73d7866d5 100644
--- a/src/components/ha-md-dialog.ts
+++ b/src/components/ha-md-dialog.ts
@@ -164,8 +164,8 @@ export class HaMdDialog extends MdDialog {
min-width: 320px;
}
- :host(:not([type="alert"])) {
- @media all and (max-width: 450px), all and (max-height: 500px) {
+ @media all and (max-width: 450px), all and (max-height: 500px) {
+ :host(:not([type="alert"])) {
min-width: calc(
100vw - env(safe-area-inset-right) - env(safe-area-inset-left)
);
@@ -178,7 +178,7 @@ export class HaMdDialog extends MdDialog {
}
}
- :host ::slotted(ha-dialog-header) {
+ ::slotted(ha-dialog-header[slot="headline"]) {
display: contents;
}
@@ -190,7 +190,7 @@ export class HaMdDialog extends MdDialog {
padding: var(--dialog-content-padding, 24px);
}
.scrim {
- z-index: 10; // overlay navigation
+ z-index: 10; /* overlay navigation */
}
`,
];
diff --git a/src/components/ha-password-field.ts b/src/components/ha-password-field.ts
index f149264fdb8a..15fd9666dd34 100644
--- a/src/components/ha-password-field.ts
+++ b/src/components/ha-password-field.ts
@@ -117,8 +117,8 @@ export class HaPasswordField extends LitElement {
.autocapitalize=${this.autocapitalize}
.type=${this._unmaskedPassword ? "text" : "password"}
.suffix=${html``}
- @input=${this._handleInputChange}
- @change=${this._reDispatchEvent}
+ @input=${this._handleInputEvent}
+ @change=${this._handleChangeEvent}
>
+
+ ${Array(this.rows)
.fill(0)
.map((_, index) => {
- const row = Math.floor(index / this.columns) + 1;
- const column = (index % this.columns) + 1;
+ const row = index + 1;
return html`
-
+
+
| + `; + })} + |
No Logbook entries found for this step.
diff --git a/src/components/trace/ha-trace-path-details.ts b/src/components/trace/ha-trace-path-details.ts
index 2a38ca6504c8..75b4946f71ee 100644
--- a/src/components/trace/ha-trace-path-details.ts
+++ b/src/components/trace/ha-trace-path-details.ts
@@ -18,6 +18,7 @@ import "../../panels/logbook/ha-logbook-renderer";
import { traceTabStyles } from "./trace-tab-styles";
import type { HomeAssistant } from "../../types";
import type { NodeInfo } from "./hat-script-graph";
+import { describeCondition } from "../../data/automation_i18n";
const TRACE_PATH_TABS = [
"step_config",
@@ -121,6 +122,19 @@ export class HaTracePathDetails extends LitElement {
const data: ActionTraceStep[] = paths[curPath];
+ // Extract details from this.selected.config child properties used to add 'alias' (to headline), describeCondition and 'entity_id' (to result)
+ const nestPath = curPath
+ .substring(this.selected.path.length + 1)
+ .split("/");
+ let currentDetail = this.selected.config;
+ for (let i = 0; i < nestPath.length; i++) {
+ if (
+ !["undefined", "string"].includes(typeof currentDetail[nestPath[i]])
+ ) {
+ currentDetail = currentDetail[nestPath[i]];
+ }
+ }
+
parts.push(
data.map((trace, idx) => {
const { path, timestamp, result, error, changed_variables, ...rest } =
@@ -134,7 +148,9 @@ export class HaTracePathDetails extends LitElement {
return html`
${curPath === this.selected.path
- ? ""
+ ? currentDetail.alias
+ ? html`
` + : nothing} ${this.hass!.localize( "ui.panel.config.automation.trace.path.executed", { @@ -176,6 +201,12 @@ export class HaTracePathDetails extends LitElement { ${Object.keys(rest).length === 0 ? nothing : html`) {
- const params = extractSearchParamsObject();
- for (const [key, value] of Object.entries(update)) {
- if (value === undefined) {
- delete params[key];
- } else {
- params[key] = value;
- }
+ private _updatePath() {
+ const params: Record = {};
+
+ if (this._targetPickerValue.entity_id) {
+ params.entity_id = ensureArray(this._targetPickerValue.entity_id).join(
+ ","
+ );
+ }
+ if (this._targetPickerValue.label_id) {
+ params.label_id = ensureArray(this._targetPickerValue.label_id).join(",");
+ }
+ if (this._targetPickerValue.floor_id) {
+ params.floor_id = ensureArray(this._targetPickerValue.floor_id).join(",");
+ }
+ if (this._targetPickerValue.area_id) {
+ params.area_id = ensureArray(this._targetPickerValue.area_id).join(",");
}
+ if (this._targetPickerValue.device_id) {
+ params.device_id = ensureArray(this._targetPickerValue.device_id).join(
+ ","
+ );
+ }
+
+ if (this._time.range[0]) {
+ params.start_date = this._time.range[0].toISOString();
+ }
+
+ if (this._time.range[1]) {
+ params.end_date = this._time.range[1].toISOString();
+ }
+
navigate(`/logbook?${createSearchParam(params)}`, { replace: true });
}
diff --git a/src/panels/lovelace/cards/energy/hui-energy-date-selection-card.ts b/src/panels/lovelace/cards/energy/hui-energy-date-selection-card.ts
index 8db4e6b44a6b..5e021d53dad3 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-date-selection-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-date-selection-card.ts
@@ -1,11 +1,11 @@
import type { CSSResultGroup, PropertyValues } from "lit";
import { LitElement, css, html, nothing } from "lit";
import { customElement, property, state } from "lit/decorators";
+import "../../../../components/ha-card";
import type { HomeAssistant } from "../../../../types";
import { hasConfigChanged } from "../../common/has-changed";
import "../../components/hui-energy-period-selector";
-import "../../../../components/ha-card";
-import type { LovelaceCard, LovelaceLayoutOptions } from "../../types";
+import type { LovelaceCard, LovelaceGridOptions } from "../../types";
import type { EnergyCardBaseConfig } from "../types";
@customElement("hui-energy-date-selection-card")
@@ -21,10 +21,10 @@ export class HuiEnergyDateSelectionCard
return 1;
}
- public getLayoutOptions(): LovelaceLayoutOptions {
+ public getGridOptions(): LovelaceGridOptions {
return {
- grid_rows: 1,
- grid_columns: 4,
+ rows: 1,
+ columns: 12,
};
}
diff --git a/src/panels/lovelace/cards/hui-area-card.ts b/src/panels/lovelace/cards/hui-area-card.ts
index 1e2b335ade56..e8c0eb8cea78 100644
--- a/src/panels/lovelace/cards/hui-area-card.ts
+++ b/src/panels/lovelace/cards/hui-area-card.ts
@@ -45,7 +45,7 @@ import "../components/hui-warning";
import type {
LovelaceCard,
LovelaceCardEditor,
- LovelaceLayoutOptions,
+ LovelaceGridOptions,
} from "../types";
import type { AreaCardConfig } from "./types";
@@ -534,10 +534,11 @@ export class HuiAreaCard
forwardHaptic("light");
}
- getLayoutOptions(): LovelaceLayoutOptions {
+ getGridOptions(): LovelaceGridOptions {
return {
- grid_columns: 4,
- grid_rows: 3,
+ columns: 12,
+ rows: 3,
+ min_columns: 3,
};
}
diff --git a/src/panels/lovelace/cards/hui-button-card.ts b/src/panels/lovelace/cards/hui-button-card.ts
index 2bed7c6038e9..2fbb0adb2f9e 100644
--- a/src/panels/lovelace/cards/hui-button-card.ts
+++ b/src/panels/lovelace/cards/hui-button-card.ts
@@ -46,7 +46,7 @@ import { createEntityNotFoundWarning } from "../components/hui-warning";
import type {
LovelaceCard,
LovelaceCardEditor,
- LovelaceLayoutOptions,
+ LovelaceGridOptions,
} from "../types";
import type { ButtonCardConfig } from "./types";
@@ -134,20 +134,23 @@ export class HuiButtonCard extends LitElement implements LovelaceCard {
);
}
- public getLayoutOptions(): LovelaceLayoutOptions {
+ public getGridOptions(): LovelaceGridOptions {
if (
this._config?.show_icon &&
(this._config?.show_name || this._config?.show_state)
) {
return {
- grid_rows: 2,
- grid_columns: 2,
- grid_min_rows: 2,
+ rows: 2,
+ columns: 6,
+ min_columns: 2,
+ min_rows: 2,
};
}
return {
- grid_rows: 1,
- grid_columns: 1,
+ rows: 1,
+ columns: 3,
+ min_columns: 2,
+ min_rows: 1,
};
}
diff --git a/src/panels/lovelace/cards/hui-entity-card.ts b/src/panels/lovelace/cards/hui-entity-card.ts
index b2b849525540..6e5b30e2b44d 100644
--- a/src/panels/lovelace/cards/hui-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-card.ts
@@ -33,8 +33,8 @@ import { createEntityNotFoundWarning } from "../components/hui-warning";
import { createHeaderFooterElement } from "../create-element/create-header-footer-element";
import type {
LovelaceCard,
+ LovelaceGridOptions,
LovelaceHeaderFooter,
- LovelaceLayoutOptions,
} from "../types";
import type { HuiErrorCard } from "./hui-error-card";
import type { EntityCardConfig } from "./types";
@@ -249,12 +249,12 @@ export class HuiEntityCard extends LitElement implements LovelaceCard {
fireEvent(this, "hass-more-info", { entityId: this._config!.entity });
}
- public getLayoutOptions(): LovelaceLayoutOptions {
+ public getGridOptions(): LovelaceGridOptions {
return {
- grid_columns: 2,
- grid_rows: 2,
- grid_min_columns: 2,
- grid_min_rows: 2,
+ columns: 6,
+ rows: 2,
+ min_columns: 6,
+ min_rows: 2,
};
}
diff --git a/src/panels/lovelace/cards/hui-heading-card.ts b/src/panels/lovelace/cards/hui-heading-card.ts
index 6d57a1ae064c..307fc6bfdbe2 100644
--- a/src/panels/lovelace/cards/hui-heading-card.ts
+++ b/src/panels/lovelace/cards/hui-heading-card.ts
@@ -16,7 +16,7 @@ import "../heading-badges/hui-heading-badge";
import type {
LovelaceCard,
LovelaceCardEditor,
- LovelaceLayoutOptions,
+ LovelaceGridOptions,
} from "../types";
import type { HeadingCardConfig } from "./types";
@@ -65,10 +65,11 @@ export class HuiHeadingCard extends LitElement implements LovelaceCard {
return 1;
}
- public getLayoutOptions(): LovelaceLayoutOptions {
+ public getGridOptions(): LovelaceGridOptions {
return {
- grid_columns: "full",
- grid_rows: this._config?.heading_style === "subtitle" ? "auto" : 1,
+ columns: "full",
+ rows: this._config?.heading_style === "subtitle" ? "auto" : 1,
+ min_columns: 3,
};
}
diff --git a/src/panels/lovelace/cards/hui-humidifier-card.ts b/src/panels/lovelace/cards/hui-humidifier-card.ts
index c342934afc6e..15bee2a43d8f 100644
--- a/src/panels/lovelace/cards/hui-humidifier-card.ts
+++ b/src/panels/lovelace/cards/hui-humidifier-card.ts
@@ -19,7 +19,7 @@ import { createEntityNotFoundWarning } from "../components/hui-warning";
import type {
LovelaceCard,
LovelaceCardEditor,
- LovelaceLayoutOptions,
+ LovelaceGridOptions,
} from "../types";
import type { HumidifierCardConfig } from "./types";
@@ -171,21 +171,21 @@ export class HuiHumidifierCard extends LitElement implements LovelaceCard {
`;
}
- public getLayoutOptions(): LovelaceLayoutOptions {
- const grid_columns = 4;
- let grid_rows = 5;
- let grid_min_rows = 2;
- const grid_min_columns = 2;
+ public getGridOptions(): LovelaceGridOptions {
+ const columns = 12;
+ let rows = 5;
+ let min_rows = 2;
+ const min_columns = 6;
if (this._config?.features?.length) {
const featureHeight = Math.ceil((this._config.features.length * 2) / 3);
- grid_rows += featureHeight;
- grid_min_rows += featureHeight;
+ rows += featureHeight;
+ min_rows += featureHeight;
}
return {
- grid_columns,
- grid_rows,
- grid_min_rows,
- grid_min_columns,
+ columns,
+ rows,
+ min_columns,
+ min_rows,
};
}
diff --git a/src/panels/lovelace/cards/hui-iframe-card.ts b/src/panels/lovelace/cards/hui-iframe-card.ts
index aa078608cebc..72188af3ba7d 100644
--- a/src/panels/lovelace/cards/hui-iframe-card.ts
+++ b/src/panels/lovelace/cards/hui-iframe-card.ts
@@ -11,7 +11,7 @@ import { IFRAME_SANDBOX } from "../../../util/iframe";
import type {
LovelaceCard,
LovelaceCardEditor,
- LovelaceLayoutOptions,
+ LovelaceGridOptions,
} from "../types";
import type { IframeCardConfig } from "./types";
@@ -113,11 +113,12 @@ export class HuiIframeCard extends LitElement implements LovelaceCard {
`;
}
- public getLayoutOptions(): LovelaceLayoutOptions {
+ public getGridOptions(): LovelaceGridOptions {
return {
- grid_columns: "full",
- grid_rows: 4,
- grid_min_rows: 2,
+ columns: "full",
+ rows: 4,
+ min_columns: 3,
+ min_rows: 2,
};
}
diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts
index 9931303f93f6..f1234225722c 100644
--- a/src/panels/lovelace/cards/hui-map-card.ts
+++ b/src/panels/lovelace/cards/hui-map-card.ts
@@ -11,8 +11,8 @@ import { computeDomain } from "../../../common/entity/compute_domain";
import { computeStateName } from "../../../common/entity/compute_state_name";
import { deepEqual } from "../../../common/util/deep-equal";
import parseAspectRatio from "../../../common/util/parse-aspect-ratio";
-import "../../../components/ha-card";
import "../../../components/ha-alert";
+import "../../../components/ha-card";
import "../../../components/ha-icon-button";
import "../../../components/map/ha-map";
import type {
@@ -23,15 +23,15 @@ import type {
} from "../../../components/map/ha-map";
import type { HistoryStates } from "../../../data/history";
import { subscribeHistoryStatesTimeWindow } from "../../../data/history";
+import type { HomeAssistant } from "../../../types";
+import { findEntities } from "../common/find-entities";
import {
hasConfigChanged,
hasConfigOrEntitiesChanged,
} from "../common/has-changed";
-import type { HomeAssistant } from "../../../types";
-import { findEntities } from "../common/find-entities";
import { processConfigEntities } from "../common/process-config-entities";
import type { EntityConfig } from "../entity-rows/types";
-import type { LovelaceCard, LovelaceLayoutOptions } from "../types";
+import type { LovelaceCard, LovelaceGridOptions } from "../types";
import type { MapCardConfig } from "./types";
export const DEFAULT_HOURS_TO_SHOW = 0;
@@ -431,12 +431,12 @@ class HuiMapCard extends LitElement implements LovelaceCard {
}
);
- public getLayoutOptions(): LovelaceLayoutOptions {
+ public getGridOptions(): LovelaceGridOptions {
return {
- grid_columns: "full",
- grid_rows: 4,
- grid_min_columns: 2,
- grid_min_rows: 2,
+ columns: "full",
+ rows: 4,
+ min_columns: 6,
+ min_rows: 2,
};
}
diff --git a/src/panels/lovelace/cards/hui-recovery-mode-card.ts b/src/panels/lovelace/cards/hui-recovery-mode-card.ts
index 10102b6dd728..37d979dc19e6 100644
--- a/src/panels/lovelace/cards/hui-recovery-mode-card.ts
+++ b/src/panels/lovelace/cards/hui-recovery-mode-card.ts
@@ -31,7 +31,7 @@ export class HuiRecoveryModeCard extends LitElement implements LovelaceCard {
"ui.panel.lovelace.cards.recovery-mode.description"
)}
- ${currentDetail.alias}
` + : nothing : html`${curPath.substring(this.selected.path.length + 1)}
`} @@ -146,6 +162,15 @@ export class HaTracePathDetails extends LitElement { { number: idx + 1 } )} `} + ${curPath + .substring(this.selected.path.length + 1) + .includes("condition") + ? html`[${describeCondition( + currentDetail, + this.hass, + currentDetail.alias + )}]` + : nothing} ${this.hass!.localize( "ui.panel.config.automation.trace.path.executed", { @@ -176,6 +201,12 @@ export class HaTracePathDetails extends LitElement { ${Object.keys(rest).length === 0 ? nothing : html`
${dump(rest)}`}
+ ${currentDetail.entity_id &&
+ curPath
+ .substring(this.selected.path.length + 1)
+ .includes("entity_id")
+ ? html`entity: ${currentDetail.entity_id}`
+ : nothing}
`;
})
);
@@ -291,7 +322,10 @@ export class HaTracePathDetails extends LitElement {
.entries=${entries}
.narrow=${this.narrow}
>
-
${this.hass!.localize(
diff --git a/src/components/trace/ha-trace-timeline.ts b/src/components/trace/ha-trace-timeline.ts
index 7c62b3fbb033..07e7fc360026 100644
--- a/src/components/trace/ha-trace-timeline.ts
+++ b/src/components/trace/ha-trace-timeline.ts
@@ -28,7 +28,10 @@ export class HaTraceTimeline extends LitElement {
allowPick
>
- >("GET", `hassio/host/logs/boots`);
+export const fetchHassioLogsLegacy = async (
+ hass: HomeAssistant,
+ provider: string
+) =>
+ hass.callApi(
+ "GET",
+ `hassio/${provider.includes("_") ? `addons/${provider}` : provider}/logs`
+ );
+
export const fetchHassioLogs = async (
hass: HomeAssistant,
provider: string,
diff --git a/src/data/logbook.ts b/src/data/logbook.ts
index 712680ae9073..f41a994fd3df 100644
--- a/src/data/logbook.ts
+++ b/src/data/logbook.ts
@@ -63,8 +63,8 @@ const triggerPhrases: Record = {
triggered_by_numeric_state_of: "numeric state of", // number state trigger
triggered_by_state_of: "state of", // state trigger
triggered_by_event: "event", // event trigger
- triggered_by_time: "time", // time trigger
triggered_by_time_pattern: "time pattern", // time trigger
+ triggered_by_time: "time", // time trigger
triggered_by_homeassistant_stopping: "Home Assistant stopping", // stop event
triggered_by_homeassistant_starting: "Home Assistant starting", // start event
};
@@ -218,114 +218,32 @@ export const localizeStateMessage = (
const isOff = state === BINARY_STATE_OFF;
const device_class = stateObj.attributes.device_class;
- switch (device_class) {
- case "battery":
- if (isOn) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_low`);
- }
- if (isOff) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_normal`);
- }
- break;
-
- case "connectivity":
- if (isOn) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_connected`);
- }
- if (isOff) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_disconnected`);
- }
- break;
-
- case "door":
- case "garage_door":
- case "opening":
- case "window":
- if (isOn) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_opened`);
- }
- if (isOff) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_closed`);
- }
- break;
-
- case "lock":
- if (isOn) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_unlocked`);
- }
- if (isOff) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_locked`);
- }
- break;
-
- case "plug":
- if (isOn) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_plugged_in`);
- }
- if (isOff) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_unplugged`);
- }
- break;
-
- case "presence":
- if (isOn) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_at_home`);
- }
- if (isOff) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_away`);
- }
- break;
-
- case "safety":
- if (isOn) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_unsafe`);
- }
- if (isOff) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.was_safe`);
- }
- break;
-
- case "cold":
- case "gas":
- case "heat":
- case "moisture":
- case "motion":
- case "occupancy":
- case "power":
- case "problem":
- case "smoke":
- case "sound":
- case "vibration":
- if (isOn) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.detected_device_class`, {
+ if (device_class && (isOn || isOff)) {
+ return (
+ localize(
+ `${LOGBOOK_LOCALIZE_PATH}.${isOn ? "detected_device_classes" : "cleared_device_classes"}.${device_class}`,
+ {
device_class: autoCaseNoun(
localize(
`component.binary_sensor.entity_component.${device_class}.name`
- ),
+ ) || device_class,
hass.language
),
- });
- }
- if (isOff) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.cleared_device_class`, {
+ }
+ ) ||
+ // If there's no key for a specific device class, fallback to generic string
+ localize(
+ `${LOGBOOK_LOCALIZE_PATH}.${isOn ? "detected_device_class" : "cleared_device_class"}`,
+ {
device_class: autoCaseNoun(
localize(
`component.binary_sensor.entity_component.${device_class}.name`
- ),
+ ) || device_class,
hass.language
),
- });
- }
- break;
-
- case "tamper":
- if (isOn) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.detected_tampering`);
- }
- if (isOff) {
- return localize(`${LOGBOOK_LOCALIZE_PATH}.cleared_tampering`);
- }
- break;
+ }
+ )
+ );
}
break;
diff --git a/src/data/selector.ts b/src/data/selector.ts
index c72dacc4f187..5623ecc268cb 100644
--- a/src/data/selector.ts
+++ b/src/data/selector.ts
@@ -1,4 +1,7 @@
-import type { HassEntity } from "home-assistant-js-websocket";
+import type {
+ HassEntity,
+ HassServiceTarget,
+} from "home-assistant-js-websocket";
import { ensureArray } from "../common/array/ensure-array";
import { computeStateDomain } from "../common/entity/compute_state_domain";
import { supportsFeature } from "../common/entity/supports-feature";
@@ -871,3 +874,65 @@ export const computeCreateDomains = (
return [...new Set(createDomains)];
};
+
+export const resolveEntityIDs = (
+ hass: HomeAssistant,
+ targetPickerValue: HassServiceTarget,
+ entities: HomeAssistant["entities"],
+ devices: HomeAssistant["devices"],
+ areas: HomeAssistant["areas"]
+): string[] => {
+ if (!targetPickerValue) {
+ return [];
+ }
+
+ const targetSelector = { target: {} };
+ const targetEntities = new Set(ensureArray(targetPickerValue.entity_id));
+ const targetDevices = new Set(ensureArray(targetPickerValue.device_id));
+ const targetAreas = new Set(ensureArray(targetPickerValue.area_id));
+ const targetFloors = new Set(ensureArray(targetPickerValue.floor_id));
+ const targetLabels = new Set(ensureArray(targetPickerValue.label_id));
+
+ targetLabels.forEach((labelId) => {
+ const expanded = expandLabelTarget(
+ hass,
+ labelId,
+ areas,
+ devices,
+ entities,
+ targetSelector
+ );
+ expanded.devices.forEach((id) => targetDevices.add(id));
+ expanded.entities.forEach((id) => targetEntities.add(id));
+ expanded.areas.forEach((id) => targetAreas.add(id));
+ });
+
+ targetFloors.forEach((floorId) => {
+ const expanded = expandFloorTarget(hass, floorId, areas, targetSelector);
+ expanded.areas.forEach((id) => targetAreas.add(id));
+ });
+
+ targetAreas.forEach((areaId) => {
+ const expanded = expandAreaTarget(
+ hass,
+ areaId,
+ devices,
+ entities,
+ targetSelector
+ );
+ expanded.devices.forEach((id) => targetDevices.add(id));
+ expanded.entities.forEach((id) => targetEntities.add(id));
+ });
+
+ targetDevices.forEach((deviceId) => {
+ const expanded = expandDeviceTarget(
+ hass,
+ deviceId,
+ entities,
+ targetSelector
+ );
+ expanded.entities.forEach((id) => targetEntities.add(id));
+ });
+
+ return Array.from(targetEntities);
+};
diff --git a/src/data/zwave_js.ts b/src/data/zwave_js.ts
index af7fe06ae324..dc4b835d3815 100644
--- a/src/data/zwave_js.ts
+++ b/src/data/zwave_js.ts
@@ -209,6 +209,17 @@ export interface ZWaveJSNodeStatus {
has_firmware_update_cc: boolean;
}
+export type ZWaveJSNodeCapabilities = {
+ [endpoint: number]: ZWaveJSEndpointCapability[];
+};
+
+export interface ZWaveJSEndpointCapability {
+ id: number;
+ name: string;
+ version: number;
+ is_secure: boolean;
+}
+
export interface ZwaveJSNodeMetadata {
node_id: number;
exclusion: string;
@@ -264,6 +275,15 @@ export interface ZWaveJSSetConfigParamData {
value: string | number;
}
+export interface ZWaveJSSetRawConfigParamData {
+ type: string;
+ device_id: string;
+ property: number;
+ value: number;
+ value_size: number;
+ value_format: number;
+}
+
export interface ZWaveJSSetConfigParamResult {
value_id?: string;
status?: string;
@@ -404,6 +424,25 @@ export interface RequestedGrant {
clientSideAuth: boolean;
}
+export const invokeZWaveCCApi = (
+ hass: HomeAssistant,
+ device_id: string,
+ command_class: number,
+ endpoint: number | undefined,
+ method_name: string,
+ parameters: any[],
+ wait_for_result?: boolean
+): Promise =>
+ hass.callWS({
+ type: "zwave_js/invoke_cc_api",
+ device_id,
+ command_class,
+ endpoint,
+ method_name,
+ parameters,
+ wait_for_result,
+ });
+
export const fetchZwaveNetworkStatus = (
hass: HomeAssistant,
device_or_entry_id: {
@@ -579,6 +618,15 @@ export const fetchZwaveNodeStatus = (
device_id,
});
+export const fetchZwaveNodeCapabilities = (
+ hass: HomeAssistant,
+ device_id: string
+): Promise =>
+ hass.callWS({
+ type: "zwave_js/node_capabilities",
+ device_id,
+ });
+
export const subscribeZwaveNodeStatus = (
hass: HomeAssistant,
device_id: string,
@@ -638,6 +686,36 @@ export const setZwaveNodeConfigParameter = (
return hass.callWS(data);
};
+export const setZwaveNodeRawConfigParameter = (
+ hass: HomeAssistant,
+ device_id: string,
+ property: number,
+ value: number,
+ value_size: number,
+ value_format: number
+): Promise => {
+ const data: ZWaveJSSetRawConfigParamData = {
+ type: "zwave_js/set_raw_config_parameter",
+ device_id,
+ property,
+ value,
+ value_size,
+ value_format,
+ };
+ return hass.callWS(data);
+};
+
+export const getZwaveNodeRawConfigParameter = (
+ hass: HomeAssistant,
+ device_id: string,
+ property: number
+): Promise =>
+ hass.callWS({
+ type: "zwave_js/get_raw_config_parameter",
+ device_id,
+ property,
+ });
+
export const reinterviewZwaveNode = (
hass: HomeAssistant,
device_id: string,
diff --git a/src/dialogs/more-info/controls/more-info-camera.ts b/src/dialogs/more-info/controls/more-info-camera.ts
index d532b5861c38..7b339db519c8 100644
--- a/src/dialogs/more-info/controls/more-info-camera.ts
+++ b/src/dialogs/more-info/controls/more-info-camera.ts
@@ -4,14 +4,20 @@ import { property, state } from "lit/decorators";
import "../../../components/ha-camera-stream";
import type { CameraEntity } from "../../../data/camera";
import type { HomeAssistant } from "../../../types";
+import "../../../components/buttons/ha-progress-button";
+import { UNAVAILABLE } from "../../../data/entity";
+import { fileDownload } from "../../../util/file_download";
+import { showToast } from "../../../util/toast";
class MoreInfoCamera extends LitElement {
- @property({ attribute: false }) public hass?: HomeAssistant;
+ @property({ attribute: false }) public hass!: HomeAssistant;
@property({ attribute: false }) public stateObj?: CameraEntity;
@state() private _attached = false;
+ @state() private _waiting = false;
+
public connectedCallback() {
super.connectedCallback();
this._attached = true;
@@ -23,7 +29,7 @@ class MoreInfoCamera extends LitElement {
}
protected render() {
- if (!this._attached || !this.hass || !this.stateObj) {
+ if (!this._attached || !this.stateObj) {
return nothing;
}
@@ -34,14 +40,70 @@ class MoreInfoCamera extends LitElement {
allow-exoplayer
controls
>
+
+ {
- if (this._streamSupported) {
+ private async _downloadLogs(): Promise {
+ if (this._streamSupported && this.provider) {
showDownloadLogsDialog(this, {
header: this.header,
provider: this.provider,
@@ -354,10 +428,6 @@ class ErrorLogCard extends LitElement {
}
}
- private _showLogs(): void {
- this.show = true;
- }
-
private async _loadLogs(): Promise {
this._error = undefined;
this._loadingState = "loading";
@@ -369,15 +439,28 @@ class ErrorLogCard extends LitElement {
try {
if (this._logStreamAborter) {
this._logStreamAborter.abort();
+ this._logStreamAborter = undefined;
}
- this._logStreamAborter = new AbortController();
-
if (
this._streamSupported &&
isComponentLoaded(this.hass, "hassio") &&
this.provider
) {
+ this._logStreamAborter = new AbortController();
+
+ // check if there are any logs at all
+ const testResponse = await fetchHassioLogs(
+ this.hass,
+ this.provider,
+ `entries=:-1:`,
+ this._boot
+ );
+ const testLogs = await testResponse.text();
+ if (!testLogs.trim()) {
+ this._loadingState = "empty";
+ }
+
const response = await fetchHassioLogsFollow(
this.hass,
this.provider,
@@ -438,6 +521,17 @@ class ErrorLogCard extends LitElement {
} else {
this._newLogsIndicator = true;
}
+
+ if (!this._downloadSupported) {
+ const downloadUrl = getHassioLogDownloadLinesUrl(
+ this.provider,
+ this._numberOfLines,
+ this._boot
+ );
+ getSignedPath(this.hass, downloadUrl).then((signedUrl) => {
+ this._logsFileLink = signedUrl.path;
+ });
+ }
}
}
} else {
@@ -445,8 +539,7 @@ class ErrorLogCard extends LitElement {
this._streamSupported = false;
let logs = "";
if (isComponentLoaded(this.hass, "hassio") && this.provider) {
- const repsonse = await fetchHassioLogs(this.hass, this.provider);
- logs = await repsonse.text();
+ logs = await fetchHassioLogsLegacy(this.hass, this.provider);
} else {
logs = await fetchErrorLog(this.hass);
}
@@ -461,10 +554,13 @@ class ErrorLogCard extends LitElement {
if (err.name === "AbortError") {
return;
}
- this._error = this.hass.localize("ui.panel.config.logs.failed_get_logs", {
- provider: this.provider,
- error: extractApiErrorMessage(err),
- });
+ this._error = (this.localizeFunc || this.hass.localize)(
+ "ui.panel.config.logs.failed_get_logs",
+ {
+ provider: this.provider,
+ error: extractApiErrorMessage(err),
+ }
+ );
}
}
@@ -495,60 +591,62 @@ class ErrorLogCard extends LitElement {
if (ev.detail === "disconnected" && this._logStreamAborter) {
this._logStreamAborter.abort();
}
- if (ev.detail === "connected" && this.show) {
+ if (ev.detail === "connected") {
this._loadLogs();
}
};
private async _loadMoreLogs() {
if (
- this._firstCursor &&
- this._loadingPrevState !== "loading" &&
- this._loadingState === "loaded" &&
- this._logElement
+ !this._firstCursor ||
+ this._loadingPrevState === "loading" ||
+ this._loadingState !== "loaded" ||
+ !this._logElement ||
+ !this.provider
) {
- const scrolledToBottom = this._scrolledToBottomController.value;
- const scrollPositionFromBottom =
- this._logElement.scrollHeight - this._logElement.scrollTop;
- this._loadingPrevState = "loading";
- const response = await fetchHassioLogs(
- this.hass,
- this.provider,
- `entries=${this._firstCursor}:-100:100`,
- this._boot
- );
+ return;
+ }
+ const scrolledToBottom = this._scrolledToBottomController.value;
+ const scrollPositionFromBottom =
+ this._logElement.scrollHeight - this._logElement.scrollTop;
+ this._loadingPrevState = "loading";
+ const response = await fetchHassioLogs(
+ this.hass,
+ this.provider,
+ `entries=${this._firstCursor}:-100:100`,
+ this._boot
+ );
- if (response.headers.has("X-First-Cursor")) {
- if (this._firstCursor === response.headers.get("X-First-Cursor")!) {
- this._loadingPrevState = "end";
- return;
- }
- this._firstCursor = response.headers.get("X-First-Cursor")!;
+ if (response.headers.has("X-First-Cursor")) {
+ if (this._firstCursor === response.headers.get("X-First-Cursor")!) {
+ this._loadingPrevState = "end";
+ return;
}
+ this._firstCursor = response.headers.get("X-First-Cursor")!;
+ }
- const body = await response.text();
+ const body = await response.text();
- if (body) {
- const lines = body
- .split("\n")
- .filter((line) => line.trim() !== "")
- .reverse();
+ if (body) {
+ const lines = body
+ .split("\n")
+ .filter((line) => line.trim() !== "")
+ .reverse();
- this._ansiToHtmlElement?.parseLinesToColoredPre(lines, true);
- this._numberOfLines! += lines.length;
- this._loadingPrevState = "loaded";
- } else {
- this._loadingPrevState = "end";
- }
+ this._ansiToHtmlElement?.parseLinesToColoredPre(lines, true);
+ this._numberOfLines! += lines.length;
+ this._loadingPrevState = "loaded";
+ } else {
+ this._loadingPrevState = "end";
+ }
- if (scrolledToBottom) {
- this._scrollToBottom();
- } else if (this._loadingPrevState !== "end" && this._logElement) {
- window.requestAnimationFrame(() => {
- this._logElement!.scrollTop =
- this._logElement!.scrollHeight - scrollPositionFromBottom;
- });
- }
+ if (scrolledToBottom) {
+ this._scrollToBottom();
+ } else if (this._loadingPrevState !== "end" && this._logElement) {
+ window.requestAnimationFrame(() => {
+ this._logElement!.scrollTop =
+ this._logElement!.scrollHeight - scrollPositionFromBottom;
+ });
}
}
@@ -585,6 +683,26 @@ class ErrorLogCard extends LitElement {
}
}
+ private _toggleLineWrap() {
+ this._wrapLines = !this._wrapLines;
+ }
+
+ private _handleOverflowAction(ev: CustomEvent) {
+ let index = ev.detail.index;
+ if (this.provider === "core") {
+ index--;
+ }
+ switch (index) {
+ case -1:
+ // @ts-ignore
+ fireEvent(this, "switch-log-view");
+ break;
+ case 0:
+ this._showBootsSelect = !this._showBootsSelect;
+ break;
+ }
+ }
+
private _toggleBootsMenu() {
if (this._bootsMenu) {
this._bootsMenu.open = !this._bootsMenu.open;
@@ -597,6 +715,9 @@ class ErrorLogCard extends LitElement {
}
static styles: CSSResultGroup = css`
+ :host {
+ direction: var(--direction);
+ }
.error-log-intro {
text-align: center;
margin: 16px;
@@ -646,14 +767,14 @@ class ErrorLogCard extends LitElement {
position: relative;
font-family: var(--code-font-family, monospace);
clear: both;
- text-align: left;
+ text-align: start;
padding-top: 12px;
padding-bottom: 12px;
overflow-y: scroll;
min-height: var(--error-log-card-height, calc(100vh - 240px));
max-height: var(--error-log-card-height, calc(100vh - 240px));
-
border-top: 1px solid var(--divider-color);
+ direction: ltr;
}
@media all and (max-width: 870px) {
@@ -713,6 +834,36 @@ class ErrorLogCard extends LitElement {
--ha-assist-chip-container-shape: 10px;
--md-assist-chip-trailing-space: 8px;
}
+
+ @keyframes breathe {
+ from {
+ opacity: 0.8;
+ }
+ to {
+ opacity: 0;
+ }
+ }
+
+ .live-indicator {
+ position: absolute;
+ bottom: 0;
+ inset-inline-end: 16px;
+ border-top-right-radius: 8px;
+ border-top-left-radius: 8px;
+ background-color: var(--primary-color);
+ color: var(--text-primary-color);
+ padding: 4px 8px;
+ opacity: 0.8;
+ }
+ .live-indicator ha-svg-icon {
+ animation: breathe 1s cubic-bezier(0.5, 0, 1, 1) infinite alternate;
+ height: 14px;
+ width: 14px;
+ }
+
+ .download-link {
+ color: var(--text-color);
+ }
`;
}
diff --git a/src/panels/config/logs/ha-config-logs.ts b/src/panels/config/logs/ha-config-logs.ts
index 4b15706054c6..3d6ae423c72b 100644
--- a/src/panels/config/logs/ha-config-logs.ts
+++ b/src/panels/config/logs/ha-config-logs.ts
@@ -3,20 +3,20 @@ import type { CSSResultGroup, TemplateResult } from "lit";
import { css, html, LitElement } from "lit";
import { customElement, property, query, state } from "lit/decorators";
import { isComponentLoaded } from "../../../common/config/is_component_loaded";
+import { navigate } from "../../../common/navigate";
import { extractSearchParam } from "../../../common/url/search-params";
-import "../../../components/ha-button-menu";
import "../../../components/ha-button";
+import "../../../components/ha-button-menu";
import "../../../components/search-input";
import type { LogProvider } from "../../../data/error_log";
import { fetchHassioAddonsInfo } from "../../../data/hassio/addon";
+import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
import "../../../layouts/hass-subpage";
import { haStyle } from "../../../resources/styles";
import type { HomeAssistant, Route } from "../../../types";
import "./error-log-card";
import "./system-log-card";
import type { SystemLogCard } from "./system-log-card";
-import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
-import { navigate } from "../../../common/navigate";
const logProviders: LogProvider[] = [
{
@@ -57,6 +57,8 @@ export class HaConfigLogs extends LitElement {
@state() private _filter = extractSearchParam("filter") || "";
+ @state() private _detail = false;
+
@query("system-log-card") private systemLog?: SystemLogCard;
@state() private _selectedLogProvider = "core";
@@ -141,7 +143,7 @@ export class HaConfigLogs extends LitElement {
: ""}
${search}
{
@@ -723,7 +727,21 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
history.back();
}
- private _switchUiMode() {
+ private async _switchUiMode() {
+ if (this._yamlErrors) {
+ const result = await showConfirmationDialog(this, {
+ text: html`${this.hass.localize(
+ "ui.panel.config.automation.editor.switch_ui_yaml_error"
+ )}
${this._yamlErrors}`, + confirmText: this.hass!.localize("ui.common.continue"), + destructive: true, + dismissText: this.hass!.localize("ui.common.cancel"), + }); + if (!result) { + return; + } + } + this._yamlErrors = undefined; this._mode = "gui"; } @@ -763,6 +781,13 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) { } private async _saveScript(): Promise {
+ if (this._yamlErrors) {
+ showToast(this, {
+ message: this._yamlErrors,
+ });
+ return;
+ }
+
if (!this.scriptId) {
const saved = await this._promptScriptAlias();
if (!saved) {
diff --git a/src/panels/history/ha-panel-history.ts b/src/panels/history/ha-panel-history.ts
index c167c48da19d..39ff903a0c53 100644
--- a/src/panels/history/ha-panel-history.ts
+++ b/src/panels/history/ha-panel-history.ts
@@ -50,12 +50,7 @@ import {
} from "../../data/history";
import type { Statistics } from "../../data/recorder";
import { fetchStatistics } from "../../data/recorder";
-import {
- expandAreaTarget,
- expandDeviceTarget,
- expandFloorTarget,
- expandLabelTarget,
-} from "../../data/selector";
+import { resolveEntityIDs } from "../../data/selector";
import { getSensorNumericDeviceClasses } from "../../data/sensor";
import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
import { haStyle } from "../../resources/styles";
@@ -543,66 +538,8 @@ class HaPanelHistory extends LitElement {
entities: HomeAssistant["entities"],
devices: HomeAssistant["devices"],
areas: HomeAssistant["areas"]
- ): string[] => {
- if (!targetPickerValue) {
- return [];
- }
-
- const targetSelector = { target: {} };
- const targetEntities = new Set(ensureArray(targetPickerValue.entity_id));
- const targetDevices = new Set(ensureArray(targetPickerValue.device_id));
- const targetAreas = new Set(ensureArray(targetPickerValue.area_id));
- const targetFloors = new Set(ensureArray(targetPickerValue.floor_id));
- const targetLabels = new Set(ensureArray(targetPickerValue.label_id));
-
- targetLabels.forEach((labelId) => {
- const expanded = expandLabelTarget(
- this.hass,
- labelId,
- areas,
- devices,
- entities,
- targetSelector
- );
- expanded.devices.forEach((id) => targetDevices.add(id));
- expanded.entities.forEach((id) => targetEntities.add(id));
- expanded.areas.forEach((id) => targetAreas.add(id));
- });
-
- targetFloors.forEach((floorId) => {
- const expanded = expandFloorTarget(
- this.hass,
- floorId,
- areas,
- targetSelector
- );
- expanded.areas.forEach((id) => targetAreas.add(id));
- });
-
- targetAreas.forEach((areaId) => {
- const expanded = expandAreaTarget(
- this.hass,
- areaId,
- devices,
- entities,
- targetSelector
- );
- expanded.devices.forEach((id) => targetDevices.add(id));
- expanded.entities.forEach((id) => targetEntities.add(id));
- });
-
- targetDevices.forEach((deviceId) => {
- const expanded = expandDeviceTarget(
- this.hass,
- deviceId,
- entities,
- targetSelector
- );
- expanded.entities.forEach((id) => targetEntities.add(id));
- });
-
- return Array.from(targetEntities);
- }
+ ): string[] =>
+ resolveEntityIDs(this.hass, targetPickerValue, entities, devices, areas)
);
private _dateRangeChanged(ev) {
diff --git a/src/panels/logbook/ha-panel-logbook.ts b/src/panels/logbook/ha-panel-logbook.ts
index 54c9f9b02294..a69adc24a6a2 100644
--- a/src/panels/logbook/ha-panel-logbook.ts
+++ b/src/panels/logbook/ha-panel-logbook.ts
@@ -2,6 +2,8 @@ import { mdiRefresh } from "@mdi/js";
import type { PropertyValues } from "lit";
import { css, html, LitElement } from "lit";
import { customElement, property, state } from "lit/decorators";
+import type { HassServiceTarget } from "home-assistant-js-websocket";
+import memoizeOne from "memoize-one";
import { navigate } from "../../common/navigate";
import { constructUrlCurrentPath } from "../../common/url/construct-url";
import {
@@ -15,10 +17,14 @@ import "../../components/ha-icon-button";
import "../../components/ha-icon-button-arrow-prev";
import "../../components/ha-menu-button";
import "../../components/ha-top-app-bar-fixed";
+import "../../components/ha-target-picker";
import { filterLogbookCompatibleEntities } from "../../data/logbook";
import { haStyle } from "../../resources/styles";
import type { HomeAssistant } from "../../types";
import "./ha-logbook";
+import { storage } from "../../common/decorators/storage";
+import { ensureArray } from "../../common/array/ensure-array";
+import { resolveEntityIDs } from "../../data/selector";
@customElement("ha-panel-logbook")
export class HaPanelLogbook extends LitElement {
@@ -33,6 +39,13 @@ export class HaPanelLogbook extends LitElement {
@state()
private _showBack?: boolean;
+ @storage({
+ key: "logbookPickedValue",
+ state: true,
+ subscribe: false,
+ })
+ private _targetPickerValue: HassServiceTarget = {};
+
public constructor() {
super();
@@ -82,21 +95,19 @@ export class HaPanelLogbook extends LitElement {
@change=${this._dateRangeChanged}
>
-
+
+ ${this.hass.localize(
+ "ui.dialogs.more_info_control.camera.download_snapshot"
+ )}
+
+
`;
}
+ private async _downloadSnapshot(ev: CustomEvent) {
+ const button = ev.currentTarget as any;
+ this._waiting = true;
+
+ try {
+ const result: Response | undefined = await this.hass.callApiRaw(
+ "GET",
+ `camera_proxy/${this.stateObj!.entity_id}`
+ );
+
+ if (!result) {
+ throw new Error("No response from API");
+ }
+
+ const blob = await result.blob();
+ const url = window.URL.createObjectURL(blob);
+ fileDownload(url);
+ } catch (err) {
+ this._waiting = false;
+ button.actionError();
+ showToast(this, {
+ message: this.hass.localize(
+ "ui.dialogs.more_info_control.camera.failed_to_download"
+ ),
+ });
+ return;
+ }
+
+ this._waiting = false;
+ button.actionSuccess();
+ }
+
static get styles(): CSSResultGroup {
return css`
:host {
display: block;
}
+
+ .actions {
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ justify-content: flex-end;
+ box-sizing: border-box;
+ padding: 12px;
+ z-index: 1;
+ gap: 8px;
+ }
`;
}
}
diff --git a/src/dialogs/more-info/controls/more-info-update.ts b/src/dialogs/more-info/controls/more-info-update.ts
index 7014a505e99f..5fe6d6d792c6 100644
--- a/src/dialogs/more-info/controls/more-info-update.ts
+++ b/src/dialogs/more-info/controls/more-info-update.ts
@@ -52,59 +52,61 @@ class MoreInfoUpdate extends LitElement {
return html`
- ${this.stateObj.attributes.in_progress
- ? supportsFeature(this.stateObj, UpdateEntityFeature.PROGRESS) &&
- this.stateObj.attributes.update_percentage !== null
- ? html`${this._error} `
- : nothing}
- ;
+
@property() public filter = "";
@property() public header?: string;
- @property() public provider!: string;
+ @property() public provider?: string;
- @property({ type: Boolean, attribute: true }) public show = false;
+ @property({ attribute: "allow-switch", type: Boolean }) public allowSwitch =
+ false;
@query(".error-log") private _logElement?: HTMLElement;
@@ -109,30 +128,48 @@ class ErrorLogCard extends LitElement {
@state() private _boots?: number[];
+ @state() private _showBootsSelect = false;
+
+ @state() private _wrapLines = true;
+
+ @state() private _downloadSupported?: boolean;
+
+ @state() private _logsFileLink?: string;
+
protected render(): TemplateResult {
+ const streaming =
+ this._streamSupported &&
+ this.provider &&
+ isComponentLoaded(this.hass, "hassio") &&
+ this._loadingState !== "loading";
+
+ const hasBoots = this._streamSupported && Array.isArray(this._boots);
+
+ const localize = this.localizeFunc || this.hass.localize;
return html`
- ${this.hass.localize("ui.panel.config.logs.scroll_down_button")}
+ ${localize("ui.panel.config.logs.scroll_down_button")}
+ ${streaming && this._boot === 0 && !this._error
+ ? html`
-
-
- ${this.hass.localize("ui.panel.config.logs.load_logs")}
-
- `
- : ""}
`;
}
- public connectedCallback() {
- super.connectedCallback();
+ protected willUpdate(changedProps: PropertyValues) {
+ super.willUpdate(changedProps);
+ if (!this.hasUpdated) {
+ this._downloadSupported = downloadFileSupported(this.hass);
+ this._streamSupported =
+ !__SUPERVISOR__ || atLeastVersion(this.hass.config.version, 2024, 11);
+
+ // just needs to be loaded once, because only the host endpoints provide boots information
+ this._loadBoots();
- if (this._streamSupported === undefined) {
- this._streamSupported = atLeastVersion(
- this.hass.config.version,
- 2024,
- 11
+ window.addEventListener(
+ "connection-status",
+ this._handleConnectionStatus
);
+
+ this.hass.loadFragmentTranslation("config");
+ }
+
+ if (changedProps.has("provider")) {
+ this._boot = 0;
+ this._loadLogs();
}
}
@@ -277,28 +368,11 @@ class ErrorLogCard extends LitElement {
this._scrolledToTopController.callback = this._handleTopScroll;
this._scrolledToTopController.observe(this._scrollTopMarkerElement!);
-
- window.addEventListener("connection-status", this._handleConnectionStatus);
-
- if (this.hass?.config.recovery_mode || this.show) {
- this.hass.loadFragmentTranslation("config");
- }
-
- // just needs to be loaded once, because only the host endpoints provide boots information
- this._loadBoots();
}
protected updated(changedProps) {
super.updated(changedProps);
- if (
- (changedProps.has("show") && this.show) ||
- (changedProps.has("provider") && this.show)
- ) {
- this._boot = 0;
- this._loadLogs();
- }
-
if (this._newLogsIndicator && this._scrolledToBottomController.value) {
this._newLogsIndicator = false;
}
@@ -331,8 +405,8 @@ class ErrorLogCard extends LitElement {
);
}
- private async _downloadFullLog(): Promise${this.stateObj.attributes.title}
- ${this._error - ? html`
-
-
- ${this.hass.formatEntityAttributeName(
- this.stateObj,
- "installed_version"
- )}
-
-
- ${this.stateObj.attributes.installed_version ??
- this.hass.localize("state.default.unavailable")}
-
-
-
${this.hass.localize("ui.common.cancel")}
-
+
${this.hass.localize("ui.common.download")}
@@ -103,7 +105,7 @@ class DownloadLogsDialog extends LitElement {
`;
}
- private async _dowloadLogs() {
+ private async _downloadLogs() {
const provider = this._dialogParams!.provider;
const boot = this._dialogParams!.boot;
diff --git a/src/panels/config/logs/error-log-card.ts b/src/panels/config/logs/error-log-card.ts
index 259a87ca7d12..a5bd9e0b5f5c 100644
--- a/src/panels/config/logs/error-log-card.ts
+++ b/src/panels/config/logs/error-log-card.ts
@@ -1,9 +1,17 @@
import "@material/mwc-list/mwc-list-item";
+import type { ActionDetail } from "@material/mwc-list";
+
import {
mdiArrowCollapseDown,
+ mdiDotsVertical,
+ mdiCircle,
mdiDownload,
+ mdiFormatListNumbered,
mdiMenuDown,
mdiRefresh,
+ mdiWrap,
+ mdiWrapDisabled,
+ mdiFolderTextOutline,
} from "@mdi/js";
import {
css,
@@ -31,6 +39,8 @@ import "../../../components/chips/ha-assist-chip";
import "../../../components/ha-menu";
import "../../../components/ha-md-menu-item";
import "../../../components/ha-md-divider";
+import "../../../components/ha-button-menu";
+import "../../../components/ha-list-item";
import { getSignedPath } from "../../../data/auth";
@@ -40,17 +50,23 @@ import {
fetchHassioBoots,
fetchHassioLogs,
fetchHassioLogsFollow,
+ fetchHassioLogsLegacy,
+ getHassioLogDownloadLinesUrl,
getHassioLogDownloadUrl,
} from "../../../data/hassio/supervisor";
import type { HomeAssistant } from "../../../types";
-import { fileDownload } from "../../../util/file_download";
-import type { HASSDomEvent } from "../../../common/dom/fire_event";
+import {
+ downloadFileSupported,
+ fileDownload,
+} from "../../../util/file_download";
+import { fireEvent, type HASSDomEvent } from "../../../common/dom/fire_event";
import type { ConnectionStatus } from "../../../data/connection-status";
import { atLeastVersion } from "../../../common/config/version";
import { isComponentLoaded } from "../../../common/config/is_component_loaded";
import { debounce } from "../../../common/util/debounce";
import { showDownloadLogsDialog } from "./show-dialog-download-logs";
import type { HaMenu } from "../../../components/ha-menu";
+import type { LocalizeFunc } from "../../../common/translations/localize";
const NUMBER_OF_LINES = 100;
@@ -58,13 +74,16 @@ const NUMBER_OF_LINES = 100;
class ErrorLogCard extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
+ @property({ attribute: false }) public localizeFunc?: LocalizeFunc
- ${this.hass.formatEntityAttributeName(
- this.stateObj,
- "latest_version"
- )}
+ {
@@ -752,7 +756,21 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
}
}
- private _switchUiMode() {
+ private async _switchUiMode() {
+ if (this._yamlErrors) {
+ const result = await showConfirmationDialog(this, {
+ text: html`${this.hass.localize(
+ "ui.panel.config.automation.editor.switch_ui_yaml_error"
+ )}
${this._yamlErrors}`, + confirmText: this.hass!.localize("ui.common.continue"), + destructive: true, + dismissText: this.hass!.localize("ui.common.cancel"), + }); + if (!result) { + return; + } + } + this._yamlErrors = undefined; this._mode = "gui"; } @@ -792,6 +810,13 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) { } private async _saveAutomation(): Promise {
+ if (this._yamlErrors) {
+ showToast(this, {
+ message: this._yamlErrors,
+ });
+ return;
+ }
+
const id = this.automationId || String(Date.now());
if (!this.automationId) {
const saved = await this._promptAutomationAlias();
diff --git a/src/panels/config/core/updates/dialog-join-beta.ts b/src/panels/config/core/updates/dialog-join-beta.ts
index 5a96530f36ca..7b4d7381c56c 100644
--- a/src/panels/config/core/updates/dialog-join-beta.ts
+++ b/src/panels/config/core/updates/dialog-join-beta.ts
@@ -48,7 +48,7 @@ export class DialogJoinBeta
${this.hass.localize("ui.dialogs.join_beta_channel.backup")}
`
diff --git a/src/panels/config/logs/dialog-download-logs.ts b/src/panels/config/logs/dialog-download-logs.ts
index 0a7e9d965f40..801ef1db2262 100644
--- a/src/panels/config/logs/dialog-download-logs.ts
+++ b/src/panels/config/logs/dialog-download-logs.ts
@@ -17,19 +17,21 @@ import type { HomeAssistant } from "../../../types";
import { fileDownload } from "../../../util/file_download";
import type { DownloadLogsDialogParams } from "./show-dialog-download-logs";
+const DEFAULT_LINE_COUNT = 500;
+
@customElement("dialog-download-logs")
class DownloadLogsDialog extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
@state() private _dialogParams?: DownloadLogsDialogParams;
- @state() private _lineCount = 100;
+ @state() private _lineCount = DEFAULT_LINE_COUNT;
@query("ha-md-dialog") private _dialogElement!: HaMdDialog;
public showDialog(dialogParams: DownloadLogsDialogParams) {
this._dialogParams = dialogParams;
- this._lineCount = this._dialogParams?.defaultLineCount ?? 100;
+ this._lineCount = this._dialogParams?.defaultLineCount || 500;
}
public closeDialog() {
@@ -38,7 +40,7 @@ class DownloadLogsDialog extends LitElement {
private _dialogClosed() {
this._dialogParams = undefined;
- this._lineCount = 100;
+ this._lineCount = DEFAULT_LINE_COUNT;
fireEvent(this, "dialog-closed", { dialog: this.localName });
}
@@ -48,7 +50,7 @@ class DownloadLogsDialog extends LitElement {
}
const numberOfLinesOptions = [100, 500, 1000, 5000, 10000];
- if (!numberOfLinesOptions.includes(this._lineCount)) {
+ if (!numberOfLinesOptions.includes(this._lineCount) && this._lineCount) {
numberOfLinesOptions.push(this._lineCount);
numberOfLinesOptions.sort((a, b) => a - b);
}
@@ -63,7 +65,7 @@ class DownloadLogsDialog extends LitElement {
.path=${mdiClose}
>
- ${this.hass.localize("ui.panel.config.logs.download_full_log")}
+ ${this.hass.localize("ui.panel.config.logs.download_logs")}
${this._dialogParams.header}${this._dialogParams.boot === 0
@@ -95,7 +97,7 @@ class DownloadLogsDialog extends LitElement {
+ ${this.stateObj.attributes.in_progress
+ ? supportsFeature(this.stateObj, UpdateEntityFeature.PROGRESS) &&
+ this.stateObj.attributes.update_percentage !== null
+ ? html`${this._error} `
+ : nothing}
+
${supportsFeature(this.stateObj!, UpdateEntityFeature.RELEASE_NOTES) &&
!this._error
? this._releaseNotes === undefined
@@ -293,6 +295,11 @@ class MoreInfoUpdate extends LitElement {
ha-expansion-panel {
margin: 16px 0;
}
+
+ .summary {
+ margin-bottom: 16px;
+ }
+
.row {
margin: 0;
display: flex;
@@ -308,7 +315,9 @@ class MoreInfoUpdate extends LitElement {
);
position: sticky;
bottom: 0;
- margin: 0 -24px -24px -24px;
+ margin: 0 -24px 0 -24px;
+ margin-bottom: calc(-1 * max(env(safe-area-inset-bottom), 24px));
+ padding-bottom: env(safe-area-inset-bottom);
box-sizing: border-box;
display: flex;
flex-direction: column;
diff --git a/src/external_app/external_messaging.ts b/src/external_app/external_messaging.ts
index a870b72be2ff..292746bdee17 100644
--- a/src/external_app/external_messaging.ts
+++ b/src/external_app/external_messaging.ts
@@ -264,6 +264,7 @@ export interface ExternalConfig {
hasAssist: boolean;
hasBarCodeScanner: number;
canSetupImprov: boolean;
+ downloadFileSupported: boolean;
}
export class ExternalMessaging {
diff --git a/src/html/_script_loader.html.template b/src/html/_script_loader.html.template
index 5ea3f23ac476..f56c5c01b182 100644
--- a/src/html/_script_loader.html.template
+++ b/src/html/_script_loader.html.template
@@ -9,16 +9,8 @@
diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts
index 437db6e2b67c..eeb6560a8315 100644
--- a/src/panels/calendar/dialog-calendar-event-editor.ts
+++ b/src/panels/calendar/dialog-calendar-event-editor.ts
@@ -173,7 +173,7 @@ class DialogCalendarEventEditor extends LitElement {
.label=${this.hass.localize("ui.components.calendar.event.summary")}
.value=${this._summary}
required
- @change=${this._handleSummaryChanged}
+ @input=${this._handleSummaryChanged}
.validationMessage=${this.hass.localize("ui.common.error_required")}
dialogInitialFocus
>
diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts
index 99e497a70b6f..c5d298e44db8 100644
--- a/src/panels/config/automation/add-automation-element-dialog.ts
+++ b/src/panels/config/automation/add-automation-element-dialog.ts
@@ -370,7 +370,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
}`,
description:
this.hass.localize(
- `component.${domain}.services.${service}.description`
+ `component.${dmn}.services.${service}.description`
) || services[dmn][service]?.description,
});
}
diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts
index 37c9f8b77b1a..6be64adc0417 100644
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -103,6 +103,8 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
@state() private _errors?: string;
+ @state() private _yamlErrors?: string;
+
@state() private _entityId?: string;
@state() private _mode: "gui" | "yaml" = "gui";
@@ -629,15 +631,17 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
private _yamlChanged(ev: CustomEvent) {
ev.stopPropagation();
+ this._dirty = true;
if (!ev.detail.isValid) {
+ this._yamlErrors = ev.detail.errorMsg;
return;
}
+ this._yamlErrors = undefined;
this._config = {
id: this._config?.id,
...normalizeAutomationConfig(ev.detail.value),
};
this._errors = undefined;
- this._dirty = true;
}
private async confirmUnsavedChanged(): Promise${this.stateObj.attributes.title}
+ ${this._error + ? html`
+
-
+ ${this.hass.formatEntityAttributeName(
+ this.stateObj,
+ "installed_version"
+ )}
+
+
+ ${this.stateObj.attributes.installed_version ??
+ this.hass.localize("state.default.unavailable")}
+
- ${this.stateObj.attributes.latest_version ??
- this.hass.localize("state.default.unavailable")}
+
- ${this.stateObj.attributes.release_url
- ? html``
- : nothing}
+ ${this.stateObj.attributes.release_url
+ ? html``
+ : nothing}
+
+
-
+ ${this.hass.formatEntityAttributeName(
+ this.stateObj,
+ "latest_version"
+ )}
+
+
+ ${this.stateObj.attributes.latest_version ??
+ this.hass.localize("state.default.unavailable")}
+
${this._yamlErrors}`, + confirmText: this.hass!.localize("ui.common.continue"), + destructive: true, + dismissText: this.hass!.localize("ui.common.cancel"), + }); + if (!result) { + return; + } + } + this._yamlErrors = undefined; this._mode = "gui"; } @@ -792,6 +810,13 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) { } private async _saveAutomation(): Promise
- ${this.hass.localize("ui.dialogs.join_beta_channel.warning")}
+ ${this.hass.localize("ui.dialogs.join_beta_channel.warning")}.
${this.hass.localize("ui.dialogs.join_beta_channel.release_items")}
-
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 3d869428ca3b..f54db76e0d75 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
@@ -1,7 +1,8 @@
import "@material/mwc-list/mwc-list";
import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
-import { css, html, LitElement } from "lit";
+import { css, html, LitElement, nothing } from "lit";
import { customElement, property, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
import { until } from "lit/directives/until";
import { computeStateName } from "../../../../common/entity/compute_state_name";
import { stripPrefixFromEntityName } from "../../../../common/entity/strip_prefix_from_entity_name";
@@ -86,36 +87,42 @@ export class HaDeviceEntitiesCard extends LitElement {
return html`
-
- ${shownEntities.map((entry) =>
- this.hass.states[entry.entity_id]
- ? this._renderEntity(entry)
- : this._renderEntry(entry)
- )}
-
-
- ${hiddenEntities.length
- ? !this.showHidden
- ? html`
-
- `
- : html`
+ ${shownEntities.length
+ ? html`
+
+ ${!this.showHidden
+ ? html`
+
+ `
+ : html`
+
+ ${hiddenEntities.map((entry) => this._renderEntry(entry))}
+
+
+ `}
+
`
+ : nothing}
+ ${hass.localize("ui.panel.config.integrations.config_entry.check_the_logs")} + `; +}; + @customElement("ha-config-integration-page") class HaConfigIntegrationPage extends SubscribeMixin(LitElement) { @property({ attribute: false }) public hass!: HomeAssistant; @@ -618,37 +650,7 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) { stateText = [ `ui.panel.config.integrations.config_entry.state.${item.state}`, ]; - if (item.reason) { - if (item.error_reason_translation_key) { - const lokalisePromExc = this.hass - .loadBackendTranslation("exceptions", item.domain) - .then( - (localize) => - localize( - `component.${item.domain}.exceptions.${item.error_reason_translation_key}.message`, - item.error_reason_translation_placeholders ?? undefined - ) || item.reason - ); - stateTextExtra = html`${until(lokalisePromExc)}`; - } else { - const lokalisePromError = this.hass - .loadBackendTranslation("config", item.domain) - .then( - (localize) => - localize( - `component.${item.domain}.config.error.${item.reason}` - ) || item.reason - ); - stateTextExtra = html`${until(lokalisePromError, item.reason)}`; - } - } else { - stateTextExtra = html` -
- ${this.hass.localize( - "ui.panel.config.integrations.config_entry.check_the_logs" - )} - `; - } + stateTextExtra = renderConfigEntryError(this.hass, item); } const devices = this._getConfigEntryDevices(item); diff --git a/src/panels/config/integrations/integration-panels/zwave_js/capability-controls/zwave_js-capability-control-color-switch.ts b/src/panels/config/integrations/integration-panels/zwave_js/capability-controls/zwave_js-capability-control-color-switch.ts new file mode 100644 index 000000000000..69ee23b3f16f --- /dev/null +++ b/src/panels/config/integrations/integration-panels/zwave_js/capability-controls/zwave_js-capability-control-color-switch.ts @@ -0,0 +1,98 @@ +import { LitElement, html } from "lit"; +import { customElement, property, state } from "lit/decorators"; +import type { DeviceRegistryEntry } from "../../../../../../data/device_registry"; +import type { HomeAssistant } from "../../../../../../types"; +import { invokeZWaveCCApi } from "../../../../../../data/zwave_js"; +import "../../../../../../components/ha-alert"; +import "../../../../../../components/ha-circular-progress"; +import { extractApiErrorMessage } from "../../../../../../data/hassio/common"; +import "./zwave_js-capability-control-multilevel-switch"; + +enum ColorComponent { + "Warm White" = 0, + "Cold White", + Red, + Green, + Blue, + Amber, + Cyan, + Purple, + Index, +} + +@customElement("zwave_js-capability-control-color_switch") +class ZWaveJSCapabilityColorSwitch extends LitElement { + @property({ attribute: false }) public hass!: HomeAssistant; + + @property({ attribute: false }) public device!: DeviceRegistryEntry; + + @property({ type: Number }) public endpoint!: number; + + @property({ type: Number }) public command_class!: number; + + @property({ type: Number }) public version!: number; + + @state() private _color_components?: ColorComponent[]; + + @state() private _error?: string; + + protected render() { + if (this._error) { + return html`
+ ${this.hass.localize( + "ui.panel.config.zwave_js.node_installer.capability_controls.color_switch.color_component" + )}: + ${this.hass.localize( + `ui.panel.config.zwave_js.node_installer.capability_controls.color_switch.colors.${color}` + )} +
++ ${this.hass.localize( + "ui.panel.config.zwave_js.node_installer.capability_controls.multilevel_switch.title" + )} +
+ ${this._error + ? html`
+
+ ${this.hass.localize(
+ "ui.panel.config.zwave_js.node_installer.capability_controls.multilevel_switch.start_transition"
+ )}
+
+
+ ${this.hass.localize(
+ "ui.panel.config.zwave_js.node_installer.capability_controls.multilevel_switch.stop_transition"
+ )}
+
+
+ `;
+ }
+
+ private async _controlTransition(ev: any) {
+ const control = ev.currentTarget!.control;
+ const button = ev.currentTarget as HaProgressButton;
+ button.progress = true;
+
+ const direction = (this.shadowRoot!.getElementById("direction") as HaSelect)
+ .value;
+
+ const ignoreStartLevel = (
+ this.shadowRoot!.getElementById("ignore_start_level") as HaSwitch
+ ).checked;
+
+ const startLevel = Number(
+ (this.shadowRoot!.getElementById("start_level") as HaTextField).value
+ );
+
+ const options = {
+ direction,
+ ignoreStartLevel,
+ startLevel,
+ };
+
+ try {
+ button.actionSuccess();
+ await invokeZWaveCCApi(
+ this.hass,
+ this.device.id,
+ this.command_class,
+ this.endpoint,
+ control,
+ [
+ this.transform_options
+ ? this.transform_options(options, control)
+ : options,
+ ],
+ true
+ );
+ } catch (err) {
+ button.actionError();
+ this._error = this.hass.localize(
+ "ui.panel.config.zwave_js.node_installer.capability_controls.multilevel_switch.control_failed",
+ { error: extractApiErrorMessage(err) }
+ );
+ }
+
+ button.progress = false;
+ }
+
+ static styles = css`
+ ha-select,
+ ha-formfield,
+ ha-textfield {
+ display: block;
+ margin-bottom: 8px;
+ }
+ .actions {
+ display: flex;
+ justify-content: flex-end;
+ }
+ `;
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "zwave_js-capability-control-multilevel_switch": ZWaveJSCapabilityMultiLevelSwitch;
+ }
+}
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/capability-controls/zwave_js-capability-control-thermostat-setback.ts b/src/panels/config/integrations/integration-panels/zwave_js/capability-controls/zwave_js-capability-control-thermostat-setback.ts
new file mode 100644
index 000000000000..784a4b8e07b7
--- /dev/null
+++ b/src/panels/config/integrations/integration-panels/zwave_js/capability-controls/zwave_js-capability-control-thermostat-setback.ts
@@ -0,0 +1,241 @@
+import { LitElement, css, html } from "lit";
+import { customElement, property, query, state } from "lit/decorators";
+import type { DeviceRegistryEntry } from "../../../../../../data/device_registry";
+import type { HomeAssistant } from "../../../../../../types";
+import { invokeZWaveCCApi } from "../../../../../../data/zwave_js";
+import "../../../../../../components/ha-button";
+import "../../../../../../components/buttons/ha-progress-button";
+import "../../../../../../components/ha-textfield";
+import "../../../../../../components/ha-select";
+import "../../../../../../components/ha-list-item";
+import "../../../../../../components/ha-alert";
+import type { HaSelect } from "../../../../../../components/ha-select";
+import type { HaTextField } from "../../../../../../components/ha-textfield";
+import { extractApiErrorMessage } from "../../../../../../data/hassio/common";
+import type { HaProgressButton } from "../../../../../../components/buttons/ha-progress-button";
+
+// enum with special states
+enum SpecialState {
+ frost_protection = "Frost Protection",
+ energy_saving = "Energy Saving",
+ unused = "Unused",
+}
+
+const SETBACK_TYPE_OPTIONS = ["none", "temporary", "permanent"];
+
+@customElement("zwave_js-capability-control-thermostat_setback")
+class ZWaveJSCapabilityThermostatSetback extends LitElement {
+ @property({ attribute: false }) public hass!: HomeAssistant;
+
+ @property({ attribute: false }) public device!: DeviceRegistryEntry;
+
+ @property({ type: Number }) public endpoint!: number;
+
+ @property({ type: Number }) public command_class!: number;
+
+ @property({ type: Number }) public version!: number;
+
+ @state() private _disableSetbackState = false;
+
+ @query("#setback_type") private _setbackTypeInput!: HaSelect;
+
+ @query("#setback_state") private _setbackStateInput!: HaTextField;
+
+ @query("#setback_special_state")
+ private _setbackSpecialStateSelect!: HaSelect;
+
+ @state() private _error?: string;
+
+ @state() private _loading = true;
+
+ protected render() {
+ return html`
+ + ${this.hass.localize( + `ui.panel.config.zwave_js.node_installer.capability_controls.thermostat_setback.title` + )} +
+ ${this._error + ? html`
+
+
+ ${Object.entries(SpecialState).map(
+ ([translationKey, value]) =>
+ html`
+ ${this.hass.localize(
+ `ui.panel.config.zwave_js.node_installer.capability_controls.thermostat_setback.setback_special_state.${translationKey}`
+ )}
+ `
+ )}
+
+
+
+ ${this.hass.localize("ui.common.clear")}
+
+ ${this.hass.localize("ui.common.save")}
+
+
+ `;
+ }
+
+ protected firstUpdated() {
+ this._loadSetback();
+ }
+
+ private async _loadSetback() {
+ this._loading = true;
+ try {
+ const { setbackType, setbackState } = (await invokeZWaveCCApi(
+ this.hass,
+ this.device.id,
+ this.command_class,
+ this.endpoint,
+ "get",
+ [],
+ true
+ )) as { setbackType: number; setbackState: number | SpecialState };
+
+ this._setbackTypeInput.value = String(setbackType);
+ if (typeof setbackState === "number") {
+ this._setbackStateInput.value = String(setbackState);
+ this._setbackSpecialStateSelect.value = "";
+ } else {
+ this._setbackSpecialStateSelect.value = setbackState;
+ }
+ } catch (err) {
+ this._error = this.hass.localize(
+ "ui.panel.config.zwave_js.node_installer.capability_controls.thermostat_setback.get_setback_failed",
+ { error: extractApiErrorMessage(err) }
+ );
+ }
+
+ this._loading = false;
+ }
+
+ private _changeSpecialState() {
+ this._disableSetbackState = !!this._setbackSpecialStateSelect.value;
+ }
+
+ private async _saveSetback(ev: CustomEvent) {
+ const button = ev.currentTarget as HaProgressButton;
+ button.progress = true;
+
+ this._error = undefined;
+ const setbackType = this._setbackTypeInput.value;
+
+ let setbackState: number | string = Number(this._setbackStateInput.value);
+ if (this._setbackSpecialStateSelect.value) {
+ setbackState = this._setbackSpecialStateSelect.value;
+ }
+
+ try {
+ await invokeZWaveCCApi(
+ this.hass,
+ this.device.id,
+ this.command_class,
+ this.endpoint,
+ "set",
+ [Number(setbackType), setbackState],
+ true
+ );
+
+ button.actionSuccess();
+ } catch (err) {
+ button.actionError();
+ this._error = this.hass.localize(
+ "ui.panel.config.zwave_js.node_installer.capability_controls.thermostat_setback.save_setback_failed",
+ { error: extractApiErrorMessage(err) }
+ );
+ }
+
+ button.progress = false;
+ }
+
+ private _clear() {
+ this._loadSetback();
+ }
+
+ static styles = css`
+ :host {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ gap: 16px;
+ }
+ :host > ha-select {
+ width: 100%;
+ }
+ .actions {
+ width: 100%;
+ display: flex;
+ justify-content: flex-end;
+ }
+ .actions .clear-button {
+ --mdc-theme-primary: var(--red-color);
+ }
+ .setback-state {
+ width: 100%;
+ display: flex;
+ gap: 16px;
+ }
+ .setback-state ha-select,
+ ha-textfield {
+ flex: 1;
+ }
+ `;
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "zwave_js-capability-control-thermostat_setback": ZWaveJSCapabilityThermostatSetback;
+ }
+}
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
index 565478d98247..2b8435f0bb30 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
@@ -851,7 +851,7 @@ class DialogZWaveJSAddNode extends LitElement {
this._addNodeTimeoutHandle = window.setTimeout(() => {
this._unsubscribe();
this._status = "timed_out";
- }, 90000);
+ }, 300000);
}
private _onBeforeUnload = (event: BeforeUnloadEvent) => {
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts
index 0666dedf4783..008f8a514958 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts
@@ -48,6 +48,10 @@ class ZWaveJSConfigRouter extends HassRouterPage {
tag: "zwave_js-node-config",
load: () => import("./zwave_js-node-config"),
},
+ node_installer: {
+ tag: "zwave_js-node-installer",
+ load: () => import("./zwave_js-node-installer"),
+ },
logs: {
tag: "zwave_js-logs",
load: () => import("./zwave_js-logs"),
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-custom-param.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-custom-param.ts
new file mode 100644
index 000000000000..15364e9ae520
--- /dev/null
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-custom-param.ts
@@ -0,0 +1,264 @@
+import { LitElement, html, css, type CSSResultGroup, nothing } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { mdiCloseCircle } from "@mdi/js";
+import "../../../../../components/ha-textfield";
+import "../../../../../components/ha-select";
+import "../../../../../components/ha-button";
+import "../../../../../components/ha-circular-progress";
+import "../../../../../components/ha-list-item";
+import type { HomeAssistant } from "../../../../../types";
+import {
+ getZwaveNodeRawConfigParameter,
+ setZwaveNodeRawConfigParameter,
+} from "../../../../../data/zwave_js";
+
+@customElement("zwave_js-custom-param")
+class ZWaveJSCustomParam extends LitElement {
+ @property({ attribute: false }) public hass!: HomeAssistant;
+
+ @property() public deviceId!: string;
+
+ @state() private _customParamNumber?: number;
+
+ @state() private _valueSize = 1;
+
+ @state() private _value?: number;
+
+ @state() private _valueFormat = 0;
+
+ @state() private _isLoading = false;
+
+ @state() private _error = "";
+
+ protected render() {
+ return html`
+
+
+ 1
+ 2
+ 4
+
+
+ ${this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.signed"
+ )}
+ ${this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.unsigned"
+ )}
+ ${this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.enumerated"
+ )}
+ ${this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.bitfield"
+ )}
+
+
+
+
+ ${this._error
+ ? html`
+ `;
+ }
+
+ private _tryParseNumber(value: string): number | undefined {
+ if (!value) return undefined;
+ const parsed = Number(value);
+ if (Number.isNaN(parsed)) return undefined;
+ return parsed;
+ }
+
+ private _customParamNumberChanged(ev: Event) {
+ this._customParamNumber = this._tryParseNumber(
+ (ev.target as HTMLInputElement).value
+ );
+ }
+
+ private _customValueSizeChanged(ev: Event) {
+ this._valueSize =
+ this._tryParseNumber((ev.target as HTMLSelectElement).value) ?? 1;
+ }
+
+ private _customValueChanged(ev: Event) {
+ this._value = this._tryParseNumber((ev.target as HTMLInputElement).value);
+ }
+
+ private _customValueFormatChanged(ev: Event) {
+ this._valueFormat =
+ this._tryParseNumber((ev.target as HTMLSelectElement).value) ?? 0;
+ }
+
+ private async _getCustomConfigValue() {
+ if (this._customParamNumber === undefined) {
+ this._error = this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.error_required",
+ {
+ entity: this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.parameter"
+ ),
+ }
+ );
+ return;
+ }
+ this._error = "";
+ this._isLoading = true;
+ try {
+ const value = await getZwaveNodeRawConfigParameter(
+ this.hass,
+ this.deviceId,
+ this._customParamNumber
+ );
+ this._value = value;
+ } catch (err: any) {
+ this._error = err?.message || "Unknown error";
+ } finally {
+ this._isLoading = false;
+ }
+ }
+
+ private async _setCustomConfigValue() {
+ if (this._customParamNumber === undefined) {
+ this._error = this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.error_required",
+ {
+ entity: this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.parameter"
+ ),
+ }
+ );
+ return;
+ }
+ if (this._value === undefined) {
+ this._error = this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.error_required",
+ {
+ entity: this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.value"
+ ),
+ }
+ );
+ return;
+ }
+ this._error = "";
+ this._isLoading = true;
+ try {
+ await setZwaveNodeRawConfigParameter(
+ this.hass,
+ this.deviceId,
+ this._customParamNumber,
+ this._value,
+ this._valueSize,
+ this._valueFormat
+ );
+ } catch (err: any) {
+ this._error = err?.message || "Unknown error";
+ } finally {
+ this._isLoading = false;
+ }
+ }
+
+ static get styles(): CSSResultGroup {
+ return css`
+ .custom-config-form {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 16px;
+ margin-bottom: 8px;
+ }
+
+ ha-textfield,
+ ha-select {
+ flex-grow: 1;
+ flex-basis: calc(50% - 8px);
+ min-width: 120px;
+ }
+
+ @media (min-width: 681px) {
+ .custom-config-form {
+ flex-wrap: nowrap;
+ }
+
+ ha-textfield,
+ ha-select {
+ flex-basis: 0;
+ }
+ }
+
+ .custom-config-buttons {
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ }
+
+ .error {
+ color: var(--error-color);
+ }
+
+ .error-icon {
+ margin-right: 8px;
+ }
+ `;
+ }
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "zwave_js-custom-param": ZWaveJSCustomParam;
+ }
+}
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
index 91be0fa47003..30f1cde47baf 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
@@ -13,22 +13,26 @@ import { classMap } from "lit/directives/class-map";
import { groupBy } from "../../../../../common/util/group-by";
import "../../../../../components/ha-alert";
import "../../../../../components/ha-card";
-import "../../../../../components/ha-icon-next";
import "../../../../../components/ha-select";
import "../../../../../components/ha-settings-row";
import "../../../../../components/ha-svg-icon";
import "../../../../../components/ha-textfield";
import "../../../../../components/ha-selector/ha-selector-boolean";
+import "../../../../../components/buttons/ha-progress-button";
+import type { HaProgressButton } from "../../../../../components/buttons/ha-progress-button";
import { computeDeviceName } from "../../../../../data/device_registry";
import type {
+ ZWaveJSNodeCapabilities,
ZWaveJSNodeConfigParam,
ZWaveJSNodeConfigParams,
ZWaveJSSetConfigParamResult,
ZwaveJSNodeMetadata,
} from "../../../../../data/zwave_js";
import {
+ fetchZwaveNodeCapabilities,
fetchZwaveNodeConfigParameters,
fetchZwaveNodeMetadata,
+ invokeZWaveCCApi,
setZwaveNodeConfigParameter,
} from "../../../../../data/zwave_js";
import "../../../../../layouts/hass-error-screen";
@@ -38,6 +42,9 @@ import { haStyle } from "../../../../../resources/styles";
import type { HomeAssistant, Route } from "../../../../../types";
import "../../../ha-config-section";
import { configTabs } from "./zwave_js-config-router";
+import "./zwave_js-custom-param";
+import { showConfirmationDialog } from "../../../../../dialogs/generic/show-dialog-box";
+import { fireEvent } from "../../../../../common/dom/fire_event";
const icons = {
accepted: mdiCheckCircle,
@@ -63,10 +70,14 @@ class ZWaveJSNodeConfig extends LitElement {
@state() private _config?: ZWaveJSNodeConfigParams;
+ @state() private _canResetAll = false;
+
@state() private _results: Record${computeDeviceName(device, this.hass)}
+${deviceName}
${device.manufacturer} ${device.model}
+
+ ${this.hass.localize(
+ "ui.panel.config.zwave_js.node_config.reset_to_default.button_label"
+ )}
+
+
`
+ : nothing}
+ + ${this.hass.localize( + "ui.panel.config.zwave_js.node_config.custom_config" + )} +
+ + ${this.hass.localize( + "ui.panel.config.zwave_js.node_config.custom_config_description" + )} + +
+ ${this.hass.localize(
+ "ui.panel.config.zwave_js.node_installer.header"
+ )}
+
+
+
+ ${device
+ ? html`
+
+ ${endpoints.length
+ ? endpoints.map(
+ ([endpoint, capabilities]) => html`
+
+
+ `
+ : ``}
+ ${this.hass.localize(
+ "ui.panel.config.zwave_js.node_installer.introduction"
+ )}
+ ${computeDeviceName(device, this.hass)}
+${device.manufacturer} ${device.model}
++ ${this.hass.localize( + "ui.panel.config.zwave_js.node_installer.endpoint" + )}: + ${endpoint} +
+
+
`
+ : nothing}
+ `
+ )}
+ + ${this.hass.localize( + "ui.panel.config.zwave_js.node_installer.command_class" + )}: + ${capability.name} +
+ ${dynamicElement( + `zwave_js-capability-control-${CAPABILITY_CONTROLS[capability.id]}`, + { + hass: this.hass, + device: device, + endpoint: endpoint, + command_class: capability.id, + version: capability.version, + is_secure: capability.is_secure, + } + )} +
${this._error
? html`${this._error} `
- : ""}
-
+ : nothing}
+
- ${this.header || - this.hass.localize("ui.panel.config.logs.show_full_logs")} + ${this.header || localize("ui.panel.config.logs.show_full_logs")}
@@ -202,25 +289,22 @@ class ErrorLogCard extends LitElement {
`
: nothing}
${this._loadingState === "loading"
- ? html`
- ${this.hass.localize("ui.panel.config.logs.loading_log")}
-
`
+ ? html`${localize("ui.panel.config.logs.loading_log")}
`
: this._loadingState === "empty"
- ? html`
- ${this.hass.localize("ui.panel.config.logs.no_errors")}
-
`
+ ? html`${localize("ui.panel.config.logs.no_errors")}
`
: nothing}
${this._loadingState === "loaded" &&
this.filter &&
this._noSearchResults
? html`
- ${this.hass.localize(
- "ui.panel.config.logs.no_issues_search",
- { term: this.filter }
- )}
+ ${localize("ui.panel.config.logs.no_issues_search", {
+ term: this.filter,
+ })}
`
: nothing}
-
+
`
+ : nothing}
- ${this.show === false
- ? html`
-
- ${this._selectedLogProvider === "core"
+ ${this._selectedLogProvider === "core" && !this._detail
? html`
p.key === this._selectedLogProvider
)!.name}
.filter=${this._filter}
+ @switch-log-view=${this._showDetail}
>
`
- : ""}
- p.key === this._selectedLogProvider
- )!.name}
- .filter=${this._filter}
- .provider=${this._selectedLogProvider}
- .show=${this._selectedLogProvider !== "core"}
- >
+ : html` p.key === this._selectedLogProvider
+ )!.name}
+ .filter=${this._filter}
+ .provider=${this._selectedLogProvider}
+ @switch-log-view=${this._showDetail}
+ allow-switch
+ > `}
`;
}
+ private _showDetail() {
+ this._detail = !this._detail;
+ }
+
private _selectProvider(ev) {
this._selectedLogProvider = (ev.currentTarget as any).provider;
this._filter = "";
diff --git a/src/panels/config/logs/system-log-card.ts b/src/panels/config/logs/system-log-card.ts
index 1e1a9d12c120..60ef7284d00a 100644
--- a/src/panels/config/logs/system-log-card.ts
+++ b/src/panels/config/logs/system-log-card.ts
@@ -1,16 +1,20 @@
-import { mdiRefresh } from "@mdi/js";
import "@material/mwc-list/mwc-list";
+import { mdiDotsVertical, mdiDownload, mdiRefresh, mdiText } from "@mdi/js";
import type { CSSResultGroup } from "lit";
import { css, html, LitElement, nothing } from "lit";
import { customElement, property, state } from "lit/decorators";
import memoizeOne from "memoize-one";
+import { fireEvent } from "../../../common/dom/fire_event";
import type { LocalizeFunc } from "../../../common/translations/localize";
import "../../../components/buttons/ha-call-service-button";
import "../../../components/buttons/ha-progress-button";
+import "../../../components/ha-button-menu";
import "../../../components/ha-card";
import "../../../components/ha-circular-progress";
import "../../../components/ha-icon-button";
import "../../../components/ha-list-item";
+import { getSignedPath } from "../../../data/auth";
+import { getErrorLogDownloadUrl } from "../../../data/error_log";
import { domainToName } from "../../../data/integration";
import type { LoggedError } from "../../../data/system_log";
import {
@@ -19,6 +23,7 @@ import {
isCustomIntegrationError,
} from "../../../data/system_log";
import type { HomeAssistant } from "../../../types";
+import { fileDownload } from "../../../util/file_download";
import { showSystemLogDetailDialog } from "./show-dialog-system-log-detail";
import { formatSystemLogTime } from "./util";
@@ -104,11 +109,34 @@ export class SystemLogCard extends LitElement {
: html`
${this.header || "Logs"}
-${this._yamlErrors}`, + confirmText: this.hass!.localize("ui.common.continue"), + destructive: true, + dismissText: this.hass!.localize("ui.common.cancel"), + }); + if (!result) { + return; + } + } + this._yamlErrors = undefined; this._mode = "gui"; } @@ -763,6 +781,13 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) { } private async _saveScript(): Promise