Skip to content

[GM3] Devices: Discard acts as Cancel #1103

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

Merged
sofyakurilova merged 1 commit into from
Feb 5, 2025
Merged

[GM3] Devices: Discard acts as Cancel #1103

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
15 changes: 9 additions & 6 deletions ...pages/devices/components/device-qualification-from/device-qualification-from.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,7 @@ export class DeviceQualificationFromComponent implements OnInit, AfterViewInit {
} else if (this.device != this.initialDevice()) {
// prevent select new device before user confirmation
this.devicesStore.selectDevice(this.device);
this.openCloseDialog().subscribe(close => {
if (close) {
this.changeDevice = true;
this.devicesStore.selectDevice(this.initialDevice());
}
});
this.openCloseDialogToChangeDevice(this.initialDevice());
}
});

Expand Down Expand Up @@ -462,6 +457,14 @@ export class DeviceQualificationFromComponent implements OnInit, AfterViewInit {
});
}

private openCloseDialogToChangeDevice(device: Device | null) {
this.openCloseDialog().subscribe(close => {
if (close) {
this.changeDevice = true;
this.devicesStore.selectDevice(device);
}
});
}
private openCloseDialog() {
const dialogRef = this.dialog.open(SimpleDialogComponent, {
ariaLabel: 'Discard the Device changes',
Expand Down