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

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

Browse Source
This commit is contained in:
Andrii Shvaika 2021-04-23 14:36:08 +03:00
commit ec78890308
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui-ngx/src/app/modules/home/components/home-components.module.ts
View File

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

6
ui-ngx/src/app/modules/home/models/services.map.ts
View File

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

0
ui-ngx/src/app/modules/home/components/firmware/firmware-autocomplete.component.html → ui-ngx/src/app/shared/components/firmware/firmware-autocomplete.component.html
View File

0
ui-ngx/src/app/modules/home/components/firmware/firmware-autocomplete.component.ts → ui-ngx/src/app/shared/components/firmware/firmware-autocomplete.component.ts
View File

3
ui-ngx/src/app/shared/shared.module.ts
View File

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