aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+admin
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r--client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html2
-rw-r--r--client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts5
-rw-r--r--client/src/app/+admin/plugins/plugin-search/plugin-search.component.html2
-rw-r--r--client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts4
4 files changed, 11 insertions, 2 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 6d2155332..4526aaf66 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
@@ -6,7 +6,7 @@
6 {{ getNoResultMessage() }} 6 {{ getNoResultMessage() }}
7</div> 7</div>
8 8
9<div class="plugins" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [autoInit]="true"> 9<div class="plugins" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [autoInit]="true" [dataObservable]="onDataSubject.asObservable()">
10 <div class="card plugin" *ngFor="let plugin of plugins"> 10 <div class="card plugin" *ngFor="let plugin of plugins">
11 <div class="card-body"> 11 <div class="card-body">
12 <div class="first-row"> 12 <div class="first-row">
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 dced14dee..b30b136bd 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
@@ -8,6 +8,7 @@ import { PeerTubePlugin } from '@shared/models/plugins/peertube-plugin.model'
8import { ActivatedRoute, Router } from '@angular/router' 8import { ActivatedRoute, Router } from '@angular/router'
9import { compareSemVer } from '@shared/core-utils/miscs/miscs' 9import { compareSemVer } from '@shared/core-utils/miscs/miscs'
10import { PluginService } from '@app/core/plugins/plugin.service' 10import { PluginService } from '@app/core/plugins/plugin.service'
11import { Subject } from 'rxjs'
11 12
12@Component({ 13@Component({
13 selector: 'my-plugin-list-installed', 14 selector: 'my-plugin-list-installed',
@@ -33,6 +34,8 @@ export class PluginListInstalledComponent implements OnInit {
33 34
34 PluginType = PluginType 35 PluginType = PluginType
35 36
37 onDataSubject = new Subject<any[]>()
38
36 constructor ( 39 constructor (
37 private i18n: I18n, 40 private i18n: I18n,
38 private pluginService: PluginService, 41 private pluginService: PluginService,
@@ -67,6 +70,8 @@ export class PluginListInstalledComponent implements OnInit {
67 res => { 70 res => {
68 this.plugins = this.plugins.concat(res.data) 71 this.plugins = this.plugins.concat(res.data)
69 this.pagination.totalItems = res.total 72 this.pagination.totalItems = res.total
73
74 this.onDataSubject.next(res.data)
70 }, 75 },
71 76
72 err => this.notifier.error(err.message) 77 err => this.notifier.error(err.message)
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 87f1c86ee..6ec6301b1 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
@@ -29,7 +29,7 @@
29 No results. 29 No results.
30</div> 30</div>
31 31
32<div class="plugins" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [autoInit]="true"> 32<div class="plugins" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [autoInit]="true" [dataObservable]="onDataSubject.asObservable()">
33 <div class="card plugin" *ngFor="let plugin of plugins"> 33 <div class="card plugin" *ngFor="let plugin of plugins">
34 <div class="card-body"> 34 <div class="card-body">
35 <div class="first-row"> 35 <div class="first-row">
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 a6fbeed84..65566ab79 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
@@ -36,6 +36,8 @@ export class PluginSearchComponent implements OnInit {
36 installing: { [name: string]: boolean } = {} 36 installing: { [name: string]: boolean } = {}
37 pluginInstalled = false 37 pluginInstalled = false
38 38
39 onDataSubject = new Subject<any[]>()
40
39 private searchSubject = new Subject<string>() 41 private searchSubject = new Subject<string>()
40 42
41 constructor ( 43 constructor (
@@ -90,6 +92,8 @@ export class PluginSearchComponent implements OnInit {
90 92
91 this.plugins = this.plugins.concat(res.data) 93 this.plugins = this.plugins.concat(res.data)
92 this.pagination.totalItems = res.total 94 this.pagination.totalItems = res.total
95
96 this.onDataSubject.next(res.data)
93 }, 97 },
94 98
95 err => { 99 err => {