Skip to content

Commit 9e0dab5

Browse files
committed
hotfix$
1 parent 2596954 commit 9e0dab5

File tree

7 files changed

+22
-12
lines changed

7 files changed

+22
-12
lines changed

src/app/views/detail/database/detail-database.view.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<mat-card-title>
55
<p style="display: flex; align-items: center; gap: 0.5em">
66
<mat-icon class="material-symbols-outlined">Database</mat-icon>
7-
{{ request.host ? request.host + ':' + (request.port || '') + ' -- ' + request.name : 'N/A'}}
7+
{{ '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')}}
88
</p>
99

1010
<div class="right">

src/app/views/detail/ftp/detail-ftp.view.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<mat-card-title>
44
<div style="display: flex; align-items: center; gap: 0.5em">
55
<mat-icon class="material-symbols-outlined">smb_share</mat-icon>
6-
{{ request.host + ':' + request.port || 'N/A' }}
6+
{{ request.protocol + '://' + (request.host ? request.host : 'N/A') + (request.port == -1 ? '' : ':' + request.port)}}
77
</div>
88

99
<div class="right">

src/app/views/detail/ldap/detail-ldap.view.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<mat-card-title>
44
<div style="display: flex; align-items: center; gap: 0.5em">
55
<mat-icon class="material-symbols-outlined">user_attributes</mat-icon>
6-
{{ request.host + ':' + request.port || 'N/A' }}
6+
{{ request.protocol + '://' + (request.host ? request.host : 'N/A') + (request.port == -1 ? '' : ':' + request.port)}}
77
</div>
88

99
<div class="right">

src/app/views/detail/session/main/detail-session-main.view.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ export class DetailSessionMainView implements OnInit, OnDestroy {
4949
return forkJoin({
5050
session: of(s),
5151
instance: this._traceService.getInstance(s.instanceId),
52-
requests: this._traceService.getRestRequests(s.id),
53-
queries: this._traceService.getDatabaseRequests(s.id),
54-
stages: this._traceService.getLocalRequests(s.id),
55-
ftps: this._traceService.getFtpRequests(s.id),
56-
mails: this._traceService.getSmtpRequests(s.id),
57-
ldaps: this._traceService.getLdapRequests(s.id)
52+
requests: (s.mask & 4) > 0 ? this._traceService.getRestRequests(s.id) : of([]),
53+
queries: (s.mask & 2) > 0 ? this._traceService.getDatabaseRequests(s.id) : of([]),
54+
stages: (s.mask & 1) > 0 ? this._traceService.getLocalRequests(s.id) : of([]),
55+
ftps: (s.mask & 8) > 0 ? this._traceService.getFtpRequests(s.id) : of([]),
56+
mails: (s.mask & 16) > 0 ? this._traceService.getSmtpRequests(s.id) : of([]),
57+
ldaps: (s.mask & 32) > 0 ? this._traceService.getLdapRequests(s.id) : of([])
5858
});
5959
}),
6060
finalize(() => this.isLoading = false)

src/app/views/detail/smtp/detail-smtp.view.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<mat-card-title>
44
<div style="display: flex; align-items: center; gap: 0.5em">
55
<mat-icon style="height: 20px;" class="material-symbols-outlined">outgoing_mail</mat-icon>
6-
{{ request.host + ':' + request.port || 'N/A' }}
6+
{{ 'smtp://' + (request.host ? request.host : 'N/A') + (request.port == -1 ? '' : ':' + request.port)}}
77
</div>
88

99
<div class="right">

src/app/views/statistic/view/statistic-client.view.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
[data]="requests.countRestRequestByDate?.data?.pie || []" [isLoading]="requests.countByDate?.isLoading" />
5555
</div>
5656
<div style="display: flex; flex-direction: row; gap: 0.5em; margin-bottom: 1em;">
57-
<dependents-table style="width: 50%" [data]="requests.dependents?.data || []"
58-
[isLoading]="requests.dependents?.isLoading"/>
57+
<dependents-table style="width: 50%" [data]="requests.dependents?.data || []"
58+
[isLoading]="requests.dependents?.isLoading" (onClickRow)="onClickRow($event.event, $event.row)"/>
5959
<exception-table style="width: 50%" [data]="requests.exceptions?.data || []" [isLoading]="requests.exceptions?.isLoading"></exception-table>
6060
</div>

src/app/views/statistic/view/statistic-client.view.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,16 @@ export class StatisticClientView implements OnInit, OnDestroy {
9898
}, { emitEvent: false });
9999
}
100100

101+
onClickRow(event: MouseEvent, row: any) {
102+
if (event.ctrlKey) {
103+
this._router.open(`#/dashboard/server/${row.name}?env=${this.params.env}&start=${this.params.start.toISOString()}&end=${this.params.end.toISOString()}`, '_blank')
104+
} else {
105+
this._router.navigate(['/dashboard/server', row.name], {
106+
queryParamsHandling: 'preserve'
107+
});
108+
}
109+
}
110+
101111
REQUEST = (name: string, env: string, start: Date, end: Date) => {
102112
let now = new Date();
103113
let groupedBy = periodManagement(start, end);

0 commit comments

Comments
 (0)