dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3733 from vvlladd28/improvement/device-profile/alarm-type/validation

Browse Source 
UI: Added unique alarm type validation in alarm rule
This commit is contained in:
Igor Kulikov 2020-11-16 17:17:14 +02:00 committed by GitHub
commit 566f24f429
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui-ngx/src/app/modules/home/components/profile/alarm/device-profile-alarm.component.html
View File

@ -41,6 +41,9 @@
<mat-error *ngIf="alarmFormGroup.get('alarmType').hasError('required')"> <mat-error *ngIf="alarmFormGroup.get('alarmType').hasError('required')">
{{ 'device-profile.alarm-type-required' | translate }} {{ 'device-profile.alarm-type-required' | translate }}
</mat-error> </mat-error>
<mat-error *ngIf="alarmFormGroup.get('alarmType').hasError('unique')">
{{ 'device-profile.alarm-type-unique' | translate }}
</mat-error>
<mat-hint *ngIf="!disabled" <mat-hint *ngIf="!disabled"
innerHTML="{{ 'device-profile.alarm-type-pattern-hint' | translate }}"></mat-hint> innerHTML="{{ 'device-profile.alarm-type-pattern-hint' | translate }}"></mat-hint>
</mat-form-field> </mat-form-field>

13
ui-ngx/src/app/modules/home/components/profile/alarm/device-profile-alarm.component.ts
View File

@ -133,6 +133,19 @@ export class DeviceProfileAlarmComponent implements ControlValueAccessor, OnInit
} }
public validate(c: FormControl) { public validate(c: FormControl) {
if (c.parent) {
const alarmType = c.value.alarmType;
const profileAlarmsType = [];
c.parent.getRawValue().forEach((alarm: DeviceProfileAlarm) => {
profileAlarmsType.push(alarm.alarmType);
}
);
if (profileAlarmsType.filter(profileAlarmType => profileAlarmType === alarmType).length > 1) {
this.alarmFormGroup.get('alarmType').setErrors({
unique: true
});
}
}
return (this.alarmFormGroup.valid) ? null : { return (this.alarmFormGroup.valid) ? null : {
alarm: { alarm: {
valid: false, valid: false,

10
ui-ngx/src/app/modules/home/components/profile/device-profile.component.ts
View File

@ -38,7 +38,7 @@ import {
} from '@shared/models/device.models'; } from '@shared/models/device.models';
import { EntityType } from '@shared/models/entity-type.models'; import { EntityType } from '@shared/models/entity-type.models';
import { RuleChainId } from '@shared/models/id/rule-chain-id'; import { RuleChainId } from '@shared/models/id/rule-chain-id';
import {ServiceType} from "@shared/models/queue.models"; import { ServiceType } from '@shared/models/queue.models';
@Component({ @Component({
selector: 'tb-device-profile', selector: 'tb-device-profile',
@ -176,10 +176,10 @@ export class DeviceProfileComponent extends EntityComponent<DeviceProfile> {
transportConfiguration: entity.profileData?.transportConfiguration, transportConfiguration: entity.profileData?.transportConfiguration,
alarms: entity.profileData?.alarms, alarms: entity.profileData?.alarms,
provisionConfiguration: deviceProvisionConfiguration provisionConfiguration: deviceProvisionConfiguration
}}); }}, {emitEvent: false});
this.entityForm.patchValue({defaultRuleChainId: entity.defaultRuleChainId ? entity.defaultRuleChainId.id : null}); this.entityForm.patchValue({defaultRuleChainId: entity.defaultRuleChainId ? entity.defaultRuleChainId.id : null}, {emitEvent: false});
this.entityForm.patchValue({defaultQueueName: entity.defaultQueueName}); this.entityForm.patchValue({defaultQueueName: entity.defaultQueueName}, {emitEvent: false});
this.entityForm.patchValue({description: entity.description}); this.entityForm.patchValue({description: entity.description}, {emitEvent: false});
} }
prepareFormValue(formValue: any): any { prepareFormValue(formValue: any): any {

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

@ -909,6 +909,7 @@
"edit-alarm-rule": "Edit alarm rule", "edit-alarm-rule": "Edit alarm rule",
"alarm-type": "Alarm type", "alarm-type": "Alarm type",
"alarm-type-required": "Alarm type is required.", "alarm-type-required": "Alarm type is required.",
"alarm-type-unique": "Alarm type must be unique within the device profile alarm rules.",
"alarm-type-pattern-hint": "Alarm type pattern, use <code>${metaKeyName}</code> to substitute variables from metadata", "alarm-type-pattern-hint": "Alarm type pattern, use <code>${metaKeyName}</code> to substitute variables from metadata",
"create-alarm-pattern": "Create <b>{{alarmType}}</b> alarm", "create-alarm-pattern": "Create <b>{{alarmType}}</b> alarm",
"create-alarm-rules": "Create alarm rules", "create-alarm-rules": "Create alarm rules",