mirror of
https://github.com/home-assistant/frontend
synced 2024-09-30 15:52:53 +02:00
Fixes for snapshot upload during onboarding (#7390)
Co-authored-by: Bram Kragten <mail@bramkragten.nl>
This commit is contained in:
parent
7c51001c3c
commit
eec4a91ad8
@ -1,4 +1,3 @@
|
||||
import "../../../src/components/ha-file-upload";
|
||||
import "@material/mwc-icon-button/mwc-icon-button";
|
||||
import { mdiFolderUpload } from "@mdi/js";
|
||||
import "@polymer/iron-input/iron-input";
|
||||
@ -12,13 +11,15 @@ import {
|
||||
} from "lit-element";
|
||||
import { fireEvent } from "../../../src/common/dom/fire_event";
|
||||
import "../../../src/components/ha-circular-progress";
|
||||
import "../../../src/components/ha-file-upload";
|
||||
import "../../../src/components/ha-svg-icon";
|
||||
import { extractApiErrorMessage } from "../../../src/data/hassio/common";
|
||||
import {
|
||||
HassioSnapshot,
|
||||
uploadSnapshot,
|
||||
} from "../../../src/data/hassio/snapshot";
|
||||
import { HomeAssistant } from "../../../src/types";
|
||||
import { showAlertDialog } from "../../../src/dialogs/generic/show-dialog-box";
|
||||
import { HomeAssistant } from "../../../src/types";
|
||||
|
||||
declare global {
|
||||
interface HASSDomEvents {
|
||||
@ -65,7 +66,7 @@ export class HassioUploadSnapshot extends LitElement {
|
||||
} catch (err) {
|
||||
showAlertDialog(this, {
|
||||
title: "Upload failed",
|
||||
text: err.toString(),
|
||||
text: extractApiErrorMessage(err),
|
||||
confirmText: "ok",
|
||||
});
|
||||
} finally {
|
||||
|
@ -1,6 +1,7 @@
|
||||
import "@material/mwc-button";
|
||||
import { mdiClose, mdiDelete, mdiDownload, mdiHistory } from "@mdi/js";
|
||||
import { PaperCheckboxElement } from "@polymer/paper-checkbox/paper-checkbox";
|
||||
import "@polymer/paper-checkbox/paper-checkbox";
|
||||
import type { PaperCheckboxElement } from "@polymer/paper-checkbox/paper-checkbox";
|
||||
import "@polymer/paper-input/paper-input";
|
||||
import {
|
||||
css,
|
||||
|
@ -22,8 +22,8 @@ export const hassioApiResultExtractor = <T>(response: HassioResponse<T>) =>
|
||||
export const extractApiErrorMessage = (error: any): string => {
|
||||
return typeof error === "object"
|
||||
? typeof error.body === "object"
|
||||
? error.body.message || "Unknown error, see logs"
|
||||
: error.body || "Unknown error, see logs"
|
||||
? error.body.message || "Unknown error, see supervisor logs"
|
||||
: error.body || error.message || "Unknown error, see supervisor logs"
|
||||
: error;
|
||||
};
|
||||
|
||||
|
@ -15,6 +15,10 @@ import { showSnapshotUploadDialog } from "../../hassio/src/dialogs/snapshot/show
|
||||
import { navigate } from "../common/navigate";
|
||||
import type { LocalizeFunc } from "../common/translations/localize";
|
||||
import "../components/ha-card";
|
||||
import {
|
||||
extractApiErrorMessage,
|
||||
ignoredStatusCodes,
|
||||
} from "../data/hassio/common";
|
||||
import { makeDialogManager } from "../dialogs/make-dialog-manager";
|
||||
import { ProvideHassLitMixin } from "../mixins/provide-hass-lit-mixin";
|
||||
import { haStyle } from "../resources/styles";
|
||||
@ -32,9 +36,9 @@ class OnboardingRestoreSnapshot extends ProvideHassLitMixin(LitElement) {
|
||||
|
||||
@property() public language!: string;
|
||||
|
||||
@property({ type: Boolean }) private restoring = false;
|
||||
@property({ type: Boolean }) public restoring = false;
|
||||
|
||||
@internalProperty() private _log?: string;
|
||||
@internalProperty() private _log = "";
|
||||
|
||||
@internalProperty() private _showFullLog = false;
|
||||
|
||||
@ -45,17 +49,15 @@ class OnboardingRestoreSnapshot extends ProvideHassLitMixin(LitElement) {
|
||||
"ui.panel.page-onboarding.restore.in_progress"
|
||||
)}
|
||||
>
|
||||
${this._log
|
||||
? this._showFullLog
|
||||
? html`<hassio-ansi-to-html .content=${this._log}>
|
||||
</hassio-ansi-to-html>`
|
||||
: html`<onboarding-loading></onboarding-loading>
|
||||
<hassio-ansi-to-html
|
||||
class="logentry"
|
||||
.content=${this._lastLogEntry(this._log)}
|
||||
>
|
||||
</hassio-ansi-to-html>`
|
||||
: ""}
|
||||
${this._showFullLog
|
||||
? html`<hassio-ansi-to-html .content=${this._log}>
|
||||
</hassio-ansi-to-html>`
|
||||
: html`<onboarding-loading></onboarding-loading>
|
||||
<hassio-ansi-to-html
|
||||
class="logentry"
|
||||
.content=${this._lastLogEntry(this._log)}
|
||||
>
|
||||
</hassio-ansi-to-html>`}
|
||||
<div class="card-actions">
|
||||
<mwc-button @click=${this._toggeFullLog}>
|
||||
${this._showFullLog
|
||||
@ -83,7 +85,8 @@ class OnboardingRestoreSnapshot extends ProvideHassLitMixin(LitElement) {
|
||||
(entry) =>
|
||||
!entry.includes("/supervisor/logs") &&
|
||||
!entry.includes("/supervisor/ping") &&
|
||||
!entry.includes("DEBUG")
|
||||
!entry.includes("DEBUG") &&
|
||||
!entry.includes("TypeError: Failed to fetch")
|
||||
)
|
||||
.join("\n")
|
||||
.replace(/\s[A-Z]+\s\(\w+\)\s\[[\w.]+\]/gi, "")
|
||||
@ -116,19 +119,33 @@ class OnboardingRestoreSnapshot extends ProvideHassLitMixin(LitElement) {
|
||||
const response = await fetch("/api/hassio/supervisor/logs", {
|
||||
method: "GET",
|
||||
});
|
||||
if (response.status === 401) {
|
||||
// If we get a unauthorized response, the restore is done
|
||||
this._restoreDone();
|
||||
} else if (
|
||||
response.status &&
|
||||
!ignoredStatusCodes.has(response.status)
|
||||
) {
|
||||
// Handle error responses
|
||||
this._log += this._filterLogs(extractApiErrorMessage(response));
|
||||
}
|
||||
const logs = await response.text();
|
||||
this._log = this._filterLogs(logs);
|
||||
if (this._log.match(/\d{2}:\d{2}:\d{2}\s.*Restore\s\w+\sdone/)) {
|
||||
// The log indicates that the restore done, navigate the user back to base
|
||||
navigate(this, "/", true);
|
||||
location.reload();
|
||||
this._restoreDone();
|
||||
}
|
||||
} catch (err) {
|
||||
this._log = err.toString();
|
||||
this._log += this._filterLogs(err.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private _restoreDone(): void {
|
||||
navigate(this, "/", true);
|
||||
location.reload();
|
||||
}
|
||||
|
||||
private _showSnapshotDialog(slug: string): void {
|
||||
showHassioSnapshotDialog(this, {
|
||||
slug,
|
||||
|
Loading…
Reference in New Issue
Block a user