From 1f5a8ef70f8912a00912b318abcf3396e7d72f61 Mon Sep 17 00:00:00 2001
From: Kalutka Zhenya <ykalytka@thingsboard.io>
Date: Tue, 18 May 2021 10:52:38 +0300
Subject: [PATCH] Updated logic for 'Set entity from widget' in static widget

---
 .../widget/action/manage-widget-actions.component.ts |  6 +++++-
 .../action/widget-action-dialog.component.html       |  2 +-
 .../widget/action/widget-action-dialog.component.ts  | 12 +++++++++++-
 .../components/widget/widget-config.component.html   |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions.component.ts b/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions.component.ts
index 0367cf3ce5..2a68251c3d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions.component.ts
@@ -42,6 +42,7 @@ import {
   WidgetActionDialogData
 } from '@home/components/widget/action/widget-action-dialog.component';
 import { deepClone } from '@core/utils';
+import { WidgetConfigComponentData } from '@home/models/widget-component.models';
 
 @Component({
   selector: 'tb-manage-widget-actions',
@@ -59,6 +60,8 @@ export class ManageWidgetActionsComponent extends PageComponent implements OnIni
 
   @Input() disabled: boolean;
 
+  @Input() modelValue: WidgetConfigComponentData;
+
   @Input() callbacks: WidgetActionCallbacks;
 
   innerValue: WidgetActionsData;
@@ -180,7 +183,8 @@ export class ManageWidgetActionsComponent extends PageComponent implements OnIni
         isAdd,
         callbacks: this.callbacks,
         actionsData,
-        action: deepClone(action)
+        action: deepClone(action),
+        modelValue: this.modelValue
       }
     }).afterClosed().subscribe(
       (res) => {
diff --git a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
index 44bfe44e1e..36234da531 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
@@ -120,7 +120,7 @@
                                      widgetActionFormGroup.get('type').value === widgetActionType.updateDashboardState ||
                                      widgetActionFormGroup.get('type').value === widgetActionType.openDashboard ?
                                      widgetActionFormGroup.get('type').value : ''">
-          <mat-checkbox formControlName="setEntityId">
+          <mat-checkbox *ngIf="data.modelValue.widgetType !== widgetType.static" formControlName="setEntityId">
             {{ 'widget-action.set-entity-from-widget' | translate }}
           </mat-checkbox>
           <mat-form-field *ngIf="actionTypeFormGroup.get('setEntityId').value"
diff --git a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
index 0227ded562..72798bfd1a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
@@ -28,6 +28,10 @@ import {
   ValidatorFn,
   Validators
 } from '@angular/forms';
+import {
+  WidgetConfigComponentData,
+  WidgetInfo
+} from '@home/models/widget-component.models';
 import { Observable, of } from 'rxjs';
 import { Router } from '@angular/router';
 import { DialogComponent } from '@app/shared/components/dialog.component';
@@ -46,12 +50,14 @@ import { DashboardUtilsService } from '@core/services/dashboard-utils.service';
 import { CustomActionEditorCompleter } from '@home/components/widget/action/custom-action.models';
 import { isDefinedAndNotNull } from '@core/utils';
 import { MobileActionEditorComponent } from '@home/components/widget/action/mobile-action-editor.component';
+import { widgetType } from '@shared/models/widget.models';
 
 export interface WidgetActionDialogData {
   isAdd: boolean;
   callbacks: WidgetActionCallbacks;
   actionsData: WidgetActionsData;
   action?: WidgetActionDescriptorInfo;
+  modelValue: WidgetConfigComponentData;
 }
 
 @Component({
@@ -67,8 +73,10 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
 
   @ViewChild('mobileActionEditor', {static: false}) mobileActionEditor: MobileActionEditorComponent;
 
+
   widgetActionFormGroup: FormGroup;
   actionTypeFormGroup: FormGroup;
+  widgetInfo: WidgetInfo;
 
   isAdd: boolean;
   action: WidgetActionDescriptorInfo;
@@ -84,6 +92,7 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
   customActionEditorCompleter = CustomActionEditorCompleter;
 
   submitted = false;
+  widgetType = widgetType;
 
   constructor(protected store: Store<AppState>,
               protected router: Router,
@@ -139,9 +148,10 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
             this.fb.control(action ? action.targetDashboardStateId : null,
               type === WidgetActionType.openDashboardState ? [Validators.required] : [])
           );
+
           this.actionTypeFormGroup.addControl(
             'setEntityId',
-            this.fb.control(action ? action.setEntityId : true, [])
+            this.fb.control(action ? action.setEntityId : this.data.modelValue.widgetType === widgetType.static ? false : true , [])
           );
           this.actionTypeFormGroup.addControl(
             'stateEntityParamName',
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
index ea1cd70932..634daa42c3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
@@ -443,6 +443,7 @@
   <mat-tab label="{{ 'widget-config.actions' | translate }}" [formGroup]="actionsSettings">
     <tb-manage-widget-actions
       [callbacks]="widgetConfigCallbacks"
+      [modelValue] = "modelValue"
       formControlName="actionsData">
     </tb-manage-widget-actions>
   </mat-tab>