Browse Source

Refactoring and updated fix

pull/4592/head
Kalutka Zhenya 5 years ago
parent
commit
596b8cc647
  1. 6
      ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions.component.ts
  2. 2
      ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
  3. 7
      ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
  4. 2
      ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
  5. 2
      ui-ngx/src/app/modules/home/components/widget/widget.component.ts

6
ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions.component.ts

@ -42,7 +42,7 @@ import {
WidgetActionDialogData WidgetActionDialogData
} from '@home/components/widget/action/widget-action-dialog.component'; } from '@home/components/widget/action/widget-action-dialog.component';
import { deepClone } from '@core/utils'; import { deepClone } from '@core/utils';
import { WidgetConfigComponentData } from '@home/models/widget-component.models'; import { widgetType } from '@shared/models/widget.models';
@Component({ @Component({
selector: 'tb-manage-widget-actions', selector: 'tb-manage-widget-actions',
@ -60,7 +60,7 @@ export class ManageWidgetActionsComponent extends PageComponent implements OnIni
@Input() disabled: boolean; @Input() disabled: boolean;
@Input() modelValue: WidgetConfigComponentData; @Input() widgetType: widgetType;
@Input() callbacks: WidgetActionCallbacks; @Input() callbacks: WidgetActionCallbacks;
@ -184,7 +184,7 @@ export class ManageWidgetActionsComponent extends PageComponent implements OnIni
callbacks: this.callbacks, callbacks: this.callbacks,
actionsData, actionsData,
action: deepClone(action), action: deepClone(action),
modelValue: this.modelValue widgetType: this.widgetType
} }
}).afterClosed().subscribe( }).afterClosed().subscribe(
(res) => { (res) => {

2
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.updateDashboardState ||
widgetActionFormGroup.get('type').value === widgetActionType.openDashboard ? widgetActionFormGroup.get('type').value === widgetActionType.openDashboard ?
widgetActionFormGroup.get('type').value : ''"> widgetActionFormGroup.get('type').value : ''">
<mat-checkbox *ngIf="data.modelValue.widgetType !== widgetType.static" formControlName="setEntityId"> <mat-checkbox *ngIf="data.widgetType !== widgetType.static" formControlName="setEntityId">
{{ 'widget-action.set-entity-from-widget' | translate }} {{ 'widget-action.set-entity-from-widget' | translate }}
</mat-checkbox> </mat-checkbox>
<mat-form-field *ngIf="actionTypeFormGroup.get('setEntityId').value" <mat-form-field *ngIf="actionTypeFormGroup.get('setEntityId').value"

7
ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts

@ -28,9 +28,6 @@ import {
ValidatorFn, ValidatorFn,
Validators Validators
} from '@angular/forms'; } from '@angular/forms';
import {
WidgetConfigComponentData
} from '@home/models/widget-component.models';
import { Observable, of } from 'rxjs'; import { Observable, of } from 'rxjs';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { DialogComponent } from '@app/shared/components/dialog.component'; import { DialogComponent } from '@app/shared/components/dialog.component';
@ -56,7 +53,7 @@ export interface WidgetActionDialogData {
callbacks: WidgetActionCallbacks; callbacks: WidgetActionCallbacks;
actionsData: WidgetActionsData; actionsData: WidgetActionsData;
action?: WidgetActionDescriptorInfo; action?: WidgetActionDescriptorInfo;
modelValue: WidgetConfigComponentData; widgetType: widgetType;
} }
@Component({ @Component({
@ -147,7 +144,7 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
); );
this.actionTypeFormGroup.addControl( this.actionTypeFormGroup.addControl(
'setEntityId', 'setEntityId',
this.fb.control(action ? action.setEntityId : this.data.modelValue.widgetType === widgetType.static ? false : true , []) this.fb.control(this.data.widgetType === widgetType.static ? false : action ? action.setEntityId : true, [])
); );
this.actionTypeFormGroup.addControl( this.actionTypeFormGroup.addControl(
'stateEntityParamName', 'stateEntityParamName',

2
ui-ngx/src/app/modules/home/components/widget/widget-config.component.html

@ -443,7 +443,7 @@
<mat-tab label="{{ 'widget-config.actions' | translate }}" [formGroup]="actionsSettings"> <mat-tab label="{{ 'widget-config.actions' | translate }}" [formGroup]="actionsSettings">
<tb-manage-widget-actions <tb-manage-widget-actions
[callbacks]="widgetConfigCallbacks" [callbacks]="widgetConfigCallbacks"
[modelValue] = "modelValue" [widgetType] = "modelValue.widgetType"
formControlName="actionsData"> formControlName="actionsData">
</tb-manage-widget-actions> </tb-manage-widget-actions>
</mat-tab> </mat-tab>

2
ui-ngx/src/app/modules/home/components/widget/widget.component.ts

@ -1015,7 +1015,7 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
const type = descriptor.type; const type = descriptor.type;
const targetEntityParamName = descriptor.stateEntityParamName; const targetEntityParamName = descriptor.stateEntityParamName;
let targetEntityId: EntityId; let targetEntityId: EntityId;
if (descriptor.setEntityId && validateEntityId(entityId)) { if (this.widgetInfo.type !== 'static' && descriptor.setEntityId && validateEntityId(entityId)) {
targetEntityId = entityId; targetEntityId = entityId;
} }
switch (type) { switch (type) {

Loading…
Cancel
Save