ui-soxo-bootstrap-core 2.6.1-dev.14 → 2.6.1-dev.15

package/core/modules/reporting/components/reporting-dashboard/display-columns/build-display-columns.js

@@ -25,11 +25,15 @@ function getExportDefinition(entry, record) {
  * @param {Array} root0.columns
  * @param {Array} root0.patients
  * @param {boolean} root0.isFixedIndex
- * @param {Object} root0.CustomComponents
+ * @param {Object.<string, React.ComponentType<any>>} root0.CustomComponents
  * @param {Function} root0.refresh
+ * @param {Object} [root0.otherDetails={}] - Optional details from the report configuration.
+ * @param {boolean} [root0.otherDetails.isFilterEnabled] - Fallback to enable filtering on all columns.
+ * @param {boolean} [root.otherDetails.isSortingEnabled] - Fallback to enable sorting on all columns.
+ * @param {boolean} [root0.otherDetails.isHeaderWrapEnabled] - Fallback to enable header text wrapping for all columns.
  * @returns {Array}
  */
-export default function buildDisplayColumns({ columns = [], patients = [], isFixedIndex, CustomComponents, refresh }) {
+export default function buildDisplayColumns({ columns = [], patients = [], isFixedIndex, CustomComponents, refresh, otherDetails = {} }) {
   const displayColumns = [
     {
       title: '#',
@@ -42,6 +46,12 @@ export default function buildDisplayColumns({ columns = [], patients = [], isFix
   ];
 
   columns.forEach((entry, index) => {
+    const isFilterEnabled = entry.isFilterEnabled || otherDetails?.isFilterEnabled;
+    const isSortingEnabled = entry.isSortingEnabled || otherDetails?.isSortingEnabled;
+    const isHeaderWrapEnabled = otherDetails?.isHeaderWrapEnabled;
+
+    const titleStyle = isHeaderWrapEnabled ? { whiteSpace: 'pre-wrap', overflowWrap: 'break-word' } : {};
+
     displayColumns.push({
       render: (record) =>
         renderDisplayCell({
@@ -52,20 +62,26 @@ export default function buildDisplayColumns({ columns = [], patients = [], isFix
         }),
       field: entry.field,
       title: (
-        <Tooltip title={entry.tooltip || entry.title}>
-          <span>{entry.title}</span>
+        <Tooltip
+          title={entry.tooltip || entry.title}
+          overlayInnerStyle={{
+            whiteSpace: 'normal',
+            overflowWrap: 'break-word',
+          }}
+        >
+          <span style={titleStyle}>{entry.title}</span>
         </Tooltip>
       ),
       key: entry.field || `display_column_${index}`,
       width: entry.width ? parseInt(entry.width, 10) : 160,
       fixed: entry.isFixedColumn ? entry.isFixedColumn : null,
       filters:
-        entry.isFilterEnabled && Array.isArray(patients)
+        isFilterEnabled && Array.isArray(patients)
           ? [...new Set(patients.map((item) => item[entry.field]).filter(Boolean))].map((value) => ({ text: value, value }))
           : null,
-      onFilter: entry.isFilterEnabled ? (value, record) => record[entry.field] === value : null,
-      sorter: entry.isSortingEnabled ? (a, b) => String(a[entry.field]).localeCompare(String(b[entry.field])) : null,
-      filterSearch: entry.isFilterEnabled ? entry.isFilterEnabled : false,
+      onFilter: isFilterEnabled ? (value, record) => record[entry.field] === value : null,
+      sorter: isSortingEnabled ? (a, b) => String(a[entry.field] ?? '').localeCompare(String(b[entry.field] ?? '')) : null,
+      filterSearch: !!isFilterEnabled,
       exportDefinition: (record) => getExportDefinition(entry, record),
       align: entry.type === 'number' ? 'right' : 'left',
     });

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

@@ -723,6 +723,7 @@ function GuestList({
   const { isMobile, dispatch } = useContext(GlobalContext);
   const [single, setSingle] = useState({});
 
+  const otherDetails = config.other_details1 ? JSON.parse(config.other_details1) : {};
   // const [view, setView] = useState(isMobile ? true : false); //Need to check this condition
   const cols = buildDisplayColumns({
     columns,
@@ -730,6 +731,7 @@ function GuestList({
     isFixedIndex,
     CustomComponents,
     refresh,
+    otherDetails,
   });
 
   /**

package/package.json

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