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

UI: Fixes deleting an attribute or telemetry whose name has special characters

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2022-11-15 11:52:54 +02:00
parent 6a75cd076f
commit 8566ca0e94
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/core/http/attribute.service.ts
View File

@ -43,7 +43,7 @@ export class AttributeService {
public deleteEntityAttributes(entityId: EntityId, attributeScope: AttributeScope, attributes: Array<AttributeData>, public deleteEntityAttributes(entityId: EntityId, attributeScope: AttributeScope, attributes: Array<AttributeData>,
config?: RequestConfig): Observable<any> { config?: RequestConfig): Observable<any> {
const keys = attributes.map(attribute => encodeURI(attribute.key)).join(','); const keys = attributes.map(attribute => encodeURIComponent(attribute.key)).join(',');
return this.http.delete(`/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/${attributeScope}` + return this.http.delete(`/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/${attributeScope}` +
`?keys=${keys}`, `?keys=${keys}`,
defaultHttpOptionsFromConfig(config)); defaultHttpOptionsFromConfig(config));
@ -51,7 +51,7 @@ export class AttributeService {
public deleteEntityTimeseries(entityId: EntityId, timeseries: Array<AttributeData>, deleteAllDataForKeys = false, public deleteEntityTimeseries(entityId: EntityId, timeseries: Array<AttributeData>, deleteAllDataForKeys = false,
startTs?: number, endTs?: number, config?: RequestConfig): Observable<any> { startTs?: number, endTs?: number, config?: RequestConfig): Observable<any> {
const keys = timeseries.map(attribute => encodeURI(attribute.key)).join(','); const keys = timeseries.map(attribute => encodeURIComponent(attribute.key)).join(',');
let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/delete` + let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/delete` +
`?keys=${keys}&deleteAllDataForKeys=${deleteAllDataForKeys}`; `?keys=${keys}&deleteAllDataForKeys=${deleteAllDataForKeys}`;
if (isDefinedAndNotNull(startTs)) { if (isDefinedAndNotNull(startTs)) {