ui-soxo-bootstrap-core 2.4.25-dev.24 → 2.4.25-dev.26

package/core/lib/components/sidemenu/sidemenu.js

@@ -163,6 +163,10 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
   const onMenuClick = (menu, index) => {
     const key = menu.path || `menu-${menu.id || index}`;
 
+    if (menu.isRoot) {
+      setOpenKeys([]);
+    }
+
     setSelectedKeys([key]);
 
     if (menu.path) {
@@ -447,7 +451,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
                       // }}
 
                       onClick={() => {
-                        onMenuClick({ ...menu, parentKey: menu.path || menu.caption }, index);
+                        onMenuClick({ ...menu, parentKey: menu.path || menu.caption, isRoot: true }, index);
                       }}
                       // key={`${menu.id}-${randomIndex}`}
                       key={menu.path || menu.caption}

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
 
@@ -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>;
               }
             }
           }
@@ -779,8 +800,7 @@ function GuestList({
         field: entry.field,
         title: entry.title,
         key: entry.field,
-        width: entry.width || 160,
-        ellipsis: true,
+        width: entry.width ? parseInt(entry.width) : undefined,
         fixed: entry.isFixedColumn ? entry.isFixedColumn : null, // Conditionally setting the 'fixed' key to 'left' if 'isColumnStatic' is true; otherwise, setting it to null.
         // Check if filtering is enabled and patients is an array
         filters:
@@ -1168,3 +1188,5 @@ function GuestList({
 //         </Card>
 //     );
 // }
+//     );
+// }

package/package.json

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