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-network feedback #6733

Merged
merged 1 commit into from
Sep 3, 2020
Merged
Changes from all commits
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
82 changes: 47 additions & 35 deletions hassio/src/addon-view/config/hassio-addon-network.ts
Expand Up @@ -21,6 +21,7 @@ import { haStyle } from "../../../../src/resources/styles";
import { HomeAssistant } from "../../../../src/types";
import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
import { hassioStyle } from "../../resources/hassio-style";
import "../../../../src/components/buttons/ha-progress-button";

interface NetworkItem {
description: string;
Expand Down Expand Up @@ -85,38 +86,17 @@ class HassioAddonNetwork extends LitElement {
</table>
</div>
<div class="card-actions">
<mwc-button class="warning" @click=${this._resetTapped}>
Reset to defaults
</mwc-button>
<mwc-button @click=${this._saveTapped}>Save</mwc-button>
<ha-progress-button class="warning" @click=${this._resetTapped}>
Reset to defaults </ha-progress-button
>>
<ha-progress-button @click=${this._saveTapped}>
Save
</ha-progress-button>
</div>
</ha-card>
`;
}

static get styles(): CSSResult[] {
return [
haStyle,
hassioStyle,
css`
:host {
display: block;
}
ha-card {
display: block;
}
.errors {
color: var(--error-color);
margin-bottom: 16px;
}
.card-actions {
display: flex;
justify-content: space-between;
}
`,
];
}

protected update(changedProperties: PropertyValues): void {
super.update(changedProperties);
if (changedProperties.has("addon")) {
Expand Down Expand Up @@ -149,7 +129,10 @@ class HassioAddonNetwork extends LitElement {
});
}

private async _resetTapped(): Promise<void> {
private async _resetTapped(ev: CustomEvent): Promise<void> {
const button = ev.target as any;
button.progress = true;

const data: HassioAddonSetOptionParams = {
network: null,
};
Expand All @@ -162,17 +145,22 @@ class HassioAddonNetwork extends LitElement {
path: "option",
};
fireEvent(this, "hass-api-called", eventdata);
if (this.addon?.state === "started") {
await suggestAddonRestart(this, this.hass, this.addon);
}
} catch (err) {
this._error = `Failed to set addon network configuration, ${
err.body?.message || err
}`;
}
if (!this._error && this.addon?.state === "started") {
await suggestAddonRestart(this, this.hass, this.addon);
}

button.progress = false;
}

private async _saveTapped(): Promise<void> {
private async _saveTapped(ev: CustomEvent): Promise<void> {
const button = ev.target as any;
button.progress = true;

this._error = undefined;
const networkconfiguration = {};
this._config!.forEach((item) => {
Expand All @@ -191,14 +179,38 @@ class HassioAddonNetwork extends LitElement {
path: "option",
};
fireEvent(this, "hass-api-called", eventdata);
if (this.addon?.state === "started") {
await suggestAddonRestart(this, this.hass, this.addon);
}
} catch (err) {
this._error = `Failed to set addon network 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;
}
.errors {
color: var(--error-color);
margin-bottom: 16px;
}
.card-actions {
display: flex;
justify-content: space-between;
}
`,
];
}
}

Expand Down