ui-soxo-bootstrap-core 2.4.25-dev.36 → 2.4.25-dev.37

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

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext, useRef } from 'react';
 
-import { Table, Skeleton, Input, Tag, Modal, message, Pagination } from 'antd';
+import { Table, Skeleton, Input, Tag, Modal, message, Pagination, Tooltip } from 'antd';
 
 import { QrcodeOutlined } from '@ant-design/icons';
 
@@ -798,9 +798,19 @@ function GuestList({
           }
         },
         field: entry.field,
-        title: entry.title,
+        // title: entry.title,
+        // title: (
+        //   <Tooltip title={entry.title}>
+        //     {entry.title}
+        //   </Tooltip>
+        // ),
+        title: (
+          <Tooltip title={entry.tooltip || entry.title}>
+            <span>{entry.title}</span>
+          </Tooltip>
+        ),
         key: entry.field,
-        width: entry.width ? parseInt(entry.width) : undefined,
+        width: entry.width ? parseInt(entry.width) : 160,
         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:
@@ -824,7 +834,6 @@ function GuestList({
             // Return the value from record.props if it exists
             return description && record[description] ? record[description] : null;
           }
-
           return record[entry.field];
         },
         // Add align property based on column type
@@ -908,13 +917,21 @@ function GuestList({
       // setData(data);
 
       // Define export data
-      let exportDatas = getExportData(patients, cols);
+      // Sanitize cols for export to ensure titles are strings
+      const exportCols = cols.map((col) => {
+        if (col.title && typeof col.title === 'object' && col.title.props) {
+          return { ...col, title: col.title.props.title };
+        }
+        return col;
+      });
+
+      let exportDatas = getExportData(patients, exportCols);
 
       if (exportDatas.exportDataColumns.length && exportDatas.exportDataHeaders.length) {
         setExportData({ exportDatas });
       }
     }
-  }, [patients]);
+  }, [patients, columns]);
 
   let filtered;
 

package/package.json

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