jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-26 02:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make error on general config better + default timezone (#14635)

Browse Source
This commit is contained in:
Bram Kragten 2022-12-12 20:20:56 +01:00 committed by GitHub
parent 8d1ecdb27e
commit c1dba217da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/panels/config/core/ha-config-section-general.ts
View File

@ -25,6 +25,7 @@ import { SYMBOL_TO_ISO } from "../../../data/currency";
import "../../../layouts/hass-subpage"; import "../../../layouts/hass-subpage";
import { haStyle } from "../../../resources/styles"; import { haStyle } from "../../../resources/styles";
import type { HomeAssistant } from "../../../types"; import type { HomeAssistant } from "../../../types";
import "../../../components/ha-alert";
@customElement("ha-config-section-general") @customElement("ha-config-section-general")
class HaConfigSectionGeneral extends LitElement { class HaConfigSectionGeneral extends LitElement {
@ -52,6 +53,8 @@ class HaConfigSectionGeneral extends LitElement {
@state() private _languages?: { value: string; label: string }[]; @state() private _languages?: { value: string; label: string }[];
@state() private _error?: string;
protected render(): TemplateResult { protected render(): TemplateResult {
const canEdit = ["storage", "default"].includes( const canEdit = ["storage", "default"].includes(
this.hass.config.config_source this.hass.config.config_source
@ -65,6 +68,9 @@ class HaConfigSectionGeneral extends LitElement {
.header=${this.hass.localize("ui.panel.config.core.caption")} .header=${this.hass.localize("ui.panel.config.core.caption")}
> >
<div class="content"> <div class="content">
${this._error
? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
: ""}
<ha-card outlined> <ha-card outlined>
<div class="card-content"> <div class="card-content">
${!canEdit ${!canEdit
@ -289,7 +295,7 @@ class HaConfigSectionGeneral extends LitElement {
this._country = this.hass.config.country; this._country = this.hass.config.country;
this._language = this.hass.config.language; this._language = this.hass.config.language;
this._elevation = this.hass.config.elevation; this._elevation = this.hass.config.elevation;
this._timeZone = this.hass.config.time_zone; this._timeZone = this.hass.config.time_zone || "Etc/GMT";
this._name = this.hass.config.location_name; this._name = this.hass.config.location_name;
this._computeLanguages(); this._computeLanguages();
} }
@ -347,6 +353,8 @@ class HaConfigSectionGeneral extends LitElement {
}; };
} }
this._error = undefined;
try { try {
await saveCoreConfig(this.hass, { await saveCoreConfig(this.hass, {
currency: this._currency, currency: this._currency,
@ -361,7 +369,7 @@ class HaConfigSectionGeneral extends LitElement {
button.actionSuccess(); button.actionSuccess();
} catch (err: any) { } catch (err: any) {
button.actionError(); button.actionError();
alert(`Error saving config: ${err.message}`); this._error = err.message;
} finally { } finally {
button.progress = false; button.progress = false;
} }