From 805feab1cf166c06ba08cedb3f6315edb37b8d48 Mon Sep 17 00:00:00 2001
From: kalytka <ykalytka@thingsboard.io>
Date: Wed, 8 Nov 2023 15:32:44 +0200
Subject: [PATCH] Added support of custom basic settings

---
 .../app/modules/home/components/public-api.ts |  2 ++
 .../widget/widget-component.service.ts        | 22 ++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

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 34b1960365..aca4d33e39 100644
--- a/ui-ngx/src/app/modules/home/components/public-api.ts
+++ b/ui-ngx/src/app/modules/home/components/public-api.ts
@@ -15,3 +15,5 @@
 ///
 
 export * from './home-components.module';
+
+export * from './widget/config/widget-config.component.models';
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts b/ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts
index 313993167d..c29df7f243 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts
@@ -29,7 +29,13 @@ import {
 import cssjs from '@core/css/css';
 import { UtilsService } from '@core/services/utils.service';
 import { ModulesWithFactories, ResourcesService } from '@core/services/resources.service';
-import { Widget, widgetActionSources, WidgetControllerDescriptor, WidgetType } from '@shared/models/widget.models';
+import {
+  IWidgetSettingsComponent,
+  Widget,
+  widgetActionSources,
+  WidgetControllerDescriptor,
+  WidgetType
+} from '@shared/models/widget.models';
 import { catchError, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 import { isFunction, isUndefined } from '@core/utils';
 import { TranslateService } from '@ngx-translate/core';
@@ -47,6 +53,8 @@ import moment from 'moment';
 import { IModulesMap } from '@modules/common/modules-map.models';
 import { HOME_COMPONENTS_MODULE_TOKEN } from '@home/components/tokens';
 import { widgetSettingsComponentsMap } from '@home/components/widget/lib/settings/widget-settings.module';
+import { basicWidgetConfigComponentsMap } from '@home/components/widget/config/basic/basic-widget-config.module';
+import { IBasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models';
 
 @Injectable()
 export class WidgetComponentService {
@@ -397,6 +405,7 @@ export class WidgetComponentService {
 
   private registerWidgetSettingsForms(widgetInfo: WidgetInfo, factories: ComponentFactory<any>[]) {
     const directives: string[] = [];
+    const basicDirectives: string[] = [];
     if (widgetInfo.settingsDirective && widgetInfo.settingsDirective.length) {
       directives.push(widgetInfo.settingsDirective);
     }
@@ -407,12 +416,19 @@ export class WidgetComponentService {
       directives.push(widgetInfo.latestDataKeySettingsDirective);
     }
     if (widgetInfo.basicModeDirective && widgetInfo.basicModeDirective.length) {
-      directives.push(widgetInfo.basicModeDirective);
+      basicDirectives.push(widgetInfo.basicModeDirective);
     }
+
+    this.expandSettingComponentMap(widgetSettingsComponentsMap, directives, factories);
+    this.expandSettingComponentMap(basicWidgetConfigComponentsMap, basicDirectives, factories);
+  }
+
+  private expandSettingComponentMap(settingsComponentsMap: {[key: string]: Type<IWidgetSettingsComponent | IBasicWidgetConfigComponent>},
+                                    directives: string[], factories: ComponentFactory<any>[]): void {
     if (directives.length) {
       factories.filter((factory) => directives.includes(factory.selector))
         .forEach((foundFactory) => {
-          widgetSettingsComponentsMap[foundFactory.selector] = foundFactory.componentType;
+          settingsComponentsMap[foundFactory.selector] = foundFactory.componentType;
         });
     }
   }