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

dashboard-form name validation added, rule-chain-details name validation pattern and trim added

Browse Source
This commit is contained in:
Serhii Mikhnytskyi 2020-09-18 12:04:13 +03:00 committed by Andrew Shvayka
parent a39087883a
commit 3963b56102
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/modules/home/pages/dashboard/dashboard-form.component.ts
View File

@ -95,11 +95,6 @@ export class DashboardFormComponent extends EntityComponent<Dashboard> {
this.entityForm.patchValue({configuration: {description: entity.configuration ? entity.configuration.description : ''}}); this.entityForm.patchValue({configuration: {description: entity.configuration ? entity.configuration.description : ''}});
} }
prepareFormValue(formValue: any): any {
formValue.configuration = {...(this.entity.configuration || {}), ...(formValue.configuration || {})};
return formValue;
}
onPublicLinkCopied($event) { onPublicLinkCopied($event) {
this.store.dispatch(new ActionNotificationShow( this.store.dispatch(new ActionNotificationShow(
{ {

3
ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
View File

@ -29,7 +29,8 @@
<mat-form-field fxFlex class="mat-block"> <mat-form-field fxFlex class="mat-block">
<mat-label translate>rulenode.name</mat-label> <mat-label translate>rulenode.name</mat-label>
<input matInput formControlName="name" required> <input matInput formControlName="name" required>
<mat-error *ngIf="ruleNodeFormGroup.get('name').hasError('required')"> <mat-error *ngIf="ruleNodeFormGroup.get('name').hasError('required')
|| ruleNodeFormGroup.get('name').hasError('pattern')">
{{ 'rulenode.name-required' | translate }} {{ 'rulenode.name-required' | translate }}
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>

5
ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.ts
View File

@ -72,8 +72,9 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
} }
if (this.ruleNode) { if (this.ruleNode) {
if (this.ruleNode.component.type !== RuleNodeType.RULE_CHAIN) { if (this.ruleNode.component.type !== RuleNodeType.RULE_CHAIN) {
this.ruleNodeFormGroup = this.fb.group({ this.ruleNodeFormGroup = this.fb.group({
name: [this.ruleNode.name, [Validators.required]], name: [this.ruleNode.name, [Validators.required, Validators.pattern('(.|\\s)*\\S(.|\\s)*')]],
debugMode: [this.ruleNode.debugMode, []], debugMode: [this.ruleNode.debugMode, []],
configuration: [this.ruleNode.configuration, [Validators.required]], configuration: [this.ruleNode.configuration, [Validators.required]],
additionalInfo: this.fb.group( additionalInfo: this.fb.group(
@ -102,6 +103,7 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
private updateRuleNode() { private updateRuleNode() {
const formValue = this.ruleNodeFormGroup.value || {}; const formValue = this.ruleNodeFormGroup.value || {};
if (this.ruleNode.component.type === RuleNodeType.RULE_CHAIN) { if (this.ruleNode.component.type === RuleNodeType.RULE_CHAIN) {
const targetRuleChainId: string = formValue.targetRuleChainId; const targetRuleChainId: string = formValue.targetRuleChainId;
if (this.ruleNode.targetRuleChainId !== targetRuleChainId && targetRuleChainId) { if (this.ruleNode.targetRuleChainId !== targetRuleChainId && targetRuleChainId) {
@ -115,6 +117,7 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
Object.assign(this.ruleNode, formValue); Object.assign(this.ruleNode, formValue);
} }
} else { } else {
formValue.name = formValue.name.trim();
Object.assign(this.ruleNode, formValue); Object.assign(this.ruleNode, formValue);
} }
} }

5
ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
View File

@ -1550,6 +1550,11 @@ export class AddRuleNodeDialogComponent extends DialogComponent<AddRuleNodeDialo
add(): void { add(): void {
this.submitted = true; this.submitted = true;
const formValue = this.ruleNodeDetailsComponent.ruleNodeFormGroup.value;
formValue.name = formValue.name.trim();
this.ruleNodeDetailsComponent.validate(); this.ruleNodeDetailsComponent.validate();
if (this.ruleNodeDetailsComponent.ruleNodeFormGroup.valid) { if (this.ruleNodeDetailsComponent.ruleNodeFormGroup.valid) {
this.dialogRef.close(this.ruleNode); this.dialogRef.close(this.ruleNode);