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

Merge pull request #11100 from rusikv/bug/empty-string-attr

Browse Source 
Disabled filtering of attributes with empty string values for attribute table
This commit is contained in:
Igor Kulikov 2024-07-01 16:20:20 +03:00 committed by GitHub
commit 27c7f12fb1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
View File

@ -186,6 +186,7 @@
<div fxFlex fxLayout="row" style="overflow: hidden; align-items: center;"> <div fxFlex fxLayout="row" style="overflow: hidden; align-items: center;">
<span class="ellipsis">{{attribute.value | tbJson}}</span> <span class="ellipsis">{{attribute.value | tbJson}}</span>
<tb-copy-button <tb-copy-button
*ngIf="attribute.value !== ''"
class="attribute-copy" class="attribute-copy"
[disabled]="isLoading$ | async" [disabled]="isLoading$ | async"
[copyText]="attribute.value | tbJson" [copyText]="attribute.value | tbJson"

2
ui-ngx/src/app/modules/home/models/datasource/attribute-datasource.ts
View File

@ -89,7 +89,7 @@ export class AttributeDatasource implements DataSource<AttributeData> {
pageLink: PageLink): Observable<PageData<AttributeData>> { pageLink: PageLink): Observable<PageData<AttributeData>> {
return this.getAllAttributes(entityId, attributesScope).pipe( return this.getAllAttributes(entityId, attributesScope).pipe(
map((data) => { map((data) => {
const filteredData = data.filter(attrData => attrData.lastUpdateTs !== 0 && attrData.value !== ''); const filteredData = data.filter(attrData => attrData.lastUpdateTs !== 0);
return pageLink.filterData(filteredData); return pageLink.filterData(filteredData);
}) })
); );