From bb933a4d4e0c76d054792e20eae421ed8a65a1e0 Mon Sep 17 00:00:00 2001
From: kalytka <ykalytka@thingsboard.io>
Date: Fri, 2 Feb 2024 15:07:15 +0200
Subject: [PATCH] Changed share modules logic

---
 ui-ngx/src/app/modules/common/modules-map.ts      |  8 ++++++++
 .../home/components/home-components.module.ts     | 15 ++-------------
 .../src/app/modules/home/components/public-api.ts |  4 ++++
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ui-ngx/src/app/modules/common/modules-map.ts b/ui-ngx/src/app/modules/common/modules-map.ts
index b19a588d8b..84676b9661 100644
--- a/ui-ngx/src/app/modules/common/modules-map.ts
+++ b/ui-ngx/src/app/modules/common/modules-map.ts
@@ -248,6 +248,10 @@ import * as ImportDialogCsvComponent from '@shared/import-export/import-dialog-c
 import * as TableColumnsAssignmentComponent from '@shared/import-export/table-columns-assignment.component';
 import * as EventContentDialogComponent from '@home/components/event/event-content-dialog.component';
 import * as SharedHomeComponentsModule from '@home/components/shared-home-components.module';
+import * as WidgetConfigComponentsModule from '@home/components/widget/config/widget-config-components.module';
+import * as BasicWidgetConfigModule from '@home/components/widget/config/basic/basic-widget-config.module';
+import * as WidgetSettingsCommonModule from '@home/components/widget/lib/settings/common/widget-settings-common.module';
+import * as  WidgetComponentsModule from '@home/components/widget/widget-components.module';
 import * as SelectTargetLayoutDialogComponent from '@home/components/dashboard/select-target-layout-dialog.component';
 import * as SelectTargetStateDialogComponent from '@home/components/dashboard/select-target-state-dialog.component';
 import * as AliasesEntityAutocompleteComponent from '@home/components/alias/aliases-entity-autocomplete.component';
@@ -571,6 +575,10 @@ class ModulesMap implements IModulesMap {
     '@home/components/attribute/add-widget-to-dashboard-dialog.component': AddWidgetToDashboardDialogComponent,
     '@home/components/event/event-content-dialog.component': EventContentDialogComponent,
     '@home/components/shared-home-components.module': SharedHomeComponentsModule,
+    '@home/components/widget/config/widget-config-components.module': WidgetConfigComponentsModule,
+    '@home/components/widget/config/basic/basic-widget-config.module': BasicWidgetConfigModule,
+    '@home/components/widget/lib/settings/common/widget-settings-common.module': WidgetSettingsCommonModule,
+    '@home/components/widget/widget-components.module': WidgetComponentsModule,
     '@home/components/dashboard/select-target-layout-dialog.component': SelectTargetLayoutDialogComponent,
     '@home/components/dashboard/select-target-state-dialog.component': SelectTargetStateDialogComponent,
     '@home/components/alias/aliases-entity-autocomplete.component': AliasesEntityAutocompleteComponent,
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 5d1b2d12f0..6411485f14 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
@@ -172,10 +172,7 @@ import {
   ManageWidgetActionsDialogComponent
 } from '@home/components/widget/action/manage-widget-actions-dialog.component';
 import { WidgetConfigComponentsModule } from '@home/components/widget/config/widget-config-components.module';
-import { BasicWidgetConfigModule } from '@home/components/widget/config/basic/basic-widget-config.module';
 import { DeleteTimeseriesPanelComponent } from '@home/components/attribute/delete-timeseries-panel.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:
@@ -327,16 +324,9 @@ import { WidgetComponentsModule } from '@home/components/widget/widget-component
     SnmpDeviceProfileTransportModule,
     StatesControllerModule,
     DeviceCredentialsModule,
-    DeviceProfileCommonModule,
-    WidgetSettingsCommonModule,
-    WidgetComponentsModule,
-    BasicWidgetConfigModule
+    DeviceProfileCommonModule
   ],
   exports: [
-    WidgetComponentsModule,
-    SharedHomeComponentsModule,
-    WidgetSettingsCommonModule,
-    WidgetConfigComponentsModule,
     RouterTabsComponent,
     EntitiesTableComponent,
     AddEntityDialogComponent,
@@ -456,8 +446,7 @@ import { WidgetComponentsModule } from '@home/components/widget/widget-component
     RateLimitsComponent,
     RateLimitsTextComponent,
     RateLimitsDetailsDialogComponent,
-    SendNotificationButtonComponent,
-    BasicWidgetConfigModule
+    SendNotificationButtonComponent
   ],
   providers: [
     WidgetComponentService,
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 22748a828c..e5e1fd068d 100644
--- a/ui-ngx/src/app/modules/home/components/public-api.ts
+++ b/ui-ngx/src/app/modules/home/components/public-api.ts
@@ -15,6 +15,10 @@
 ///
 
 export * from './home-components.module';
+export * from './widget/config/basic/basic-widget-config.module';
+export * from './widget/lib/settings/common/widget-settings-common.module';
+export * from './widget/widget-components.module';
+export * from './widget/config/widget-config-components.module';
 
 export * from './widget/config/widget-config.component.models';
 export * from './widget/lib/table-widget.models';