Merge branch 'master' into feature/jdk11

@@ -53,6 +53,7 @@
                                [isMobile]="isMobile"
                                [state]="dashboardCtx.state"
                                [currentState]="currentState"
+                               [syncStateWithQueryParam]="syncStateWithQueryParam"
                                [states]="dashboardConfiguration.states">
           </tb-states-component>
         </div>

@@ -124,6 +124,9 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
   hideToolbar: boolean;
 
   @Input()
+  syncStateWithQueryParam = true;
+
+  @Input()
   dashboard: Dashboard;
   dashboardConfiguration: DashboardConfiguration;
 

@@ -88,6 +88,8 @@ export abstract class StateControllerComponent implements IStateControllerCompon
 
   currentState: string;
 
+  syncStateWithQueryParam: boolean;
+
   private rxSubscriptions = new Array<Subscription>();
 
   private inited = false;
@@ -99,18 +101,20 @@ export abstract class StateControllerComponent implements IStateControllerCompon
   }
 
   ngOnInit(): void {
-    this.rxSubscriptions.push(this.route.queryParamMap.subscribe((paramMap) => {
-      const dashboardId = this.route.snapshot.params.dashboardId || '';
-      if (this.dashboardId === dashboardId) {
-        const newState = this.decodeStateParam(paramMap.get('state'));
-        if (this.currentState !== newState) {
-          this.currentState = newState;
-          if (this.inited) {
-            this.onStateChanged();
+    if (this.syncStateWithQueryParam) {
+      this.rxSubscriptions.push(this.route.queryParamMap.subscribe((paramMap) => {
+        const dashboardId = this.route.snapshot.params.dashboardId || '';
+        if (this.dashboardId === dashboardId) {
+          const newState = this.decodeStateParam(paramMap.get('state'));
+          if (this.currentState !== newState) {
+            this.currentState = newState;
+            if (this.inited) {
+              this.onStateChanged();
+            }
           }
         }
-      }
-    }));
+      }));
+    }
     this.init();
     this.inited = true;
   }
@@ -124,16 +128,18 @@ export abstract class StateControllerComponent implements IStateControllerCompon
 
   protected updateStateParam(newState: string) {
     this.currentState = newState;
-    const queryParams: Params = { state: this.currentState };
-    this.ngZone.run(() => {
-      this.router.navigate(
-        [],
-        {
-          relativeTo: this.route,
-          queryParams,
-          queryParamsHandling: 'merge',
-        });
-    });
+    if (this.syncStateWithQueryParam) {
+      const queryParams: Params = {state: this.currentState};
+      this.ngZone.run(() => {
+        this.router.navigate(
+          [],
+          {
+            relativeTo: this.route,
+            queryParams,
+            queryParamsHandling: 'merge',
+          });
+      });
+    }
   }
 
   public openRightLayout(): void {

@@ -24,6 +24,7 @@ export interface IStateControllerComponent extends IStateController {
   stateControllerInstanceId: string;
   state: string;
   currentState: string;
+  syncStateWithQueryParam: boolean;
   isMobile: boolean;
   states: {[id: string]: DashboardState };
   dashboardId: string;

@@ -54,6 +54,9 @@ export class StatesComponentDirective implements OnInit, OnDestroy, OnChanges {
   currentState: string;
 
   @Input()
+  syncStateWithQueryParam: boolean;
+
+  @Input()
   isMobile: boolean;
 
   stateControllerComponentRef: ComponentRef<IStateControllerComponent>;
@@ -89,6 +92,8 @@ export class StatesComponentDirective implements OnInit, OnDestroy, OnChanges {
           this.stateControllerComponent.state = this.state;
         } else if (propName === 'currentState') {
           this.stateControllerComponent.currentState = this.currentState;
+        } else if (propName === 'syncStateWithQueryParam') {
+          this.stateControllerComponent.syncStateWithQueryParam = this.syncStateWithQueryParam;
         }
       }
     }
@@ -119,6 +124,7 @@ export class StatesComponentDirective implements OnInit, OnDestroy, OnChanges {
     this.stateControllerComponent.stateControllerInstanceId = stateControllerInstanceId;
     this.stateControllerComponent.state = this.state;
     this.stateControllerComponent.currentState = this.currentState;
+    this.stateControllerComponent.syncStateWithQueryParam = this.syncStateWithQueryParam;
     this.stateControllerComponent.isMobile = this.isMobile;
     this.stateControllerComponent.states = this.states;
     this.stateControllerComponent.dashboardId = this.dashboardId;

@@ -44,7 +44,7 @@ import { EntityAction } from '@home/models/entity/entity-component.models';
 import { Subscription } from 'rxjs';
 import { MatTab, MatTabGroup } from '@angular/material/tabs';
 import { EntityTabsComponent } from '@home/components/entity/entity-tabs.component';
-import { deepClone } from '@core/utils';
+import { deepClone, mergeDeep } from '@core/utils';
 
 @Component({
   selector: 'tb-entity-details-panel',
@@ -280,7 +280,7 @@ export class EntityDetailsPanelComponent extends PageComponent implements OnInit
 
   saveEntity() {
     if (this.detailsForm.valid) {
-      const editingEntity = {...this.editingEntity, ...this.entityComponent.entityFormValue()};
+      const editingEntity = mergeDeep(this.editingEntity, this.entityComponent.entityFormValue());
       this.entitiesTableConfig.saveEntity(editingEntity).subscribe(
         (entity) => {
           this.entity = entity;

@@ -27,7 +27,8 @@
   </mat-progress-bar>
   <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
   <div class="dashboard-state-dialog-content" mat-dialog-content fxFlex fxLayout="column" style="padding: 8px;">
-    <tb-dashboard-page [embedded]="true" [hideToolbar]="hideToolbar" [currentState]="state" [dashboard]="dashboard" style="width: 100%; height: 100%;"></tb-dashboard-page>
+    <tb-dashboard-page [embedded]="true" [syncStateWithQueryParam]="false" [hideToolbar]="hideToolbar"
+                       [currentState]="state" [dashboard]="dashboard" style="width: 100%; height: 100%;"></tb-dashboard-page>
   </div>
   <div mat-dialog-actions fxLayoutAlign="end center">
     <button mat-button color="primary"