From 078b4716cdd4dbf1b15c1a864ccab999ed3d0e8e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 11 Jan 2021 10:46:02 +0100 Subject: [PATCH] Fix theme npm link --- .../plugin-list-installed.component.html | 2 +- .../plugin-list-installed.component.ts | 4 ++++ .../plugin-search/plugin-search.component.html | 2 +- .../plugins/plugin-search/plugin-search.component.ts | 12 ++++++++---- .../app/+admin/plugins/shared/plugin-api.service.ts | 8 ++++++++ 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html index 919b5d26d..82a965313 100644 --- a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html +++ b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html @@ -18,7 +18,7 @@ - + diff --git a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts index 1ffd001c6..c78b19585 100644 --- a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts +++ b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts @@ -149,6 +149,10 @@ export class PluginListInstalledComponent implements OnInit { return [ '/admin', 'plugins', 'show', this.pluginService.nameToNpmName(plugin.name, plugin.type) ] } + getPluginOrThemeHref (name: string) { + return this.pluginApiService.getPluginOrThemeHref(this.pluginType, name) + } + private getUpdatingKey (plugin: PeerTubePlugin) { return plugin.name + plugin.type } diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html index d3333a370..1b5fe45c6 100644 --- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html +++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html @@ -41,7 +41,7 @@ - + diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts index 1a6b4eba3..4c571dee4 100644 --- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts +++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts @@ -39,13 +39,13 @@ export class PluginSearchComponent implements OnInit { private searchSubject = new Subject() constructor ( - private pluginService: PluginApiService, + private pluginApiService: PluginApiService, private notifier: Notifier, private confirmService: ConfirmService, private router: Router, private route: ActivatedRoute ) { - this.pluginTypeOptions = this.pluginService.getPluginTypeOptions() + this.pluginTypeOptions = this.pluginApiService.getPluginTypeOptions() } ngOnInit () { @@ -83,7 +83,7 @@ export class PluginSearchComponent implements OnInit { loadMorePlugins () { this.isSearching = true - this.pluginService.searchAvailablePlugins(this.pluginType, this.pagination, this.sort, this.search) + this.pluginApiService.searchAvailablePlugins(this.pluginType, this.pagination, this.sort, this.search) .subscribe( res => { this.isSearching = false @@ -115,6 +115,10 @@ export class PluginSearchComponent implements OnInit { return !!this.installing[plugin.npmName] } + getPluginOrThemeHref (name: string) { + return this.pluginApiService.getPluginOrThemeHref(this.pluginType, name) + } + async install (plugin: PeerTubePluginIndex) { if (this.installing[plugin.npmName]) return @@ -126,7 +130,7 @@ export class PluginSearchComponent implements OnInit { this.installing[plugin.npmName] = true - this.pluginService.install(plugin.npmName) + this.pluginApiService.install(plugin.npmName) .subscribe( () => { this.installing[plugin.npmName] = false diff --git a/client/src/app/+admin/plugins/shared/plugin-api.service.ts b/client/src/app/+admin/plugins/shared/plugin-api.service.ts index b28d46df4..fad30576b 100644 --- a/client/src/app/+admin/plugins/shared/plugin-api.service.ts +++ b/client/src/app/+admin/plugins/shared/plugin-api.service.ts @@ -134,6 +134,14 @@ export class PluginApiService { .pipe(catchError(res => this.restExtractor.handleError(res))) } + getPluginOrThemeHref (type: PluginType, name: string) { + const typeString = type === PluginType.PLUGIN + ? 'plugin' + : 'theme' + + return `https://www.npmjs.com/package/peertube-${typeString}-${name}` + } + private translateSettingsLabel (npmName: string, res: RegisteredServerSettings): Observable { return this.pluginService.translationsObservable .pipe(