Introduce default dashboard for device profile

Igor Kulikov
1 parent 6a237b84
Showing 21 changed files with 108 additions and 12 deletions
application/src/main/data/upgrade/3.2.2/schema_update.sql
application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileInfo.java
dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceProfileEntity.java
dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceProfileRepository.java
dao/src/main/java/org/thingsboard/server/dao/sql/query/AlarmDataAdapter.java
dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
dao/src/main/resources/sql/schema-entities-hsql.sql
dao/src/main/resources/sql/schema-entities.sql
dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java
ui-ngx/src/app/modules/home/components/profile/add-device-profile-dialog.component.html
ui-ngx/src/app/modules/home/components/profile/add-device-profile-dialog.component.ts
ui-ngx/src/app/modules/home/components/profile/device-profile.component.html
ui-ngx/src/app/modules/home/components/profile/device-profile.component.ts
ui-ngx/src/app/shared/components/dashboard-autocomplete.component.ts
ui-ngx/src/app/shared/models/device.models.ts
--- a/application/src/main/data/upgrade/3.2.2/schema_update.sql
View file @5cc3a93
+++ b/application/src/main/data/upgrade/3.2.2/schema_update.sql
View file @5cc3a93
@@ -84,7 +84,8 @@ ALTER TABLE dashboard
 ALTER TABLE device_profile
     ADD COLUMN IF NOT EXISTS image varchar(1000000),
     ADD COLUMN IF NOT EXISTS firmware_id uuid,
-    ADD COLUMN IF NOT EXISTS software_id uuid;
+    ADD COLUMN IF NOT EXISTS software_id uuid,
+    ADD COLUMN IF NOT EXISTS default_dashboard_id uuid;
 ALTER TABLE device
     ADD COLUMN IF NOT EXISTS firmware_id uuid,
@@ -109,6 +110,12 @@ DO $$
                     FOREIGN KEY (firmware_id) REFERENCES firmware(id);
         END IF;
+        IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_default_dashboard_device_profile') THEN
+            ALTER TABLE device_profile
+                ADD CONSTRAINT fk_default_dashboard_device_profile
+                    FOREIGN KEY (default_dashboard_id) REFERENCES dashboard(id);
+        END IF;
+
         IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_firmware_device') THEN
             ALTER TABLE device
                 ADD CONSTRAINT fk_firmware_device
--- a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
View file @5cc3a93
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
View file @5cc3a93
@@ -313,7 +313,8 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
         Collections.sort(loadedDeviceProfileInfos, deviceProfileInfoIdComparator);
         List<DeviceProfileInfo> deviceProfileInfos = deviceProfiles.stream().map(deviceProfile -> new DeviceProfileInfo(deviceProfile.getId(),
-                deviceProfile.getName(), deviceProfile.getImage(), deviceProfile.getType(), deviceProfile.getTransportType())).collect(Collectors.toList());
+                deviceProfile.getName(), deviceProfile.getImage(), deviceProfile.getDefaultDashboardId(),
+                deviceProfile.getType(), deviceProfile.getTransportType())).collect(Collectors.toList());
         Assert.assertEquals(deviceProfileInfos, loadedDeviceProfileInfos);
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
View file @5cc3a93
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
View file @5cc3a93
@@ -21,6 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
+import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.FirmwareId;
 import org.thingsboard.server.common.data.id.RuleChainId;
@@ -49,6 +50,7 @@ public class DeviceProfile extends SearchTextBased<DeviceProfileId> implements H
     private DeviceTransportType transportType;
     private DeviceProfileProvisionType provisionType;
     private RuleChainId defaultRuleChainId;
+    private DashboardId defaultDashboardId;
     @NoXss
     private String defaultQueueName;
     @Valid
@@ -78,6 +80,7 @@ public class DeviceProfile extends SearchTextBased<DeviceProfileId> implements H
         this.image = deviceProfile.getImage();
         this.isDefault = deviceProfile.isDefault();
         this.defaultRuleChainId = deviceProfile.getDefaultRuleChainId();
+        this.defaultDashboardId = deviceProfile.getDefaultDashboardId();
         this.defaultQueueName = deviceProfile.getDefaultQueueName();
         this.setProfileData(deviceProfile.getProfileData());
         this.provisionDeviceKey = deviceProfile.getProvisionDeviceKey();
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileInfo.java
View file @5cc3a93
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileInfo.java
View file @5cc3a93
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.Value;
+import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
@@ -31,6 +32,7 @@ import java.util.UUID;
 public class DeviceProfileInfo extends EntityInfo {
     private final String image;
+    private final DashboardId defaultDashboardId;
     private final DeviceProfileType type;
     private final DeviceTransportType transportType;
@@ -38,17 +40,20 @@ public class DeviceProfileInfo extends EntityInfo {
     public DeviceProfileInfo(@JsonProperty("id") EntityId id,
                              @JsonProperty("name") String name,
                              @JsonProperty("image") String image,
+                             @JsonProperty("defaultDashboardId") DashboardId defaultDashboardId,
                              @JsonProperty("type") DeviceProfileType type,
                              @JsonProperty("transportType") DeviceTransportType transportType) {
         super(id, name);
         this.image = image;
+        this.defaultDashboardId = defaultDashboardId;
         this.type = type;
         this.transportType = transportType;
     }
-    public DeviceProfileInfo(UUID uuid, String name, String image, DeviceProfileType type, DeviceTransportType transportType) {
+    public DeviceProfileInfo(UUID uuid, String name, String image, UUID defaultDashboardId, DeviceProfileType type, DeviceTransportType transportType) {
         super(EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE_PROFILE, uuid), name);
         this.image = image;
+        this.defaultDashboardId = defaultDashboardId != null ? new DashboardId(defaultDashboardId) : null;
         this.type = type;
         this.transportType = transportType;
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
View file @5cc3a93
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
View file @5cc3a93
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.dashboard;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -166,7 +167,16 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
         log.trace("Executing deleteDashboard [{}]", dashboardId);
         Validator.validateId(dashboardId, INCORRECT_DASHBOARD_ID + dashboardId);
         deleteEntityRelations(tenantId, dashboardId);
-        dashboardDao.removeById(tenantId, dashboardId.getId());
+        try {
+            dashboardDao.removeById(tenantId, dashboardId.getId());
+        } catch (Exception t) {
+            ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
+            if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("fk_default_dashboard_device_profile")) {
+                throw new DataValidationException("The dashboard referenced by the device profiles cannot be deleted!");
+            } else {
+                throw t;
+            }
+        }
     }
     @Override
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
View file @5cc3a93
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
View file @5cc3a93
@@ -36,6 +36,7 @@ import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.thingsboard.server.common.data.DashboardInfo;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileInfo;
@@ -61,9 +62,12 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.firmware.FirmwareService;
+import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
 import org.thingsboard.server.dao.service.Validator;
@@ -117,6 +121,12 @@ public class DeviceProfileServiceImpl extends AbstractEntityService implements D
     @Autowired
     private FirmwareService firmwareService;
+    @Autowired
+    private RuleChainService ruleChainService;
+
+    @Autowired
+    private DashboardService dashboardService;
+
     private final Lock findOrCreateLock = new ReentrantLock();
     @Cacheable(cacheNames = DEVICE_PROFILE_CACHE, key = "{#deviceProfileId.id}")
@@ -336,7 +346,7 @@ public class DeviceProfileServiceImpl extends AbstractEntityService implements D
     }
     private DataValidator<DeviceProfile> deviceProfileValidator =
-            new DataValidator<DeviceProfile>() {
+            new DataValidator<>() {
                 @Override
                 protected void validateDataImpl(TenantId tenantId, DeviceProfile deviceProfile) {
                     if (StringUtils.isEmpty(deviceProfile.getName())) {
@@ -402,6 +412,20 @@ public class DeviceProfileServiceImpl extends AbstractEntityService implements D
                         }
                     }
+                    if (deviceProfile.getDefaultRuleChainId() != null) {
+                        RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, deviceProfile.getDefaultRuleChainId());
+                        if (ruleChain == null) {
+                            throw new DataValidationException("Can't assign non-existent rule chain!");
+                        }
+                    }
+
+                    if (deviceProfile.getDefaultDashboardId() != null) {
+                        DashboardInfo dashboard = dashboardService.findDashboardInfoById(tenantId, deviceProfile.getDefaultDashboardId());
+                        if (dashboard == null) {
+                            throw new DataValidationException("Can't assign non-existent dashboard!");
+                        }
+                    }
+
                     if (deviceProfile.getFirmwareId() != null) {
                         Firmware firmware = firmwareService.findFirmwareById(tenantId, deviceProfile.getFirmwareId());
                         if (firmware == null) {
--- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
View file @5cc3a93
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
View file @5cc3a93
@@ -177,6 +177,7 @@ public class ModelConstants {
     public static final String DEVICE_PROFILE_DESCRIPTION_PROPERTY = "description";
     public static final String DEVICE_PROFILE_IS_DEFAULT_PROPERTY = "is_default";
     public static final String DEVICE_PROFILE_DEFAULT_RULE_CHAIN_ID_PROPERTY = "default_rule_chain_id";
+    public static final String DEVICE_PROFILE_DEFAULT_DASHBOARD_ID_PROPERTY = "default_dashboard_id";
     public static final String DEVICE_PROFILE_DEFAULT_QUEUE_NAME_PROPERTY = "default_queue_name";
     public static final String DEVICE_PROFILE_PROVISION_DEVICE_KEY = "provision_device_key";
     public static final String DEVICE_PROFILE_FIRMWARE_ID_PROPERTY = "firmware_id";
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceProfileEntity.java
View file @5cc3a93
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceProfileEntity.java
View file @5cc3a93
@@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.DeviceProfileType;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
+import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.FirmwareId;
 import org.thingsboard.server.common.data.id.RuleChainId;
@@ -83,6 +84,9 @@ public final class DeviceProfileEntity extends BaseSqlEntity<DeviceProfile> impl
     @Column(name = ModelConstants.DEVICE_PROFILE_DEFAULT_RULE_CHAIN_ID_PROPERTY, columnDefinition = "uuid")
     private UUID defaultRuleChainId;
+    @Column(name = ModelConstants.DEVICE_PROFILE_DEFAULT_DASHBOARD_ID_PROPERTY)
+    private UUID defaultDashboardId;
+
     @Column(name = ModelConstants.DEVICE_PROFILE_DEFAULT_QUEUE_NAME_PROPERTY)
     private String defaultQueueName;
@@ -122,6 +126,9 @@ public final class DeviceProfileEntity extends BaseSqlEntity<DeviceProfile> impl
         if (deviceProfile.getDefaultRuleChainId() != null) {
             this.defaultRuleChainId = deviceProfile.getDefaultRuleChainId().getId();
         }
+        if (deviceProfile.getDefaultDashboardId() != null) {
+            this.defaultDashboardId = deviceProfile.getDefaultDashboardId().getId();
+        }
         this.defaultQueueName = deviceProfile.getDefaultQueueName();
         this.provisionDeviceKey = deviceProfile.getProvisionDeviceKey();
         if (deviceProfile.getFirmwareId() != null) {
@@ -164,6 +171,9 @@ public final class DeviceProfileEntity extends BaseSqlEntity<DeviceProfile> impl
         if (defaultRuleChainId != null) {
             deviceProfile.setDefaultRuleChainId(new RuleChainId(defaultRuleChainId));
         }
+        if (defaultDashboardId != null) {
+            deviceProfile.setDefaultDashboardId(new DashboardId(defaultDashboardId));
+        }
         deviceProfile.setDefaultQueueName(defaultQueueName);
         deviceProfile.setProvisionDeviceKey(provisionDeviceKey);
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceProfileRepository.java
View file @5cc3a93
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceProfileRepository.java
View file @5cc3a93
@@ -28,7 +28,7 @@ import java.util.UUID;
 public interface DeviceProfileRepository extends PagingAndSortingRepository<DeviceProfileEntity, UUID> {
-    @Query("SELECT new org.thingsboard.server.common.data.DeviceProfileInfo(d.id, d.name, d.image, d.type, d.transportType) " +
+    @Query("SELECT new org.thingsboard.server.common.data.DeviceProfileInfo(d.id, d.name, d.image, d.defaultDashboardId, d.type, d.transportType) " +
             "FROM DeviceProfileEntity d " +
             "WHERE d.id = :deviceProfileId")
     DeviceProfileInfo findDeviceProfileInfoById(@Param("deviceProfileId") UUID deviceProfileId);
@@ -39,14 +39,14 @@ public interface DeviceProfileRepository extends PagingAndSortingRepository<Devi
                                                  @Param("textSearch") String textSearch,
                                                  Pageable pageable);
-    @Query("SELECT new org.thingsboard.server.common.data.DeviceProfileInfo(d.id, d.name, d.image, d.type, d.transportType) " +
+    @Query("SELECT new org.thingsboard.server.common.data.DeviceProfileInfo(d.id, d.name, d.image, d.defaultDashboardId, d.type, d.transportType) " +
             "FROM DeviceProfileEntity d WHERE " +
             "d.tenantId = :tenantId AND LOWER(d.searchText) LIKE LOWER(CONCAT(:textSearch, '%'))")
     Page<DeviceProfileInfo> findDeviceProfileInfos(@Param("tenantId") UUID tenantId,
                                                    @Param("textSearch") String textSearch,
                                                    Pageable pageable);
-    @Query("SELECT new org.thingsboard.server.common.data.DeviceProfileInfo(d.id, d.name, d.image, d.type, d.transportType) " +
+    @Query("SELECT new org.thingsboard.server.common.data.DeviceProfileInfo(d.id, d.name, d.image, d.defaultDashboardId, d.type, d.transportType) " +
             "FROM DeviceProfileEntity d WHERE " +
             "d.tenantId = :tenantId AND d.transportType = :transportType AND LOWER(d.searchText) LIKE LOWER(CONCAT(:textSearch, '%'))")
     Page<DeviceProfileInfo> findDeviceProfileInfos(@Param("tenantId") UUID tenantId,
@@ -58,7 +58,7 @@ public interface DeviceProfileRepository extends PagingAndSortingRepository<Devi
             "WHERE d.tenantId = :tenantId AND d.isDefault = true")
     DeviceProfileEntity findByDefaultTrueAndTenantId(@Param("tenantId") UUID tenantId);
-    @Query("SELECT new org.thingsboard.server.common.data.DeviceProfileInfo(d.id, d.name, d.image, d.type, d.transportType) " +
+    @Query("SELECT new org.thingsboard.server.common.data.DeviceProfileInfo(d.id, d.name, d.image, d.defaultDashboardId, d.type, d.transportType) " +
             "FROM DeviceProfileEntity d " +
             "WHERE d.tenantId = :tenantId AND d.isDefault = true")
     DeviceProfileInfo findDefaultDeviceProfileInfo(@Param("tenantId") UUID tenantId);
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/AlarmDataAdapter.java
View file @5cc3a93
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/AlarmDataAdapter.java
View file @5cc3a93
@@ -87,7 +87,9 @@ public class AlarmDataAdapter {
         alarm.setSeverity(AlarmSeverity.valueOf(row.get(ModelConstants.ALARM_SEVERITY_PROPERTY).toString()));
         alarm.setStatus(AlarmStatus.valueOf(row.get(ModelConstants.ALARM_STATUS_PROPERTY).toString()));
         alarm.setTenantId(new TenantId((UUID) row.get(ModelConstants.TENANT_ID_PROPERTY)));
-        alarm.setCustomerId(new CustomerId((UUID) row.get(ModelConstants.CUSTOMER_ID_PROPERTY)));
+        Object customerIdObj = row.get(ModelConstants.CUSTOMER_ID_PROPERTY);
+        CustomerId customerId = customerIdObj != null ? new CustomerId((UUID) customerIdObj) : null;
+        alarm.setCustomerId(customerId);
         if (row.get(ModelConstants.ALARM_PROPAGATE_RELATION_TYPES) != null) {
             String propagateRelationTypes = row.get(ModelConstants.ALARM_PROPAGATE_RELATION_TYPES).toString();
             if (!StringUtils.isEmpty(propagateRelationTypes)) {
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
View file @5cc3a93
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
View file @5cc3a93
@@ -140,11 +140,11 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
         Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
         customerService.deleteCustomersByTenantId(tenantId);
         widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId);
-        dashboardService.deleteDashboardsByTenantId(tenantId);
         entityViewService.deleteEntityViewsByTenantId(tenantId);
         assetService.deleteAssetsByTenantId(tenantId);
         deviceService.deleteDevicesByTenantId(tenantId);
         deviceProfileService.deleteDeviceProfilesByTenantId(tenantId);
+        dashboardService.deleteDashboardsByTenantId(tenantId);
         edgeService.deleteEdgesByTenantId(tenantId);
         userService.deleteTenantAdmins(tenantId);
         ruleChainService.deleteRuleChainsByTenantId(tenantId);
--- a/dao/src/main/resources/sql/schema-entities-hsql.sql
View file @5cc3a93
+++ b/dao/src/main/resources/sql/schema-entities-hsql.sql
View file @5cc3a93
@@ -195,11 +195,13 @@ CREATE TABLE IF NOT EXISTS device_profile (
     firmware_id uuid,
     software_id uuid,
     default_rule_chain_id uuid,
+    default_dashboard_id uuid,
     default_queue_name varchar(255),
     provision_device_key varchar,
     CONSTRAINT device_profile_name_unq_key UNIQUE (tenant_id, name),
     CONSTRAINT device_provision_key_unq_key UNIQUE (provision_device_key),
     CONSTRAINT fk_default_rule_chain_device_profile FOREIGN KEY (default_rule_chain_id) REFERENCES rule_chain(id),
+    CONSTRAINT fk_default_dashboard_device_profile FOREIGN KEY (default_dashboard_id) REFERENCES dashboard(id),
     CONSTRAINT fk_firmware_device_profile FOREIGN KEY (firmware_id) REFERENCES firmware(id),
     CONSTRAINT fk_software_device_profile FOREIGN KEY (software_id) REFERENCES firmware(id)
 );
--- a/dao/src/main/resources/sql/schema-entities.sql
View file @5cc3a93
+++ b/dao/src/main/resources/sql/schema-entities.sql
View file @5cc3a93
@@ -214,11 +214,13 @@ CREATE TABLE IF NOT EXISTS device_profile (
     firmware_id uuid,
     software_id uuid,
     default_rule_chain_id uuid,
+    default_dashboard_id uuid,
     default_queue_name varchar(255),
     provision_device_key varchar,
     CONSTRAINT device_profile_name_unq_key UNIQUE (tenant_id, name),
     CONSTRAINT device_provision_key_unq_key UNIQUE (provision_device_key),
     CONSTRAINT fk_default_rule_chain_device_profile FOREIGN KEY (default_rule_chain_id) REFERENCES rule_chain(id),
+    CONSTRAINT fk_default_dashboard_device_profile FOREIGN KEY (default_dashboard_id) REFERENCES dashboard(id),
     CONSTRAINT fk_firmware_device_profile FOREIGN KEY (firmware_id) REFERENCES firmware(id),
     CONSTRAINT fk_software_device_profile FOREIGN KEY (software_id) REFERENCES firmware(id)
 );
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java
View file @5cc3a93
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java
View file @5cc3a93
@@ -333,7 +333,8 @@ public class BaseDeviceProfileServiceTest extends AbstractServiceTest {
         List<DeviceProfileInfo> deviceProfileInfos = deviceProfiles.stream()
                 .map(deviceProfile -> new DeviceProfileInfo(deviceProfile.getId(),
-                        deviceProfile.getName(), deviceProfile.getImage(), deviceProfile.getType(), deviceProfile.getTransportType())).collect(Collectors.toList());
+                        deviceProfile.getName(), deviceProfile.getImage(), deviceProfile.getDefaultDashboardId(),
+                        deviceProfile.getType(), deviceProfile.getTransportType())).collect(Collectors.toList());
         Assert.assertEquals(deviceProfileInfos, loadedDeviceProfileInfos);
--- a/ui-ngx/src/app/modules/home/components/profile/add-device-profile-dialog.component.html
View file @5cc3a93
+++ b/ui-ngx/src/app/modules/home/components/profile/add-device-profile-dialog.component.html
View file @5cc3a93
@@ -45,6 +45,10 @@
               labelText="device-profile.default-rule-chain"
               formControlName="defaultRuleChainId">
             </tb-rule-chain-autocomplete>
+            <tb-dashboard-autocomplete
+              placeholder="{{'device-profile.default-dashboard' | translate}}"
+              formControlName="defaultDashboardId">
+            </tb-dashboard-autocomplete>
             <tb-queue-type-list
               [queueType]="serviceType"
               formControlName="defaultQueueName">
--- a/ui-ngx/src/app/modules/home/components/profile/add-device-profile-dialog.component.ts
View file @5cc3a93
+++ b/ui-ngx/src/app/modules/home/components/profile/add-device-profile-dialog.component.ts
View file @5cc3a93
@@ -49,6 +49,7 @@ import { RuleChainId } from '@shared/models/id/rule-chain-id';
 import { StepperSelectionEvent } from '@angular/cdk/stepper';
 import { deepTrim } from '@core/utils';
 import { ServiceType } from '@shared/models/queue.models';
+import { DashboardId } from '@shared/models/id/dashboard-id';
 export interface AddDeviceProfileDialogData {
   deviceProfileName: string;
@@ -108,6 +109,7 @@ export class AddDeviceProfileDialogComponent extends
         type: [DeviceProfileType.DEFAULT, [Validators.required]],
         image: [null, []],
         defaultRuleChainId: [null, []],
+        defaultDashboardId: [null, []],
         defaultQueueName: ['', []],
         description: ['', []]
       }
@@ -199,6 +201,9 @@ export class AddDeviceProfileDialogComponent extends
       if (this.deviceProfileDetailsFormGroup.get('defaultRuleChainId').value) {
         deviceProfile.defaultRuleChainId = new RuleChainId(this.deviceProfileDetailsFormGroup.get('defaultRuleChainId').value);
       }
+      if (this.deviceProfileDetailsFormGroup.get('defaultDashboardId').value) {
+        deviceProfile.defaultDashboardId = new DashboardId(this.deviceProfileDetailsFormGroup.get('defaultDashboardId').value);
+      }
       this.deviceProfileService.saveDeviceProfile(deepTrim(deviceProfile)).subscribe(
         (savedDeviceProfile) => {
           this.dialogRef.close(savedDeviceProfile);
--- a/ui-ngx/src/app/modules/home/components/profile/device-profile.component.html
View file @5cc3a93
+++ b/ui-ngx/src/app/modules/home/components/profile/device-profile.component.html
View file @5cc3a93
@@ -59,6 +59,10 @@
         labelText="device-profile.default-rule-chain"
         formControlName="defaultRuleChainId">
       </tb-rule-chain-autocomplete>
+      <tb-dashboard-autocomplete
+        placeholder="{{'device-profile.default-dashboard' | translate}}"
+        formControlName="defaultDashboardId">
+      </tb-dashboard-autocomplete>
       <tb-queue-type-list
         [queueType]="serviceType"
         formControlName="defaultQueueName">
--- a/ui-ngx/src/app/modules/home/components/profile/device-profile.component.ts
View file @5cc3a93
+++ b/ui-ngx/src/app/modules/home/components/profile/device-profile.component.ts
View file @5cc3a93
@@ -41,6 +41,7 @@ import { RuleChainId } from '@shared/models/id/rule-chain-id';
 import { ServiceType } from '@shared/models/queue.models';
 import { EntityId } from '@shared/models/id/entity-id';
 import { FirmwareType } from '@shared/models/firmware.models';
+import { DashboardId } from '@shared/models/id/dashboard-id';
 @Component({
   selector: 'tb-device-profile',
@@ -112,6 +113,7 @@ export class DeviceProfileComponent extends EntityComponent<DeviceProfile> {
           provisionConfiguration: [deviceProvisionConfiguration, Validators.required]
         }),
         defaultRuleChainId: [entity && entity.defaultRuleChainId ? entity.defaultRuleChainId.id : null, []],
+        defaultDashboardId: [entity && entity.defaultDashboardId ? entity.defaultDashboardId.id : null, []],
         defaultQueueName: [entity ? entity.defaultQueueName : '', []],
         firmwareId: [entity ? entity.firmwareId : null],
         softwareId: [entity ? entity.softwareId : null],
@@ -190,6 +192,7 @@ export class DeviceProfileComponent extends EntityComponent<DeviceProfile> {
       provisionConfiguration: deviceProvisionConfiguration
     }}, {emitEvent: false});
     this.entityForm.patchValue({defaultRuleChainId: entity.defaultRuleChainId ? entity.defaultRuleChainId.id : null}, {emitEvent: false});
+    this.entityForm.patchValue({defaultDashboardId: entity.defaultDashboardId ? entity.defaultDashboardId.id : null}, {emitEvent: false});
     this.entityForm.patchValue({defaultQueueName: entity.defaultQueueName}, {emitEvent: false});
     this.entityForm.patchValue({firmwareId: entity.firmwareId}, {emitEvent: false});
     this.entityForm.patchValue({softwareId: entity.softwareId}, {emitEvent: false});
@@ -200,6 +203,9 @@ export class DeviceProfileComponent extends EntityComponent<DeviceProfile> {
     if (formValue.defaultRuleChainId) {
       formValue.defaultRuleChainId = new RuleChainId(formValue.defaultRuleChainId);
     }
+    if (formValue.defaultDashboardId) {
+      formValue.defaultDashboardId = new DashboardId(formValue.defaultDashboardId);
+    }
     const deviceProvisionConfiguration: DeviceProvisionConfiguration = formValue.profileData.provisionConfiguration;
     formValue.provisionType = deviceProvisionConfiguration.type;
     formValue.provisionDeviceKey = deviceProvisionConfiguration.provisionDeviceKey;
--- a/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.ts
View file @5cc3a93
+++ b/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.ts
View file @5cc3a93
@@ -139,6 +139,11 @@ export class DashboardAutocompleteComponent implements ControlValueAccessor, OnI
   setDisabledState(isDisabled: boolean): void {
     this.disabled = isDisabled;
+    if (this.disabled) {
+      this.selectDashboardFormGroup.disable({emitEvent: false});
+    } else {
+      this.selectDashboardFormGroup.enable({emitEvent: false});
+    }
   }
   writeValue(value: DashboardInfo | string | null): void {
--- a/ui-ngx/src/app/shared/models/device.models.ts
View file @5cc3a93
+++ b/ui-ngx/src/app/shared/models/device.models.ts
View file @5cc3a93
@@ -28,6 +28,7 @@ import { TimeUnit } from '@shared/models/time/time.models';
 import * as _moment from 'moment';
 import { AbstractControl, ValidationErrors } from '@angular/forms';
 import { FirmwareId } from '@shared/models/id/firmware-id';
+import { DashboardId } from '@shared/models/id/dashboard-id';
 export enum DeviceProfileType {
   DEFAULT = 'DEFAULT',
@@ -497,6 +498,7 @@ export interface DeviceProfile extends BaseData<DeviceProfileId> {
   provisionType: DeviceProvisionType;
   provisionDeviceKey?: string;
   defaultRuleChainId?: RuleChainId;
+  defaultDashboardId?: DashboardId;
   defaultQueueName?: string;
   firmwareId?: FirmwareId;
   softwareId?: FirmwareId;
@@ -507,6 +509,7 @@ export interface DeviceProfileInfo extends EntityInfoData {
   type: DeviceProfileType;
   transportType: DeviceTransportType;
   image?: string;
+  defaultDashboardId?: DashboardId;
 }
 export interface DefaultDeviceConfiguration {
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
View file @5cc3a93
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
View file @5cc3a93
@@ -1048,6 +1048,7 @@
         "profile-configuration": "Profile configuration",
         "transport-configuration": "Transport configuration",
         "default-rule-chain": "Default rule chain",
+        "default-dashboard": "Default dashboard",
         "select-queue-hint": "Select from a drop-down list or add a custom name.",
         "delete-device-profile-title": "Are you sure you want to delete the device profile '{{deviceProfileName}}'?",
         "delete-device-profile-text": "Be careful, after the confirmation the device profile and all related data will become unrecoverable.",