Merge branch 'feature/firmware' of github.com:thingsboard/thingsboard into feature/firmware

@@ -137,7 +137,6 @@ import { EMBED_DASHBOARD_DIALOG_TOKEN } from '@home/components/widget/dialog/emb
 import { EdgeDownlinkTableComponent } from '@home/components/edge/edge-downlink-table.component';
 import { EdgeDownlinkTableComponent } from '@home/components/edge/edge-downlink-table.component';
 import { EdgeDownlinkTableHeaderComponent } from '@home/components/edge/edge-downlink-table-header.component';
 import { EdgeDownlinkTableHeaderComponent } from '@home/components/edge/edge-downlink-table-header.component';
 import { DisplayWidgetTypesPanelComponent } from '@home/components/dashboard-page/widget-types-panel.component';
 import { DisplayWidgetTypesPanelComponent } from '@home/components/dashboard-page/widget-types-panel.component';
-import { FirmwareAutocompleteComponent } from '@home/components/firmware/firmware-autocomplete.component';
 
 
 @NgModule({
 @NgModule({
   declarations:
   declarations:
@@ -254,8 +253,7 @@ import { FirmwareAutocompleteComponent } from '@home/components/firmware/firmwar
       ManageDashboardStatesDialogComponent,
       ManageDashboardStatesDialogComponent,
       DashboardStateDialogComponent,
       DashboardStateDialogComponent,
       EmbedDashboardDialogComponent,
       EmbedDashboardDialogComponent,
-      DisplayWidgetTypesPanelComponent,
-      FirmwareAutocompleteComponent
+      DisplayWidgetTypesPanelComponent
     ],
     ],
   imports: [
   imports: [
     CommonModule,
     CommonModule,
@@ -361,8 +359,7 @@ import { FirmwareAutocompleteComponent } from '@home/components/firmware/firmwar
     ManageDashboardStatesDialogComponent,
     ManageDashboardStatesDialogComponent,
     DashboardStateDialogComponent,
     DashboardStateDialogComponent,
     EmbedDashboardDialogComponent,
     EmbedDashboardDialogComponent,
-    DisplayWidgetTypesPanelComponent,
-    FirmwareAutocompleteComponent
+    DisplayWidgetTypesPanelComponent
   ],
   ],
   providers: [
   providers: [
     WidgetComponentService,
     WidgetComponentService,

@@ -34,6 +34,8 @@ import { AlarmService } from '@core/http/alarm.service';
 import { Router } from '@angular/router';
 import { Router } from '@angular/router';
 import { BroadcastService } from '@core/services/broadcast.service';
 import { BroadcastService } from '@core/services/broadcast.service';
 import { ImportExportService } from '@home/components/import-export/import-export.service';
 import { ImportExportService } from '@home/components/import-export/import-export.service';
+import { DeviceProfileService } from '@core/http/device-profile.service';
+import { FirmwareService } from '@core/http/firmware.service';
 
 
 export const ServicesMap = new Map<string, Type<any>>(
 export const ServicesMap = new Map<string, Type<any>>(
   [
   [
@@ -55,6 +57,8 @@ export const ServicesMap = new Map<string, Type<any>>(
    ['translate', TranslateService],
    ['translate', TranslateService],
    ['http', HttpClient],
    ['http', HttpClient],
    ['router', Router],
    ['router', Router],
-   ['importExport', ImportExportService]
+   ['importExport', ImportExportService],
+   ['deviceProfileService', DeviceProfileService],
+   ['firmwareService', FirmwareService]
   ]
   ]
 );
 );

@@ -141,6 +141,7 @@ import { FileSizePipe } from '@shared/pipe/file-size.pipe';
 import { WidgetsBundleSearchComponent } from '@shared/components/widgets-bundle-search.component';
 import { WidgetsBundleSearchComponent } from '@shared/components/widgets-bundle-search.component';
 import { SelectableColumnsPipe } from '@shared/pipe/selectable-columns.pipe';
 import { SelectableColumnsPipe } from '@shared/pipe/selectable-columns.pipe';
 import { QuickTimeIntervalComponent } from '@shared/components/time/quick-time-interval.component';
 import { QuickTimeIntervalComponent } from '@shared/components/time/quick-time-interval.component';
+import { FirmwareAutocompleteComponent } from '@shared/components/firmware/firmware-autocomplete.component';
 import { MAT_DATE_LOCALE } from '@angular/material/core';
 import { MAT_DATE_LOCALE } from '@angular/material/core';
 
 
 @NgModule({
 @NgModule({
@@ -238,6 +239,7 @@ import { MAT_DATE_LOCALE } from '@angular/material/core';
     HistorySelectorComponent,
     HistorySelectorComponent,
     EntityGatewaySelectComponent,
     EntityGatewaySelectComponent,
     ContactComponent,
     ContactComponent,
+    FirmwareAutocompleteComponent,
     WidgetsBundleSearchComponent
     WidgetsBundleSearchComponent
   ],
   ],
   imports: [
   imports: [
@@ -409,6 +411,7 @@ import { MAT_DATE_LOCALE } from '@angular/material/core';
     HistorySelectorComponent,
     HistorySelectorComponent,
     EntityGatewaySelectComponent,
     EntityGatewaySelectComponent,
     ContactComponent,
     ContactComponent,
+    FirmwareAutocompleteComponent,
     WidgetsBundleSearchComponent
     WidgetsBundleSearchComponent
   ]
   ]
 })
 })