Commit 1e3271ce71878373a321afd7aa8a1407da0833b7
Committed by
Andrew Shvayka
1 parent
9b01f67d
UI: move firmware-autocomplete to shared module; Add service map: DeviceProfileS…
…ervice, FirmwareService
Showing
5 changed files
with
10 additions
and
6 deletions
@@ -137,7 +137,6 @@ import { EMBED_DASHBOARD_DIALOG_TOKEN } from '@home/components/widget/dialog/emb | @@ -137,7 +137,6 @@ import { EMBED_DASHBOARD_DIALOG_TOKEN } from '@home/components/widget/dialog/emb | ||
137 | import { EdgeDownlinkTableComponent } from '@home/components/edge/edge-downlink-table.component'; | 137 | import { EdgeDownlinkTableComponent } from '@home/components/edge/edge-downlink-table.component'; |
138 | import { EdgeDownlinkTableHeaderComponent } from '@home/components/edge/edge-downlink-table-header.component'; | 138 | import { EdgeDownlinkTableHeaderComponent } from '@home/components/edge/edge-downlink-table-header.component'; |
139 | import { DisplayWidgetTypesPanelComponent } from '@home/components/dashboard-page/widget-types-panel.component'; | 139 | import { DisplayWidgetTypesPanelComponent } from '@home/components/dashboard-page/widget-types-panel.component'; |
140 | -import { FirmwareAutocompleteComponent } from '@home/components/firmware/firmware-autocomplete.component'; | ||
141 | 140 | ||
142 | @NgModule({ | 141 | @NgModule({ |
143 | declarations: | 142 | declarations: |
@@ -254,8 +253,7 @@ import { FirmwareAutocompleteComponent } from '@home/components/firmware/firmwar | @@ -254,8 +253,7 @@ import { FirmwareAutocompleteComponent } from '@home/components/firmware/firmwar | ||
254 | ManageDashboardStatesDialogComponent, | 253 | ManageDashboardStatesDialogComponent, |
255 | DashboardStateDialogComponent, | 254 | DashboardStateDialogComponent, |
256 | EmbedDashboardDialogComponent, | 255 | EmbedDashboardDialogComponent, |
257 | - DisplayWidgetTypesPanelComponent, | ||
258 | - FirmwareAutocompleteComponent | 256 | + DisplayWidgetTypesPanelComponent |
259 | ], | 257 | ], |
260 | imports: [ | 258 | imports: [ |
261 | CommonModule, | 259 | CommonModule, |
@@ -361,8 +359,7 @@ import { FirmwareAutocompleteComponent } from '@home/components/firmware/firmwar | @@ -361,8 +359,7 @@ import { FirmwareAutocompleteComponent } from '@home/components/firmware/firmwar | ||
361 | ManageDashboardStatesDialogComponent, | 359 | ManageDashboardStatesDialogComponent, |
362 | DashboardStateDialogComponent, | 360 | DashboardStateDialogComponent, |
363 | EmbedDashboardDialogComponent, | 361 | EmbedDashboardDialogComponent, |
364 | - DisplayWidgetTypesPanelComponent, | ||
365 | - FirmwareAutocompleteComponent | 362 | + DisplayWidgetTypesPanelComponent |
366 | ], | 363 | ], |
367 | providers: [ | 364 | providers: [ |
368 | WidgetComponentService, | 365 | WidgetComponentService, |
@@ -34,6 +34,8 @@ import { AlarmService } from '@core/http/alarm.service'; | @@ -34,6 +34,8 @@ import { AlarmService } from '@core/http/alarm.service'; | ||
34 | import { Router } from '@angular/router'; | 34 | import { Router } from '@angular/router'; |
35 | import { BroadcastService } from '@core/services/broadcast.service'; | 35 | import { BroadcastService } from '@core/services/broadcast.service'; |
36 | import { ImportExportService } from '@home/components/import-export/import-export.service'; | 36 | import { ImportExportService } from '@home/components/import-export/import-export.service'; |
37 | +import { DeviceProfileService } from '@core/http/device-profile.service'; | ||
38 | +import { FirmwareService } from '@core/http/firmware.service'; | ||
37 | 39 | ||
38 | export const ServicesMap = new Map<string, Type<any>>( | 40 | export const ServicesMap = new Map<string, Type<any>>( |
39 | [ | 41 | [ |
@@ -55,6 +57,8 @@ export const ServicesMap = new Map<string, Type<any>>( | @@ -55,6 +57,8 @@ export const ServicesMap = new Map<string, Type<any>>( | ||
55 | ['translate', TranslateService], | 57 | ['translate', TranslateService], |
56 | ['http', HttpClient], | 58 | ['http', HttpClient], |
57 | ['router', Router], | 59 | ['router', Router], |
58 | - ['importExport', ImportExportService] | 60 | + ['importExport', ImportExportService], |
61 | + ['deviceProfileService', DeviceProfileService], | ||
62 | + ['firmwareService', FirmwareService] | ||
59 | ] | 63 | ] |
60 | ); | 64 | ); |
ui-ngx/src/app/shared/components/firmware/firmware-autocomplete.component.html
renamed from
ui-ngx/src/app/modules/home/components/firmware/firmware-autocomplete.component.html
ui-ngx/src/app/shared/components/firmware/firmware-autocomplete.component.ts
renamed from
ui-ngx/src/app/modules/home/components/firmware/firmware-autocomplete.component.ts
@@ -141,6 +141,7 @@ import { FileSizePipe } from '@shared/pipe/file-size.pipe'; | @@ -141,6 +141,7 @@ import { FileSizePipe } from '@shared/pipe/file-size.pipe'; | ||
141 | import { WidgetsBundleSearchComponent } from '@shared/components/widgets-bundle-search.component'; | 141 | import { WidgetsBundleSearchComponent } from '@shared/components/widgets-bundle-search.component'; |
142 | import { SelectableColumnsPipe } from '@shared/pipe/selectable-columns.pipe'; | 142 | import { SelectableColumnsPipe } from '@shared/pipe/selectable-columns.pipe'; |
143 | import { QuickTimeIntervalComponent } from '@shared/components/time/quick-time-interval.component'; | 143 | import { QuickTimeIntervalComponent } from '@shared/components/time/quick-time-interval.component'; |
144 | +import { FirmwareAutocompleteComponent } from '@shared/components/firmware/firmware-autocomplete.component'; | ||
144 | import { MAT_DATE_LOCALE } from '@angular/material/core'; | 145 | import { MAT_DATE_LOCALE } from '@angular/material/core'; |
145 | 146 | ||
146 | @NgModule({ | 147 | @NgModule({ |
@@ -238,6 +239,7 @@ import { MAT_DATE_LOCALE } from '@angular/material/core'; | @@ -238,6 +239,7 @@ import { MAT_DATE_LOCALE } from '@angular/material/core'; | ||
238 | HistorySelectorComponent, | 239 | HistorySelectorComponent, |
239 | EntityGatewaySelectComponent, | 240 | EntityGatewaySelectComponent, |
240 | ContactComponent, | 241 | ContactComponent, |
242 | + FirmwareAutocompleteComponent, | ||
241 | WidgetsBundleSearchComponent | 243 | WidgetsBundleSearchComponent |
242 | ], | 244 | ], |
243 | imports: [ | 245 | imports: [ |
@@ -409,6 +411,7 @@ import { MAT_DATE_LOCALE } from '@angular/material/core'; | @@ -409,6 +411,7 @@ import { MAT_DATE_LOCALE } from '@angular/material/core'; | ||
409 | HistorySelectorComponent, | 411 | HistorySelectorComponent, |
410 | EntityGatewaySelectComponent, | 412 | EntityGatewaySelectComponent, |
411 | ContactComponent, | 413 | ContactComponent, |
414 | + FirmwareAutocompleteComponent, | ||
412 | WidgetsBundleSearchComponent | 415 | WidgetsBundleSearchComponent |
413 | ] | 416 | ] |
414 | }) | 417 | }) |