refactor: enhance type safety and streamline modal confirmation logic

- Updated type definitions in the editor registry to incorporate UnwrapCodeEvaluators for improved type handling.
- Refactored LayerSelectorSettingsModalWrapper to use a more specific type for settings, enhancing type safety.
- Simplified modal confirmation logic in createModalApi by consolidating promise handling and reducing code duplication.

Author: czwe-01

shesha-reactjs/src/designer-components/inputComponent/wrappers/index.tsx

@@ -43,14 +43,15 @@ import { KeyInformationBarColumnsWrapper } from "./keyInformationBarColumns";
 import { SizableColumnsConfigWrapper } from "./sizableColumnsConfig";
 import { LayerSelectorSettingsModalWrapper } from "./layerSelectorSettingsModal";
 import { ThreeStateSwitchWrapper } from "./threeStateSwitch";
+import { UnwrapCodeEvaluators } from "@/index";
 
 
 type InputType = ISettingsInputProps['type'];
 
 export type EditorComponent = FC<ISettingsInputProps>;
 
 type EditorDictionary = {
-  [K in InputType]: FC<BaseInputProps & { type: K }>;
+  [K in InputType]: FC<UnwrapCodeEvaluators<BaseInputProps & { type: K }>> | FC<BaseInputProps & { type: K }>;
 };
 
 export const editorRegistry: EditorDictionary = {
@@ -80,7 +81,7 @@ export const editorRegistry: EditorDictionary = {
   columnsList: ColumnsListWrapper,
   labelValueEditor: LabelValueEditorWrapper,
   componentSelector: ComponentSelectorWrapper,
-  itemListConfiguratorModal: ItemListConfiguratorModalWrapper as any,
+  itemListConfiguratorModal: ItemListConfiguratorModalWrapper,
   dataSortingEditor: DataSortingEditorWrapper,
   queryBuilder: QueryBuilderWrapper,
   filtersList: FiltersListWrapper,
@@ -90,7 +91,7 @@ export const editorRegistry: EditorDictionary = {
   RefListItemSelectorSettingsModal: RefListItemSelectorSettingsModalWrapper,
   Password: PasswordWrapper,
   date: DateWrapper,
-  layerSelectorSettingsModal: LayerSelectorSettingsModalWrapper as any,
+  layerSelectorSettingsModal: LayerSelectorSettingsModalWrapper,
   // TODO: check usages and remove or implement wrapper
   settingsInput: undefined,
   endpointsAutocomplete: EndpointsAutocompleteWrapper,

shesha-reactjs/src/designer-components/inputComponent/wrappers/layerSelectorSettingsModal.tsx

@@ -1,7 +1,7 @@
 import LayerSelectorSettingsModal from '@/components/layerEditor/modal';
 import { ILayerSelectorSettingsInputProps } from '@/designer-components/settingsInput/interfaces';
 import React from 'react';
-import { FCUnwrapped } from '@/providers/form/models';
+import { FCUnwrapped, FormMarkup } from '@/providers/form/models';
 
 export const LayerSelectorSettingsModalWrapper: FCUnwrapped<ILayerSelectorSettingsInputProps> = (props) => {
   const { value, readOnly, onChange, settings } = props;
@@ -10,7 +10,7 @@ export const LayerSelectorSettingsModalWrapper: FCUnwrapped<ILayerSelectorSettin
       value={value}
       onChange={(e) => onChange(e)}
       readOnly={readOnly}
-      settings={settings as any}
+      settings={settings as unknown as FormMarkup}
     />
   );
 };

shesha-reactjs/src/providers/dynamicModal/modalApi.tsx

@@ -267,32 +267,21 @@ export const createModalApi = (
     confirm: (args: ConfirmModalArgs): Promise<boolean> => {
       const { title = 'Confirm', content, okText = 'Yes', cancelText = 'No', okType = 'primary' } = args;
 
-      // Use Ant Design's modal API if available, otherwise use the static Modal.confirm
-      if (modalApi) {
-        return new Promise<boolean>((resolve) => {
-          modalApi.confirm({
-            title,
-            content,
-            okText,
-            cancelText,
-            okType,
-            onOk: () => resolve(true),
-            onCancel: () => resolve(false),
-          });
-        });
-      } else {
-        return new Promise<boolean>((resolve) => {
-          AntModal.confirm({
-            title,
-            content,
-            okText,
-            cancelText,
-            okType,
-            onOk: () => resolve(true),
-            onCancel: () => resolve(false),
-          });
-        });
-      }
+      return new Promise<boolean>((resolve) => {
+        const options = {
+          title,
+          content,
+          okText,
+          cancelText,
+          okType,
+          onOk: () => resolve(true),
+          onCancel: () => resolve(false),
+        };
+
+        // Use Ant Design's modal API if available, otherwise use the static Modal.confirm
+        const confirmFn = modalApi ? modalApi.confirm : AntModal.confirm;
+        confirmFn(options);
+      });
     },
 
     warning: createAlertHandler('warning', 'Warning', modalApi),