ui-soxo-bootstrap-core 2.6.48 → 2.6.50-dev.0

package/core/components/index.js

@@ -7,8 +7,8 @@ import RootApplicationAPI from './root-application-api/root-application-api';
 import { HomePageAPI } from '../modules';
 
 import { ExternalWindow } from './external-window/external-window';
-// import LicenseAlert from './license-management/license-alert';
+import LicenseAlert from './license-management/license-alert';
 
 export { LandingAPI, RootApplicationAPI, ExtraInfoDetail, HomePageAPI, ExternalWindow, 
-    // LicenseAlert 
+    LicenseAlert 
 };

package/core/components/landing-api/landing-api.js

@@ -58,28 +58,36 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
 
   const [meta, setMeta] = useState({});
   const [loadingMessage, setLoadingMessage] = useState('');
-  // const [licenseData, setLicenseData] = useState(null);
-  // const [licAlert, setLicAlert] = useState(false);
+  const [licenseData, setLicenseData] = useState(null);
+  const [licAlert, setLicAlert] = useState(false);
 
   // const [reports, setReports] = useState([]);
 
   var config = {};
 
-  // //fetch license summary
-  // const fetchSummary = async () => {
-  //   try {
-  //     const res = await MenusAPI.getSummary();
-  //     if (res?.data) {
-  //       setLicenseData(res?.data);
-  //       setLicAlert(true);
-  //     } else {
-  //       setLicenseData(null);
-  //       setLicAlert(false);
-  //     }
-  //   } catch (err) {
-  //     console.error(err);
-  //   }
-  // };
+  // Variable decides whether license-summary fetching/alerting runs at all
+  let disableLicense = false;
+
+  if (process.env.REACT_APP_DISABLE_LICENSE) {
+    disableLicense = JSON.parse(process.env.REACT_APP_DISABLE_LICENSE);
+  }
+
+  //fetch license summary
+  const fetchSummary = async () => {
+    if (disableLicense) return;
+    try {
+      const res = await MenusAPI.getSummary();
+      if (res?.data) {
+        setLicenseData(res?.data);
+        setLicAlert(true);
+      } else {
+        setLicenseData(null);
+        setLicAlert(false);
+      }
+    } catch (err) {
+      console.error(err);
+    }
+  };
 
   // Variable decides the control of homepage
   // #TODO This is a temporary fix - Homemage
@@ -285,7 +293,7 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
 
     await loadMenus(report);
     // fetch license summary
-    // fetchSummary();
+    fetchSummary();
   }
 
   // const keyMap = {
@@ -307,7 +315,7 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
     setLoader(true);
 
     // setReports(report)
-    // fetchSummary();
+    fetchSummary();
     const result = await MenusAPI.getMenus(user);
 
     // console.log(result);
@@ -437,8 +445,8 @@ export default function LandingApi({ history, CustomComponents, CustomModels, ap
         modules={allModules}
         user={user}
         history={history}
-        // licenseData={licenseData}
-        // licAlert={licAlert}
+        licenseData={licenseData}
+        licAlert={licAlert}
       >
         {loader ? (
           <Card className="skeleton-card">

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

@@ -1,97 +1,97 @@
-// import { Alert } from 'antd';
-// import React, { useState, useEffect } from 'react';
+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);
+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
+      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 () => {
+        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;
+  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.',
-//     };
-//   }
+  // ===== 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.',
-//     };
-//   }
+  // ===== 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.`;
-//     }
+  // ===== 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,
-//     };
-//   }
+    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.',
-//     };
-//   }
+  // ===== 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;
-// }
+  return null;
+}

package/core/lib/components/global-header/global-header.js

@@ -20,12 +20,12 @@ import LanguageSwitcher from '../language-switcher/language-switcher';
 import { useTranslation } from 'react-i18next';
 import SettingsUtil from '../../../utils/settings.utils';
 import SpotlightSearch from '../spotlight-search/spotlight-search.component';
-// import LicenseAlert from '../../../components/license-management/license-alert';
+ import LicenseAlert from '../../../components/license-management/license-alert';
 
 const { Title } = Typography;
 function GlobalHeaderContent({ loading, appSettings, children, isConnected, history, modules = [], sidemenu = [], reload, meta = {}, 
-  //  licAlert,
-  // licenseData,
+    licAlert,
+   licenseData,
   ...props }) {
   let location = useLocation();
   // let location = {};
@@ -244,19 +244,19 @@ function GlobalHeaderContent({ loading, appSettings, children, isConnected, hist
 
 
 
-     {/* {licAlert && licenseData && ( */}
-        {/* // <div
-        //   style={{
-        //     top: 0,
-        //     marginTop: '3rem',
-        //     right: '2%',
-        //     position: 'absolute',
-        //     zIndex: 1008,
-        //   }}
-        // >
-          // <LicenseAlert data={licenseData} />
-        // </div>
-      )} */}
+  {licAlert && licenseData && ( 
+       <div
+          style={{
+            top: 0,
+            marginTop: '3rem',
+            right: '2%',
+            position: 'absolute',
+            zIndex: 1008,
+          }}
+        >
+          <LicenseAlert data={licenseData} />
+        </div>
+      )} 
       </>
   );
 }

package/core/lib/utils/http/http.utils.js

@@ -14,6 +14,10 @@ import FirebaseUtils from '../firebase.utils';
 import { Location } from '../location/location.utils';
 import { getRefreshToken, queueRequest, refreshAccessToken } from './auth.helper';
 
+const isLicenseDisabled = process.env.REACT_APP_DISABLE_LICENSE
+  ? JSON.parse(process.env.REACT_APP_DISABLE_LICENSE)
+  : false;
+
 let headers = {
   // 'Accept': 'application/json',
   'Content-Type': 'application/json',
@@ -128,7 +132,7 @@ export async function ApiCall({ url, formBody, method, settings, ...props }) {
     const res = await fetch(baseUrl + url, payload);
     const refreshToken = getRefreshToken();
 
-    if (res.status === 403) {
+    if (res.status === 403 && !isLicenseDisabled) {
       message.warn('Your license has expired. Please contact support.');
     }
 

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

@@ -90,41 +90,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.
  *
@@ -219,26 +184,17 @@ function renderCustomComponent({ entry, record, CustomComponents, refresh }) {
  */
 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),
+    url: record?.file_location + record?.file_name,
     config: {
-      requireLinuxPath: resolveRecordValue(entry.require_linux_path, record),
-      replaceBranch: resolveRecordValue(entry.replace_branch, record),
       ...(entry.file_loader_config || {}),
     },
-    entry,
-    record,
+    type:record?.Native_filetype,
   };
 
   return (

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',
@@ -111,24 +103,15 @@ describe('display-cell-renderer', () => {
         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,
+        file_location: '\\\\server\\reports\\',
+        file_name: 'doc.pdf',
+        Native_filetype: 'pdf',
       },
       refresh: jest.fn(),
       CustomComponents: { FileUpload },
@@ -140,14 +123,11 @@ describe('display-cell-renderer', () => {
     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', () => {

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

@@ -474,7 +474,7 @@ export default function ReportingTable({
               dataSource={filtered}
               columns={cols}
               sticky
-              pagination={false}
+              pagination={true}
               summary={(pageData) => {
                 const summaryCols = columns.filter((col) => col.enable_summary);
                 if (!summaryCols.length) return null;
@@ -505,14 +505,14 @@ export default function ReportingTable({
             />
           )}
           <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: 8 }}>
-            <Pagination
+            {/* <Pagination
               showSizeChanger
               current={pagination?.current}
               pageSize={pagination?.pageSize}
               total={pagination?.total}
               pageSizeOptions={[20, 30, 50, 100]}
-              onChange={(page, pageSize) => handlePaginationInternal({ current: page, pageSize })}
-            />
+              onChange={(page, pageSize) => handlePaginationInternal({ current: page, pageSize })} */}
+            {/* /> */}
           </div>
           <p className="size-hint">{patients ? patients.length : 0} records.</p>
         </Card>

package/package.json

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