Merge branch 'master' of github.com:thingsboard/thingsboard

@@ -128,7 +128,7 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
             }
         }
         alarmsMap.clear();
-        alarmsMap.putAll(alarms.getData().stream().collect(Collectors.toMap(AlarmData::getId, Function.identity())));
+        alarmsMap.putAll(alarms.getData().stream().collect(Collectors.toMap(AlarmData::getId, Function.identity(), (a, b) -> a)));
         return this.alarms;
     }
 

@@ -22,13 +22,15 @@ import { TranslateService } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
 import { BreakpointObserver } from '@angular/cdk/layout';
 import { deepClone } from '@core/utils';
-import { FilterInfo, isFilterEditable } from '@shared/models/query/query.models';
+import { Filter, FilterInfo, isFilterEditable } from '@shared/models/query/query.models';
 import {
   FILTER_EDIT_PANEL_DATA,
   FiltersEditPanelComponent,
   FiltersEditPanelData
 } from '@home/components/filter/filters-edit-panel.component';
 import { ComponentPortal, PortalInjector } from '@angular/cdk/portal';
+import { UserFilterDialogComponent, UserFilterDialogData } from '@home/components/filter/user-filter-dialog.component';
+import { MatDialog } from '@angular/material/dialog';
 
 @Component({
   selector: 'tb-filters-edit',
@@ -65,7 +67,8 @@ export class FiltersEditComponent implements OnInit, OnDestroy {
   constructor(private translate: TranslateService,
               private overlay: Overlay,
               private breakpointObserver: BreakpointObserver,
-              private viewContainerRef: ViewContainerRef) {
+              private viewContainerRef: ViewContainerRef,
+              private dialog: MatDialog) {
   }
 
   private setupAliasController(aliasController: IAliasController) {
@@ -101,33 +104,53 @@ export class FiltersEditComponent implements OnInit, OnDestroy {
     if (this.disabled || !this.hasEditableFilters) {
       return;
     }
-    const position = this.overlay.position();
-    const config = new OverlayConfig({
-      panelClass: 'tb-filters-edit-panel',
-      backdropClass: 'cdk-overlay-transparent-backdrop',
-      hasBackdrop: true,
-    });
-    const connectedPosition: ConnectedPosition = {
-      originX: 'start',
-      originY: 'bottom',
-      overlayX: 'start',
-      overlayY: 'top'
-    };
-    config.positionStrategy = position.flexibleConnectedTo(this.filtersEditPanelOrigin.elementRef)
-      .withPositions([connectedPosition]);
-    const overlayRef = this.overlay.create(config);
-    overlayRef.backdropClick().subscribe(() => {
-      overlayRef.dispose();
-    });
-
-    const injector = this._createFiltersEditPanelInjector(
-      overlayRef,
-      {
-        aliasController: this.aliasController,
-        filtersInfo: deepClone(this.filtersInfo)
-      }
-    );
-    overlayRef.attach(new ComponentPortal(FiltersEditPanelComponent, this.viewContainerRef, injector));
+    const filteredArray = Object.entries(this.filtersInfo);
+
+    if (filteredArray.length === 1) {
+      const singleFilter: Filter = {id: filteredArray[0][0], ...filteredArray[0][1]};
+      this.dialog.open<UserFilterDialogComponent, UserFilterDialogData,
+        Filter>(UserFilterDialogComponent, {
+        disableClose: true,
+        panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
+        data: {
+          filter: singleFilter
+        }
+      }).afterClosed().subscribe(
+        (result) => {
+          if (result) {
+            this.filtersInfo[result.id] = result;
+            this.aliasController.updateUserFilter(result);
+          }
+        });
+    } else {
+      const position = this.overlay.position();
+      const config = new OverlayConfig({
+        panelClass: 'tb-filters-edit-panel',
+        backdropClass: 'cdk-overlay-transparent-backdrop',
+        hasBackdrop: true,
+      });
+      const connectedPosition: ConnectedPosition = {
+        originX: 'start',
+        originY: 'bottom',
+        overlayX: 'start',
+        overlayY: 'top'
+      };
+      config.positionStrategy = position.flexibleConnectedTo(this.filtersEditPanelOrigin.elementRef)
+        .withPositions([connectedPosition]);
+      const overlayRef = this.overlay.create(config);
+      overlayRef.backdropClick().subscribe(() => {
+        overlayRef.dispose();
+      });
+
+      const injector = this._createFiltersEditPanelInjector(
+        overlayRef,
+        {
+          aliasController: this.aliasController,
+          filtersInfo: deepClone(this.filtersInfo)
+        }
+      );
+      overlayRef.attach(new ComponentPortal(FiltersEditPanelComponent, this.viewContainerRef, injector));
+    }
   }
 
   private _createFiltersEditPanelInjector(overlayRef: OverlayRef, data: FiltersEditPanelData): PortalInjector {

@@ -42,7 +42,7 @@ import { Polygon } from './polygon';
 import { createTooltip, parseArray, safeExecute } from '@home/components/widget/lib/maps/maps-utils';
 import { WidgetContext } from '@home/models/widget-component.models';
 import { DatasourceData } from '@shared/models/widget.models';
-import { deepClone } from '@core/utils';
+import { deepClone, isDefinedAndNotNull } from '@core/utils';
 
 export default abstract class LeafletMap {
 
@@ -249,10 +249,10 @@ export default abstract class LeafletMap {
         if (!expression) return null;
         const lat = expression[this.options.latKeyName];
         const lng = expression[this.options.lngKeyName];
-        if (isNaN(lat) || isNaN(lng))
-            return null;
-        else
-            return L.latLng(lat, lng) as L.LatLng;
+        if (!isDefinedAndNotNull(lat) || isNaN(lat) || !isDefinedAndNotNull(lng) || isNaN(lng)) {
+          return null;
+        }
+        return L.latLng(lat, lng) as L.LatLng;
     }
 
     convertPositionPolygon(expression: Array<[number, number]>): L.LatLngExpression[] {

@@ -25,7 +25,7 @@ import {
 } from './schemes';
 import { EntityType } from '@shared/models/entity-type.models';
 
-export const DEFAULT_MAP_PAGE_SIZE = 1024;
+export const DEFAULT_MAP_PAGE_SIZE = 16384;
 
 export type GenericFunction = (data: FormattedData, dsData: FormattedData[], dsIndex: number) => string;
 export type MarkerImageFunction = (data: FormattedData, dsData: FormattedData[], dsIndex: number) => string;
@@ -68,6 +68,7 @@ export type MapSettings = {
     removeOutsideVisibleBounds: boolean,
     useCustomProvider: boolean,
     customProviderTileUrl: string;
+    mapPageSize: number;
 }
 
 export enum MapProviders {
@@ -267,7 +268,8 @@ export const defaultSettings: any = {
     credentials: '',
     markerClusteringSetting: null,
     draggableMarker: false,
-    fitMapBounds: true
+    fitMapBounds: true,
+    mapPageSize: DEFAULT_MAP_PAGE_SIZE
 };
 
 export const hereProviders = [

@@ -81,7 +81,7 @@ export class MapWidgetController implements MapWidgetInterface {
         this.map.saveMarkerLocation = this.setMarkerLocation;
         this.pageLink = {
           page: 0,
-          pageSize: DEFAULT_MAP_PAGE_SIZE,
+          pageSize: this.settings.mapPageSize,
           textSearch: null,
           dynamic: true
         };

@@ -24,6 +24,7 @@ import { WidgetContext } from '@home/models/widget-component.models';
 import { DataSet, DatasourceType, widgetType } from '@shared/models/widget.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { WidgetSubscriptionOptions } from '@core/api/widget-api.models';
+import { isDefinedAndNotNull } from '@core/utils';
 
 const maxZoom = 4;// ?
 
@@ -209,11 +210,15 @@ export class ImageMap extends LeafletMap {
     }
 
     convertPosition(expression): L.LatLng {
-        if (isNaN(expression[this.options.xPosKeyName]) || isNaN(expression[this.options.yPosKeyName])) return null;
-        Object.assign(expression, this.posFunction(expression[this.options.xPosKeyName], expression[this.options.yPosKeyName]));
-        return this.pointToLatLng(
-            expression.x * this.width,
-            expression.y * this.height);
+      const xPos = expression[this.options.xPosKeyName];
+      const yPos = expression[this.options.yPosKeyName];
+      if (!isDefinedAndNotNull(xPos) || isNaN(xPos) || !isDefinedAndNotNull(yPos) || isNaN(yPos)) {
+        return null;
+      }
+      Object.assign(expression, this.posFunction(xPos, yPos));
+      return this.pointToLatLng(
+        expression.x * this.width,
+        expression.y * this.height);
     }
 
     convertPositionPolygon(expression: Array<[number, number]>): L.LatLngExpression[] {

@@ -14,6 +14,8 @@
 /// limitations under the License.
 ///
 
+import { DEFAULT_MAP_PAGE_SIZE } from '@home/components/widget/lib/maps/map-models';
+
 export const googleMapSettingsSchema =
 {
     schema: {
@@ -198,10 +200,6 @@ export const openstreetMapSettingsSchema =
                     label: 'OpenStreetMap.Mapnik (Default)'
                 },
                 {
-                    value: 'OpenStreetMap.BlackAndWhite',
-                    label: 'OpenStreetMap.BlackAndWhite'
-                },
-                {
                     value: 'OpenStreetMap.HOT',
                     label: 'OpenStreetMap.HOT'
                 },
@@ -246,6 +244,11 @@ export const commonMapSettingsSchema =
                 type: 'boolean',
                 default: false
             },
+            mapPageSize: {
+                title: 'Map page size load entities',
+                type: 'number',
+                default: DEFAULT_MAP_PAGE_SIZE
+            },
             defaultCenterPosition: {
                 title: 'Default map center position (0,0)',
                 type: 'string',
@@ -408,6 +411,7 @@ export const commonMapSettingsSchema =
             key: 'fitMapBounds',
             condition: 'model.provider !== "image-map"'
         },
+        'mapPageSize',
         'draggableMarker',
         {
             key: 'disableScrollZooming',