Browse Source

UI: added 'Default coma separetad values' hint to alarm rule condition string filter predicate value input in case of 'in' and 'not in' operations

pull/10175/head
rusikv 3 years ago
parent
commit
7a747f101e
  1. 2
      ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.html
  2. 14
      ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.ts
  3. 1
      ui-ngx/src/app/modules/home/components/filter/string-filter-predicate.component.html
  4. 1
      ui-ngx/src/assets/locale/locale.constant-en_US.json

2
ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.html

@ -41,7 +41,7 @@
</mat-checkbox> </mat-checkbox>
</ng-template> </ng-template>
</div> </div>
<div class="tb-hint" translate>filter.default-value</div> <div class="tb-hint">{{ hintText | translate }}</div>
</div> </div>
<div fxFlex fxLayout="column" [fxShow]="dynamicMode || onlyUserDynamicSource"> <div fxFlex fxLayout="column" [fxShow]="dynamicMode || onlyUserDynamicSource">
<div formGroupName="dynamicValue" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px"> <div formGroupName="dynamicValue" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">

14
ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.ts

@ -32,7 +32,8 @@ import {
EntityKeyValueType, EntityKeyValueType,
FilterPredicateValue, FilterPredicateValue,
getDynamicSourcesForAllowUser, getDynamicSourcesForAllowUser,
inheritModeForDynamicValueSourceType inheritModeForDynamicValueSourceType,
StringOperation
} from '@shared/models/query/query.models'; } from '@shared/models/query/query.models';
@Component({ @Component({
@ -81,6 +82,15 @@ export class FilterPredicateValueComponent implements ControlValueAccessor, Vali
return this.onlyUserDynamicSourceValue; return this.onlyUserDynamicSourceValue;
} }
@Input()
set operation(operation: StringOperation) {
if (operation && (operation === StringOperation.IN || operation === StringOperation.NOT_IN)) {
this.hintText = 'filter.default-coma-separated-values';
} else {
this.hintText = 'filter.default-value';
}
}
@Input() @Input()
valueType: EntityKeyValueType; valueType: EntityKeyValueType;
@ -98,6 +108,8 @@ export class FilterPredicateValueComponent implements ControlValueAccessor, Vali
inheritMode = false; inheritMode = false;
hintText = 'filter.default-value';
private propagateChange = null; private propagateChange = null;
private propagateChangePending = false; private propagateChangePending = false;

1
ui-ngx/src/app/modules/home/components/filter/string-filter-predicate.component.html

@ -31,6 +31,7 @@
[onlyUserDynamicSource]="onlyUserDynamicSource" [onlyUserDynamicSource]="onlyUserDynamicSource"
fxFlex="70" fxFlex="70"
[valueType]="valueTypeEnum.STRING" [valueType]="valueTypeEnum.STRING"
[operation]="stringFilterPredicateFormGroup.get('operation').value"
formControlName="value"> formControlName="value">
</tb-filter-predicate-value> </tb-filter-predicate-value>
</div> </div>

1
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -2667,6 +2667,7 @@
"current-user": "Current user", "current-user": "Current user",
"current-device": "Current device", "current-device": "Current device",
"default-value": "Default value", "default-value": "Default value",
"default-coma-separated-values": "Default coma separated values",
"dynamic-source-type": "Dynamic source type", "dynamic-source-type": "Dynamic source type",
"dynamic-value": "Dynamic value", "dynamic-value": "Dynamic value",
"no-dynamic-value": "No dynamic value", "no-dynamic-value": "No dynamic value",

Loading…
Cancel
Save