Compare commits

...

13 Commits

Author SHA1 Message Date
Bram Kragten
8a4b96f1ff Bumped version to 20241106.1 2024-11-07 21:40:38 +01:00
Paul Bottein
17b6bf0673 Enable auto-scroll for drag and drop (#22725) 2024-11-07 21:39:45 +01:00
Bram Kragten
387392713c move download logs button, switch between raw and normal logs (#22721) 2024-11-07 21:39:44 +01:00
Wendelin
125ad9c794 Fix logs live-indicator on older boots (#22719) 2024-11-07 21:39:43 +01:00
Bram Kragten
ae33b10cb2 Add support for helper text in form boolean (#22711) 2024-11-07 21:39:43 +01:00
Wendelin
1181ddcbbf Fix hassio logs for core < 2024.11 (#22708) 2024-11-07 21:39:42 +01:00
Paul Bottein
f7103febdf Fix typo for fixed background attribute (#22707) 2024-11-07 21:39:41 +01:00
Bram Kragten
6e8c1f1a63 Update value of password field on change event (#22706) 2024-11-07 21:39:40 +01:00
Bram Kragten
ce39b1a2c8 20241106.0 (#22695) 2024-11-06 14:05:23 +01:00
Paul Bottein
a6971d61d1 20241105.0 (#22679) 2024-11-05 18:47:04 +01:00
Bram Kragten
452cfee2cd Merge branch 'dev' 2024-11-04 19:04:13 +01:00
Paul Bottein
deb077b5e9 20241031.0 (#22613) 2024-10-31 15:14:02 +01:00
Paul Bottein
79e223cf8e 20241030.0 (#22599) 2024-10-30 16:35:54 +01:00
16 changed files with 264 additions and 158 deletions

View File

@@ -510,6 +510,7 @@ class DemoHaForm extends LitElement {
.computeError=${(error) => translations[error] || error} .computeError=${(error) => translations[error] || error}
.computeLabel=${(schema) => .computeLabel=${(schema) =>
translations[schema.name] || schema.name} translations[schema.name] || schema.name}
.computeHelper=${() => "Helper text"}
@value-changed=${(e) => { @value-changed=${(e) => {
this.data[idx] = e.detail.value; this.data[idx] = e.detail.value;
this.requestUpdate(); this.requestUpdate();

View File

@@ -47,7 +47,6 @@ class HassioAddonLogDashboard extends LitElement {
.localizeFunc=${this.supervisor.localize} .localizeFunc=${this.supervisor.localize}
.header=${this.addon.name} .header=${this.addon.name}
.provider=${this.addon.slug} .provider=${this.addon.slug}
show
.filter=${this._filter} .filter=${this._filter}
> >
</error-log-card> </error-log-card>

View File

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "home-assistant-frontend" name = "home-assistant-frontend"
version = "20241106.0" version = "20241106.1"
license = {text = "Apache-2.0"} license = {text = "Apache-2.0"}
description = "The Home Assistant frontend" description = "The Home Assistant frontend"
readme = "README.md" readme = "README.md"

View File

@@ -1,6 +1,6 @@
import "@material/mwc-formfield"; import "@material/mwc-formfield";
import type { TemplateResult } from "lit"; import type { CSSResultGroup, TemplateResult } from "lit";
import { html, LitElement } from "lit"; import { css, html, LitElement, nothing } from "lit";
import { customElement, property, query } from "lit/decorators"; import { customElement, property, query } from "lit/decorators";
import { fireEvent } from "../../common/dom/fire_event"; import { fireEvent } from "../../common/dom/fire_event";
import type { import type {
@@ -19,6 +19,8 @@ export class HaFormBoolean extends LitElement implements HaFormElement {
@property() public label!: string; @property() public label!: string;
@property() public helper?: string;
@property({ type: Boolean }) public disabled = false; @property({ type: Boolean }) public disabled = false;
@query("ha-checkbox", true) private _input?: HTMLElement; @query("ha-checkbox", true) private _input?: HTMLElement;
@@ -37,6 +39,12 @@ export class HaFormBoolean extends LitElement implements HaFormElement {
.disabled=${this.disabled} .disabled=${this.disabled}
@change=${this._valueChanged} @change=${this._valueChanged}
></ha-checkbox> ></ha-checkbox>
<span slot="label">
<p class="primary">${this.label}</p>
${this.helper
? html`<p class="secondary">${this.helper}</p>`
: nothing}
</span>
</mwc-formfield> </mwc-formfield>
`; `;
} }
@@ -46,6 +54,28 @@ export class HaFormBoolean extends LitElement implements HaFormElement {
value: (ev.target as HaCheckbox).checked, 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 { declare global {

View File

@@ -117,8 +117,8 @@ export class HaPasswordField extends LitElement {
.autocapitalize=${this.autocapitalize} .autocapitalize=${this.autocapitalize}
.type=${this._unmaskedPassword ? "text" : "password"} .type=${this._unmaskedPassword ? "text" : "password"}
.suffix=${html`<div style="width: 24px"></div>`} .suffix=${html`<div style="width: 24px"></div>`}
@input=${this._handleInputChange} @input=${this._handleInputEvent}
@change=${this._reDispatchEvent} @change=${this._handleChangeEvent}
></ha-textfield> ></ha-textfield>
<ha-icon-button <ha-icon-button
toggles toggles
@@ -153,11 +153,16 @@ export class HaPasswordField extends LitElement {
} }
@eventOptions({ passive: true }) @eventOptions({ passive: true })
private _handleInputChange(ev) { private _handleInputEvent(ev) {
this.value = ev.target.value; this.value = ev.target.value;
} }
@eventOptions({ passive: true }) @eventOptions({ passive: true })
private _handleChangeEvent(ev) {
this.value = ev.target.value;
this._reDispatchEvent(ev);
}
private _reDispatchEvent(oldEvent: Event) { private _reDispatchEvent(oldEvent: Event) {
const newEvent = new Event(oldEvent.type, oldEvent); const newEvent = new Event(oldEvent.type, oldEvent);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);

View File

@@ -135,6 +135,10 @@ export class HaSortable extends LitElement {
const Sortable = (await import("../resources/sortable")).default; const Sortable = (await import("../resources/sortable")).default;
const options: SortableInstance.Options = { const options: SortableInstance.Options = {
scroll: true,
// Force the autoscroll fallback because it works better than the native one
forceAutoScrollFallback: true,
scrollSpeed: 20,
animation: 150, animation: 150,
...this.options, ...this.options,
onChoose: this._handleChoose, onChoose: this._handleChoose,

View File

@@ -185,6 +185,15 @@ export const fetchHassioInfo = async (
export const fetchHassioBoots = async (hass: HomeAssistant) => export const fetchHassioBoots = async (hass: HomeAssistant) =>
hass.callApi<HassioResponse<HassioBoots>>("GET", `hassio/host/logs/boots`); hass.callApi<HassioResponse<HassioBoots>>("GET", `hassio/host/logs/boots`);
export const fetchHassioLogsLegacy = async (
hass: HomeAssistant,
provider: string
) =>
hass.callApi<string>(
"GET",
`hassio/${provider.includes("_") ? `addons/${provider}` : provider}/logs`
);
export const fetchHassioLogs = async ( export const fetchHassioLogs = async (
hass: HomeAssistant, hass: HomeAssistant,
provider: string, provider: string,

View File

@@ -11,6 +11,7 @@ import {
mdiRefresh, mdiRefresh,
mdiWrap, mdiWrap,
mdiWrapDisabled, mdiWrapDisabled,
mdiFolderTextOutline,
} from "@mdi/js"; } from "@mdi/js";
import { import {
css, css,
@@ -49,6 +50,7 @@ import {
fetchHassioBoots, fetchHassioBoots,
fetchHassioLogs, fetchHassioLogs,
fetchHassioLogsFollow, fetchHassioLogsFollow,
fetchHassioLogsLegacy,
getHassioLogDownloadLinesUrl, getHassioLogDownloadLinesUrl,
getHassioLogDownloadUrl, getHassioLogDownloadUrl,
} from "../../../data/hassio/supervisor"; } from "../../../data/hassio/supervisor";
@@ -57,7 +59,7 @@ import {
downloadFileSupported, downloadFileSupported,
fileDownload, fileDownload,
} from "../../../util/file_download"; } from "../../../util/file_download";
import type { HASSDomEvent } from "../../../common/dom/fire_event"; import { fireEvent, type HASSDomEvent } from "../../../common/dom/fire_event";
import type { ConnectionStatus } from "../../../data/connection-status"; import type { ConnectionStatus } from "../../../data/connection-status";
import { atLeastVersion } from "../../../common/config/version"; import { atLeastVersion } from "../../../common/config/version";
import { isComponentLoaded } from "../../../common/config/is_component_loaded"; import { isComponentLoaded } from "../../../common/config/is_component_loaded";
@@ -78,9 +80,10 @@ class ErrorLogCard extends LitElement {
@property() public header?: string; @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; @query(".error-log") private _logElement?: HTMLElement;
@@ -129,26 +132,32 @@ class ErrorLogCard extends LitElement {
@state() private _wrapLines = true; @state() private _wrapLines = true;
@state() private _downloadSupported; @state() private _downloadSupported?: boolean;
@state() private _logsFileLink; @state() private _logsFileLink?: string;
protected render(): TemplateResult { 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; const localize = this.localizeFunc || this.hass.localize;
return html` return html`
<div class="error-log-intro"> <div class="error-log-intro">
${this._error ${this._error
? html`<ha-alert alert-type="error">${this._error}</ha-alert>` ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
: nothing} : nothing}
<ha-card outlined class=${classMap({ hidden: this.show === false })}> <ha-card outlined>
<div class="header"> <div class="header">
<h1 class="card-header"> <h1 class="card-header">
${this.header || localize("ui.panel.config.logs.show_full_logs")} ${this.header || localize("ui.panel.config.logs.show_full_logs")}
</h1> </h1>
<div class="action-buttons"> <div class="action-buttons">
${this._streamSupported && ${hasBoots && this._showBootsSelect
Array.isArray(this._boots) &&
this._showBootsSelect
? html` ? html`
<ha-assist-chip <ha-assist-chip
.title=${localize( .title=${localize(
@@ -174,7 +183,7 @@ class ErrorLogCard extends LitElement {
id="boots-menu" id="boots-menu"
positioning="fixed" positioning="fixed"
> >
${this._boots.map( ${this._boots!.map(
(boot) => html` (boot) => html`
<ha-md-menu-item <ha-md-menu-item
.value=${boot} .value=${boot}
@@ -231,27 +240,40 @@ class ErrorLogCard extends LitElement {
`ui.panel.config.logs.${this._wrapLines ? "full_width" : "wrap_lines"}` `ui.panel.config.logs.${this._wrapLines ? "full_width" : "wrap_lines"}`
)} )}
></ha-icon-button> ></ha-icon-button>
${!this._streamSupported || this._error ${!streaming || this._error
? html`<ha-icon-button ? html`<ha-icon-button
.path=${mdiRefresh} .path=${mdiRefresh}
@click=${this._loadLogs} @click=${this._loadLogs}
.label=${localize("ui.common.refresh")} .label=${localize("ui.common.refresh")}
></ha-icon-button>` ></ha-icon-button>`
: nothing} : nothing}
${this._streamSupported && Array.isArray(this._boots) ${(this.allowSwitch && this.provider === "core") || hasBoots
? html` ? html`
<ha-button-menu @action=${this._handleOverflowAction}> <ha-button-menu @action=${this._handleOverflowAction}>
<ha-icon-button slot="trigger" .path=${mdiDotsVertical}> <ha-icon-button slot="trigger" .path=${mdiDotsVertical}>
</ha-icon-button> </ha-icon-button>
<ha-list-item graphic="icon"> ${this.allowSwitch && this.provider === "core"
<ha-svg-icon ? html`<ha-list-item graphic="icon">
slot="graphic" <ha-svg-icon
.path=${mdiFormatListNumbered} slot="graphic"
></ha-svg-icon> .path=${mdiFolderTextOutline}
${localize( ></ha-svg-icon>
`ui.panel.config.logs.${this._showBootsSelect ? "hide" : "show"}_haos_boots` ${this.hass.localize(
)} "ui.panel.config.logs.show_condensed_logs"
</ha-list-item> )}
</ha-list-item>`
: nothing}
${hasBoots
? html`<ha-list-item graphic="icon">
<ha-svg-icon
slot="graphic"
.path=${mdiFormatListNumbered}
></ha-svg-icon>
${localize(
`ui.panel.config.logs.${this._showBootsSelect ? "hide" : "show"}_haos_boots`
)}
</ha-list-item>`
: nothing}
</ha-button-menu> </ha-button-menu>
` `
: nothing} : nothing}
@@ -304,47 +326,34 @@ class ErrorLogCard extends LitElement {
slot="trailingIcon" slot="trailingIcon"
></ha-svg-icon> ></ha-svg-icon>
</ha-button> </ha-button>
${this._streamSupported && ${streaming && this._boot === 0 && !this._error
this._loadingState !== "loading" &&
!this._error
? html`<div class="live-indicator"> ? html`<div class="live-indicator">
<ha-svg-icon path=${mdiCircle}></ha-svg-icon> <ha-svg-icon path=${mdiCircle}></ha-svg-icon>
Live Live
</div>` </div>`
: nothing} : nothing}
</ha-card> </ha-card>
${this.show === false
? html`
${this._downloadSupported
? html`
<ha-button outlined @click=${this._downloadLogs}>
<ha-svg-icon .path=${mdiDownload}></ha-svg-icon>
${localize("ui.panel.config.logs.download_logs")}
</ha-button>
`
: nothing}
<mwc-button raised @click=${this._showLogs}>
${localize("ui.panel.config.logs.load_logs")}
</mwc-button>
`
: nothing}
</div> </div>
`; `;
} }
public connectedCallback() { protected willUpdate(changedProps: PropertyValues) {
super.connectedCallback(); super.willUpdate(changedProps);
if (changedProps.has("provider")) {
this._boot = 0;
this._loadLogs();
}
if (this.hasUpdated) {
return;
}
this._streamSupported = atLeastVersion(this.hass.config.version, 2024, 11);
this._downloadSupported = downloadFileSupported(this.hass);
// just needs to be loaded once, because only the host endpoints provide boots information
this._loadBoots();
if (this._streamSupported === undefined) { window.addEventListener("connection-status", this._handleConnectionStatus);
this._streamSupported = atLeastVersion(
this.hass.config.version, this.hass.loadFragmentTranslation("config");
2024,
11
);
}
if (this._downloadSupported === undefined && this.hass) {
this._downloadSupported = downloadFileSupported(this.hass);
}
} }
protected firstUpdated(changedProps: PropertyValues) { protected firstUpdated(changedProps: PropertyValues) {
@@ -354,28 +363,11 @@ class ErrorLogCard extends LitElement {
this._scrolledToTopController.callback = this._handleTopScroll; this._scrolledToTopController.callback = this._handleTopScroll;
this._scrolledToTopController.observe(this._scrollTopMarkerElement!); 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) { protected updated(changedProps) {
super.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) { if (this._newLogsIndicator && this._scrolledToBottomController.value) {
this._newLogsIndicator = false; this._newLogsIndicator = false;
} }
@@ -409,7 +401,7 @@ class ErrorLogCard extends LitElement {
} }
private async _downloadLogs(): Promise<void> { private async _downloadLogs(): Promise<void> {
if (this._streamSupported) { if (this._streamSupported && this.provider) {
showDownloadLogsDialog(this, { showDownloadLogsDialog(this, {
header: this.header, header: this.header,
provider: this.provider, provider: this.provider,
@@ -431,10 +423,6 @@ class ErrorLogCard extends LitElement {
} }
} }
private _showLogs(): void {
this.show = true;
}
private async _loadLogs(): Promise<void> { private async _loadLogs(): Promise<void> {
this._error = undefined; this._error = undefined;
this._loadingState = "loading"; this._loadingState = "loading";
@@ -446,15 +434,16 @@ class ErrorLogCard extends LitElement {
try { try {
if (this._logStreamAborter) { if (this._logStreamAborter) {
this._logStreamAborter.abort(); this._logStreamAborter.abort();
this._logStreamAborter = undefined;
} }
this._logStreamAborter = new AbortController();
if ( if (
this._streamSupported && this._streamSupported &&
isComponentLoaded(this.hass, "hassio") && isComponentLoaded(this.hass, "hassio") &&
this.provider this.provider
) { ) {
this._logStreamAborter = new AbortController();
// check if there are any logs at all // check if there are any logs at all
const testResponse = await fetchHassioLogs( const testResponse = await fetchHassioLogs(
this.hass, this.hass,
@@ -545,8 +534,7 @@ class ErrorLogCard extends LitElement {
this._streamSupported = false; this._streamSupported = false;
let logs = ""; let logs = "";
if (isComponentLoaded(this.hass, "hassio") && this.provider) { if (isComponentLoaded(this.hass, "hassio") && this.provider) {
const repsonse = await fetchHassioLogs(this.hass, this.provider); logs = await fetchHassioLogsLegacy(this.hass, this.provider);
logs = await repsonse.text();
} else { } else {
logs = await fetchErrorLog(this.hass); logs = await fetchErrorLog(this.hass);
} }
@@ -598,60 +586,62 @@ class ErrorLogCard extends LitElement {
if (ev.detail === "disconnected" && this._logStreamAborter) { if (ev.detail === "disconnected" && this._logStreamAborter) {
this._logStreamAborter.abort(); this._logStreamAborter.abort();
} }
if (ev.detail === "connected" && this.show) { if (ev.detail === "connected") {
this._loadLogs(); this._loadLogs();
} }
}; };
private async _loadMoreLogs() { private async _loadMoreLogs() {
if ( if (
this._firstCursor && !this._firstCursor ||
this._loadingPrevState !== "loading" && this._loadingPrevState === "loading" ||
this._loadingState === "loaded" && this._loadingState !== "loaded" ||
this._logElement !this._logElement ||
!this.provider
) { ) {
const scrolledToBottom = this._scrolledToBottomController.value; return;
const scrollPositionFromBottom = }
this._logElement.scrollHeight - this._logElement.scrollTop; const scrolledToBottom = this._scrolledToBottomController.value;
this._loadingPrevState = "loading"; const scrollPositionFromBottom =
const response = await fetchHassioLogs( this._logElement.scrollHeight - this._logElement.scrollTop;
this.hass, this._loadingPrevState = "loading";
this.provider, const response = await fetchHassioLogs(
`entries=${this._firstCursor}:-100:100`, this.hass,
this._boot this.provider,
); `entries=${this._firstCursor}:-100:100`,
this._boot
);
if (response.headers.has("X-First-Cursor")) { if (response.headers.has("X-First-Cursor")) {
if (this._firstCursor === response.headers.get("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();
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._loadingPrevState = "end";
return;
} }
this._firstCursor = response.headers.get("X-First-Cursor")!;
}
if (scrolledToBottom) { const body = await response.text();
this._scrollToBottom();
} else if (this._loadingPrevState !== "end" && this._logElement) { if (body) {
window.requestAnimationFrame(() => { const lines = body
this._logElement!.scrollTop = .split("\n")
this._logElement!.scrollHeight - scrollPositionFromBottom; .filter((line) => line.trim() !== "")
}); .reverse();
}
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;
});
} }
} }
@@ -693,7 +683,15 @@ class ErrorLogCard extends LitElement {
} }
private _handleOverflowAction(ev: CustomEvent<ActionDetail>) { private _handleOverflowAction(ev: CustomEvent<ActionDetail>) {
switch (ev.detail.index) { let index = ev.detail.index;
if (this.provider === "core") {
index--;
}
switch (index) {
case -1:
// @ts-ignore
fireEvent(this, "switch-log-view");
break;
case 0: case 0:
this._showBootsSelect = !this._showBootsSelect; this._showBootsSelect = !this._showBootsSelect;
break; break;

View File

@@ -3,20 +3,20 @@ import type { CSSResultGroup, TemplateResult } from "lit";
import { css, html, LitElement } from "lit"; import { css, html, LitElement } from "lit";
import { customElement, property, query, state } from "lit/decorators"; import { customElement, property, query, state } from "lit/decorators";
import { isComponentLoaded } from "../../../common/config/is_component_loaded"; import { isComponentLoaded } from "../../../common/config/is_component_loaded";
import { navigate } from "../../../common/navigate";
import { extractSearchParam } from "../../../common/url/search-params"; import { extractSearchParam } from "../../../common/url/search-params";
import "../../../components/ha-button-menu";
import "../../../components/ha-button"; import "../../../components/ha-button";
import "../../../components/ha-button-menu";
import "../../../components/search-input"; import "../../../components/search-input";
import type { LogProvider } from "../../../data/error_log"; import type { LogProvider } from "../../../data/error_log";
import { fetchHassioAddonsInfo } from "../../../data/hassio/addon"; import { fetchHassioAddonsInfo } from "../../../data/hassio/addon";
import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
import "../../../layouts/hass-subpage"; import "../../../layouts/hass-subpage";
import { haStyle } from "../../../resources/styles"; import { haStyle } from "../../../resources/styles";
import type { HomeAssistant, Route } from "../../../types"; import type { HomeAssistant, Route } from "../../../types";
import "./error-log-card"; import "./error-log-card";
import "./system-log-card"; import "./system-log-card";
import type { SystemLogCard } from "./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[] = [ const logProviders: LogProvider[] = [
{ {
@@ -57,6 +57,8 @@ export class HaConfigLogs extends LitElement {
@state() private _filter = extractSearchParam("filter") || ""; @state() private _filter = extractSearchParam("filter") || "";
@state() private _detail = false;
@query("system-log-card") private systemLog?: SystemLogCard; @query("system-log-card") private systemLog?: SystemLogCard;
@state() private _selectedLogProvider = "core"; @state() private _selectedLogProvider = "core";
@@ -141,7 +143,7 @@ export class HaConfigLogs extends LitElement {
: ""} : ""}
${search} ${search}
<div class="content"> <div class="content">
${this._selectedLogProvider === "core" ${this._selectedLogProvider === "core" && !this._detail
? html` ? html`
<system-log-card <system-log-card
.hass=${this.hass} .hass=${this.hass}
@@ -149,23 +151,28 @@ export class HaConfigLogs extends LitElement {
(p) => p.key === this._selectedLogProvider (p) => p.key === this._selectedLogProvider
)!.name} )!.name}
.filter=${this._filter} .filter=${this._filter}
@switch-log-view=${this._showDetail}
></system-log-card> ></system-log-card>
` `
: ""} : html`<error-log-card
<error-log-card .hass=${this.hass}
.hass=${this.hass} .header=${this._logProviders.find(
.header=${this._logProviders.find( (p) => p.key === this._selectedLogProvider
(p) => p.key === this._selectedLogProvider )!.name}
)!.name} .filter=${this._filter}
.filter=${this._filter} .provider=${this._selectedLogProvider}
.provider=${this._selectedLogProvider} @switch-log-view=${this._showDetail}
.show=${this._selectedLogProvider !== "core"} allow-switch
></error-log-card> ></error-log-card>`}
</div> </div>
</hass-subpage> </hass-subpage>
`; `;
} }
private _showDetail() {
this._detail = !this._detail;
}
private _selectProvider(ev) { private _selectProvider(ev) {
this._selectedLogProvider = (ev.currentTarget as any).provider; this._selectedLogProvider = (ev.currentTarget as any).provider;
this._filter = ""; this._filter = "";

View File

@@ -1,16 +1,20 @@
import { mdiRefresh } from "@mdi/js";
import "@material/mwc-list/mwc-list"; import "@material/mwc-list/mwc-list";
import { mdiDotsVertical, mdiDownload, mdiRefresh, mdiText } from "@mdi/js";
import type { CSSResultGroup } from "lit"; import type { CSSResultGroup } from "lit";
import { css, html, LitElement, nothing } from "lit"; import { css, html, LitElement, nothing } from "lit";
import { customElement, property, state } from "lit/decorators"; import { customElement, property, state } from "lit/decorators";
import memoizeOne from "memoize-one"; import memoizeOne from "memoize-one";
import { fireEvent } from "../../../common/dom/fire_event";
import type { LocalizeFunc } from "../../../common/translations/localize"; import type { LocalizeFunc } from "../../../common/translations/localize";
import "../../../components/buttons/ha-call-service-button"; import "../../../components/buttons/ha-call-service-button";
import "../../../components/buttons/ha-progress-button"; import "../../../components/buttons/ha-progress-button";
import "../../../components/ha-button-menu";
import "../../../components/ha-card"; import "../../../components/ha-card";
import "../../../components/ha-circular-progress"; import "../../../components/ha-circular-progress";
import "../../../components/ha-icon-button"; import "../../../components/ha-icon-button";
import "../../../components/ha-list-item"; import "../../../components/ha-list-item";
import { getSignedPath } from "../../../data/auth";
import { getErrorLogDownloadUrl } from "../../../data/error_log";
import { domainToName } from "../../../data/integration"; import { domainToName } from "../../../data/integration";
import type { LoggedError } from "../../../data/system_log"; import type { LoggedError } from "../../../data/system_log";
import { import {
@@ -19,6 +23,7 @@ import {
isCustomIntegrationError, isCustomIntegrationError,
} from "../../../data/system_log"; } from "../../../data/system_log";
import type { HomeAssistant } from "../../../types"; import type { HomeAssistant } from "../../../types";
import { fileDownload } from "../../../util/file_download";
import { showSystemLogDetailDialog } from "./show-dialog-system-log-detail"; import { showSystemLogDetailDialog } from "./show-dialog-system-log-detail";
import { formatSystemLogTime } from "./util"; import { formatSystemLogTime } from "./util";
@@ -104,11 +109,34 @@ export class SystemLogCard extends LitElement {
: html` : html`
<div class="header"> <div class="header">
<h1 class="card-header">${this.header || "Logs"}</h1> <h1 class="card-header">${this.header || "Logs"}</h1>
<ha-icon-button <div class="header-buttons">
.path=${mdiRefresh} <ha-icon-button
@click=${this.fetchData} .path=${mdiDownload}
.label=${this.hass.localize("ui.common.refresh")} @click=${this._downloadLogs}
></ha-icon-button> .label=${this.hass.localize(
"ui.panel.config.logs.download_logs"
)}
></ha-icon-button>
<ha-icon-button
.path=${mdiRefresh}
@click=${this.fetchData}
.label=${this.hass.localize("ui.common.refresh")}
></ha-icon-button>
<ha-button-menu @action=${this._handleOverflowAction}>
<ha-icon-button slot="trigger" .path=${mdiDotsVertical}>
</ha-icon-button>
<ha-list-item graphic="icon">
<ha-svg-icon
slot="graphic"
.path=${mdiText}
></ha-svg-icon>
${this.hass.localize(
"ui.panel.config.logs.show_full_logs"
)}
</ha-list-item>
</ha-button-menu>
</div>
</div> </div>
${this._items.length === 0 ${this._items.length === 0
? html` ? html`
@@ -195,6 +223,19 @@ export class SystemLogCard extends LitElement {
} }
} }
private _handleOverflowAction() {
// @ts-ignore
fireEvent(this, "switch-log-view");
}
private async _downloadLogs() {
const timeString = new Date().toISOString().replace(/:/g, "-");
const downloadUrl = getErrorLogDownloadUrl;
const logFileName = `home-assistant_${timeString}.log`;
const signedUrl = await getSignedPath(this.hass, downloadUrl);
fileDownload(signedUrl.path, logFileName);
}
private _openLog(ev: Event): void { private _openLog(ev: Event): void {
const item = (ev.currentTarget as any).logItem; const item = (ev.currentTarget as any).logItem;
showSystemLogDetailDialog(this, { item }); showSystemLogDetailDialog(this, { item });
@@ -203,7 +244,7 @@ export class SystemLogCard extends LitElement {
static get styles(): CSSResultGroup { static get styles(): CSSResultGroup {
return css` return css`
ha-card { ha-card {
padding-top: 16px; padding-top: 8px;
} }
.header { .header {
@@ -212,6 +253,11 @@ export class SystemLogCard extends LitElement {
padding: 0 16px; padding: 0 16px;
} }
.header-buttons {
display: flex;
align-items: center;
}
.card-header { .card-header {
color: var(--ha-card-header-color, var(--primary-text-color)); color: var(--ha-card-header-color, var(--primary-text-color));
font-family: var(--ha-card-header-font-family, inherit); font-family: var(--ha-card-header-font-family, inherit);
@@ -243,6 +289,10 @@ export class SystemLogCard extends LitElement {
color: var(--warning-color); color: var(--warning-color);
} }
.card-content {
border-top: 1px solid var(--divider-color);
}
.card-actions, .card-actions,
.empty-content { .empty-content {
direction: var(--direction); direction: var(--direction);

View File

@@ -31,7 +31,7 @@ export class HuiRecoveryModeCard extends LitElement implements LovelaceCard {
"ui.panel.lovelace.cards.recovery-mode.description" "ui.panel.lovelace.cards.recovery-mode.description"
)} )}
</div> </div>
<error-log-card .hass=${this.hass}></error-log-card> <error-log-card .hass=${this.hass} provider="core"></error-log-card>
</ha-card> </ha-card>
`; `;
} }

View File

@@ -47,7 +47,7 @@ class HuiViewContainer extends LitElement {
private _isFixedBackground(background?: BackgroundConfig) { private _isFixedBackground(background?: BackgroundConfig) {
if (typeof background === "string") { if (typeof background === "string") {
return background.includes(" fixed"); return background.split(" ").includes("fixed");
} }
return false; return false;
} }
@@ -126,7 +126,7 @@ class HuiViewContainer extends LitElement {
); );
background-attachment: scroll !important; background-attachment: scroll !important;
} }
:host(:not(fixed-background)) { :host(:not([fixed-background])) {
background: var( background: var(
--view-background, --view-background,
var(--lovelace-background, var(--primary-background-color)) var(--lovelace-background, var(--primary-background-color))

View File

@@ -1,10 +1,11 @@
import type Sortable from "sortablejs"; import type Sortable from "sortablejs";
import SortableCore, { import SortableCore, {
OnSpill,
AutoScroll, AutoScroll,
OnSpill,
} from "sortablejs/modular/sortable.core.esm"; } from "sortablejs/modular/sortable.core.esm";
SortableCore.mount(OnSpill, new AutoScroll()); SortableCore.mount(OnSpill);
SortableCore.mount(new AutoScroll());
export default SortableCore as typeof Sortable; export default SortableCore as typeof Sortable;

View File

@@ -158,6 +158,7 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
}, },
callApi: async (method, path, parameters, headers) => callApi: async (method, path, parameters, headers) =>
hassCallApi(auth, method, path, parameters, headers), hassCallApi(auth, method, path, parameters, headers),
// callApiRaw introduced in 2024.11
callApiRaw: async (method, path, parameters, headers, signal) => callApiRaw: async (method, path, parameters, headers, signal) =>
hassCallApiRaw(auth, method, path, parameters, headers, signal), hassCallApiRaw(auth, method, path, parameters, headers, signal),
fetchWithAuth: ( fetchWithAuth: (

View File

@@ -2470,9 +2470,9 @@
"search": "Search logs", "search": "Search logs",
"failed_get_logs": "Failed to get {provider} logs, {error}", "failed_get_logs": "Failed to get {provider} logs, {error}",
"no_issues_search": "No issues found for search term ''{term}''", "no_issues_search": "No issues found for search term ''{term}''",
"load_logs": "Load full logs", "load_logs": "Load logs",
"nr_of_lines": "Number of lines", "nr_of_lines": "Number of lines",
"loading_log": "Loading full log…", "loading_log": "Loading log…",
"no_errors": "No errors have been reported", "no_errors": "No errors have been reported",
"no_issues": "There are no new issues!", "no_issues": "There are no new issues!",
"clear": "Clear", "clear": "Clear",
@@ -2489,7 +2489,8 @@
}, },
"custom_integration": "custom integration", "custom_integration": "custom integration",
"error_from_custom_integration": "This error originated from a custom integration.", "error_from_custom_integration": "This error originated from a custom integration.",
"show_full_logs": "Show full logs", "show_full_logs": "Show raw logs",
"show_condensed_logs": "Show condensed logs",
"select_number_of_lines": "Select number of lines to download", "select_number_of_lines": "Select number of lines to download",
"lines": "Lines", "lines": "Lines",
"download_logs": "Download logs", "download_logs": "Download logs",

View File

@@ -259,7 +259,7 @@ export interface HomeAssistant {
parameters?: Record<string, any>, parameters?: Record<string, any>,
headers?: Record<string, string> headers?: Record<string, string>
): Promise<T>; ): Promise<T>;
callApiRaw( callApiRaw( // introduced in 2024.11
method: "GET" | "POST" | "PUT" | "DELETE", method: "GET" | "POST" | "PUT" | "DELETE",
path: string, path: string,
parameters?: Record<string, any>, parameters?: Record<string, any>,