diff --git a/ui-ngx/src/app/modules/common/modules-map.ts b/ui-ngx/src/app/modules/common/modules-map.ts index d93a84ea51..76294e6330 100644 --- a/ui-ngx/src/app/modules/common/modules-map.ts +++ b/ui-ngx/src/app/modules/common/modules-map.ts @@ -188,7 +188,13 @@ import * as MaterialIconsComponent from '@shared/components/material-icons.compo import * as TbIconComponent from '@shared/components/icon.component'; import * as HintTooltipIconComponent from '@shared/components/hint-tooltip-icon.component'; +import * as CssUnitSelectComponent from '@home/components/widget/lib/settings/common/css-unit-select.component'; +import * as WidgetActionsPanelComponent from '@home/components/widget/config/basic/common/widget-actions-panel.component'; +import * as FontSettingsComponent from '@home/components/widget/lib/settings/common/font-settings.component'; +import * as ColorSettingsComponent from '@home/components/widget/lib/settings/common/color-settings.component'; import * as AddEntityDialogComponent from '@home/components/entity/add-entity-dialog.component'; +import * as DatasourceComponent from '@home/components/widget/config/datasources.component'; +import * as DataKeysPanelComponent from '@home/components/widget/config/basic/common/data-keys-panel.component'; import * as EntitiesTableComponent from '@home/components/entity/entities-table.component'; import * as DetailsPanelComponent from '@home/components/details-panel.component'; import * as EntityDetailsPanelComponent from '@home/components/entity/entity-details-panel.component'; @@ -313,6 +319,11 @@ import * as AssetProfileAutocompleteComponent from '@home/components/profile/ass import * as RuleChainSelectComponent from '@shared/components/rule-chain/rule-chain-select.component'; import { IModulesMap } from '@modules/common/modules-map.models'; +import { DisplayColumnsPanelComponent } from '@home/components/widget/lib/display-columns-panel.component'; +import { AlarmDetailsDialogComponent } from '@home/components/alarm/alarm-details-dialog.component'; +import { AlarmAssigneePanelComponent } from '@home/components/alarm/alarm-assignee-panel.component'; +import { AlarmCommentDialogComponent } from '@home/components/alarm/alarm-comment-dialog.component'; +import { AlarmFilterConfigComponent } from '@home/components/alarm/alarm-filter-config.component'; declare const System; @@ -495,7 +506,14 @@ class ModulesMap implements IModulesMap { '@shared/components/icon.component': TbIconComponent, '@shared/components/hint-tooltip-icon.component': HintTooltipIconComponent, + '@home/components/alarm/alarm-filter-config.component': AlarmFilterConfigComponent, + '@home/components/alarm/alarm-comment-dialog.component': AlarmCommentDialogComponent, + '@home/components/alarm/alarm-assignee-panel.component': AlarmAssigneePanelComponent, + '@home/components/alarm/alarm-details-dialog.component': AlarmDetailsDialogComponent, + '@home/components/widget/lib/display-columns-panel.component': DisplayColumnsPanelComponent, '@home/components/entity/add-entity-dialog.component': AddEntityDialogComponent, + '@home/components/widget/config/datasources.component': DatasourceComponent, + '@home/components/widget/config/basic/common/data-keys-panel.component': DataKeysPanelComponent, '@home/components/entity/entities-table.component': EntitiesTableComponent, '@home/components/details-panel.component': DetailsPanelComponent, '@home/components/entity/entity-details-panel.component': EntityDetailsPanelComponent, @@ -617,7 +635,11 @@ class ModulesMap implements IModulesMap { '@home/components/dashboard-page/dashboard-image-dialog.component': DashboardImageDialogComponent, '@home/components/widget/widget-container.component': WidgetContainerComponent, '@home/components/profile/queue/tenant-profile-queues.component': TenantProfileQueuesComponent, - '@home/components/queue/queue-form.component': QueueFormComponent + '@home/components/queue/queue-form.component': QueueFormComponent, + '@home/components/widget/lib/settings/common/color-settings.component': ColorSettingsComponent, + '@home/components/widget/lib/settings/common/font-settings.component': FontSettingsComponent, + '@home/components/widget/config/basic/common/widget-actions-panel.component': WidgetActionsPanelComponent, + '@home/components/widget/lib/settings/common/css-unit-select.component': CssUnitSelectComponent }; init() { diff --git a/ui-ngx/src/app/modules/home/components/home-components.module.ts b/ui-ngx/src/app/modules/home/components/home-components.module.ts index 46e9f15275..e60dadf626 100644 --- a/ui-ngx/src/app/modules/home/components/home-components.module.ts +++ b/ui-ngx/src/app/modules/home/components/home-components.module.ts @@ -182,10 +182,13 @@ import { ExportWidgetsBundleDialogComponent } from '@home/components/import-export/export-widgets-bundle-dialog.component'; import { ScrollGridComponent } from '@home/components/grid/scroll-grid.component'; +import { WidgetSettingsCommonModule } from '@home/components/widget/lib/settings/common/widget-settings-common.module'; +import { WidgetComponentsModule } from '@home/components/widget/widget-components.module'; @NgModule({ declarations: [ + ScrollGridComponent, RouterTabsComponent, EntitiesTableComponent, AddEntityDialogComponent, @@ -326,8 +329,7 @@ import { ScrollGridComponent } from '@home/components/grid/scroll-grid.component RateLimitsComponent, RateLimitsTextComponent, RateLimitsDetailsDialogComponent, - SendNotificationButtonComponent, - ScrollGridComponent + SendNotificationButtonComponent ], imports: [ CommonModule, @@ -339,9 +341,15 @@ import { ScrollGridComponent } from '@home/components/grid/scroll-grid.component SnmpDeviceProfileTransportModule, StatesControllerModule, DeviceCredentialsModule, - DeviceProfileCommonModule + DeviceProfileCommonModule, + WidgetSettingsCommonModule, + WidgetComponentsModule ], exports: [ + WidgetComponentsModule, + SharedHomeComponentsModule, + WidgetSettingsCommonModule, + WidgetConfigComponentsModule, RouterTabsComponent, EntitiesTableComponent, AddEntityDialogComponent, diff --git a/ui-ngx/src/app/modules/home/components/public-api.ts b/ui-ngx/src/app/modules/home/components/public-api.ts index aca4d33e39..22748a828c 100644 --- a/ui-ngx/src/app/modules/home/components/public-api.ts +++ b/ui-ngx/src/app/modules/home/components/public-api.ts @@ -17,3 +17,5 @@ export * from './home-components.module'; export * from './widget/config/widget-config.component.models'; +export * from './widget/lib/table-widget.models'; +export * from './widget/lib/flot-widget.models'; diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts index 5bb6d9ea52..4b41a8ad09 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts @@ -22,14 +22,9 @@ import { WidgetConfigComponentsModule } from '@home/components/widget/config/wid import { SimpleCardBasicConfigComponent } from '@home/components/widget/config/basic/cards/simple-card-basic-config.component'; -import { - WidgetActionsPanelComponent -} from '@home/components/widget/config/basic/common/widget-actions-panel.component'; import { EntitiesTableBasicConfigComponent } from '@home/components/widget/config/basic/entity/entities-table-basic-config.component'; -import { DataKeysPanelComponent } from '@home/components/widget/config/basic/common/data-keys-panel.component'; -import { DataKeyRowComponent } from '@home/components/widget/config/basic/common/data-key-row.component'; import { TimeseriesTableBasicConfigComponent } from '@home/components/widget/config/basic/cards/timeseries-table-basic-config.component'; @@ -88,7 +83,6 @@ import { @NgModule({ declarations: [ - WidgetActionsPanelComponent, SimpleCardBasicConfigComponent, EntitiesTableBasicConfigComponent, TimeseriesTableBasicConfigComponent, @@ -98,8 +92,6 @@ import { AggregatedValueCardBasicConfigComponent, AggregatedDataKeyRowComponent, AggregatedDataKeysPanelComponent, - DataKeyRowComponent, - DataKeysPanelComponent, AlarmCountBasicConfigComponent, EntityCountBasicConfigComponent, BatteryLevelBasicConfigComponent, @@ -119,7 +111,6 @@ import { WidgetConfigComponentsModule ], exports: [ - WidgetActionsPanelComponent, SimpleCardBasicConfigComponent, EntitiesTableBasicConfigComponent, TimeseriesTableBasicConfigComponent, @@ -129,8 +120,6 @@ import { AggregatedValueCardBasicConfigComponent, AggregatedDataKeyRowComponent, AggregatedDataKeysPanelComponent, - DataKeyRowComponent, - DataKeysPanelComponent, AlarmCountBasicConfigComponent, EntityCountBasicConfigComponent, BatteryLevelBasicConfigComponent, diff --git a/ui-ngx/src/app/modules/home/components/widget/config/widget-config-components.module.ts b/ui-ngx/src/app/modules/home/components/widget/config/widget-config-components.module.ts index ea0d27dcf6..86b1a7457c 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/widget-config-components.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/config/widget-config-components.module.ts @@ -32,6 +32,9 @@ import { TimewindowConfigPanelComponent } from '@home/components/widget/config/t import { WidgetSettingsCommonModule } from '@home/components/widget/lib/settings/common/widget-settings-common.module'; import { TimewindowStyleComponent } from '@home/components/widget/config/timewindow-style.component'; import { TimewindowStylePanelComponent } from '@home/components/widget/config/timewindow-style-panel.component'; +import { DataKeysPanelComponent } from '@home/components/widget/config/basic/common/data-keys-panel.component'; +import { DataKeyRowComponent } from '@home/components/widget/config/basic/common/data-key-row.component'; +import { WidgetActionsPanelComponent } from '@home/components/widget/config/basic/common/widget-actions-panel.component'; @NgModule({ declarations: @@ -48,7 +51,10 @@ import { TimewindowStylePanelComponent } from '@home/components/widget/config/ti TimewindowStyleComponent, TimewindowStylePanelComponent, TimewindowConfigPanelComponent, - WidgetSettingsComponent + DataKeysPanelComponent, + DataKeyRowComponent, + WidgetSettingsComponent, + WidgetActionsPanelComponent ], imports: [ CommonModule, @@ -61,6 +67,8 @@ import { TimewindowStylePanelComponent } from '@home/components/widget/config/ti AlarmFilterConfigComponent, DataKeysComponent, DataKeyConfigDialogComponent, + DataKeysPanelComponent, + DataKeyRowComponent, DataKeyConfigComponent, DatasourceComponent, DatasourcesComponent, @@ -70,7 +78,8 @@ import { TimewindowStylePanelComponent } from '@home/components/widget/config/ti TimewindowStylePanelComponent, TimewindowConfigPanelComponent, WidgetSettingsComponent, - WidgetSettingsCommonModule + WidgetSettingsCommonModule, + WidgetActionsPanelComponent ] }) export class WidgetConfigComponentsModule { }