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

Added trim for creating/editing alias or filter name

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2020-08-05 17:38:20 +03:00
parent 35b2996401
commit 4e75efddb8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/modules/home/components/alias/entity-alias-dialog.component.ts
View File

@ -104,7 +104,7 @@ export class EntityAliasDialogComponent extends DialogComponent<EntityAliasDialo
validateDuplicateAliasName(): ValidatorFn { validateDuplicateAliasName(): ValidatorFn {
return (c: FormControl) => { return (c: FormControl) => {
const newAlias = c.value; const newAlias = c.value.trim();
const found = this.entityAliases.find((entityAlias) => entityAlias.alias === newAlias); const found = this.entityAliases.find((entityAlias) => entityAlias.alias === newAlias);
if (found) { if (found) {
if (this.isAdd || this.alias.id !== found.id) { if (this.isAdd || this.alias.id !== found.id) {
@ -138,7 +138,7 @@ export class EntityAliasDialogComponent extends DialogComponent<EntityAliasDialo
save(): void { save(): void {
this.submitted = true; this.submitted = true;
this.alias.alias = this.entityAliasFormGroup.get('alias').value; this.alias.alias = this.entityAliasFormGroup.get('alias').value.trim();
this.alias.filter = this.entityAliasFormGroup.get('filter').value; this.alias.filter = this.entityAliasFormGroup.get('filter').value;
this.alias.filter.resolveMultiple = this.entityAliasFormGroup.get('resolveMultiple').value; this.alias.filter.resolveMultiple = this.entityAliasFormGroup.get('resolveMultiple').value;
this.validate().subscribe(() => { this.validate().subscribe(() => {

2
ui-ngx/src/app/modules/home/components/alias/entity-aliases-dialog.component.ts
View File

@ -242,7 +242,7 @@ export class EntityAliasesDialogComponent extends DialogComponent<EntityAliasesD
const aliasesArray = this.entityAliasesFormGroup.get('entityAliases').value as any[]; const aliasesArray = this.entityAliasesFormGroup.get('entityAliases').value as any[];
for (const aliasValue of aliasesArray) { for (const aliasValue of aliasesArray) {
const aliasId: string = aliasValue.id; const aliasId: string = aliasValue.id;
const alias: string = aliasValue.alias; const alias: string = aliasValue.alias.trim();
const filter: EntityAliasFilter = aliasValue.filter; const filter: EntityAliasFilter = aliasValue.filter;
if (uniqueAliasList[alias]) { if (uniqueAliasList[alias]) {
valid = false; valid = false;

4
ui-ngx/src/app/modules/home/components/filter/filter-dialog.component.ts
View File

@ -96,7 +96,7 @@ export class FilterDialogComponent extends DialogComponent<FilterDialogComponent
validateDuplicateFilterName(): ValidatorFn { validateDuplicateFilterName(): ValidatorFn {
return (c: FormControl) => { return (c: FormControl) => {
const newFilter = c.value; const newFilter = c.value.trim();
const found = this.filters.find((filter) => filter.filter === newFilter); const found = this.filters.find((filter) => filter.filter === newFilter);
if (found) { if (found) {
if (this.isAdd || this.filter.id !== found.id) { if (this.isAdd || this.filter.id !== found.id) {
@ -126,7 +126,7 @@ export class FilterDialogComponent extends DialogComponent<FilterDialogComponent
save(): void { save(): void {
this.submitted = true; this.submitted = true;
this.filter.filter = this.filterFormGroup.get('filter').value; this.filter.filter = this.filterFormGroup.get('filter').value.trim();
this.filter.editable = this.filterFormGroup.get('editable').value; this.filter.editable = this.filterFormGroup.get('editable').value;
this.filter.keyFilters = this.filterFormGroup.get('keyFilters').value; this.filter.keyFilters = this.filterFormGroup.get('keyFilters').value;
if (this.isAdd) { if (this.isAdd) {