Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

hassio-addon-config feedback #6732

Merged
merged 3 commits into from
Sep 3, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
89 changes: 50 additions & 39 deletions hassio/src/addon-view/config/hassio-addon-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import {
HassioAddonSetOptionParams,
setHassioAddonOption,
} from "../../../../src/data/hassio/addon";
import "../../../../src/components/buttons/ha-progress-button";

import { showConfirmationDialog } from "../../../../src/dialogs/generic/show-dialog-box";
import { haStyle } from "../../../../src/resources/styles";
import type { HomeAssistant } from "../../../../src/types";
Expand Down Expand Up @@ -55,50 +57,20 @@ class HassioAddonConfig extends LitElement {
${valid ? "" : html` <div class="errors">Invalid YAML</div> `}
</div>
<div class="card-actions">
<mwc-button class="warning" @click=${this._resetTapped}>
<ha-progress-button class="warning" @click=${this._resetTapped}>
Reset to defaults
</mwc-button>
<mwc-button
</ha-progress-button>
<ha-progress-button
@click=${this._saveTapped}
.disabled=${!this._configHasChanged || !valid}
>
Save
</mwc-button>
</ha-progress-button>
</div>
</ha-card>
`;
}

static get styles(): CSSResult[] {
return [
haStyle,
hassioStyle,
css`
:host {
display: block;
}
ha-card {
display: block;
}
.card-actions {
display: flex;
justify-content: space-between;
}
.errors {
color: var(--error-color);
margin-top: 16px;
}
iron-autogrow-textarea {
width: 100%;
font-family: monospace;
}
.syntaxerror {
color: var(--error-color);
}
`,
];
}

protected updated(changedProperties: PropertyValues): void {
super.updated(changedProperties);
if (changedProperties.has("addon")) {
Expand All @@ -111,7 +83,10 @@ class HassioAddonConfig extends LitElement {
this.requestUpdate();
}

private async _resetTapped(): Promise<void> {
private async _resetTapped(ev: CustomEvent): Promise<void> {
const button = ev.target as any;
ludeeus marked this conversation as resolved.
Show resolved Hide resolved
button.progress = true;

const confirmed = await showConfirmationDialog(this, {
title: this.addon.name,
text: "Are you sure you want to reset all your options?",
Expand All @@ -120,6 +95,7 @@ class HassioAddonConfig extends LitElement {
});

if (!confirmed) {
button.progress = false;
return;
}

Expand All @@ -141,9 +117,13 @@ class HassioAddonConfig extends LitElement {
err.body?.message || err
}`;
}
button.progress = false;
}

private async _saveTapped(): Promise<void> {
private async _saveTapped(ev: CustomEvent): Promise<void> {
const button = ev.target as any;
ludeeus marked this conversation as resolved.
Show resolved Hide resolved
button.progress = true;

let data: HassioAddonSetOptionParams;
this._error = undefined;
try {
Expand All @@ -163,14 +143,45 @@ class HassioAddonConfig extends LitElement {
path: "options",
};
fireEvent(this, "hass-api-called", eventdata);
if (this.addon?.state === "started") {
await suggestAddonRestart(this, this.hass, this.addon);
}
} catch (err) {
this._error = `Failed to save addon configuration, ${
err.body?.message || err
}`;
}
if (!this._error && this.addon?.state === "started") {
await suggestAddonRestart(this, this.hass, this.addon);
}
button.progress = false;
}

static get styles(): CSSResult[] {
return [
haStyle,
hassioStyle,
css`
:host {
display: block;
}
ha-card {
display: block;
}
.card-actions {
display: flex;
justify-content: space-between;
}
.errors {
color: var(--error-color);
margin-top: 16px;
}
iron-autogrow-textarea {
width: 100%;
font-family: monospace;
}
.syntaxerror {
color: var(--error-color);
}
`,
];
}
}

Expand Down