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

Merge pull request #5904 from YevhenBondarenko/feature/attributes-improvements

Browse Source 
[3.3.3]improved removing timeseries/attributes
This commit is contained in:
Andrew Shvayka 2022-01-17 13:38:26 +02:00 committed by GitHub
commit 80e5272d14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
View File

@ -331,7 +331,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
if (subscriptionUpdate == null) { if (subscriptionUpdate == null) {
subscriptionUpdate = new ArrayList<>(); subscriptionUpdate = new ArrayList<>();
} }
subscriptionUpdate.add(new BasicTsKvEntry(0, new StringDataEntry(key, null))); subscriptionUpdate.add(new BasicTsKvEntry(0, new StringDataEntry(key, "")));
} }
} }
return subscriptionUpdate; return subscriptionUpdate;
@ -355,7 +355,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
if (subscriptionUpdate == null) { if (subscriptionUpdate == null) {
subscriptionUpdate = new ArrayList<>(); subscriptionUpdate = new ArrayList<>();
} }
subscriptionUpdate.add(new BasicTsKvEntry(0, new StringDataEntry(key, null))); subscriptionUpdate.add(new BasicTsKvEntry(0, new StringDataEntry(key, "")));
} }
} }
return subscriptionUpdate; return subscriptionUpdate;

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 !== null); const filteredData = data.filter(attrData => attrData.lastUpdateTs !== 0 && attrData.value !== '');
return pageLink.filterData(filteredData); return pageLink.filterData(filteredData);
}) })
); );