Merge pull request #58 from oneteme/develop

hotfix$
oneteme · Nov 27, 2024 · 3b29446 · 3b29446
2 parents ce79299 + 9e0dab5
commit 3b29446
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 12 deletions.
diff --git a/src/app/views/detail/database/detail-database.view.html b/src/app/views/detail/database/detail-database.view.html
@@ -4,7 +4,7 @@
         <mat-card-title>
             <p style="display: flex; align-items: center; gap: 0.5em">
                 <mat-icon class="material-symbols-outlined">Database</mat-icon>
-                {{ 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')}}
             </p>
 
             <div class="right">

diff --git a/src/app/views/detail/ftp/detail-ftp.view.html b/src/app/views/detail/ftp/detail-ftp.view.html
@@ -3,7 +3,7 @@
         <mat-card-title>
             <div style="display: flex; align-items: center; gap: 0.5em">
                 <mat-icon class="material-symbols-outlined">smb_share</mat-icon>
-                {{ request.host + ':' + request.port || 'N/A' }}
+                {{ request.protocol + '://' + (request.host ? request.host : 'N/A') + (request.port == -1 ? '' : ':' + request.port)}}
             </div>
 
             <div class="right">

diff --git a/src/app/views/detail/ldap/detail-ldap.view.html b/src/app/views/detail/ldap/detail-ldap.view.html
@@ -3,7 +3,7 @@
         <mat-card-title>
             <div style="display: flex; align-items: center; gap: 0.5em">
                 <mat-icon class="material-symbols-outlined">user_attributes</mat-icon>
-                {{ request.host + ':' + request.port || 'N/A' }}
+                {{ request.protocol + '://' + (request.host ? request.host : 'N/A') + (request.port == -1 ? '' : ':' + request.port)}}
             </div>
 
             <div class="right">

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
@@ -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
@@ -3,7 +3,7 @@
         <mat-card-title>
             <div style="display: flex; align-items: center; gap: 0.5em">
                 <mat-icon style="height: 20px;" class="material-symbols-outlined">outgoing_mail</mat-icon>
-                {{ request.host + ':' + request.port || 'N/A' }}
+                {{ 'smtp://' + (request.host ? request.host : 'N/A') + (request.port == -1 ? '' : ':' + request.port)}}
             </div>
 
             <div class="right">

diff --git 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" />
 </div>
 <div style="display: flex; flex-direction: row; gap: 0.5em; margin-bottom: 1em;">
-   <dependents-table style="width: 50%" [data]="requests.dependents?.data || []"
-                      [isLoading]="requests.dependents?.isLoading"/>
+    <dependents-table style="width: 50%" [data]="requests.dependents?.data || []"
+                      [isLoading]="requests.dependents?.isLoading" (onClickRow)="onClickRow($event.event, $event.row)"/>
     <exception-table style="width: 50%" [data]="requests.exceptions?.data || []" [isLoading]="requests.exceptions?.isLoading"></exception-table>
 </div>
diff --git 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);