@asaleh37/ui-base 25.9.5-3 → 25.9.5-5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.9.5-3",
+  "version": "25.9.5-5",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",

package/src/components/templates/DataEntryTemplates/DataEntryTypes.ts

@@ -202,6 +202,10 @@ export type RecordFieldProps = {
     | "custom";
   lookupType?: string;
   comboboxValueDataType?: "number" | "string";
+  commonStoreKey?: string;
+  dataQueryId?: number;
+  storeUrl?: string;
+  storeLoadParam?: any;
   required?: boolean;
   disabled?: boolean;
   hidden?: boolean;
@@ -252,7 +256,6 @@ export type FormElementFieldProps = {
   hiddenFields?: string[];
   disabledFields?: string[];
   formValuesChangeCallBk?: FormValueChangeCallBk;
-  
 };
 
 export type FormElementNodeProps = {

package/src/components/templates/DataEntryTemplates/TemplateDataForm/FormElementField.tsx

@@ -30,7 +30,7 @@ const FormElementField: React.FC<FormElementFieldProps> = (
         return element?.fieldInfo?.fieldLabel;
       }
     };
-    return (
+    return !element.hiddenFields.includes(fieldName) ? (
       <Grid2
         size={
           props?.formProps?.fieldSize || {
@@ -165,6 +165,10 @@ const FormElementField: React.FC<FormElementFieldProps> = (
           <ComboBox
             sx={props?.formProps?.style || { width: "100%" }}
             label={getFieldLabel()}
+            commonStoreKey={props?.commonStoreKey}
+            dataQueryId={props?.dataQueryId}
+            storeUrl={props?.storeUrl}
+            storeLoadParam={props?.storeLoadParam}
             disabled={element.disabledFields.includes(fieldName)}
             hidden={element.hiddenFields.includes(fieldName)}
             onChangeCallBack={(v: any, selectedRecord: any) => {
@@ -223,6 +227,8 @@ const FormElementField: React.FC<FormElementFieldProps> = (
           />
         ) : null}
       </Grid2>
+    ) : (
+      <></>
     );
   } else {
     return <></>;

package/src/components/templates/DataEntryTemplates/TemplateDataForm/FormFields/ComboBox.tsx

@@ -1,6 +1,8 @@
 import { useSelector } from "react-redux";
 import { Autocomplete, Popper, TextField } from "@mui/material";
 import { useTranslation } from "react-i18next";
+import { useEffect, useState } from "react";
+import { useAxios } from "../../../../../hooks";
 
 interface ComboBoxProps {
   value: any;
@@ -8,7 +10,13 @@ interface ComboBoxProps {
   label: string;
   disabled?: boolean;
   required?: boolean;
-  options: Array<any>;
+
+  commonStoreKey?: string;
+  dataQueryId?: number;
+  storeUrl?: string;
+  storeLoadParam?: any;
+
+  options?: Array<any>;
   errorMessage?: any;
   hidden?: boolean;
   displayField: string;
@@ -18,6 +26,53 @@ interface ComboBoxProps {
 
 const ComboBox: React.FC<ComboBoxProps> = (props) => {
   const AppLayoutState = useSelector((state: any) => state.AppLayout);
+  const [comboboxData, setComboboxData] = useState<Array<any>>(
+    props?.options || []
+  );
+  const commonStoreData = useSelector(
+    (state: any) => state?.commonStores?.stores[props?.commonStoreKey]?.data
+  );
+  const { handleGetRequest } = useAxios();
+  const loadComboboxData = async () => {
+    if (props?.storeUrl) {
+      await handleGetRequest({
+        endPointURI: props.storeUrl,
+        showMask: false,
+        parameters: props?.storeLoadParam,
+        successCallBkFn: (response) => {
+          setComboboxData(response.data);
+        },
+        failureCallBkFn: () => {
+          setComboboxData([]);
+        },
+      });
+    } else if (props?.dataQueryId) {
+      await handleGetRequest({
+        endPointURI: "api/v1/dev/query/result",
+        showMask: false,
+        parameters: { queryId: props.dataQueryId, ...props?.storeLoadParam },
+        successCallBkFn: (response) => {
+          setComboboxData(response.data);
+        },
+        failureCallBkFn: () => {
+          setComboboxData([]);
+        },
+      });
+    }
+  };
+  useEffect(() => {
+    if (props?.commonStoreKey) {
+      setComboboxData(commonStoreData);
+    } else {
+      loadComboboxData();
+    }
+  }, [
+    props?.storeUrl,
+    props?.storeLoadParam,
+    props?.dataQueryId,
+    props?.commonStoreKey,
+  ]);
+
   const { t } = useTranslation();
   const getValue = (v: string) => {
     for (let option of props.options) {
@@ -31,7 +86,7 @@ const ComboBox: React.FC<ComboBoxProps> = (props) => {
     <Autocomplete
       sx={props.sx}
       value={getValue(props.value)}
-      options={props.options}
+      options={comboboxData}
       disabled={props.disabled}
       hidden={props?.hidden || false}
       onChange={(event, newValue) => {

package/src/components/templates/DataEntryTemplates/TemplateDataGrid/DataGridColumnsUtil.tsx

@@ -114,9 +114,13 @@ export const generateComboColumn: (
         <ComboBox
           {...params}
           sx={{ width: "100%" }}
-          options={params.colDef.options}
-          valueField={params.colDef.valueField}
-          displayField={params.colDef.displayField}
+          options={params?.colDef?.options}
+          commonStoreKey={params?.colDef?.commonStoreKey}
+          dataQueryId={params?.colDef?.dataQueryId}
+          storeUrl={params?.colDef?.storeUrl}
+          storeLoadParam={params?.colDef?.storeLoadParam}
+          valueField={params?.colDef?.valueField}
+          displayField={params?.colDef?.displayField}
           onChangeCallBack={(v: any, selectedRecord: any) => {
             if (v === null) {
               params.api.setEditCellValue({