@esfaenza/admin-module 15.2.12 → 15.2.14

package/fesm2020/esfaenza-admin-module.mjs

@@ -31,8 +31,8 @@ import * as i3 from '@esfaenza/preferences';
 import * as i4 from '@esfaenza/httpservice';
 import { HttpParams } from '@angular/common/http';
 import { __decorate } from 'tslib';
-import { catchError } from 'rxjs/operators';
-import { of } from 'rxjs';
+import { takeUntil, catchError } from 'rxjs/operators';
+import { ReplaySubject, interval, of } from 'rxjs';
 
 class AuditsView extends AppSearch {
     constructor() {
@@ -715,6 +715,8 @@ class AdmTopActivitiesComponent {
         this.searchView = new TopActivitiesDataView();
         this.autoUpdate = false;
         this.seconds = "5";
+        this.rtWindow = null;
+        this.destroyed$ = new ReplaySubject(1);
         this.seriesPropertiesMapping = {};
         this.propertiesSeriesMapping = {
             ["cputime"]: "CPU",
@@ -729,10 +731,31 @@ class AdmTopActivitiesComponent {
         this.intercom.send(InboundMessageTypes.Navigation, { sub: false, routeTitle: this.lc.loc(this.route.snapshot.data["title"]) });
     }
     ngOnInit() {
+        // Ogni minuto calcolo qual è la finestra del realTime
+        interval(60 * 1000).pipe(takeUntil(this.destroyed$)).subscribe(_ => {
+            this.updateRealTimeWindow();
+        });
         this.storageSub = this.route.queryParams.subscribe(params => {
             this.Init(params["ignoreStorage"]);
         });
     }
+    async updateRealTimeWindow() {
+        let data = new TopActivitiesDataView();
+        data = await this.http.post(Repository.POST_Director_GetTopActivities, data).toPromise();
+        let reference = data.items[0];
+        for (let i = 0; i < reference.actsessions.length; i++) {
+            let itemref = reference.actsessions[i];
+            let theD = this.dateExts.getDateConvertion(itemref.sampletime);
+            if (!this.rtWindow)
+                this.rtWindow = { from: theD, to: theD };
+            else {
+                if (theD.isBefore(this.rtWindow.from))
+                    this.rtWindow.from = theD;
+                if (theD.isAfter(this.rtWindow.to))
+                    this.rtWindow.to = theD;
+            }
+        }
+    }
     Init(ignoreStore) {
         this.doInit(ignoreStore);
     }
@@ -759,14 +782,20 @@ class AdmTopActivitiesComponent {
         }
     }
     ngOnDestroy() {
+        this.destroyed$.next(true);
+        this.destroyed$.complete();
         if (this.storageSub)
             this.storageSub.unsubscribe();
     }
-    sendSearch(resetPage = true, update = false, searchViewOverride = null) {
-        this.searchView.searchinprogress = true;
-        if (resetPage)
-            this.searchView.page = 1;
-        this.POSTGetItems(Repository.POST_Director_GetTopActivities, searchViewOverride ?? this.searchView, update);
+    async sendSearch(resetPage = true, update = false, searchViewOverride = null) {
+        let sv = searchViewOverride ?? this.searchView;
+        if ((sv.filterfrom || sv.filterto) && !this.rtWindow)
+            await this.updateRealTimeWindow();
+        let dateRequestOnRealtimeWindow = sv.filterfrom && this.dateExts.getDateConvertion(sv.filterfrom).isAfter(this.rtWindow.from) &&
+            sv.filterto && this.dateExts.getDateConvertion(sv.filterto).isBefore(this.rtWindow.to);
+        sv.filterrealtime = dateRequestOnRealtimeWindow;
+        sv.searchinprogress = true;
+        this.POSTGetItems(Repository.POST_Director_GetTopActivities, sv, update);
     }
     POSTGetItems(url, data, update) {
         this.http.post(url, data).subscribe(async (t) => {
@@ -1064,7 +1093,7 @@ class AdmMetricsComponent {
                 this.metricsToShow = [];
                 this.searchView = t;
                 this.searchView.items.forEach(m => {
-                    if (!this.Instances.find(t => t.id == m.instance))
+                    if (!this.Instances.find(t => t.id == m.instance) && m.instance)
                         this.Instances.push(new KeyValue(m.instance, m.instance));
                 });
                 this.instanceRequired = this.Instances.length > 1;
@@ -1072,6 +1101,8 @@ class AdmMetricsComponent {
                     this.selectedInstance = this.Instances[0].id;
                     this.instanceSelected();
                 }
+                else
+                    this.instanceSelected(true);
                 this.localStorage.setItem("HotSearchMetrics", this.searchView).subscribe();
             }
             else {
@@ -1092,10 +1123,10 @@ class AdmMetricsComponent {
             this.searchView.searchinprogress = false;
         });
     }
-    instanceSelected() {
-        if (!this.selectedInstance)
+    instanceSelected(allowNull = false) {
+        if (!this.selectedInstance && !allowNull)
             return;
-        this.metricsToShow = this.searchView.items.filter(t => t.instance == this.selectedInstance);
+        this.metricsToShow = this.searchView.items.filter(t => !this.selectedInstance || (t.instance == this.selectedInstance));
     }
     linkChartToMetric(metric, metricChart, chartComp) {
         this.MetricsChartCache[this.metricKey(metric, metricChart)] = { chart: chartComp, lastTs: metricChart.series.map(t => dayjs.max(t.values.map(v => this.dateExts.getDateConvertion(v.d))))[0] };