ui-soxo-bootstrap-core 2.4.25-dev.23 → 2.4.25-dev.25

package/core/models/menus/components/menu-add/menu-add.js

@@ -111,7 +111,7 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
 
     let id = formContent.id;
 
-    // ✅ ONLY set step if it's NOT already provided
+    //  ONLY set step if it's NOT already provided
     if (!values.step) {
       values.step = formContent.step || step;
     }
@@ -134,7 +134,17 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
         values[field] = value;
       });
 
-      model.add({ values }).then(() => {
+      MenusAPI.createMenu({ formBody: values }).then((res) => {
+        const apiMessage = res?.result?.message;
+
+        //  (duplicate)
+        if (apiMessage?.toLowerCase().includes('already exists')) {
+          message.warning(apiMessage);
+          setLoading(false);
+          return; // stop further execution
+        }
+
+        //  Real success
         message.success('Menu Added');
         setLoading(false);
         callback();
@@ -219,9 +229,9 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
               {/* Pages Ends */}
 
               {/* Path */}
-              {/* <Form.Item name="path" label="Path" required>
-                                <Input placeholder="Enter path" />
-                            </Form.Item> */}
+              <Form.Item name="path" label="Path" rules={[{ required: true, message: 'Path is required' }]}>
+                <Input placeholder="Enter path" />
+              </Form.Item>
               {/* Path Ends */}
 
               {/* Route */}
@@ -231,7 +241,7 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
               {/* Route Ends */}
 
               {/* Switch */}
-              <Form.Item name="is_visible" label="Visible" valuePropName="checked"  required>
+              <Form.Item name="is_visible" label="Visible" valuePropName="checked" required>
                 <Switch />
               </Form.Item>
 
@@ -250,7 +260,7 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
               {/*  Icon Name Ends */}
 
               {/* Step */}
-              <Form.Item name={'step'} label="Step" rules={[{ required: true, message: 'Step is required' }]}>
+              <Form.Item name={'step'} label="Step" required>
                 <InputNumber placeholder="Enter step" />
               </Form.Item>
               {/* Step Ends */}

package/core/models/menus/components/menu-lists/menu-lists.js

@@ -474,7 +474,7 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
         </Button>
       )}
 
-      <Button
+      {/* <Button
         size="small"
         type="default"
         onClick={() => {
@@ -484,7 +484,7 @@ function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerV
         }}
       >
         <CopyOutlined />
-      </Button>
+      </Button> */}
 
       <Popconfirm title="Are you sure?" onConfirm={() => deleteRecord(item)}>
         <Button danger size="small" type="default">

package/core/models/menus/menus.js

@@ -160,6 +160,17 @@ class MenusAPI extends Base {
     });
   };
 
+  /**
+   * create menu
+   */
+
+  createMenu = ({ formBody }) => {
+    return ApiUtils.post({
+      url: `core-menus/create-menu`,
+      formBody,
+    });
+  };
+
   /**
    * load the list of menu
    *

package/core/modules/reporting/components/reporting-dashboard/reporting-dashboard.js

@@ -106,8 +106,17 @@ export default function ReportingDashboard({
     setPatients([]);
     const fetchId = idOverride || id;
     await CoreScripts.getRecord({ id: fetchId, dbPtr }).then(async ({ result }) => {
+      // Check if display columns are provided from backend
+      if (result.display_columns) {
+        // Parse and set columns from stored JSON
+
+        setColumns(JSON.parse(result.display_columns));
+      } else {
+        // Reset columns if no display columns exist
+
+        setColumns([]);
+      }
       await prepareInputParameters(result);
-      setColumns(JSON.parse(result.display_columns));
 
       if (result.summary_columns) {
         setSummaryColumns(JSON.parse(result.summary_columns));
@@ -160,11 +169,12 @@ export default function ReportingDashboard({
     if (urlParams.script_id) scriptId.current = urlParams.script_id;
 
     let otherDetails = record.other_details1 ? JSON.parse(record.other_details1) : null;
-    parameters = JSON.parse(record.input_parameters);
+
+    parameters = record.input_parameters ? JSON.parse(record.input_parameters) : null;
 
     let formContent = {};
 
-    parameters = await parameters.map((record) => {
+    parameters = await parameters?.map((record) => {
       // Only if the url params does have a matching value ,
       // we should not consider the default  value
 
@@ -210,7 +220,7 @@ export default function ReportingDashboard({
       if (['reference-select', 'reference-search', 'select'].indexOf(record.type) !== -1) {
         // let model = "";
         let model = CustomModels[record.modelName];
-
+        
         return {
           ...record,
           model,
@@ -289,6 +299,17 @@ export default function ReportingDashboard({
       }
       // Update patients
       setPatients(resultDetails || []);
+      // Check if columns are not yet defined
+      if (columns.length === 0 && resultDetails.length > 0) {
+        // Create columns dynamically from resultDetails keys
+        setColumns((prev) => {
+          if (prev.length > 0) return prev;
+          return Object.keys(resultDetails[0]).map((key) => ({
+            title: key,
+            field: key,
+          }));
+        });
+      }
 
       if (result.length) {
         // Set Pgination data into URL
@@ -739,7 +760,7 @@ function GuestList({
 
                 // If the column type is 'span', render the field inside a <span> with inline color style
               } else if (entry.columnType === 'span') {
-                return <span style={{ color: record.color_code }}>{record[entry.field]}</span>;
+                return <span style={{ color: record.color_code, overflowWrap: 'break-word', WebkitLineClamp: 3 }}>{record[entry.field]}</span>;
               }
             } else {
               /**
@@ -771,7 +792,7 @@ function GuestList({
                 }
               } else {
                 //If the value is neither 'Y' nor 'N', return the actual field value
-                return <span style={{ color: textColor }}>{record[entry.field]}</span>;
+                return <span style={{ color: textColor, whiteSpace: 'pre-wrap', overflowWrap: 'break-word' }}>{record[entry.field]}</span>;
               }
             }
           }
@@ -1168,3 +1189,5 @@ function GuestList({
 //         </Card>
 //     );
 // }
+//     );
+// }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.4.25-dev.23",
+  "version": "2.4.25-dev.25",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"