mirror/WowUp
1
0
Fork 0
mirror of https://github.com/WowUp/WowUp.git synced 2026-04-23 07:17:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue with install button not updating globally

Browse Source
This commit is contained in:
jliddev
2021-03-12 15:26:52 -06:00
parent 5223288bff
commit f52b7071c8
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
wowup-electron/src/app/components/addon-install-button/addon-install-button.component.ts
View File

@@ -1,7 +1,10 @@
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
import { TranslateService } from "@ngx-translate/core";
import { Subscription } from "rxjs";
import { filter } from "rxjs/operators";
import { Component, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output } from "@angular/core";
import { TranslateService } from "@ngx-translate/core";
import { Addon } from "../../../common/entities/addon";
import { AddonInstallState } from "../../models/wowup/addon-install-state";
import { AddonSearchResult } from "../../models/wowup/addon-search-result";
import { AddonService } from "../../services/addons/addon.service";
@@ -27,8 +30,19 @@ export class AddonInstallButtonComponent implements OnInit, OnDestroy {
public constructor(
private _addonService: AddonService,
private _sessionService: SessionService,
private _translate: TranslateService
) {}
private _translate: TranslateService,
private _ngZone: NgZone
) {
const addonInstalledSub = this._addonService.addonInstalled$
.pipe(filter((evt) => this.isSameAddon(evt.addon)))
.subscribe((evt) => {
this._ngZone.run(() => {
this.onInstallUpdate(evt.installState, evt.progress);
});
});
this._subscriptions.push(addonInstalledSub);
}
public ngOnInit(): void {
const isInstalled = this._addonService.isInstalled(
@@ -41,7 +55,6 @@ export class AddonInstallButtonComponent implements OnInit, OnDestroy {
public ngOnDestroy(): void {
this._subscriptions.forEach((sub) => sub.unsubscribe());
this._subscriptions = [];
}
public getIsButtonActive(installState: AddonInstallState): boolean {
@@ -82,8 +95,7 @@ export class AddonInstallButtonComponent implements OnInit, OnDestroy {
try {
await this._addonService.installPotentialAddon(
this.addonSearchResult,
this._sessionService.getSelectedWowInstallation(),
this.onInstallUpdate
this._sessionService.getSelectedWowInstallation()
);
} catch (e) {
console.error("onInstallUpdateClick failed", e);
@@ -91,6 +103,13 @@ export class AddonInstallButtonComponent implements OnInit, OnDestroy {
}
}
private isSameAddon = (addon: Addon): boolean => {
return (
addon.externalId === this.addonSearchResult.externalId &&
addon.providerName === this.addonSearchResult.providerName
);
};
private onInstallUpdate = (installState: AddonInstallState, progress: number): void => {
this.showProgress = this.getIsButtonActive(installState);
this.disableButton = this.getIsButtonDisabled(installState);