ui-soxo-bootstrap-core 2.6.40-dev.13 → 2.6.40-dev.17

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

@@ -354,9 +354,9 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
           <Search placeholder="Search menus & sub-menus…" allowClear style={{ width: 300, marginBottom: '0px' }} onChange={onSearch} />
 
           <Space size="small">
-            <Button onClick={getRecords} size={'small'} type="default">
+            {/* <Button onClick={getRecords} size={'small'} type="default">
               <ReloadOutlined />
-            </Button>
+            </Button> */}
 
             <Switch checked={dragMode} onChange={toggleDragMode} checkedChildren="Order On" unCheckedChildren="Order Off" />
 
@@ -489,7 +489,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
   );
 };
 /* -----------------------------------------------------------------------
-   PANEL ACTIONS 
+   PANEL ACTIONS
 ------------------------------------------------------------------------ */
 function panelActions(item, model, setSelectedRecord, setDrawerTitle, setDrawerVisible, deleteRecord) {
   return (
@@ -597,11 +597,7 @@ function NestedMenu({
   }
 
   return (
-    <Collapse
-      accordion={!searchActive}
-      activeKey={openKeys}
-      onChange={(keys) => setOpenKeys(Array.isArray(keys) ? keys : keys ? [keys] : [])}
-    >
+    <Collapse accordion={!searchActive} activeKey={openKeys} onChange={(keys) => setOpenKeys(Array.isArray(keys) ? keys : keys ? [keys] : [])}>
       {localItems.map((child, index) => (
         <Panel
           key={child.id}

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

@@ -687,6 +687,29 @@ export default function ReportingDashboard({
   );
 }
 
+/**
+ * Filters report records using the same search text that drives the table.
+ *
+ * @param {Array<Object>} records - Report rows.
+ * @param {string} searchText - Current table search text.
+ * @returns {Array<Object>} Rows matching the search text.
+ */
+function filterReportRecords(records, searchText) {
+  if (!Array.isArray(records)) return [];
+
+  const query = String(searchText || '').trim().toLowerCase();
+
+  if (!query) return records;
+
+  return records.filter((record) =>
+    Object.values(record).some((value) => {
+      if (value === undefined || value === null || typeof value === 'object') return false;
+
+      return String(value).toLowerCase().indexOf(query) !== -1;
+    })
+  );
+}
+
 /**
  *
  * @param root0
@@ -804,13 +827,13 @@ function GuestList({
         return col;
       });
       const summaryCols = columns.filter((col) => col.enable_summary);
-      let dataToExport = [...patients];
+      let dataToExport = [...filterReportRecords(patients, query)];
 
       if (summaryCols.length > 0) {
         // Build one synthetic row for CSV export that mirrors the table layout:
         // numeric summary cells are populated from `calculateSummaryValues`, while
         // non-summary columns stay blank unless a configured caption should be shown.
-        const summaryValues = calculateSummaryValues(summaryCols, patients);
+        const summaryValues = calculateSummaryValues(summaryCols, dataToExport);
         const summaryRow = { isSummaryRow: true };
 
         cols.forEach((col, index) => {
@@ -837,37 +860,15 @@ function GuestList({
       }
       let exportDatas = getExportData(dataToExport, exportCols);
 
-      if (exportDatas.exportDataColumns.length && exportDatas.exportDataHeaders.length) {
+      if (exportDatas.exportDataHeaders.length) {
         setExportData({ exportDatas });
+      } else {
+        setExportData({});
       }
     }
-  }, [patients, columns]);
+  }, [patients, columns, query]);
 
-  let filtered;
-
-  if (patients) {
-    filtered = patients.filter((record) => {
-      if (query) {
-        // Keys
-        let keys = Object.keys(record);
-
-        let flag = false;
-
-        keys.forEach((key) => {
-          let ele = record[key];
-
-          if (ele && typeof ele === 'string' && ele.toLowerCase().indexOf(query.toLowerCase()) !== -1) {
-            flag = true;
-          }
-        });
-
-        /**Will return flag */
-        return flag;
-      } else {
-        return true;
-      }
-    });
-  }
+  let filtered = filterReportRecords(patients, query);
 
   /**
    * Checks for a match in the filtered patient list based on a scanned code,
@@ -1056,7 +1057,7 @@ function GuestList({
               dataSource={filtered ? filtered : patients} // In case if there is no filtered values we can use patient data
               columns={cols}
               sticky
-              pagination={false}
+              pagination={true}
               summary={(pageData) => {
                 const summaryCols = columns.filter((col) => col.enable_summary);
                 if (!summaryCols.length) return null;

package/package.json

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