Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1096

Browse Source
This commit is contained in:
Matt Hill
2022-01-19 07:38:34 -07:00
committed by Aiden McClelland
parent 577b75a76c
commit badf8c508f
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
setup-wizard/src/app/pages/recover/recover.page.ts
View File

@@ -50,7 +50,6 @@ export class RecoverPage {
const drive: DiskBackupTarget = { const drive: DiskBackupTarget = {
vendor: d.vendor, vendor: d.vendor,
model: d.model, model: d.model,
guid: d.guid,
logicalname: p.logicalname, logicalname: p.logicalname,
label: p.label, label: p.label,
capacity: p.capacity, capacity: p.capacity,
@@ -82,12 +81,11 @@ export class RecoverPage {
await alert.present() await alert.present()
} }
const importableDrive = this.mappedDrives.find(d => !!d.drive.guid) const importableDrive = disks.find(d => !!d.guid)
if (!!importableDrive && !this.hasShownGuidAlert) { if (!!importableDrive && !this.hasShownGuidAlert) {
const nested = importableDrive.drive
const alert = await this.alertCtrl.create({ const alert = await this.alertCtrl.create({
header: 'Embassy Data Drive Detected', header: 'Embassy Data Drive Detected',
message: new IonicSafeString(`${nested.label || nested.logicalname} (${nested.vendor || 'Unknown Vendor'} - ${nested.model || 'Unknown Model' }) contains Embassy data. To use this drive and its data <i>as-is</i>, click "Use Drive". This will complete the setup process.<br /><br /><b>Important</b>. If you are trying to restore from backup or update from 0.2.x, DO NOT click "Use Drive". Instead, click "Cancel" and follow instructions.`), message: new IonicSafeString(`${importableDrive.vendor || 'Unknown Vendor'} - ${importableDrive.model || 'Unknown Model' } contains Embassy data. To use this drive and its data <i>as-is</i>, click "Use Drive". This will complete the setup process.<br /><br /><b>Important</b>. If you are trying to restore from backup or update from 0.2.x, DO NOT click "Use Drive". Instead, click "Cancel" and follow instructions.`),
buttons: [ buttons: [
{ {
role: 'cancel', role: 'cancel',
@@ -96,7 +94,7 @@ export class RecoverPage {
{ {
text: 'Use Drive', text: 'Use Drive',
handler: async () => { handler: async () => {
await this.importDrive(nested.guid) await this.importDrive(importableDrive.guid)
}, },
}, },
], ],

1
setup-wizard/src/app/services/api/api.service.ts
View File

@@ -46,7 +46,6 @@ export interface DiskListResponse {
export interface DiskBackupTarget { export interface DiskBackupTarget {
vendor: string | null vendor: string | null
model: string | null model: string | null
guid: string | null
logicalname: string | null logicalname: string | null
label: string | null label: string | null
capacity: number capacity: number