Browse Source
Merge pull request #3885 from vvlladd28/bug/bulk-import/updated-type-device
UI: Fixed updated deviceProfile in bulk import devices
pull/3893/head
Igor Kulikov
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
1 deletions
-
ui-ngx/src/app/core/http/entity.service.ts
|
|
|
@ -869,7 +869,7 @@ export class EntityService { |
|
|
|
return findEntityObservable.pipe( |
|
|
|
mergeMap((entity) => { |
|
|
|
const tasks: Observable<any>[] = []; |
|
|
|
const result: Device | Asset = entity as (Device | Asset); |
|
|
|
const result: Device & Asset = entity as (Device | Asset); |
|
|
|
const additionalInfo = result.additionalInfo || {}; |
|
|
|
if (result.label !== entityData.label || |
|
|
|
result.type !== entityData.type || |
|
|
|
@ -882,6 +882,9 @@ export class EntityService { |
|
|
|
if (result.id.entityType === EntityType.DEVICE) { |
|
|
|
result.additionalInfo.gateway = entityData.gateway; |
|
|
|
} |
|
|
|
if (result.id.entityType === EntityType.DEVICE && result.deviceProfileId) { |
|
|
|
delete result.deviceProfileId; |
|
|
|
} |
|
|
|
switch (result.id.entityType) { |
|
|
|
case EntityType.DEVICE: |
|
|
|
tasks.push(this.deviceService.saveDevice(result, config)); |
|
|
|
|
