From 9e0dab56f861cfbfe9bb3389aab973c7ebde53da Mon Sep 17 00:00:00 2001 From: fufu Date: Wed, 27 Nov 2024 14:49:34 +0100 Subject: [PATCH] hotfix$ --- .../views/detail/database/detail-database.view.html | 2 +- src/app/views/detail/ftp/detail-ftp.view.html | 2 +- src/app/views/detail/ldap/detail-ldap.view.html | 2 +- .../detail/session/main/detail-session-main.view.ts | 12 ++++++------ src/app/views/detail/smtp/detail-smtp.view.html | 2 +- .../views/statistic/view/statistic-client.view.html | 4 ++-- .../views/statistic/view/statistic-client.view.ts | 10 ++++++++++ 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/app/views/detail/database/detail-database.view.html b/src/app/views/detail/database/detail-database.view.html index 31634f5..d0c8cf0 100644 --- a/src/app/views/detail/database/detail-database.view.html +++ b/src/app/views/detail/database/detail-database.view.html @@ -4,7 +4,7 @@

Database - {{ request.host ? request.host + ':' + (request.port || '') + ' -- ' + request.name : 'N/A'}} + {{ 'jdbc:' + (request.productName ? request.productName.toLowerCase() : 'N/A') + '://' + (request.host ? request.host : 'N/A') + (request.port == -1 ? '' : ':' + request.port) + '/' + (request.name ? request.name : 'N/A')}}

diff --git a/src/app/views/detail/ftp/detail-ftp.view.html b/src/app/views/detail/ftp/detail-ftp.view.html index cef091c..9ea885a 100644 --- a/src/app/views/detail/ftp/detail-ftp.view.html +++ b/src/app/views/detail/ftp/detail-ftp.view.html @@ -3,7 +3,7 @@
smb_share - {{ request.host + ':' + request.port || 'N/A' }} + {{ request.protocol + '://' + (request.host ? request.host : 'N/A') + (request.port == -1 ? '' : ':' + request.port)}}
diff --git a/src/app/views/detail/ldap/detail-ldap.view.html b/src/app/views/detail/ldap/detail-ldap.view.html index 386627f..44f7b44 100644 --- a/src/app/views/detail/ldap/detail-ldap.view.html +++ b/src/app/views/detail/ldap/detail-ldap.view.html @@ -3,7 +3,7 @@
user_attributes - {{ request.host + ':' + request.port || 'N/A' }} + {{ request.protocol + '://' + (request.host ? request.host : 'N/A') + (request.port == -1 ? '' : ':' + request.port)}}
diff --git a/src/app/views/detail/session/main/detail-session-main.view.ts b/src/app/views/detail/session/main/detail-session-main.view.ts index 34652ba..4e64e42 100644 --- a/src/app/views/detail/session/main/detail-session-main.view.ts +++ b/src/app/views/detail/session/main/detail-session-main.view.ts @@ -49,12 +49,12 @@ export class DetailSessionMainView implements OnInit, OnDestroy { return forkJoin({ session: of(s), instance: this._traceService.getInstance(s.instanceId), - requests: this._traceService.getRestRequests(s.id), - queries: this._traceService.getDatabaseRequests(s.id), - stages: this._traceService.getLocalRequests(s.id), - ftps: this._traceService.getFtpRequests(s.id), - mails: this._traceService.getSmtpRequests(s.id), - ldaps: this._traceService.getLdapRequests(s.id) + requests: (s.mask & 4) > 0 ? this._traceService.getRestRequests(s.id) : of([]), + queries: (s.mask & 2) > 0 ? this._traceService.getDatabaseRequests(s.id) : of([]), + stages: (s.mask & 1) > 0 ? this._traceService.getLocalRequests(s.id) : of([]), + ftps: (s.mask & 8) > 0 ? this._traceService.getFtpRequests(s.id) : of([]), + mails: (s.mask & 16) > 0 ? this._traceService.getSmtpRequests(s.id) : of([]), + ldaps: (s.mask & 32) > 0 ? this._traceService.getLdapRequests(s.id) : of([]) }); }), finalize(() => this.isLoading = false) diff --git a/src/app/views/detail/smtp/detail-smtp.view.html b/src/app/views/detail/smtp/detail-smtp.view.html index ca51b2f..e7060e2 100644 --- a/src/app/views/detail/smtp/detail-smtp.view.html +++ b/src/app/views/detail/smtp/detail-smtp.view.html @@ -3,7 +3,7 @@
outgoing_mail - {{ request.host + ':' + request.port || 'N/A' }} + {{ 'smtp://' + (request.host ? request.host : 'N/A') + (request.port == -1 ? '' : ':' + request.port)}}
diff --git a/src/app/views/statistic/view/statistic-client.view.html b/src/app/views/statistic/view/statistic-client.view.html index 111cd12..6d9ff96 100644 --- a/src/app/views/statistic/view/statistic-client.view.html +++ b/src/app/views/statistic/view/statistic-client.view.html @@ -54,7 +54,7 @@ [data]="requests.countRestRequestByDate?.data?.pie || []" [isLoading]="requests.countByDate?.isLoading" />
- +
\ No newline at end of file diff --git a/src/app/views/statistic/view/statistic-client.view.ts b/src/app/views/statistic/view/statistic-client.view.ts index 6e65438..27ab72f 100644 --- a/src/app/views/statistic/view/statistic-client.view.ts +++ b/src/app/views/statistic/view/statistic-client.view.ts @@ -98,6 +98,16 @@ export class StatisticClientView implements OnInit, OnDestroy { }, { emitEvent: false }); } + onClickRow(event: MouseEvent, row: any) { + if (event.ctrlKey) { + this._router.open(`#/dashboard/server/${row.name}?env=${this.params.env}&start=${this.params.start.toISOString()}&end=${this.params.end.toISOString()}`, '_blank') + } else { + this._router.navigate(['/dashboard/server', row.name], { + queryParamsHandling: 'preserve' + }); + } + } + REQUEST = (name: string, env: string, start: Date, end: Date) => { let now = new Date(); let groupedBy = periodManagement(start, end);