{{'device-profile.alarm-rules' | translate:
diff --git a/ui-ngx/src/app/shared/models/query/query.models.ts b/ui-ngx/src/app/shared/models/query/query.models.ts
index e6019fe023..e9419a709d 100644
--- a/ui-ngx/src/app/shared/models/query/query.models.ts
+++ b/ui-ngx/src/app/shared/models/query/query.models.ts
@@ -25,6 +25,8 @@ import { PageData } from '@shared/models/page/page-data';
import { isDefined, isEqual } from '@core/utils';
import { TranslateService } from '@ngx-translate/core';
import { AlarmInfo, AlarmSearchStatus, AlarmSeverity } from '../alarm.models';
+import { Filter } from '@material-ui/icons';
+import { DatePipe } from '@angular/common';
export enum EntityKeyType {
ATTRIBUTE = 'ATTRIBUTE',
@@ -358,6 +360,98 @@ export interface FiltersInfo {
datasourceFilters: {[datasourceIndex: number]: FilterInfo};
}
+export function keyFiltersToText(translate: TranslateService, datePipe: DatePipe, keyFilters: Array): string {
+ const filtersText = keyFilters.map(keyFilter =>
+ keyFilterToText(translate, datePipe, keyFilter,
+ keyFilters.length > 1 ? ComplexOperation.AND : undefined));
+ let result: string;
+ if (filtersText.length > 1) {
+ const andText = translate.instant('filter.operation.and');
+ result = filtersText.join(' ' + andText + ' ');
+ } else {
+ result = filtersText[0];
+ }
+ return result;
+}
+
+export function keyFilterToText(translate: TranslateService, datePipe: DatePipe, keyFilter: KeyFilter,
+ parentComplexOperation?: ComplexOperation): string {
+ const keyFilterPredicate = keyFilter.predicate;
+ return keyFilterPredicateToText(translate, datePipe, keyFilter, keyFilterPredicate, parentComplexOperation);
+}
+
+export function keyFilterPredicateToText(translate: TranslateService,
+ datePipe: DatePipe,
+ keyFilter: KeyFilter,
+ keyFilterPredicate: KeyFilterPredicate,
+ parentComplexOperation?: ComplexOperation): string {
+ if (keyFilterPredicate.type === FilterPredicateType.COMPLEX) {
+ const complexPredicate = keyFilterPredicate as ComplexFilterPredicate;
+ const complexOperation = complexPredicate.operation;
+ const complexPredicatesText =
+ complexPredicate.predicates.map(predicate => keyFilterPredicateToText(translate, datePipe, keyFilter, predicate, complexOperation));
+ if (complexPredicatesText.length > 1) {
+ const operationText = translate.instant(complexOperationTranslationMap.get(complexOperation));
+ let result = complexPredicatesText.join(' ' + operationText + ' ');
+ if (complexOperation === ComplexOperation.OR && parentComplexOperation && ComplexOperation.OR !== parentComplexOperation) {
+ result = `(${result})`;
+ }
+ return result;
+ } else {
+ return complexPredicatesText[0];
+ }
+ } else {
+ return simpleKeyFilterPredicateToText(translate, datePipe, keyFilter, keyFilterPredicate);
+ }
+}
+
+function simpleKeyFilterPredicateToText(translate: TranslateService,
+ datePipe: DatePipe,
+ keyFilter: KeyFilter,
+ keyFilterPredicate: StringFilterPredicate |
+ NumericFilterPredicate |
+ BooleanFilterPredicate): string {
+ const key = keyFilter.key.key;
+ let operation: string;
+ let value: string;
+ const val = keyFilterPredicate.value;
+ const dynamicValue = !!val.dynamicValue && !!val.dynamicValue.sourceType;
+ if (dynamicValue) {
+ value = '' +
+ translate.instant(dynamicValueSourceTypeTranslationMap.get(val.dynamicValue.sourceType)) + '';
+ value += '.' + val.dynamicValue.sourceAttribute + '';
+ }
+ switch (keyFilterPredicate.type) {
+ case FilterPredicateType.STRING:
+ operation = translate.instant(stringOperationTranslationMap.get(keyFilterPredicate.operation));
+ if (keyFilterPredicate.ignoreCase) {
+ operation += ' ' + translate.instant('filter.ignore-case');
+ }
+ if (!dynamicValue) {
+ value = `'${keyFilterPredicate.value.defaultValue}'`;
+ }
+ break;
+ case FilterPredicateType.NUMERIC:
+ operation = translate.instant(numericOperationTranslationMap.get(keyFilterPredicate.operation));
+ if (!dynamicValue) {
+ if (keyFilter.valueType === EntityKeyValueType.DATE_TIME) {
+ value = datePipe.transform(keyFilterPredicate.value.defaultValue, 'yyyy-MM-dd HH:mm');
+ } else {
+ value = keyFilterPredicate.value.defaultValue + '';
+ }
+ }
+ break;
+ case FilterPredicateType.BOOLEAN:
+ operation = translate.instant(booleanOperationTranslationMap.get(keyFilterPredicate.operation));
+ value = translate.instant(keyFilterPredicate.value.defaultValue ? 'value.true' : 'value.false');
+ break;
+ }
+ if (!dynamicValue) {
+ value = `${value}`;
+ }
+ return `${key} ${operation} ${value}`;
+}
+
export function keyFilterInfosToKeyFilters(keyFilterInfos: Array): Array {
const keyFilters: Array = [];
for (const keyFilterInfo of keyFilterInfos) {
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 75165699fe..302d62133e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -813,15 +813,16 @@
"alarm-rules": "Alarm rules ({{count}})",
"add-alarm-rule": "Add alarm rule",
"edit-alarm-rule": "Edit alarm rule",
- "alarm-rule-details": "Alarm rule details",
"alarm-type": "Alarm type",
"alarm-type-required": "Alarm type is required.",
"alarm-type-pattern-hint": "Alarm type pattern, use ${metaKeyName} to substitute variables from metadata",
"create-alarm-pattern": "Create {{alarmType}} alarm",
"create-alarm-rules": "Create alarm rules",
+ "no-create-alarm-rules": "No create conditions configured",
"clear-alarm-rule": "Clear alarm rule",
- "add-create-alarm-rule": "Add create alarm rule",
- "add-clear-alarm-rule": "Add clear alarm rule",
+ "no-clear-alarm-rule": "No clear condition configured",
+ "add-create-alarm-rule": "Add create condition",
+ "add-clear-alarm-rule": "Add clear condition",
"select-alarm-severity": "Select alarm severity",
"alarm-severity-required": "Alarm severity is required.",
"condition-duration": "Condition duration",
@@ -831,6 +832,7 @@
"condition-duration-value-required": "Duration value is required.",
"condition-duration-time-unit-required": "Time unit is required.",
"advanced-settings": "Advanced settings",
+ "alarm-rule-details": "Details",
"propagate-alarm": "Propagate alarm",
"alarm-details": "Alarm details",
"alarm-rule-condition": "Alarm rule condition",
@@ -1277,6 +1279,8 @@
"filter": "Filter",
"editable": "Editable",
"no-filters-found": "No filters found.",
+ "no-filter-text": "No filter specified",
+ "add-filter-prompt": "Please add filter",
"no-filter-matching": "'{{filter}}' not found.",
"create-new-filter": "Create a new one!",
"filter-required": "Filter is required.",
@@ -1295,7 +1299,7 @@
"and": "and",
"or": "or"
},
- "ignore-case": "Ignore case",
+ "ignore-case": "ignore case",
"value": "Value",
"remove-filter": "Remove filter",
"no-filters": "No filters configured",