diff options
author | Chocobozzz <me@florianbigard.com> | 2021-10-20 14:23:32 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-10-20 14:33:38 +0200 |
commit | 64553e8809271df1113e9143426a27f234410a74 (patch) | |
tree | beba7a8d4016b74dd3b85e8081482a3ea6d00eaf /client/src/app/+admin/system/logs/logs.service.ts | |
parent | 1243729899082a71b3a3efb759df1478d9ea5c83 (diff) | |
download | PeerTube-64553e8809271df1113e9143426a27f234410a74.tar.gz PeerTube-64553e8809271df1113e9143426a27f234410a74.tar.zst PeerTube-64553e8809271df1113e9143426a27f234410a74.zip |
Add ability to filter logs by tags
Diffstat (limited to 'client/src/app/+admin/system/logs/logs.service.ts')
-rw-r--r-- | client/src/app/+admin/system/logs/logs.service.ts | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/client/src/app/+admin/system/logs/logs.service.ts b/client/src/app/+admin/system/logs/logs.service.ts index 0c222cad2..ea7e08b9b 100644 --- a/client/src/app/+admin/system/logs/logs.service.ts +++ b/client/src/app/+admin/system/logs/logs.service.ts | |||
@@ -2,7 +2,7 @@ import { Observable } from 'rxjs' | |||
2 | import { catchError, map } from 'rxjs/operators' | 2 | import { catchError, map } from 'rxjs/operators' |
3 | import { HttpClient, HttpParams } from '@angular/common/http' | 3 | import { HttpClient, HttpParams } from '@angular/common/http' |
4 | import { Injectable } from '@angular/core' | 4 | import { Injectable } from '@angular/core' |
5 | import { RestExtractor } from '@app/core' | 5 | import { RestExtractor, RestService } from '@app/core' |
6 | import { LogLevel } from '@shared/models' | 6 | import { LogLevel } from '@shared/models' |
7 | import { environment } from '../../../../environments/environment' | 7 | import { environment } from '../../../../environments/environment' |
8 | import { LogRow } from './log-row.model' | 8 | import { LogRow } from './log-row.model' |
@@ -14,22 +14,25 @@ export class LogsService { | |||
14 | 14 | ||
15 | constructor ( | 15 | constructor ( |
16 | private authHttp: HttpClient, | 16 | private authHttp: HttpClient, |
17 | private restService: RestService, | ||
17 | private restExtractor: RestExtractor | 18 | private restExtractor: RestExtractor |
18 | ) {} | 19 | ) {} |
19 | 20 | ||
20 | getLogs (options: { | 21 | getLogs (options: { |
21 | isAuditLog: boolean | 22 | isAuditLog: boolean |
22 | startDate: string | 23 | startDate: string |
24 | tagsOneOf?: string[] | ||
23 | level?: LogLevel | 25 | level?: LogLevel |
24 | endDate?: string | 26 | endDate?: string |
25 | }): Observable<any[]> { | 27 | }): Observable<any[]> { |
26 | const { isAuditLog, startDate } = options | 28 | const { isAuditLog, startDate, endDate, tagsOneOf } = options |
27 | 29 | ||
28 | let params = new HttpParams() | 30 | let params = new HttpParams() |
29 | params = params.append('startDate', startDate) | 31 | params = params.append('startDate', startDate) |
30 | 32 | ||
31 | if (!isAuditLog) params = params.append('level', options.level) | 33 | if (!isAuditLog) params = params.append('level', options.level) |
32 | if (options.endDate) params.append('endDate', options.endDate) | 34 | if (endDate) params = params.append('endDate', options.endDate) |
35 | if (tagsOneOf) params = this.restService.addArrayParams(params, 'tagsOneOf', tagsOneOf) | ||
33 | 36 | ||
34 | const path = isAuditLog | 37 | const path = isAuditLog |
35 | ? LogsService.BASE_AUDIT_LOG_URL | 38 | ? LogsService.BASE_AUDIT_LOG_URL |