ui-soxo-bootstrap-core 2.6.40-dev.16 → 2.6.40

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

@@ -1,10 +1,7 @@
-import React, { useState, useContext } from 'react';
-import { Modal, Tag } from 'antd';
+import React from 'react';
+import { Tag } from 'antd';
 import * as Icons from '@ant-design/icons';
 import { Link } from 'react-router-dom';
-import { GlobalContext, safeJSON, Location } from '../../../../../lib';
-// import { PdfViewer } from '../../../../../lib';
-import { CoreScripts } from '../../../../../models';
 
 /**
  * Utilities for rendering Reporting Dashboard display columns.
@@ -77,7 +74,7 @@ export function isActionTypeEntry(entry = {}) {
  * @param {DisplayRecord} record
  * @returns {string}
  */
-export function getRedirectLink(entry = {}, record = {}, CustomComponents = {}) {
+export function getRedirectLink(entry = {}, record = {}) {
   let redirectLink = entry.redirect_link || '';
 
   if (Array.isArray(entry.replace_variables)) {
@@ -90,41 +87,6 @@ export function getRedirectLink(entry = {}, record = {}, CustomComponents = {})
   return redirectLink;
 }
 
-/**
- * Resolves the PDF/file location for file-based action entries.
- *
- * Supports either:
- * - `entry.file_location` as a direct URL/path
- * - `entry.file_location` as a record field name
- *
- * @param {DisplayColumnEntry} entry
- * @param {DisplayRecord} record
- * @returns {string}
- */
-export function getFileLocation(entry = {}, record = {}) {
-  if (entry.file_location && typeof entry.file_location === 'string' && record[entry.file_location]) {
-    return record[entry.file_location];
-  }
-
-  return record.file_location || entry.file_location || '';
-}
-
-/**
- * Resolves a value from the row when a config field points to a record key,
- * otherwise returns the provided literal value.
- *
- * @param {*} value
- * @param {DisplayRecord} record
- * @returns {*}
- */
-function resolveRecordValue(value, record = {}) {
-  if (typeof value === 'string' && Object.prototype.hasOwnProperty.call(record, value)) {
-    return record[value];
-  }
-
-  return value;
-}
-
 /**
  * Resolves action label text with backward-compatible precedence.
  *
@@ -208,154 +170,6 @@ function renderCustomComponent({ entry, record, CustomComponents, refresh }) {
   );
 }
 
-/**
- * Renders a PDF file action inside a modal viewer.
- *
- * @param {Object} root0
- * @param {DisplayColumnEntry} root0.entry
- * @param {DisplayRecord} root0.record
- * @param {Object.<string, React.ComponentType<any>>} root0.CustomComponents
- * @returns {React.ReactNode}
- */
-function FileActionLink({ entry, record, CustomComponents }) {
-  const [isPdfVisible, setIsPdfVisible] = useState(false);
-  const fileUrl = getFileLocation(entry, record);
-  const actionLabel = getActionLabel(entry, record);
-  const FileLoaderComponent = CustomComponents?.FileLoader;
-
-  if (!fileUrl) {
-    return null;
-  }
-
-  const fileLoaderProps = {
-    url: fileUrl,
-    type: resolveRecordValue(entry.file_type, record) || 'pdf',
-    defaultScale: resolveRecordValue(entry.default_scale, record),
-    viewerType: resolveRecordValue(entry.viewer_type, record),
-    config: {
-      requireLinuxPath: resolveRecordValue(entry.require_linux_path, record),
-      replaceBranch: resolveRecordValue(entry.replace_branch, record),
-      ...(entry.file_loader_config || {}),
-    },
-    entry,
-    record,
-  };
-
-  return (
-    <>
-      {/* 1. Add the trigger link/button here */}
-      <a
-        onClick={(e) => {
-          e.preventDefault();
-          setIsPdfVisible(true);
-        }}
-        style={{ cursor: 'pointer' }}
-      >
-        {actionLabel}
-      </a>
-
-      <Modal
-        open={isPdfVisible}
-        onCancel={() => setIsPdfVisible(false)}
-        footer={null}
-        destroyOnClose
-        width={950}
-        style={{ top: 10 }}
-        title={actionLabel}
-      >
-        {/* 2. Ensure the loader component exists */}
-        {FileLoaderComponent ? <FileLoaderComponent {...fileLoaderProps} /> : <p>Loader not found</p>}
-      </Modal>
-    </>
-  );
-}
-
-/**
- * Returns the branch access list from the signed-in user's organization details.
- *
- * `organization_details` may arrive as a JSON string, so this helper keeps the
- * parsing logic in one place before branch comparisons are made.
- *
- * @param {Object} user
- * @returns {Array}
- */
-function getAccessibleBranches(user = {}) {
-  const orgDetails = safeJSON(user?.organization_details);
-  return Array.isArray(orgDetails?.branch) ? orgDetails.branch : [];
-}
-
-/**
- * Resolves branch metadata used to decide whether an action link should prompt
- * for a branch switch before navigation.
- *
- * When an action entry includes `replace_variables` with the `index` field, the
- * row is treated as branch-aware content. We compare the record's branch id
- * against the active branch from `localStorage.db_ptr`, and also resolve whether
- * the user has access to the target branch.
- *
- * @param {DisplayColumnEntry} entry
- * @param {DisplayRecord} record
- * @param {Object} user
- * @returns {{requiresBranchSwitch: boolean, hasTargetBranchAccess: boolean}}
- */
-function getBranchNavigationState(entry = {}, record = {}, user = {}) {
-  const branchFieldConfig = entry.replace_variables?.find((variable) => variable.field === 'index');
-
-  if (!branchFieldConfig) {
-    return { requiresBranchSwitch: false, hasTargetBranchAccess: false };
-  }
-
-  const accessibleBranches = getAccessibleBranches(user);
-  const activeDbPtr = localStorage.getItem('db_ptr');
-  const activeBranch = accessibleBranches.find((branch) => String(branch.dbPtr) === String(activeDbPtr));
-  const targetBranchId = record[branchFieldConfig.field];
-  const targetBranch = accessibleBranches.find((branch) => String(branch.branch_id) === String(targetBranchId));
-
-  return {
-    requiresBranchSwitch: Boolean(targetBranchId) && String(activeBranch?.branch_id) !== String(targetBranchId),
-    hasTargetBranchAccess: Boolean(targetBranch),
-  };
-}
-
-/**
- * Renders a branch-switch confirmation link for cross-branch records.
- *
- * The actual branch change is handled by the landing page via the `index`
- * query parameter. This link only confirms intent and blocks navigation when
- * the user does not have access to the target branch.
- *
- * @param {Object} root0
- * @param {string} root0.label
- * @param {string} root0.redirectLink
- * @param {boolean} root0.hasTargetBranchAccess
- * @returns {React.ReactNode}
- */
-function BranchAwareActionLink({ label, redirectLink, hasTargetBranchAccess }) {
-  return (
-    <a
-      onClick={(e) => {
-        e.preventDefault();
-        Modal.confirm({
-          title: 'Switch Branch?', // Adding a title makes it look more standard
-          content: 'This record belongs to another branch. Would you like to switch branches to view the details?',
-          onOk: () => {
-            if (hasTargetBranchAccess) {
-              Location.navigate({ url: redirectLink });
-              return;
-            }
-
-            Modal.error({
-              title: 'Access Denied',
-              content: 'This data belongs to another branch.Would you like to switch branches to view the details?',
-            });
-          },
-        });
-      }}
-    >
-      {label}
-    </a>
-  );
-}
 /**
  * Renders table cell content for a configured display column.
  *
@@ -396,21 +210,10 @@ export function renderDisplayCell({ entry, record, CustomComponents, refresh })
     }
     return null;
   }
-  if (isLegacyActionEntry(entry) || isActionTypeEntry(entry)) {
-    if (entry.redirect_link_type === 'file') {
-      return <FileActionLink entry={entry} record={record} CustomComponents={CustomComponents} />;
-    }
-    const { user = {} } = useContext(GlobalContext);
 
+  if (isLegacyActionEntry(entry) || isActionTypeEntry(entry)) {
     const redirectLink = getRedirectLink(entry, record);
-    const label = getActionLabel(entry, record);
-    const { requiresBranchSwitch, hasTargetBranchAccess } = getBranchNavigationState(entry, record, user);
-
-    if (requiresBranchSwitch) {
-      return <BranchAwareActionLink label={label} redirectLink={redirectLink} hasTargetBranchAccess={hasTargetBranchAccess} />;
-    }
-
-    return <Link to={`${redirectLink}`}>{label}</Link>;
+    return <Link to={`${redirectLink}`}>{getActionLabel(entry, record)}</Link>;
   }
 
   if (entry.field === 'custom') {

package/core/modules/reporting/components/reporting-dashboard/display-columns/display-cell-renderer.test.js

@@ -3,7 +3,6 @@ import {
   isLegacyActionEntry,
   isActionTypeEntry,
   getRedirectLink,
-  getFileLocation,
   getActionLabel,
   renderDisplayCell,
 } from './display-cell-renderer';
@@ -29,13 +28,6 @@ describe('display-cell-renderer', () => {
     expect(link).toBe('/bill/10/visit/OP100');
   });
 
-  test('resolves file location from direct config value or record field', () => {
-    expect(getFileLocation({ file_location: 'https://example.com/report.pdf' }, {})).toBe('https://example.com/report.pdf');
-    expect(getFileLocation({ file_location: 'document_url' }, { document_url: 'https://example.com/record.pdf' })).toBe(
-      'https://example.com/record.pdf',
-    );
-  });
-
   test('keeps legacy action label behavior unchanged', () => {
     const entry = {
       field: 'action',
@@ -85,71 +77,6 @@ describe('display-cell-renderer', () => {
     expect(element.props.opb_id).toBe(1);
   });
 
-  test('renders file action entry as pdf viewer trigger', () => {
-    const element = renderDisplayCell({
-      entry: {
-        type: 'action',
-        field: 'action_text',
-        redirect_link_type: 'file',
-        file_location: 'https://example.com/report.pdf',
-        label: 'Open PDF',
-      },
-      record: { action_text: 'Preview PDF' },
-      refresh: jest.fn(),
-      CustomComponents: {},
-    });
-
-    expect(typeof element.type).toBe('function');
-    expect(element.props.entry.redirect_link_type).toBe('file');
-    expect(element.props.entry.file_location).toBe('https://example.com/report.pdf');
-  });
-
-  test('passes file action props to CustomComponents.FileUpload when available', () => {
-    const FileUpload = () => null;
-    const element = renderDisplayCell({
-      entry: {
-        type: 'action',
-        field: 'action_text',
-        redirect_link_type: 'file',
-        file_location: 'document_path',
-        file_type: 'document_type',
-        default_scale: 'zoom_level',
-        viewer_type: 'inline_viewer',
-        require_linux_path: 'needs_linux_path',
-        replace_branch: 'should_replace_branch',
-        file_loader_config: {
-          sample: true,
-        },
-      },
-      record: {
-        action_text: 'Preview',
-        document_path: '\\\\server\\reports\\doc.pdf',
-        document_type: 'pdf',
-        zoom_level: 1.25,
-        inline_viewer: true,
-        needs_linux_path: true,
-        should_replace_branch: false,
-      },
-      refresh: jest.fn(),
-      CustomComponents: { FileUpload },
-    });
-
-    expect(typeof element.type).toBe('function');
-
-    const modalContent = element.props.children[1].props.children;
-    expect(modalContent.type).toBe(FileUpload);
-    expect(modalContent.props.url).toBe('\\\\server\\reports\\doc.pdf');
-    expect(modalContent.props.type).toBe('pdf');
-    expect(modalContent.props.defaultScale).toBe(1.25);
-    expect(modalContent.props.viewerType).toBe(true);
-    expect(modalContent.props.config).toEqual({
-      requireLinuxPath: true,
-      replaceBranch: false,
-      sample: true,
-    });
-    expect(modalContent.props.record.document_path).toBe('\\\\server\\reports\\doc.pdf');
-  });
-
   test('renders styled tag/span/icon/text for non-action path', () => {
     const tagElement = renderDisplayCell({
       entry: { field: 'status', enableColor: true, columnType: 'tag' },

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

@@ -70,10 +70,6 @@ export default function ReportingDashboard({
 
   const [formContents, setformContents] = useState({});
   const [liveFormContents, setLiveFormContents] = useState({});
-  const [reportMailRequest, setReportMailRequest] = useState({
-    scriptId: null,
-    inputParameters: {},
-  });
 
   const scriptId = useRef(null);
 
@@ -304,11 +300,6 @@ export default function ReportingDashboard({
         formBody = { body: { ...scope, ...paginationData } };
       }
 
-      setReportMailRequest({
-        scriptId: coreScriptId,
-        inputParameters: formBody,
-      });
-
       // Fetch result
       const result = await CoreScripts.getReportingLisitng(coreScriptId, formBody, dbPtr);
 
@@ -677,8 +668,6 @@ export default function ReportingDashboard({
             selectedSearchFields={selectedSearchFields}
             handleRemoveSearchField={handleRemoveSearchField}
             fetchReportData={(paginationUpdate) => fetchReportData(id, formContents, dbPtr, paginationUpdate || pagination)}
-            reportScriptId={reportMailRequest.scriptId}
-            reportInputParameters={reportMailRequest.inputParameters}
           />
           {/** GuestList component end*/}
         </>
@@ -687,29 +676,6 @@ 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
@@ -737,8 +703,6 @@ function GuestList({
   selectedSearchFields,
   handleRemoveSearchField,
   fetchReportData,
-  reportScriptId,
-  reportInputParameters,
 }) {
   /**
    * @param {*} propValues
@@ -827,13 +791,13 @@ function GuestList({
         return col;
       });
       const summaryCols = columns.filter((col) => col.enable_summary);
-      let dataToExport = [...filterReportRecords(patients, query)];
+      let dataToExport = [...patients];
 
       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, dataToExport);
+        const summaryValues = calculateSummaryValues(summaryCols, patients);
         const summaryRow = { isSummaryRow: true };
 
         cols.forEach((col, index) => {
@@ -860,15 +824,37 @@ function GuestList({
       }
       let exportDatas = getExportData(dataToExport, exportCols);
 
-      if (exportDatas.exportDataHeaders.length) {
+      if (exportDatas.exportDataColumns.length && exportDatas.exportDataHeaders.length) {
         setExportData({ exportDatas });
-      } else {
-        setExportData({});
       }
     }
-  }, [patients, columns, query]);
+  }, [patients, columns]);
+
+  let filtered;
+
+  if (patients) {
+    filtered = patients.filter((record) => {
+      if (query) {
+        // Keys
+        let keys = Object.keys(record);
+
+        let flag = false;
 
-  let filtered = filterReportRecords(patients, query);
+        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;
+      }
+    });
+  }
 
   /**
    * Checks for a match in the filtered patient list based on a scanned code,
@@ -991,18 +977,11 @@ function GuestList({
           <Search className="table-search-input" placeholder="Enter Search Value" allowClear onChange={onSearch} />
           <div className="table-export-button">
             {exportData.exportDatas && (
-              <>
-                <ExportReactCSV
-                  title={config.caption}
-                  headers={exportData.exportDatas.exportDataHeaders}
-                  csvData={exportData.exportDatas.exportDataColumns}
-                  fileName={`${config.caption || 'Report'}.xlsx`}
-                  pdfFileName={`${config.caption || 'Report'}.pdf`}
-                  scriptId={reportScriptId}
-                  inputParameters={reportInputParameters}
-                  dropdown
-                />
-              </>
+              <ExportReactCSV
+                title={config.caption}
+                headers={exportData.exportDatas.exportDataHeaders}
+                csvData={exportData.exportDatas.exportDataColumns}
+              />
             )}
           </div>
 
@@ -1057,7 +1036,7 @@ function GuestList({
               dataSource={filtered ? filtered : patients} // In case if there is no filtered values we can use patient data
               columns={cols}
               sticky
-              pagination={true}
+              pagination={false}
               summary={(pageData) => {
                 const summaryCols = columns.filter((col) => col.enable_summary);
                 if (!summaryCols.length) return null;

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

@@ -52,7 +52,6 @@
     display: flex;
     align-items: center;
     flex-shrink: 0;
-    gap: 4px;
   }
   
 

package/package.json

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

package/core/components/license-management/license-alert.js

@@ -1,97 +0,0 @@
-import { Alert } from 'antd';
-import React, { useState, useEffect } from 'react';
-
-export default function LicenseAlert({ data }) {
-  // setting visibility of alert based on license status
-  const [visible, setVisible] = useState(true);
-  // resolve alert configuration based on license data
-  const alertConfig = resolveLicenseAlert(data);
-  // auto-hide alert after 10 seconds or when data changes
-  useEffect(() => {
-    if (alertConfig) {
-      setVisible(true);
-
-      const timer = setTimeout(() => {
-        setVisible(false);
-      }, 10000); // 10 seconds
-
-      return () => {
-        clearTimeout(timer);
-      };
-    }
-  }, [data]);
-  // if no alert configuration or not visible, render nothing
-  if (!alertConfig || !visible) return null;
-
-  return (
-    // render the alert with appropriate type, message, and description
-    <Alert
-      type={alertConfig.type}
-      message={alertConfig.message}
-      description={alertConfig.description}
-      showIcon
-      closable
-      onClose={() => setVisible(false)}
-    />
-  );
-}
-// function to determine alert configuration based on license data
-function resolveLicenseAlert(data) {
-  if (!data) return null;
-  // destructure relevant fields from license data
-  const { status, expiresInDays, isExpiringSoon, gracePeriod } = data;
-
-  // ===== NOT INSTALLED =====
-  if (status === 'NOT_INSTALLED') {
-    return {
-      type: 'error',
-      message: 'License not found',
-      description: 'Please install a valid license to continue.',
-    };
-  }
-
-  // ===== GRACE PERIOD =====
-  if (gracePeriod) {
-    return {
-      type: 'warning',
-      message: 'Grace period mode',
-      description: 'License expired. Running in read-only mode.',
-    };
-  }
-
-  // ===== EXPIRING SOON =====
-  if (status === 'ACTIVE' && isExpiringSoon) {
-    let descriptionText = '';
-    // customize message based on how soon the license is expiring
-    if (expiresInDays === 0) {
-      descriptionText = 'Your license will expire today. Please renew immediately.';
-    } else {
-      descriptionText = `Your license will expire in ${expiresInDays} days. Please plan for renewal.`;
-    }
-
-    return {
-      type: 'warning',
-      message: 'License expiring soon',
-      description: descriptionText,
-    };
-  }
-
-  // ===== NOT INSTALLED =====
-  if (status === 'NOT_INSTALLED') {
-    return {
-      type: 'error',
-      message: 'License not found',
-      description: 'Please install a valid license to continue.',
-    };
-  }
-  // =====EXPIRED=====
-  if (status === 'EXPIRED') {
-    return {
-      type: 'error',
-      message: 'License expired',
-      description: 'Your license has expired. Please renew or install a new license.',
-    };
-  }
-
-  return null;
-}

package/core/models/roles/components/role-add/menu-label.js

@@ -1,14 +0,0 @@
-// ------------------------
-// Menu caption + path label
-// ------------------------
-const MenuLabel = ({ menu }) => {
-  const path = menu.path || menu.route;
-  return (
-    <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', gap: 8, lineHeight: 1.3 }}>
-      <span>{menu.caption}</span>
-      {path ? <span style={{ color: '#999', fontSize: 12 }}>{path}</span> : null}
-    </div>
-  );
-};
-
-export default MenuLabel;