diff --git a/ui/src/app/components/app-backup-confirmation/app-backup-confirmation.component.html b/ui/src/app/components/app-backup-confirmation/app-backup-confirmation.component.html index 21f208b0b..4f37a975c 100644 --- a/ui/src/app/components/app-backup-confirmation/app-backup-confirmation.component.html +++ b/ui/src/app/components/app-backup-confirmation/app-backup-confirmation.component.html @@ -12,10 +12,6 @@ {{e}} - - Eject drive when backup complete? - -
diff --git a/ui/src/app/components/app-backup-confirmation/app-backup-confirmation.component.ts b/ui/src/app/components/app-backup-confirmation/app-backup-confirmation.component.ts index c33aee68c..b61a0c8b8 100644 --- a/ui/src/app/components/app-backup-confirmation/app-backup-confirmation.component.ts +++ b/ui/src/app/components/app-backup-confirmation/app-backup-confirmation.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core' -import { IonicSafeString, ModalController } from '@ionic/angular' +import { ModalController } from '@ionic/angular' import { BehaviorSubject } from 'rxjs' import { AppInstalledFull } from 'src/app/models/app-types' import { DiskPartition } from 'src/app/models/server-model' @@ -13,6 +13,8 @@ export class AppBackupConfirmationComponent implements OnInit { unmasked = false password: string $error$: BehaviorSubject = new BehaviorSubject('') + + // pass this through the modalCtrl once ejecting disks is an option in the UI. eject = true message: string @@ -28,7 +30,7 @@ export class AppBackupConfirmationComponent implements OnInit { this.unmasked = !this.unmasked } - cancel() { + cancel () { this.modalCtrl.dismiss({ cancel: true }) } @@ -37,7 +39,7 @@ export class AppBackupConfirmationComponent implements OnInit { this.$error$.next('Password must be at least 12 characters in length.') return } - const { password, eject } = this - this.modalCtrl.dismiss({ password, eject }) + const { password } = this + this.modalCtrl.dismiss({ password }) } } diff --git a/ui/src/app/modals/app-backup/app-backup.page.html b/ui/src/app/modals/app-backup/app-backup.page.html index 804f37377..b46b17fc7 100644 --- a/ui/src/app/modals/app-backup/app-backup.page.html +++ b/ui/src/app/modals/app-backup/app-backup.page.html @@ -27,7 +27,7 @@ - +

diff --git a/ui/src/app/modals/app-backup/app-backup.page.ts b/ui/src/app/modals/app-backup/app-backup.page.ts index 2499f83f8..2a5b4df91 100644 --- a/ui/src/app/modals/app-backup/app-backup.page.ts +++ b/ui/src/app/modals/app-backup/app-backup.page.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core' -import { ModalController, AlertController, LoadingController, IonicSafeString, ToastController } from '@ionic/angular' +import { ModalController, AlertController, LoadingController, ToastController } from '@ionic/angular' import { AppModel, AppStatus } from 'src/app/models/app-model' import { AppInstalledFull } from 'src/app/models/app-types' import { ApiService } from 'src/app/services/api/api.service' @@ -98,7 +98,8 @@ export class AppBackupPage { m.onWillDismiss().then(res => { const data = res.data if (data.cancel) return - return this.create(disk, partition, data.password, data.eject) + // we hard code the 'eject' last argument to be false, until ejection is an option in the UI. + return this.create(disk, partition, data.password, false) }) return await m.present()