From 65df33b8d25e70c00a198f1d9155569d411e063f Mon Sep 17 00:00:00 2001 From: jliddev Date: Sat, 6 Feb 2021 21:54:03 -0600 Subject: [PATCH] Fix #717 Ensure TukUI addon ids are strings --- .../src/app/addon-providers/tukui-addon-provider.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wowup-electron/src/app/addon-providers/tukui-addon-provider.ts b/wowup-electron/src/app/addon-providers/tukui-addon-provider.ts index d809fc3c..2b201f66 100644 --- a/wowup-electron/src/app/addon-providers/tukui-addon-provider.ts +++ b/wowup-electron/src/app/addon-providers/tukui-addon-provider.ts @@ -129,7 +129,7 @@ export class TukUiAddonProvider extends AddonProvider { addonFolders: AddonFolder[] ): Promise { const allAddons = await this.getAllAddons(clientType); - for (let addonFolder of addonFolders) { + for (const addonFolder of addonFolders) { let tukUiAddon: TukUiAddon; if (addonFolder.toc?.tukUiProjectId) { tukUiAddon = _.find(allAddons, (addon) => addon.id.toString() === addonFolder.toc.tukUiProjectId); @@ -271,7 +271,6 @@ export class TukUiAddonProvider extends AddonProvider { addons.push(await this.getTukUiRetailAddon()); addons.push(await this.getElvUiRetailAddon()); } - return addons; }; @@ -283,11 +282,14 @@ export class TukUiAddonProvider extends AddonProvider { return this.getClientApiAddon("elvui"); } - private getClientApiAddon(addonName: string): Promise { + private async getClientApiAddon(addonName: string): Promise { const url = new URL(CLIENT_API_URL); url.searchParams.append("ui", addonName); - return this._circuitBreaker.getJson(url); + const result = await this._circuitBreaker.getJson(url); + result.id = result.id.toString(); // For some reason addons from this route have numeric ids not strings + + return result; } private isRetail(clientType: WowClientType) {