ui-soxo-bootstrap-core 2.4.25-dev.21 → 2.4.25-dev.23

package/core/components/external-window/{index.test.js → external-window.test.js}

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, screen, act } from '@testing-library/react';
-import { ExternalWindow } from './index';
+import { ExternalWindow } from './external-window';
 
 // Mock window.open
 global.open = jest.fn(() => {
@@ -21,8 +21,8 @@ global.open = jest.fn(() => {
     removeEventListener: jest.fn(),
     close: jest.fn(),
     screen: {
-        availWidth: 1920,
-        availHeight: 1080,
+      availWidth: 1920,
+      availHeight: 1080,
     },
     getComputedStyle: jest.fn().mockReturnValue({}),
   };
@@ -31,16 +31,16 @@ global.open = jest.fn(() => {
 
 // Mock getComputedStyle
 global.getComputedStyle = jest.fn(() => ({
-    backgroundColor: '#ffffff',
-    color: '#000000'
+  backgroundColor: '#ffffff',
+  color: '#000000'
 }));
 
 // Mock message.error
 jest.mock('antd', () => ({
-    ...jest.requireActual('antd'),
-    message: {
-      error: jest.fn(),
-    },
+  ...jest.requireActual('antd'),
+  message: {
+    error: jest.fn(),
+  },
 }));
 
 describe('ExternalWindow', () => {
@@ -61,11 +61,11 @@ describe('ExternalWindow', () => {
   it('calls window.close on unmount', () => {
     const handleClose = jest.fn();
     const { unmount } = render(<ExternalWindow onClose={handleClose} />);
-    
+
     const newWindow = global.open.mock.results[0].value;
-    
+
     unmount(); // cleanup
-    
+
     expect(newWindow.close).toHaveBeenCalledTimes(1);
   });
 

package/core/components/index.js

@@ -10,7 +10,7 @@ import RootApplicationAPI from './root-application-api/root-application-api';
 
 import { HomePageAPI } from '../modules';
 
-import { ExternalWindow } from './external-window';
+import { ExternalWindow } from './external-window/external-window';
 
 export {
     LandingAPI,

package/core/lib/components/sidemenu/sidemenu.js

@@ -158,29 +158,32 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
 
   //   callback();
   // };
+  
 
   const onMenuClick = (menu, index) => {
     const key = menu.path || `menu-${menu.id || index}`;
-    const parentKey = menu.parentKey;
 
-    // Keep submenu highlighted
     setSelectedKeys([key]);
 
-    // Keep parent open
-  
-  if (parentKey) {
-    setOpenKeys((prev) =>
-      prev.includes(parentKey) ? prev : [...prev, parentKey]
-    );
-  }
+    if (menu.path) {
+      history.push(menu.path);
+    }
 
-    history.push(menu.path);
     setMenu(menu);
-
     if (callback) callback();
   };
+  
 
   const onOpenChange = (keys) => {
+    const latestOpenKey = keys.find((k) => !openKeys.includes(k));
+
+    // If opening a ROOT menu → close other roots
+    if (rootSubmenuKeys.includes(latestOpenKey)) {
+      setOpenKeys([latestOpenKey]);
+      return;
+    }
+
+    // Otherwise (2nd / 3rd level) → keep ALL parents open
     setOpenKeys(keys);
   };
 
@@ -207,6 +210,8 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
     // document.documentElement.style.setProperty('--custom-text-color', state.theme.colors.colorText);
   }, [state.theme]);
 
+  const rootSubmenuKeys = Menus.screenMenus(modules, 'order').map((m) => m.path || m.caption);
+
   return (
     <div className="sidemenu">
       {loading ? (
@@ -337,7 +342,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
                 let sub_menus = menu && menu.sub_menus ? Menus.screenMenus(menu.sub_menus) : [];
 
                 if (menu && sub_menus && sub_menus.length) {
-                  let randomIndex = parseInt(Math.random() * 10000000000);
+                  // let randomIndex = parseInt(Math.random() * 10000000000);
 
                   return (
                     <SubMenu
@@ -358,7 +363,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
                       }
                     >
                       {sub_menus.map((submenu, innerIndex) => {
-                        let randomIndex = parseInt(Math.random() * 10000000000);
+                        // let randomIndex = parseInt(Math.random() * 10000000000);
 
                         let third_menus = submenu && submenu.sub_menus ? Menus.screenMenus(submenu.sub_menus) : [];
 
@@ -381,7 +386,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
                               }
                             >
                               {third_menus.map((menu) => {
-                                let randomIndex = parseInt(Math.random() * 10000000000);
+                                // let randomIndex = parseInt(Math.random() * 10000000000);
 
                                 return (
                                   <Menu.Item
@@ -407,7 +412,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
                             </SubMenu>
                           );
                         } else {
-                          let randomIndex = parseInt(Math.random() * 10000000000);
+                          // let randomIndex = parseInt(Math.random() * 10000000000);
 
                           return (
                             <Menu.Item
@@ -433,7 +438,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
                     </SubMenu>
                   );
                 } else {
-                  let randomIndex = parseInt(Math.random() * 10000000000);
+                  // let randomIndex = parseInt(Math.random() * 10000000000);
 
                   return (
                     <Menu.Item

package/core/models/staff/components/staff-add/staff-add.js

@@ -43,9 +43,11 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
     setIsSubmitDisabled(!(watchedName && watchedCode && watchedDesc));
   }, [watchedName, watchedCode, watchedDesc]);
 
-  // Load designations when modal opens
+  // Load designations and staff list when modal opens
   useEffect(() => {
-    if (visible) getDesignations();
+    if (visible) {
+      getDesignations();
+    }
   }, [visible]);
 
   // Reset or fill edit form
@@ -93,61 +95,61 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
       .finally(() => setLoading(false));
   };
 
+
   /** -------------------------------
-   *  VALIDATION – Code
+   *  VALIDATION – Input
    * ------------------------------- */
-  const validateDoctorCode = async (_, value) => {
-    if (editMode) return Promise.resolve(); // Skip validation if editing
-
-    if (!value) {
-      setCodeStatus({ status: '', message: '' });
-      return Promise.resolve();
-    }
-
-    // Starting space not allowed
-    if (value.startsWith(' ')) {
-      setCodeStatus({
-        status: 'error',
-        message: 'Code cannot start with a space',
-      });
-      return Promise.reject(new Error('Code cannot start with a space'));
-    }
-
-    //  Any space not allowed
-    if (/\s/.test(value)) {
-      setCodeStatus({
-        status: 'error',
-        message: 'Spaces are not allowed in the code',
-      });
-      return Promise.reject(new Error('Spaces are not allowed in the code'));
+  const validateInput = async (rule, value) => {
+    // Common check: Starting space
+    if (value && value.startsWith(' ')) {
+      const msg = rule.message || 'Cannot start with a space';
+      if (rule.field === 'id') {
+        setCodeStatus({ status: 'error', message: msg });
+      }
+      return Promise.reject(new Error(msg));
     }
 
-    try {
-      const res = await UsersAPI.getStaffCode(value);
-      console.log(res.message, ' inside validateDoctorCode');
+    // Specific check: Code (id)
+    if (rule.field === 'id') {
+      if (editMode) return Promise.resolve();
 
-      if (res?.status === 409 || res?.success === false) {
-        setCodeStatus({ status: 'error', message: res.message || 'Code already exists' });
-        console.log('here');
-        return Promise.reject(new Error(res.message || 'Code already exists'));
+      if (!value) {
+        setCodeStatus({ status: '', message: '' });
+        return Promise.resolve();
       }
 
-      if (res?.status === 200 && res?.success === true) {
-        setCodeStatus({
-          status: 'success',
-          message: 'The entered code is valid for assigning a staff.',
-        });
-        return Promise.resolve();
+      // Any space check
+      if (/\s/.test(value)) {
+        setCodeStatus({ status: 'error', message: 'Spaces are not allowed in the code' });
+        return Promise.reject(new Error('Spaces are not allowed in the code'));
       }
 
-      setCodeStatus({ status: 'error', message: 'Please enter a valid code' });
-      return Promise.reject(new Error('Please enter a valid code'));
-    } catch {
-      setCodeStatus({ status: 'error', message: 'Validation failed' });
-      return Promise.reject(new Error('Validation failed'));
+      // API Check
+      try {
+        const res = await UsersAPI.getStaffCode(value);
+
+        if (res?.status === 409 || res?.success === false) {
+          setCodeStatus({ status: 'error', message: res.message || 'Code already exists' });
+          return Promise.reject(new Error(res.message || 'Code already exists'));
+        }
+
+        if (res?.status === 200 && res?.success === true) {
+          setCodeStatus({ status: 'success', message: 'The entered code is valid for assigning a staff.' });
+          return Promise.resolve();
+        }
+
+        setCodeStatus({ status: 'error', message: 'Please enter a valid code' });
+        return Promise.reject(new Error('Please enter a valid code'));
+      } catch {
+        setCodeStatus({ status: 'error', message: 'Validation failed' });
+        return Promise.reject(new Error('Validation failed'));
+      }
     }
+
+    return Promise.resolve();
   };
 
+
   /** -------------------------------
    *  UTIL – Enter Key Navigation
    * ------------------------------- */
@@ -171,8 +173,8 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
       shortName: data.shortName,
       description: data.description,
       designation: data.designationPtr,
-      phone1: data.phone,
-      phone2: data.mobile || data.alternateMobile,
+      phone1: data.phone || data.mobile,
+      phone2: data.alternateMobile,
       email1: data.email,
       email2: data.alternateEmail,
       slno: data.slNo,
@@ -249,19 +251,38 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
               name="id"
               validateTrigger="onChange"
               hasFeedback={!editMode}
-              rules={[{ required: true, message: 'Code is required' }, { validator: validateDoctorCode }]}
+              rules={[
+                { required: true, message: 'Code is required' },
+                { validator: validateInput },
+              ]}
             >
               <Input placeholder="Enter Code" autoComplete="off" maxLength={10} ref={nameInputRef} onKeyDown={handleEnterKey} disabled={editMode} />
             </Form.Item>
           </Col>
 
           <Col span={12}>
-            <Form.Item label="Name" name="description" rules={[{ required: true }]}>
+            <Form.Item
+              label="Name"
+              name="description"
+              rules={[
+                { required: true, message: 'Name is required' },
+                { pattern: /^[A-Za-z\s]+$/, message: 'Name should contain only alphabets' },
+                { validator: validateInput, message: 'Name cannot start with a space' },
+              ]}
+            >
               <Input placeholder="Enter Description" autoComplete="off" onKeyDown={handleEnterKey} />
             </Form.Item>
           </Col>
           <Col span={6}>
-            <Form.Item label="Short Name" name="shortName" rules={[{ required: true }]}>
+            <Form.Item
+              label="Short Name"
+              name="shortName"
+              rules={[
+                { required: true, message: 'Short Name is required' },
+                { pattern: /^[A-Za-z\s]+$/, message: 'Name should contain only alphabets' },
+                { validator: validateInput, message: 'Short Name cannot start with a space' },
+              ]}
+            >
               <Input placeholder="Enter Short Name" autoComplete="off" onKeyDown={handleEnterKey} maxLength={10} />
             </Form.Item>
           </Col>
@@ -309,13 +330,13 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
               </Col>
 
               <Col span={6}>
-                <Form.Item label="Email ID" name="email1">
+                <Form.Item label="Email ID" name="email1" rules={[{ type: 'email', message: 'Please enter a valid email' }]}>
                   <Input autoComplete="off" placeholder="Enter Email" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
 
               <Col span={6}>
-                <Form.Item label="Alternate Email" name="email2">
+                <Form.Item label="Alternate Email" name="email2" rules={[{ type: 'email', message: 'Please enter a valid email' }]}>
                   <Input autoComplete="off" placeholder="Enter Email" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
@@ -330,7 +351,7 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
 
               <Col span={8}>
                 <Form.Item label="Serial Number" name="slno" rules={[{ message: 'only numbers are allowed', pattern: /^\d*$/ }]}>
-                  <Input autoComplete="off" maxLength={5} placeholder="Enter Serial Number" onKeyDown={handleEnterKey} />
+                  <Input autoComplete="off" maxLength={5} placeholder="Enter Serial Number" onKeyDown={handleEnterKey} disabled={editMode} />
                 </Form.Item>
               </Col>
 
@@ -352,7 +373,14 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
 
             <Row>
               <Col span={24}>
-                <Form.Item label="Remarks" name="remarks">
+                <Form.Item
+                  label="Remarks"
+                  name="remarks"
+                  rules={[
+                    { max: 50, message: 'Remarks must be less than 50 characters' },
+                    { validator: validateInput, message: 'Remarks cannot start with a space' },
+                  ]}
+                >
                   <Input autoComplete="off" placeholder="Enter Remarks" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>

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

@@ -614,6 +614,8 @@ function GuestList({
       {
         title: '#',
         dataIndex: 'index',
+        key: 'ColumnIndex',
+        width: 60,
         render: (value, item, index) => index + 1,
         key: 'ColumnIndex',
         fixed: isFixedIndex ? 'left' : null,
@@ -777,6 +779,8 @@ function GuestList({
         field: entry.field,
         title: entry.title,
         key: entry.field,
+        width: entry.width || 160,
+        ellipsis: true,
         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:
@@ -1042,7 +1046,8 @@ function GuestList({
           ) : (
             <TableComponent
               size="small"
-              scroll={{ x: true, y: '60vh' }}
+              scroll={{ x: 'max-content', y: '60vh' }}
+              tableLayout="fixed"
               sticky
               rowKey={(record) => record.OpNo}
               dataSource={filtered ? filtered : patients} // In case if there is no filtered values we can use patient data

package/package.json

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