mirror/WowUp
1
0
Fork 0
mirror of https://github.com/WowUp/WowUp.git synced 2026-04-21 22:40:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix import/export installation label

Browse Source 
Fix protocol dialog installation label
This commit is contained in:
jliddev
2023-01-27 01:24:21 -06:00
parent 67fd3acaa1
commit 3e55d66b20
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wowup-electron/src/app/components/addons/addon-manage-dialog/addon-manage-dialog.component.ts
View File

@@ -13,6 +13,7 @@ import { SessionService } from "../../../services/session/session.service";
import { SnackbarService } from "../../../services/snackbar/snackbar.service";
import { ElectronService } from "../../../services";
import { WowInstallation } from "wowup-lib-core/lib/models";
import { WarcraftInstallationService } from "../../../services/warcraft/warcraft-installation.service";
interface ImportComparisonViewModel extends ImportComparison {
isInstalling?: boolean;
@@ -37,8 +38,8 @@ export class AddonManageDialogComponent implements OnInit, OnDestroy {
public readonly TAB_IDX_EXPORT = 0;
public readonly TAB_IDX_IMPORT = 1;
public readonly selectedInstallation: WowInstallation;
public selectedInstallation: WowInstallation;
public exportSummary: ExportSummary | undefined;
public exportPayload!: string;
public importData = "";
@@ -65,10 +66,9 @@ export class AddonManageDialogComponent implements OnInit, OnDestroy {
private _electronService: ElectronService,
private _addonBrokerService: AddonBrokerService,
private _sessionService: SessionService,
private _snackbarService: SnackbarService
) {
this.selectedInstallation = this._sessionService.getSelectedWowInstallation();
}
private _snackbarService: SnackbarService,
private _warcraftInstallationService: WarcraftInstallationService
) {}
public ngOnInit(): void {
this.initAsync().catch((e) => console.error(e));
@@ -144,6 +144,14 @@ export class AddonManageDialogComponent implements OnInit, OnDestroy {
private async initAsync() {
try {
const installation = this._sessionService.getSelectedWowInstallation();
if (installation !== undefined) {
this.selectedInstallation = { ...installation };
this.selectedInstallation.label = await this._warcraftInstallationService.getInstallationDisplayName(
this.selectedInstallation
);
}
this.exportSummary = await this._addonBrokerService.getExportSummary(this.selectedInstallation);
const payload = await this._addonBrokerService.getExportPayload(this.selectedInstallation);

2
wowup-electron/src/app/components/addons/install-from-protocol-dialog/install-from-protocol-dialog.component.ts
View File

@@ -157,6 +157,8 @@ export class InstallFromProtocolDialogComponent implements OnInit, AfterViewInit
this.addon.providerName,
installation
);
installation.label = await this._warcraftInstallationService.getInstallationDisplayName(installation);
}
if (this.validWowInstallations.length === 0) {

2
wowup-electron/src/app/components/options/wow-client-options/wow-client-options.component.ts
View File

@@ -220,7 +220,7 @@ export class WowClientOptionsComponent implements OnInit, OnDestroy {
.afterClosed()
.pipe(
switchMap((result) => {
if (!result) {
if (result === undefined) {
return of(undefined);
}