Browse Source

UI: Fixed alarm rule filter list value type

pull/14835/head
ArtemDzhereleiko 6 months ago
committed by Vladyslav Prykhodko
parent
commit
1e2ffcfc32
  1. 2
      ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.html
  2. 12
      ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.ts

2
ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.html

@ -41,7 +41,7 @@
<div class="flex max-w-92% flex-full flex-col"> <div class="flex max-w-92% flex-full flex-col">
<div class="flex flex-row items-center justify-start"> <div class="flex flex-row items-center justify-start">
<div class="filters-text flex-1">{{ filterControl.value?.argument }}</div> <div class="filters-text flex-1">{{ filterControl.value?.argument }}</div>
<div class="filters-text flex-1">{{ FilterPredicateTypeTranslationMap.get(filterControl.value?.valueType) | translate }}</div> <div class="filters-text flex-1">{{ entityKeyValueTypes.get(entityKeyValueTypeEnum[filterControl.value?.valueType]).name | translate }}</div>
<button mat-icon-button color="primary" class="tb-budge-button" <button mat-icon-button color="primary" class="tb-budge-button"
type="button" type="button"
(click)="editFilter(index, readonly)" (click)="editFilter(index, readonly)"

12
ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.ts

@ -30,7 +30,8 @@ import { Observable } from 'rxjs';
import { import {
ComplexOperation, ComplexOperation,
complexOperationTranslationMap, complexOperationTranslationMap,
EntityKeyValueType EntityKeyValueType,
entityKeyValueTypesMap
} from '@shared/models/query/query.models'; } from '@shared/models/query/query.models';
import { MatDialog } from '@angular/material/dialog'; import { MatDialog } from '@angular/material/dialog';
import { deepClone } from '@core/utils'; import { deepClone } from '@core/utils';
@ -38,11 +39,7 @@ import {
AlarmRuleFilterDialogComponent, AlarmRuleFilterDialogComponent,
AlarmRuleFilterDialogData AlarmRuleFilterDialogData
} from "@home/components/alarm-rules/filter/alarm-rule-filter-dialog.component"; } from "@home/components/alarm-rules/filter/alarm-rule-filter-dialog.component";
import { import { AlarmRuleFilter, areFilterAndPredicateArgumentsValid } from "@shared/models/alarm-rule.models";
AlarmRuleFilter,
areFilterAndPredicateArgumentsValid,
FilterPredicateTypeTranslationMap
} from "@shared/models/alarm-rule.models";
import { CalculatedFieldArgument } from "@shared/models/calculated-field.models"; import { CalculatedFieldArgument } from "@shared/models/calculated-field.models";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop"; import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
@ -83,7 +80,8 @@ export class AlarmRuleFilterListComponent implements ControlValueAccessor, Valid
areFilterAndPredicateArgumentsValid = areFilterAndPredicateArgumentsValid; areFilterAndPredicateArgumentsValid = areFilterAndPredicateArgumentsValid;
complexOperationTranslationMap = complexOperationTranslationMap; complexOperationTranslationMap = complexOperationTranslationMap;
FilterPredicateTypeTranslationMap = FilterPredicateTypeTranslationMap entityKeyValueTypes = entityKeyValueTypesMap;
entityKeyValueTypeEnum = EntityKeyValueType;
private propagateChange = (v: any) => { }; private propagateChange = (v: any) => { };

Loading…
Cancel
Save