aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/requests/request-stats/request-stats.component.html57
-rw-r--r--client/src/app/+admin/users/user-list/user-list.component.ts4
-rw-r--r--client/src/app/shared/rest/rest-data-source.ts4
3 files changed, 34 insertions, 31 deletions
diff --git a/client/src/app/+admin/requests/request-stats/request-stats.component.html b/client/src/app/+admin/requests/request-stats/request-stats.component.html
index 29e7f7052..4508ab4c2 100644
--- a/client/src/app/+admin/requests/request-stats/request-stats.component.html
+++ b/client/src/app/+admin/requests/request-stats/request-stats.component.html
@@ -3,41 +3,44 @@
3 3
4 <h3>Requests stats</h3> 4 <h3>Requests stats</h3>
5 5
6 <div *ngFor="let requestSchedulerName of statsTitles | keys" class="col-lg-4 col-md-12"> 6 <ng-template [ngIf]="stats">
7 <div class="panel panel-default" *ngIf="stats[requestSchedulerName] !== null"> 7 <div *ngFor="let requestSchedulerName of statsTitles | keys" class="col-lg-4 col-md-12">
8 <div class="panel-heading">{{ statsTitles[requestSchedulerName] }}</div> 8 <div class="panel panel-default" *ngIf="stats[requestSchedulerName] !== null">
9 9 <div class="panel-heading">{{ statsTitles[requestSchedulerName] }}</div>
10 <div class="panel-body">
11 <div class="requests-general">
12 <div>
13 <span class="label-description">Remaining requests:</span>
14 {{ stats[requestSchedulerName].totalRequests }}
15 </div>
16 10
17 <div> 11 <div class="panel-body">
18 <span class="label-description">Interval seconds between requests:</span> 12 <div class="requests-general">
19 {{ stats[requestSchedulerName].secondsInterval }} 13 <div>
20 </div> 14 <span class="label-description">Remaining requests:</span>
15 {{ stats[requestSchedulerName].totalRequests }}
16 </div>
21 17
22 <div> 18 <div>
23 <span class="label-description">Remaining time before the scheduled request:</span> 19 <span class="label-description">Interval seconds between requests:</span>
24 {{ stats[requestSchedulerName].remainingSeconds }} 20 {{ stats[requestSchedulerName].secondsInterval }}
25 </div> 21 </div>
26 </div>
27 22
28 <div class="requests-limit"> 23 <div>
29 <div> 24 <span class="label-description">Remaining time before the scheduled request:</span>
30 <span class="label-description">Maximum number of different pods for a scheduled request:</span> 25 {{ stats[requestSchedulerName].remainingSeconds }}
31 {{ stats[requestSchedulerName].requestsLimitPods }} 26 </div>
32 </div> 27 </div>
33 28
34 <div> 29 <div class="requests-limit">
35 <span class="label-description">Maximum number of requests per pod for a scheduled request:</span> 30 <div>
36 {{ stats[requestSchedulerName].requestsLimitPerPod }} 31 <span class="label-description">Maximum number of different pods for a scheduled request:</span>
32 {{ stats[requestSchedulerName].requestsLimitPods }}
33 </div>
34
35 <div>
36 <span class="label-description">Maximum number of requests per pod for a scheduled request:</span>
37 {{ stats[requestSchedulerName].requestsLimitPerPod }}
38 </div>
37 </div> 39 </div>
38 </div> 40 </div>
39 </div> 41 </div>
40 </div> 42 </div>
41 </div> 43 </ng-template>
44
42 </div> 45 </div>
43</div> 46</div>
diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts
index b6fb0ed99..12826741c 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/users/user-list/user-list.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core'
3import { NotificationsService } from 'angular2-notifications' 3import { NotificationsService } from 'angular2-notifications'
4 4
5import { ConfirmService } from '../../../core' 5import { ConfirmService } from '../../../core'
6import { User, Utils } from '../../../shared' 6import { RestDataSource, User, Utils } from '../../../shared'
7import { UserService } from '../shared' 7import { UserService } from '../shared'
8 8
9@Component({ 9@Component({
@@ -12,7 +12,7 @@ import { UserService } from '../shared'
12 styleUrls: [ './user-list.component.scss' ] 12 styleUrls: [ './user-list.component.scss' ]
13}) 13})
14export class UserListComponent { 14export class UserListComponent {
15 usersSource = null 15 usersSource: RestDataSource = null
16 tableSettings = { 16 tableSettings = {
17 mode: 'external', 17 mode: 'external',
18 attr: { 18 attr: {
diff --git a/client/src/app/shared/rest/rest-data-source.ts b/client/src/app/shared/rest/rest-data-source.ts
index 2ef5d38da..7956637e0 100644
--- a/client/src/app/shared/rest/rest-data-source.ts
+++ b/client/src/app/shared/rest/rest-data-source.ts
@@ -19,7 +19,7 @@ export class RestDataSource extends ServerDataSource {
19 } 19 }
20 20
21 protected addSortRequestOptions (requestOptions: RequestOptionsArgs) { 21 protected addSortRequestOptions (requestOptions: RequestOptionsArgs) {
22 const searchParams = requestOptions.search as URLSearchParams 22 const searchParams = requestOptions.params as URLSearchParams
23 23
24 if (this.sortConf) { 24 if (this.sortConf) {
25 this.sortConf.forEach((fieldConf) => { 25 this.sortConf.forEach((fieldConf) => {
@@ -33,7 +33,7 @@ export class RestDataSource extends ServerDataSource {
33 } 33 }
34 34
35 protected addPagerRequestOptions (requestOptions: RequestOptionsArgs) { 35 protected addPagerRequestOptions (requestOptions: RequestOptionsArgs) {
36 const searchParams = requestOptions.search as URLSearchParams 36 const searchParams = requestOptions.params as URLSearchParams
37 37
38 if (this.pagingConf && this.pagingConf['page'] && this.pagingConf['perPage']) { 38 if (this.pagingConf && this.pagingConf['page'] && this.pagingConf['perPage']) {
39 const perPage = this.pagingConf['perPage'] 39 const perPage = this.pagingConf['perPage']