mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2025-02-25 18:55:32 -06:00
WIP plugins: add plugin settings/uninstall in client
This commit is contained in:
@@ -7,7 +7,31 @@
|
||||
</div>
|
||||
|
||||
<div class="plugins" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [autoInit]="true">
|
||||
<div class="section plugin" *ngFor="let plugin of plugins">
|
||||
{{ plugin.name }}
|
||||
<div class="card plugin" *ngFor="let plugin of plugins">
|
||||
<div class="card-body">
|
||||
<div class="first-row">
|
||||
<a class="plugin-name" [routerLink]="getShowRouterLink(plugin)" title="Show plugin settings">{{ plugin.name }}</a>
|
||||
|
||||
<span class="plugin-version">{{ plugin.version }}</span>
|
||||
</div>
|
||||
|
||||
<div class="second-row">
|
||||
<div class="description">{{ plugin.description }}</div>
|
||||
|
||||
<div class="buttons">
|
||||
<a class="action-button action-button-edit grey-button" target="_blank" rel="noopener noreferrer"
|
||||
[href]="plugin.homepage" i18n-title title="Go to the plugin homepage"
|
||||
>
|
||||
<my-global-icon iconName="go"></my-global-icon>
|
||||
<span i18n class="button-label">Homepage</span>
|
||||
</a>
|
||||
|
||||
|
||||
<my-edit-button [routerLink]="getShowRouterLink(plugin)" label="Settings" i18n-label></my-edit-button>
|
||||
|
||||
<my-delete-button (click)="uninstall(plugin)" label="Uninstall" i18n-label></my-delete-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,8 +1,37 @@
|
||||
@import '_variables';
|
||||
@import '_mixins';
|
||||
|
||||
.toggle-plugin-type {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
margin-bottom: 30px;
|
||||
.first-row {
|
||||
margin-bottom: 10px;
|
||||
|
||||
.plugin-name {
|
||||
font-size: 16px;
|
||||
margin-right: 10px;
|
||||
font-weight: $font-semibold;
|
||||
}
|
||||
|
||||
.plugin-version {
|
||||
opacity: 0.6;
|
||||
}
|
||||
}
|
||||
|
||||
.second-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.description {
|
||||
opacity: 0.8
|
||||
}
|
||||
|
||||
.buttons {
|
||||
> *:not(:last-child) {
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.action-button {
|
||||
@include peertube-button-link;
|
||||
@include button-with-icon(21px, 0, -2px);
|
||||
}
|
||||
|
||||
@@ -3,13 +3,17 @@ import { PluginType } from '@shared/models/plugins/plugin.type'
|
||||
import { I18n } from '@ngx-translate/i18n-polyfill'
|
||||
import { PluginApiService } from '@app/+admin/plugins/shared/plugin-api.service'
|
||||
import { ComponentPagination, hasMoreItems } from '@app/shared/rest/component-pagination.model'
|
||||
import { Notifier } from '@app/core'
|
||||
import { ConfirmService, Notifier } from '@app/core'
|
||||
import { PeerTubePlugin } from '@shared/models/plugins/peertube-plugin.model'
|
||||
import { ActivatedRoute, Router } from '@angular/router'
|
||||
|
||||
@Component({
|
||||
selector: 'my-plugin-list-installed',
|
||||
templateUrl: './plugin-list-installed.component.html',
|
||||
styleUrls: [ './plugin-list-installed.component.scss' ]
|
||||
styleUrls: [
|
||||
'../shared/toggle-plugin-type.scss',
|
||||
'./plugin-list-installed.component.scss'
|
||||
]
|
||||
})
|
||||
export class PluginListInstalledComponent implements OnInit {
|
||||
pluginTypeOptions: { label: string, value: PluginType }[] = []
|
||||
@@ -26,12 +30,18 @@ export class PluginListInstalledComponent implements OnInit {
|
||||
constructor (
|
||||
private i18n: I18n,
|
||||
private pluginService: PluginApiService,
|
||||
private notifier: Notifier
|
||||
private notifier: Notifier,
|
||||
private confirmService: ConfirmService,
|
||||
private router: Router,
|
||||
private route: ActivatedRoute
|
||||
) {
|
||||
this.pluginTypeOptions = this.pluginService.getPluginTypeOptions()
|
||||
}
|
||||
|
||||
ngOnInit () {
|
||||
const query = this.route.snapshot.queryParams
|
||||
if (query['pluginType']) this.pluginType = parseInt(query['pluginType'], 10)
|
||||
|
||||
this.reloadPlugins()
|
||||
}
|
||||
|
||||
@@ -39,6 +49,8 @@ export class PluginListInstalledComponent implements OnInit {
|
||||
this.pagination.currentPage = 1
|
||||
this.plugins = []
|
||||
|
||||
this.router.navigate([], { queryParams: { pluginType: this.pluginType }})
|
||||
|
||||
this.loadMorePlugins()
|
||||
}
|
||||
|
||||
@@ -69,4 +81,28 @@ export class PluginListInstalledComponent implements OnInit {
|
||||
|
||||
return this.i18n('You don\'t have themes installed yet.')
|
||||
}
|
||||
|
||||
async uninstall (plugin: PeerTubePlugin) {
|
||||
const res = await this.confirmService.confirm(
|
||||
this.i18n('Do you really want to uninstall {{pluginName}}?', { pluginName: plugin.name }),
|
||||
this.i18n('Uninstall')
|
||||
)
|
||||
if (res === false) return
|
||||
|
||||
this.pluginService.uninstall(plugin.name, plugin.type)
|
||||
.subscribe(
|
||||
() => {
|
||||
this.notifier.success(this.i18n('{{pluginName}} uninstalled.', { pluginName: plugin.name }))
|
||||
|
||||
this.plugins = this.plugins.filter(p => p.name !== plugin.name)
|
||||
this.pagination.totalItems--
|
||||
},
|
||||
|
||||
err => this.notifier.error(err.message)
|
||||
)
|
||||
}
|
||||
|
||||
getShowRouterLink (plugin: PeerTubePlugin) {
|
||||
return [ '/admin', 'plugins', 'show', this.pluginService.nameToNpmName(plugin.name, plugin.type) ]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,10 @@ import { PluginApiService } from '@app/+admin/plugins/shared/plugin-api.service'
|
||||
@Component({
|
||||
selector: 'my-plugin-search',
|
||||
templateUrl: './plugin-search.component.html',
|
||||
styleUrls: [ './plugin-search.component.scss' ]
|
||||
styleUrls: [
|
||||
'../shared/toggle-plugin-type.scss',
|
||||
'./plugin-search.component.scss'
|
||||
]
|
||||
})
|
||||
export class PluginSearchComponent implements OnInit {
|
||||
pluginTypeOptions: { label: string, value: PluginType }[] = []
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
<ng-container *ngIf="plugin">
|
||||
|
||||
<h2>
|
||||
<ng-container>{{ pluginTypeLabel }}</ng-container>
|
||||
{{ plugin.name }}
|
||||
</h2>
|
||||
|
||||
<form *ngIf="hasRegisteredSettings()" role="form" (ngSubmit)="formValidated()" [formGroup]="form">
|
||||
<div class="form-group" *ngFor="let setting of registeredSettings">
|
||||
<label [attr.for]="setting.name">{{ setting.label }}</label>
|
||||
|
||||
<input *ngIf="setting.type === 'input'" type="text" [id]="setting.name" [formControlName]="setting.name" />
|
||||
|
||||
<div *ngIf="formErrors[setting.name]" class="form-error">
|
||||
{{ formErrors[setting.name] }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<input type="submit" i18n value="Update plugin settings" [disabled]="!form.valid">
|
||||
</form>
|
||||
|
||||
<div *ngIf="!hasRegisteredSettings()" i18n class="no-settings">
|
||||
This {{ pluginTypeLabel }} does not have settings.
|
||||
</div>
|
||||
|
||||
</ng-container>
|
||||
|
||||
@@ -1,2 +1,22 @@
|
||||
@import '_variables';
|
||||
@import '_mixins';
|
||||
|
||||
h2 {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
input:not([type=submit]) {
|
||||
@include peertube-input-text(340px);
|
||||
display: block;
|
||||
}
|
||||
|
||||
.peertube-select-container {
|
||||
@include peertube-select-container(340px);
|
||||
}
|
||||
|
||||
input[type=submit], button {
|
||||
@include peertube-button;
|
||||
@include orange-button;
|
||||
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
@@ -1,14 +1,110 @@
|
||||
import { Component, OnInit } from '@angular/core'
|
||||
import { Component, OnDestroy, OnInit } from '@angular/core'
|
||||
import { PeerTubePlugin } from '@shared/models/plugins/peertube-plugin.model'
|
||||
import { I18n } from '@ngx-translate/i18n-polyfill'
|
||||
import { PluginApiService } from '@app/+admin/plugins/shared/plugin-api.service'
|
||||
import { Notifier } from '@app/core'
|
||||
import { ActivatedRoute } from '@angular/router'
|
||||
import { Subscription } from 'rxjs'
|
||||
import { map, switchMap } from 'rxjs/operators'
|
||||
import { RegisterSettingOptions } from '@shared/models/plugins/register-setting.model'
|
||||
import { BuildFormArgument, BuildFormDefaultValues, FormReactive, FormValidatorService } from '@app/shared'
|
||||
|
||||
@Component({
|
||||
selector: 'my-plugin-show-installed',
|
||||
templateUrl: './plugin-show-installed.component.html',
|
||||
styleUrls: [ './plugin-show-installed.component.scss' ]
|
||||
})
|
||||
export class PluginShowInstalledComponent implements OnInit {
|
||||
export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy{
|
||||
plugin: PeerTubePlugin
|
||||
registeredSettings: RegisterSettingOptions[] = []
|
||||
pluginTypeLabel: string
|
||||
|
||||
private sub: Subscription
|
||||
|
||||
constructor (
|
||||
protected formValidatorService: FormValidatorService,
|
||||
private i18n: I18n,
|
||||
private pluginService: PluginApiService,
|
||||
private notifier: Notifier,
|
||||
private route: ActivatedRoute
|
||||
) {
|
||||
super()
|
||||
}
|
||||
|
||||
ngOnInit () {
|
||||
this.sub = this.route.params.subscribe(
|
||||
routeParams => {
|
||||
const npmName = routeParams['npmName']
|
||||
|
||||
this.loadPlugin(npmName)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
ngOnDestroy () {
|
||||
if (this.sub) this.sub.unsubscribe()
|
||||
}
|
||||
|
||||
formValidated () {
|
||||
const settings = this.form.value
|
||||
|
||||
this.pluginService.updatePluginSettings(this.plugin.name, this.plugin.type, settings)
|
||||
.subscribe(
|
||||
() => {
|
||||
this.notifier.success(this.i18n('Settings updated.'))
|
||||
},
|
||||
|
||||
err => this.notifier.error(err.message)
|
||||
)
|
||||
}
|
||||
|
||||
hasRegisteredSettings () {
|
||||
return Array.isArray(this.registeredSettings) && this.registeredSettings.length !== 0
|
||||
}
|
||||
|
||||
private loadPlugin (npmName: string) {
|
||||
this.pluginService.getPlugin(npmName)
|
||||
.pipe(switchMap(plugin => {
|
||||
return this.pluginService.getPluginRegisteredSettings(plugin.name, plugin.type)
|
||||
.pipe(map(data => ({ plugin, registeredSettings: data.settings })))
|
||||
}))
|
||||
.subscribe(
|
||||
({ plugin, registeredSettings }) => {
|
||||
this.plugin = plugin
|
||||
this.registeredSettings = registeredSettings
|
||||
|
||||
this.pluginTypeLabel = this.pluginService.getPluginTypeLabel(this.plugin.type)
|
||||
|
||||
this.buildSettingsForm()
|
||||
},
|
||||
|
||||
err => this.notifier.error(err.message)
|
||||
)
|
||||
}
|
||||
|
||||
private buildSettingsForm () {
|
||||
const defaultValues: BuildFormDefaultValues = {}
|
||||
const buildOptions: BuildFormArgument = {}
|
||||
const settingsValues: any = {}
|
||||
|
||||
for (const setting of this.registeredSettings) {
|
||||
buildOptions[ setting.name ] = null
|
||||
settingsValues[ setting.name ] = this.getSetting(setting.name)
|
||||
}
|
||||
|
||||
this.buildForm(buildOptions)
|
||||
|
||||
this.form.patchValue(settingsValues)
|
||||
}
|
||||
|
||||
private getSetting (name: string) {
|
||||
const settings = this.plugin.settings
|
||||
|
||||
if (settings && settings[name]) return settings[name]
|
||||
|
||||
const registered = this.registeredSettings.find(r => r.name === name)
|
||||
|
||||
return registered.default
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ export const PluginsRoutes: Routes = [
|
||||
}
|
||||
},
|
||||
{
|
||||
path: 'show/:name',
|
||||
path: 'show/:npmName',
|
||||
component: PluginShowInstalledComponent,
|
||||
data: {
|
||||
meta: {
|
||||
|
||||
@@ -8,6 +8,9 @@ import { PluginType } from '@shared/models/plugins/plugin.type'
|
||||
import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
|
||||
import { ResultList } from '@shared/models'
|
||||
import { PeerTubePlugin } from '@shared/models/plugins/peertube-plugin.model'
|
||||
import { ManagePlugin } from '@shared/models/plugins/manage-plugin.model'
|
||||
import { InstallPlugin } from '@shared/models/plugins/install-plugin.model'
|
||||
import { RegisterSettingOptions } from '@shared/models/plugins/register-setting.model'
|
||||
|
||||
@Injectable()
|
||||
export class PluginApiService {
|
||||
@@ -23,16 +26,24 @@ export class PluginApiService {
|
||||
getPluginTypeOptions () {
|
||||
return [
|
||||
{
|
||||
label: this.i18n('Plugin'),
|
||||
label: this.i18n('Plugins'),
|
||||
value: PluginType.PLUGIN
|
||||
},
|
||||
{
|
||||
label: this.i18n('Theme'),
|
||||
label: this.i18n('Themes'),
|
||||
value: PluginType.THEME
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
getPluginTypeLabel (type: PluginType) {
|
||||
if (type === PluginType.PLUGIN) {
|
||||
return this.i18n('plugin')
|
||||
}
|
||||
|
||||
return this.i18n('theme')
|
||||
}
|
||||
|
||||
getPlugins (
|
||||
type: PluginType,
|
||||
componentPagination: ComponentPagination,
|
||||
@@ -47,4 +58,57 @@ export class PluginApiService {
|
||||
return this.authHttp.get<ResultList<PeerTubePlugin>>(PluginApiService.BASE_APPLICATION_URL, { params })
|
||||
.pipe(catchError(res => this.restExtractor.handleError(res)))
|
||||
}
|
||||
|
||||
getPlugin (npmName: string) {
|
||||
const path = PluginApiService.BASE_APPLICATION_URL + '/' + npmName
|
||||
|
||||
return this.authHttp.get<PeerTubePlugin>(path)
|
||||
.pipe(catchError(res => this.restExtractor.handleError(res)))
|
||||
}
|
||||
|
||||
getPluginRegisteredSettings (pluginName: string, pluginType: PluginType) {
|
||||
const path = PluginApiService.BASE_APPLICATION_URL + '/' + this.nameToNpmName(pluginName, pluginType) + '/registered-settings'
|
||||
|
||||
return this.authHttp.get<{ settings: RegisterSettingOptions[] }>(path)
|
||||
.pipe(catchError(res => this.restExtractor.handleError(res)))
|
||||
}
|
||||
|
||||
updatePluginSettings (pluginName: string, pluginType: PluginType, settings: any) {
|
||||
const path = PluginApiService.BASE_APPLICATION_URL + '/' + this.nameToNpmName(pluginName, pluginType) + '/settings'
|
||||
|
||||
return this.authHttp.put(path, { settings })
|
||||
.pipe(catchError(res => this.restExtractor.handleError(res)))
|
||||
}
|
||||
|
||||
uninstall (pluginName: string, pluginType: PluginType) {
|
||||
const body: ManagePlugin = {
|
||||
npmName: this.nameToNpmName(pluginName, pluginType)
|
||||
}
|
||||
|
||||
return this.authHttp.post(PluginApiService.BASE_APPLICATION_URL + '/uninstall', body)
|
||||
.pipe(catchError(res => this.restExtractor.handleError(res)))
|
||||
}
|
||||
|
||||
install (npmName: string) {
|
||||
const body: InstallPlugin = {
|
||||
npmName
|
||||
}
|
||||
|
||||
return this.authHttp.post(PluginApiService.BASE_APPLICATION_URL + '/install', body)
|
||||
.pipe(catchError(res => this.restExtractor.handleError(res)))
|
||||
}
|
||||
|
||||
nameToNpmName (name: string, type: PluginType) {
|
||||
const prefix = type === PluginType.PLUGIN
|
||||
? 'peertube-plugin-'
|
||||
: 'peertube-theme-'
|
||||
|
||||
return prefix + name
|
||||
}
|
||||
|
||||
pluginTypeFromNpmName (npmName: string) {
|
||||
return npmName.startsWith('peertube-plugin-')
|
||||
? PluginType.PLUGIN
|
||||
: PluginType.THEME
|
||||
}
|
||||
}
|
||||
|
||||
21
client/src/app/+admin/plugins/shared/toggle-plugin-type.scss
Normal file
21
client/src/app/+admin/plugins/shared/toggle-plugin-type.scss
Normal file
@@ -0,0 +1,21 @@
|
||||
@import '_variables';
|
||||
@import '_mixins';
|
||||
|
||||
.toggle-plugin-type {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
margin-bottom: 30px;
|
||||
|
||||
p-selectButton {
|
||||
/deep/ {
|
||||
.ui-button-text {
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
.ui-button.ui-state-active {
|
||||
background-color: var(--mainColor);
|
||||
border-color: var(--mainColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,7 @@
|
||||
//@import '~bootstrap/scss/custom-forms';
|
||||
@import '~bootstrap/scss/nav';
|
||||
//@import '~bootstrap/scss/navbar';
|
||||
//@import '~bootstrap/scss/card';
|
||||
@import '~bootstrap/scss/card';
|
||||
//@import '~bootstrap/scss/breadcrumb';
|
||||
//@import '~bootstrap/scss/pagination';
|
||||
@import '~bootstrap/scss/badge';
|
||||
|
||||
Reference in New Issue
Block a user