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.

Sign up for GitHub

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

Allow resetting data when firmware and version are the same #103

Merged
merged 1 commit into from
Nov 11, 2021
Merged

Allow resetting data when firmware and version are the same #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 53 additions & 18 deletions src/install-dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,23 @@ class EwtInstallDialog extends LitElement {
let hideActions = true;
let allowClosing = true;

const isSameFirmware = this._info!.firmware === this._manifest!.name;
const isSameVersion =
isSameFirmware && this._info!.version === this._manifest!.version;

content = html`
<div class="device-info">
${this._info!.firmware}&nbsp;${this._info!.version}
</div>
<div class="dashboard-buttons">
${!this._isSameVersion
? html`
<div>
<ewt-button
.label=${!this._isSameFirmware
? `Install ${this._manifest!.name}`
: "Update"}
@click=${() => this._startInstall(!this._isSameFirmware)}
></ewt-button>
</div>
`
: ""}
${this._client!.nextUrl === undefined
? ""
: html`
Expand Down Expand Up @@ -208,17 +216,6 @@ class EwtInstallDialog extends LitElement {
}}
></ewt-button>
</div>
<div>
<ewt-button
.label=${!isSameFirmware
? `Install ${this._manifest!.name}`
: isSameVersion
? "Up to date"
: "Update"}
@click=${() => this._startInstall(!isSameFirmware)}
.disabled=${isSameVersion}
></ewt-button>
</div>
<div>
<ewt-button
label="Logs"
Expand All @@ -234,6 +231,17 @@ class EwtInstallDialog extends LitElement {
}}
></ewt-button>
</div>
${this._isSameVersion
? html`
<div>
<ewt-button
class="danger"
label="Reset Data"
@click=${() => this._startInstall(true)}
></ewt-button>
</div>
`
: ""}
</div>
`;

Expand Down Expand Up @@ -362,9 +370,21 @@ class EwtInstallDialog extends LitElement {
let hideActions = false;
let allowClosing = false;

const isUpdate = !this._installErase && this._isUpdate;
const isUpdate = !this._installErase && this._isSameFirmware;

if (!this._installConfirmed) {
if (!this._installConfirmed && this._isSameVersion) {
heading = "Reset data";
content = html`
Do you want to reset your device and erase all existing data from your
device?
<ewt-button
class="danger"
slot="primaryAction"
label="Reset data"
@click=${this._confirmInstall}
></ewt-button>
`;
} else if (!this._installConfirmed) {
const action = isUpdate ? "update to" : "install";
content = html`
${isUpdate
Expand Down Expand Up @@ -657,10 +677,22 @@ class EwtInstallDialog extends LitElement {
this.parentNode!.removeChild(this);
}

private get _isUpdate() {
/**
* Return if the device runs same firmware as manifest.
*/
private get _isSameFirmware() {
return this._info?.firmware === this._manifest!.name;
}

/**
* Return if the device runs same firmware and version as manifest.
*/
private get _isSameVersion() {
return (
this._isSameFirmware && this._info!.version === this._manifest!.version
);
}

private async _closeClientWithoutEvents(client: ImprovSerial) {
client.removeEventListener("disconnect", this._handleDisconnect);
await client.close();
Expand Down Expand Up @@ -714,6 +746,9 @@ class EwtInstallDialog extends LitElement {
.error {
color: #db4437;
}
.danger {
--mdc-theme-primary: #db4437;
}
button.link {
background: none;
color: inherit;
Expand Down