Browse Source

UI: Fixed copy alarm rule and filter

pull/14371/head
ArtemDzhereleiko 10 months ago
parent
commit
0908bdd4fb
  1. 2
      ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts
  2. 2
      ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts

2
ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts

@ -224,7 +224,7 @@ export class AlarmRulesTableConfig extends EntityTableConfig<any> {
private copyCalculatedField(calculatedField: CalculatedField, isDirty = false): void { private copyCalculatedField(calculatedField: CalculatedField, isDirty = false): void {
const copyCalculatedAlarmRule = deepClone(calculatedField); const copyCalculatedAlarmRule = deepClone(calculatedField);
copyCalculatedAlarmRule.entityId = null; copyCalculatedAlarmRule.entityId = null;
this.getCalculatedAlarmDialog(calculatedField, 'action.apply', isDirty) this.getCalculatedAlarmDialog(copyCalculatedAlarmRule, 'action.apply', isDirty)
.subscribe((res) => { .subscribe((res) => {
if (res) { if (res) {
this.updateData(); this.updateData();

2
ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts

@ -299,7 +299,7 @@ export class EntitySubTypeListComponent implements ControlValueAccessor, OnInit,
} }
selected(event: MatAutocompleteSelectedEvent): void { selected(event: MatAutocompleteSelectedEvent): void {
this.add(event.option.viewValue); this.add(event.option.value);
this.clear(''); this.clear('');
} }

Loading…
Cancel
Save