From 27202e120b645d83dbd28bc6bbbe646eaa284b2c Mon Sep 17 00:00:00 2001 From: Lynn Date: Sat, 17 Oct 2020 11:40:07 +0200 Subject: [PATCH] get-addons will now properly "reload" when no providers are enabled --- .../src/app/pages/get-addons/get-addons.component.ts | 5 +++++ wowup-electron/src/app/services/addons/addon.service.ts | 2 +- wowup-electron/src/app/services/wowup/wowup.service.ts | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/wowup-electron/src/app/pages/get-addons/get-addons.component.ts b/wowup-electron/src/app/pages/get-addons/get-addons.component.ts index f60e9d51..6978c355 100644 --- a/wowup-electron/src/app/pages/get-addons/get-addons.component.ts +++ b/wowup-electron/src/app/pages/get-addons/get-addons.component.ts @@ -304,6 +304,11 @@ export class GetAddonsComponent implements OnInit, OnDestroy { return; } + if (this._addonService.getEnabledAddonProviders().length === 0) { + this._displayAddonsSrc.next([]); + return; + } + this.isBusy = true; this._addonService.getFeaturedAddons(clientType).subscribe({ diff --git a/wowup-electron/src/app/services/addons/addon.service.ts b/wowup-electron/src/app/services/addons/addon.service.ts index 4ea41211..ba7a8615 100644 --- a/wowup-electron/src/app/services/addons/addon.service.ts +++ b/wowup-electron/src/app/services/addons/addon.service.ts @@ -697,7 +697,7 @@ export class AddonService { }; }; - private getEnabledAddonProviders() { + public getEnabledAddonProviders() { let enabledAddonProviders = this._wowUpService.enabledAddonProviders; return this._addonProviders.filter((addonProvider: AddonProvider) => enabledAddonProviders.indexOf(addonProvider.name) !== -1); } diff --git a/wowup-electron/src/app/services/wowup/wowup.service.ts b/wowup-electron/src/app/services/wowup/wowup.service.ts index eda6ea9e..dedbb318 100644 --- a/wowup-electron/src/app/services/wowup/wowup.service.ts +++ b/wowup-electron/src/app/services/wowup/wowup.service.ts @@ -223,7 +223,6 @@ export class WowUpService { this._preferenceChangeSrc.next({ key, value: value.toString() }) } - public get lastSelectedClientType(): WowClientType { const preference = this._preferenceStorageService.findByKey(LAST_SELECTED_WOW_CLIENT_TYPE_PREFERENCE_KEY); const value = parseInt(preference, 10);