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

package/package.json

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

package/src/components/administration/dev/EntityParameterGrid.tsx

@@ -116,6 +116,7 @@ const EntityParameterGrid: React.FC = () => {
         required: true,
         fieldType: "combobox",
         options: SystemParameterTypes,
+        comboboxValueDataType: "string",
         optionDisplayField: "value",
         optionValueField: "value",
         formProps: {

package/src/components/administration/dev/ReportGrid.tsx

@@ -61,7 +61,7 @@ const adjustFormAccordingToReportType = (
   value: any,
   formActions: FormActionProps,
   formManager: UseFormReturn
-) => {
+) => {  
   if (value && validationObject[value]) {
     const validationObjects: ReportValidationOptions = validationObject[value];
     const fields = Object.keys(validationObjects);
@@ -208,6 +208,7 @@ const ReportGrid: React.FC = () => {
         optionValueField: "value",
         required: true,
         fieldType: "combobox",
+        comboboxValueDataType: "string",
         formProps: {
           onValueChangeCallBack(
             value,
@@ -247,6 +248,7 @@ const ReportGrid: React.FC = () => {
         fieldLabel: "ATTACHMENT_CONFIG_STORAGE_TYPE",
         fieldName: "storageType",
         required: true,
+        comboboxValueDataType: "string",
         fieldType: "combobox",
         options: storageTypes,
         optionDisplayField: "value",
@@ -354,10 +356,10 @@ const ReportGrid: React.FC = () => {
       props: {
         fieldLabel: "REPORT_REPORT_EXCEL_DATA_QUERY_ID",
         fieldName: "reportExcelDataQueryId",
-        hidden: true,
-        gridProps: {
-          hidden: true,
-        },
+        // hidden: true,
+        // gridProps: {
+        //   hidden: true,
+        // },
         required: false,
         fieldType: "combobox",
         options: SystemDataQueries,

package/src/components/index.ts

@@ -1,3 +1,4 @@
+import { DataGridPremium } from "@mui/x-data-grid-premium";
 export * from "./BaseApp";
 export * from "@mui/material";
 export * from "@mui/lab";
@@ -6,3 +7,4 @@ export { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 export type { FontAwesomeIconProps } from "@fortawesome/react-fontawesome";
 export * from "./templates";
 export * from "@mui/x-tree-view/models";
+export { DataGridPremium } ;

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

@@ -89,7 +89,7 @@ export const generateComboColumn: (
     type: "custom",
     valueGetter: (value) => {
       if (value) {
-        return value + "";
+        return value;
       }
       return value;
     },
@@ -128,7 +128,7 @@ export const generateComboColumn: (
             params.api.setEditCellValue({
               id: params.id,
               field: params.field,
-              value: v + "",
+              value: v,
             });
           }}
         />

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

@@ -744,23 +744,24 @@ const TemplateGrid: React.FC<TemplateGridProps> = (props) => {
     }
   };
 
-  const handleColumnWidthChange: GridEventListener<"columnWidthChange"> = (
-    params: GridColumnResizeParams
-  ) => {
-    const updatedWidths = {
-      ...columnWidths,
-      [params.colDef.field]: params.width,
-    };
-    setColumnWidths(updatedWidths);
-    if (props?.gridStateKey) {
-      saveGridState(props.gridStateKey, { columnWidths: updatedWidths });
-    }
-  };
+  // const handleColumnWidthChange: GridEventListener<"columnWidthChange"> = (
+  //   params: GridColumnResizeParams
+  // ) => {
+  //   const updatedWidths = {
+  //     ...columnWidths,
+  //     [params.colDef.field]: params.width,
+  //   };
+  //   setColumnWidths(updatedWidths);
+  //   if (props?.gridStateKey) {
+  //     saveGridState(props.gridStateKey, { columnWidths: updatedWidths });
+  //   }
+  // };
 
   const adjustedColumns: Array<TemplateGridColDef> = React.useMemo(() => {
     const baseCols = structuredColumns.map((col) => ({
       ...col,
-      width: columnWidths[col.field] || col.width,
+      minWidth: col?.width || 200,
+      flex: 1,
     }));
 
     // Reorder based on saved columnOrder
@@ -768,9 +769,9 @@ const TemplateGrid: React.FC<TemplateGridProps> = (props) => {
       const fieldToCol = new Map(baseCols.map((col) => [col.field, col]));
       return columnOrder.map((field) => fieldToCol.get(field)!).filter(Boolean);
     }
-
     return baseCols;
   }, [columnOrder, columnWidths, structuredColumns]);
+
   return (
     <>
       <ConfirmationWindow />
@@ -984,7 +985,7 @@ const TemplateGrid: React.FC<TemplateGridProps> = (props) => {
         columnVisibilityModel={columnVisibilityModel}
         onColumnVisibilityModelChange={handleColumnVisibilityChange}
         onColumnOrderChange={handleColumnOrderChange}
-        onColumnWidthChange={handleColumnWidthChange}
+        // onColumnWidthChange={handleColumnWidthChange}
         rowGroupingModel={gridRowGroupingModel}
         onRowGroupingModelChange={(model: GridRowGroupingModel) => {
           handleRowGroupChange(model);

package/src/components/templates/report/ExcelReportViewer.tsx

@@ -27,7 +27,8 @@ const getGridColumnsFromRecord = (data: Array<any>) => {
       },
     };
     formElements.push(formElement);
-  }  
+  }
+  debugger;
   return formElements;
 };
 

package/src/hooks/UseWindow.tsx

@@ -10,6 +10,7 @@ import {
 } from "@mui/material";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { IconProp } from "@fortawesome/fontawesome-svg-core";
+import { useSelector } from "react-redux";
 
 export interface TemplateWindowProp {
   height?: any;
@@ -27,7 +28,9 @@ interface WindowProps {
 
 export const useWindow = (props: TemplateWindowProp) => {
   const [windowState, setWindowState] = useState(false);
-
+  const appDirection = useSelector(
+    (state: any) => state.AppLayout.appDirection
+  );
   const Window: React.FC<WindowProps> = (windowProps: WindowProps) => {
     return (
       <Modal
@@ -40,6 +43,7 @@ export const useWindow = (props: TemplateWindowProp) => {
         }}
       >
         <Box
+          dir={appDirection}
           sx={{
             position: "absolute",
             top: "50%",