chore: cleanup and small misc fixes

display success alert if on latest EOS after check for update

fix bug with loader dismiss after alert present

fix restart button on update complete alert and fix mocks to account for this state

fix make clean and adjust default registry names
This commit is contained in:
Lucy Cifferello
2022-06-14 18:38:36 -06:00
committed by Lucy C
parent 4ad9886517
commit 37304a9d92
28 changed files with 221 additions and 130 deletions

View File

@@ -1,6 +1,14 @@
import { Component } from '@angular/core'
import { AlertController, LoadingController, ModalController } from '@ionic/angular'
import { ApiService, CifsBackupTarget, EmbassyOSRecoveryInfo } from 'src/app/services/api/api.service'
import {
AlertController,
LoadingController,
ModalController,
} from '@ionic/angular'
import {
ApiService,
CifsBackupTarget,
EmbassyOSRecoveryInfo,
} from 'src/app/services/api/api.service'
import { PasswordPage } from '../password/password.page'
@Component({
@@ -17,18 +25,18 @@ export class CifsModal {
password: '',
}
constructor (
constructor(
private readonly modalController: ModalController,
private readonly apiService: ApiService,
private readonly loadingCtrl: LoadingController,
private readonly alertCtrl: AlertController,
) { }
) {}
cancel () {
cancel() {
this.modalController.dismiss()
}
async submit (): Promise<void> {
async submit(): Promise<void> {
const loader = await this.loadingCtrl.create({
spinner: 'lines',
message: 'Connecting to shared folder...',
@@ -38,23 +46,30 @@ export class CifsModal {
try {
const embassyOS = await this.apiService.verifyCifs(this.cifs)
await loader.dismiss()
const is02x = embassyOS.version.startsWith('0.2')
if (is02x) {
this.modalController.dismiss({
cifs: this.cifs,
}, 'success')
this.modalController.dismiss(
{
cifs: this.cifs,
},
'success',
)
} else {
this.presentModalPassword(embassyOS)
}
} catch (e) {
await loader.dismiss()
this.presentAlertFailed()
} finally {
loader.dismiss()
}
}
private async presentModalPassword (embassyOS: EmbassyOSRecoveryInfo): Promise<void> {
private async presentModalPassword(
embassyOS: EmbassyOSRecoveryInfo,
): Promise<void> {
const target: CifsBackupTarget = {
...this.cifs,
mountable: true,
@@ -68,19 +83,23 @@ export class CifsModal {
})
modal.onDidDismiss().then(res => {
if (res.role === 'success') {
this.modalController.dismiss({
cifs: this.cifs,
recoveryPassword: res.data.password,
}, 'success')
this.modalController.dismiss(
{
cifs: this.cifs,
recoveryPassword: res.data.password,
},
'success',
)
}
})
await modal.present()
}
private async presentAlertFailed (): Promise<void> {
private async presentAlertFailed(): Promise<void> {
const alert = await this.alertCtrl.create({
header: 'Connection Failed',
message: 'Unable to connect to shared folder. Ensure (1) target computer is connected to LAN, (2) target folder is being shared, and (3) hostname, path, and credentials are accurate.',
message:
'Unable to connect to shared folder. Ensure (1) target computer is connected to LAN, (2) target folder is being shared, and (3) hostname, path, and credentials are accurate.',
buttons: ['OK'],
})
alert.present()