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

UI: fixed error on save relation qeury alias with empty relation filter, not option disabled if relation type is empty

Browse Source
This commit is contained in:
rusikv 2024-06-10 16:44:54 +03:00
parent 2c2273d15b
commit 0968de8881
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ export class EntityAliasDialogComponent extends DialogComponent<EntityAliasDialo
if (!isEmpty(this.alias.filter?.filters)) { if (!isEmpty(this.alias.filter?.filters)) {
this.alias.filter.filters = this.alias.filter.filters.filter((value, index, self) => this.alias.filter.filters = this.alias.filter.filters.filter((value, index, self) =>
self.findIndex(v => v.relationType === value.relationType && isEqual(v.entityTypes, value.entityTypes)) === index && self.findIndex(v => v.relationType === value.relationType && isEqual(v.entityTypes, value.entityTypes)) === index &&
(value.relationType || value.entityTypes.length) (value.relationType || value.entityTypes?.length)
); );
} }
if (this.alias.filter.type) { if (this.alias.filter.type) {

5
ui-ngx/src/app/modules/home/components/relation/relation-filters.component.html
View File

@ -27,7 +27,10 @@
<div class="tb-form-table-row align-start" <div class="tb-form-table-row align-start"
*ngFor="let relationFilterControl of relationFiltersFormArray.controls; let $index = index"> *ngFor="let relationFilterControl of relationFiltersFormArray.controls; let $index = index">
<mat-chip-listbox *ngIf="enableNotOption" class="flex-18 center-stretch" [formControl]="relationFilterControl.get('negate')"> <mat-chip-listbox *ngIf="enableNotOption" class="flex-18 center-stretch" [formControl]="relationFilterControl.get('negate')">
<mat-chip-option color="primary" [value]="true">{{ 'relation.not' | translate}}</mat-chip-option> <mat-chip-option color="primary" [value]="true"
[disabled]="!relationFilterControl.get('relationType').value">
{{ 'relation.not' | translate}}
</mat-chip-option>
</mat-chip-listbox> </mat-chip-listbox>
<tb-relation-type-autocomplete subscriptSizing="dynamic" <tb-relation-type-autocomplete subscriptSizing="dynamic"
class="flex-50" showLabel="false" class="flex-50" showLabel="false"