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

Merge pull request #3885 from vvlladd28/bug/bulk-import/updated-type-device

Browse Source 
UI: Fixed updated deviceProfile in bulk import devices
This commit is contained in:
Igor Kulikov 2020-12-23 13:30:19 +02:00 committed by GitHub
commit 09ed69a568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/core/http/entity.service.ts
View File

@ -869,7 +869,7 @@ export class EntityService {
return findEntityObservable.pipe( return findEntityObservable.pipe(
mergeMap((entity) => { mergeMap((entity) => {
const tasks: Observable<any>[] = []; const tasks: Observable<any>[] = [];
const result: Device | Asset = entity as (Device | Asset); const result: Device & Asset = entity as (Device | Asset);
const additionalInfo = result.additionalInfo || {}; const additionalInfo = result.additionalInfo || {};
if (result.label !== entityData.label || if (result.label !== entityData.label ||
result.type !== entityData.type || result.type !== entityData.type ||
@ -882,6 +882,9 @@ export class EntityService {
if (result.id.entityType === EntityType.DEVICE) { if (result.id.entityType === EntityType.DEVICE) {
result.additionalInfo.gateway = entityData.gateway; result.additionalInfo.gateway = entityData.gateway;
} }
if (result.id.entityType === EntityType.DEVICE && result.deviceProfileId) {
delete result.deviceProfileId;
}
switch (result.id.entityType) { switch (result.id.entityType) {
case EntityType.DEVICE: case EntityType.DEVICE:
tasks.push(this.deviceService.saveDevice(result, config)); tasks.push(this.deviceService.saveDevice(result, config));