From 9e0aec5765d35688103605e2ccdbdcfef0e2cbba Mon Sep 17 00:00:00 2001 From: jliddev Date: Sat, 7 Nov 2020 12:50:51 -0600 Subject: [PATCH] Add the external provider channel column Fix #343 --- wowup-electron/src/app/entities/addon.ts | 1 + .../app/pages/my-addons/my-addons.component.html | 9 +++++++++ .../src/app/pages/my-addons/my-addons.component.ts | 8 +++++++- .../app/services/addons/addon.provider.factory.ts | 13 ++----------- .../src/app/services/addons/addon.service.ts | 1 + wowup-electron/src/assets/i18n/de.json | 1 + wowup-electron/src/assets/i18n/en.json | 1 + wowup-electron/src/assets/i18n/es.json | 1 + wowup-electron/src/assets/i18n/fr.json | 1 + wowup-electron/src/assets/i18n/it.json | 1 + wowup-electron/src/assets/i18n/ko.json | 1 + wowup-electron/src/assets/i18n/nb.json | 1 + wowup-electron/src/assets/i18n/pt.json | 1 + wowup-electron/src/assets/i18n/ru.json | 1 + wowup-electron/src/assets/i18n/zh.json | 1 + 15 files changed, 30 insertions(+), 12 deletions(-) diff --git a/wowup-electron/src/app/entities/addon.ts b/wowup-electron/src/app/entities/addon.ts index 3e3f7ec6..8fd763b5 100644 --- a/wowup-electron/src/app/entities/addon.ts +++ b/wowup-electron/src/app/entities/addon.ts @@ -9,6 +9,7 @@ export interface Addon { latestVersion?: string; installedAt?: Date; externalId?: string; + externalChannel?: string; providerName?: string; providerSource?: string; externalUrl?: string; diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.html b/wowup-electron/src/app/pages/my-addons/my-addons.component.html index ad2032e5..a8747de4 100644 --- a/wowup-electron/src/app/pages/my-addons/my-addons.component.html +++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.html @@ -120,6 +120,15 @@ + + + {{ "PAGES.MY_ADDONS.TABLE.PROVIDER_RELEASE_CHANNEL" | translate }} + + + {{ element.addon.externalChannel }} + + + {{ "PAGES.MY_ADDONS.TABLE.PROVIDER_COLUMN_HEADER" | translate }} diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts index a1ff2b3f..109d2529 100644 --- a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts +++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts @@ -104,6 +104,12 @@ export class MyAddonsComponent implements OnInit, OnDestroy { visible: true, allowToggle: true, }, + { + name: "addon.externalChannel", + display: "PAGES.MY_ADDONS.TABLE.GAME_VERSION_COLUMN_HEADER", + visible: false, + allowToggle: true, + }, { name: "addon.providerName", display: "PAGES.MY_ADDONS.TABLE.PROVIDER_COLUMN_HEADER", @@ -454,7 +460,7 @@ export class MyAddonsComponent implements OnInit, OnDestroy { }); } - public onInstall() { } + public onInstall() {} public onClickIgnoreAddon(evt: MatCheckboxChange, listItem: AddonViewModel) { this.onClickIgnoreAddons(evt, [listItem]); diff --git a/wowup-electron/src/app/services/addons/addon.provider.factory.ts b/wowup-electron/src/app/services/addons/addon.provider.factory.ts index 4c47c24f..91389bc6 100644 --- a/wowup-electron/src/app/services/addons/addon.provider.factory.ts +++ b/wowup-electron/src/app/services/addons/addon.provider.factory.ts @@ -35,20 +35,11 @@ export class AddonProviderFactory { } public createCurseAddonProvider(): CurseAddonProvider { - return new CurseAddonProvider( - this._httpClient, - this._cachingService, - this._electronService - ); + return new CurseAddonProvider(this._httpClient, this._cachingService, this._electronService); } public createTukUiAddonProvider(): TukUiAddonProvider { - return new TukUiAddonProvider( - this._httpClient, - this._cachingService, - this._electronService, - this._fileService - ); + return new TukUiAddonProvider(this._httpClient, this._cachingService, this._electronService, this._fileService); } public createWowInterfaceAddonProvider(): WowInterfaceAddonProvider { diff --git a/wowup-electron/src/app/services/addons/addon.service.ts b/wowup-electron/src/app/services/addons/addon.service.ts index bd2d851a..a80ceb96 100644 --- a/wowup-electron/src/app/services/addons/addon.service.ts +++ b/wowup-electron/src/app/services/addons/addon.service.ts @@ -471,6 +471,7 @@ export class AddonService { addon.downloadUrl = latestFile.downloadUrl; addon.name = result.name; addon.author = result.author; + addon.externalChannel = getEnumName(AddonChannelType, latestFile.channelType); if (latestFile.gameVersion) { addon.gameVersion = latestFile.gameVersion; diff --git a/wowup-electron/src/assets/i18n/de.json b/wowup-electron/src/assets/i18n/de.json index de3af984..844e2ef2 100644 --- a/wowup-electron/src/assets/i18n/de.json +++ b/wowup-electron/src/assets/i18n/de.json @@ -174,6 +174,7 @@ "GAME_VERSION_COLUMN_HEADER": "Spielversion", "LATEST_VERSION_COLUMN_HEADER": "Aktuelle Version", "PROVIDER_COLUMN_HEADER": "Anbieter", + "PROVIDER_RELEASE_CHANNEL": "Provider Channel", "RELEASED_AT_COLUMN_HEADER": "Erscheinungsdatum", "STATUS_COLUMN_HEADER": "Status", "UPDATED_AT_COLUMN_HEADER": "Aktualisiert am" diff --git a/wowup-electron/src/assets/i18n/en.json b/wowup-electron/src/assets/i18n/en.json index 12a93730..0d89ce0c 100644 --- a/wowup-electron/src/assets/i18n/en.json +++ b/wowup-electron/src/assets/i18n/en.json @@ -174,6 +174,7 @@ "GAME_VERSION_COLUMN_HEADER": "Game Version", "LATEST_VERSION_COLUMN_HEADER": "Latest Version", "PROVIDER_COLUMN_HEADER": "Provider", + "PROVIDER_RELEASE_CHANNEL": "Provider Channel", "RELEASED_AT_COLUMN_HEADER": "Released At", "STATUS_COLUMN_HEADER": "Status", "UPDATED_AT_COLUMN_HEADER": "Updated At" diff --git a/wowup-electron/src/assets/i18n/es.json b/wowup-electron/src/assets/i18n/es.json index 8d310434..c1664951 100644 --- a/wowup-electron/src/assets/i18n/es.json +++ b/wowup-electron/src/assets/i18n/es.json @@ -174,6 +174,7 @@ "GAME_VERSION_COLUMN_HEADER": "Versión del juego", "LATEST_VERSION_COLUMN_HEADER": "Última Versión", "PROVIDER_COLUMN_HEADER": "Proveedor", + "PROVIDER_RELEASE_CHANNEL": "Provider Channel", "RELEASED_AT_COLUMN_HEADER": "RELEASED_AT_COLUMN_HEADER", "STATUS_COLUMN_HEADER": "Situación", "UPDATED_AT_COLUMN_HEADER": "Updated At" diff --git a/wowup-electron/src/assets/i18n/fr.json b/wowup-electron/src/assets/i18n/fr.json index c769fe81..8a5411ff 100644 --- a/wowup-electron/src/assets/i18n/fr.json +++ b/wowup-electron/src/assets/i18n/fr.json @@ -174,6 +174,7 @@ "GAME_VERSION_COLUMN_HEADER": "Version du jeu", "LATEST_VERSION_COLUMN_HEADER": "Dernière version", "PROVIDER_COLUMN_HEADER": "Fournisseur", + "PROVIDER_RELEASE_CHANNEL": "Provider Channel", "RELEASED_AT_COLUMN_HEADER": "RELEASED_AT_COLUMN_HEADER", "STATUS_COLUMN_HEADER": "Statut", "UPDATED_AT_COLUMN_HEADER": "Updated At" diff --git a/wowup-electron/src/assets/i18n/it.json b/wowup-electron/src/assets/i18n/it.json index f4907ed4..34ab46b2 100644 --- a/wowup-electron/src/assets/i18n/it.json +++ b/wowup-electron/src/assets/i18n/it.json @@ -174,6 +174,7 @@ "GAME_VERSION_COLUMN_HEADER": "Versione Del Gioco", "LATEST_VERSION_COLUMN_HEADER": "Ultima Versione", "PROVIDER_COLUMN_HEADER": "Provveditore", + "PROVIDER_RELEASE_CHANNEL": "Provider Channel", "RELEASED_AT_COLUMN_HEADER": "Rilasciato", "STATUS_COLUMN_HEADER": "Stato", "UPDATED_AT_COLUMN_HEADER": "Aggiornato" diff --git a/wowup-electron/src/assets/i18n/ko.json b/wowup-electron/src/assets/i18n/ko.json index 477705c1..2a93f3ad 100644 --- a/wowup-electron/src/assets/i18n/ko.json +++ b/wowup-electron/src/assets/i18n/ko.json @@ -174,6 +174,7 @@ "GAME_VERSION_COLUMN_HEADER": "Game Version", "LATEST_VERSION_COLUMN_HEADER": "Latest Version", "PROVIDER_COLUMN_HEADER": "Provider", + "PROVIDER_RELEASE_CHANNEL": "Provider Channel", "RELEASED_AT_COLUMN_HEADER": "Released At", "STATUS_COLUMN_HEADER": "Status", "UPDATED_AT_COLUMN_HEADER": "Updated At" diff --git a/wowup-electron/src/assets/i18n/nb.json b/wowup-electron/src/assets/i18n/nb.json index 92fa95ff..d5528d06 100644 --- a/wowup-electron/src/assets/i18n/nb.json +++ b/wowup-electron/src/assets/i18n/nb.json @@ -174,6 +174,7 @@ "GAME_VERSION_COLUMN_HEADER": "Spillversjon", "LATEST_VERSION_COLUMN_HEADER": "Siste Versjon", "PROVIDER_COLUMN_HEADER": "Leverandør", + "PROVIDER_RELEASE_CHANNEL": "Provider Channel", "RELEASED_AT_COLUMN_HEADER": "Utgivelsesdato", "STATUS_COLUMN_HEADER": "Status", "UPDATED_AT_COLUMN_HEADER": "Updated At" diff --git a/wowup-electron/src/assets/i18n/pt.json b/wowup-electron/src/assets/i18n/pt.json index e0c94eac..0a6e3bca 100644 --- a/wowup-electron/src/assets/i18n/pt.json +++ b/wowup-electron/src/assets/i18n/pt.json @@ -174,6 +174,7 @@ "GAME_VERSION_COLUMN_HEADER": "Versão do Jogo", "LATEST_VERSION_COLUMN_HEADER": "Última versão", "PROVIDER_COLUMN_HEADER": "Provedor", + "PROVIDER_RELEASE_CHANNEL": "Provider Channel", "RELEASED_AT_COLUMN_HEADER": "Lançado em", "STATUS_COLUMN_HEADER": "Estado", "UPDATED_AT_COLUMN_HEADER": "Atualizado em" diff --git a/wowup-electron/src/assets/i18n/ru.json b/wowup-electron/src/assets/i18n/ru.json index e0c80bd0..3de87354 100644 --- a/wowup-electron/src/assets/i18n/ru.json +++ b/wowup-electron/src/assets/i18n/ru.json @@ -174,6 +174,7 @@ "GAME_VERSION_COLUMN_HEADER": "Версия игры", "LATEST_VERSION_COLUMN_HEADER": "Последняя версия", "PROVIDER_COLUMN_HEADER": "Источник", + "PROVIDER_RELEASE_CHANNEL": "Provider Channel", "RELEASED_AT_COLUMN_HEADER": "Выпущена", "STATUS_COLUMN_HEADER": "Статус", "UPDATED_AT_COLUMN_HEADER": "Обновлена" diff --git a/wowup-electron/src/assets/i18n/zh.json b/wowup-electron/src/assets/i18n/zh.json index 1dac7e04..0146c932 100644 --- a/wowup-electron/src/assets/i18n/zh.json +++ b/wowup-electron/src/assets/i18n/zh.json @@ -174,6 +174,7 @@ "GAME_VERSION_COLUMN_HEADER": "游戏版本", "LATEST_VERSION_COLUMN_HEADER": "最新版本", "PROVIDER_COLUMN_HEADER": "提供商", + "PROVIDER_RELEASE_CHANNEL": "Provider Channel", "RELEASED_AT_COLUMN_HEADER": "RELEASED_AT_COLUMN_HEADER", "STATUS_COLUMN_HEADER": "状态", "UPDATED_AT_COLUMN_HEADER": "Updated At"