ui-soxo-bootstrap-core 2.4.25-dev.44 → 2.4.25-dev.46

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

@@ -163,20 +163,20 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
     return Promise.resolve();
   };
 
-  const validateSerial = (_, value) => {
-    if (!value) {
-      return Promise.resolve();
-    }
-   const exists = staffList.some((staff) => {
-     // Ignore current staff in edit mode
-     if (editMode && staff.id === staffId) return false;
-     return String(staff.slNo) === value;
-   });   
-     if (exists) {
-      return Promise.reject('Serial Number already exists');
-    }
-    return Promise.resolve();
-  };
+ const validateSerial = (_, value) => {
+   if (!value) {
+     return Promise.resolve();
+   }
+
+   // Allow same serial number for the same staff in edit mode
+   if (editMode && String(value) === String(staffData?.slNo)) {
+     return Promise.resolve();
+   }
+
+   const exists = staffList.some((staff) => String(staff.slNo) === String(value));
+
+   return exists ? Promise.reject('Serial Number already exists') : Promise.resolve();
+ };
 
   /** -------------------------------
    *  UTIL – Enter Key Navigation
@@ -316,7 +316,7 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
           </Col>
         </Row>
 
-        <Tabs defaultActiveKey="1">
+        <Tabs defaultActiveKey="1" destroyInactiveTabPane={false}>
           {/* GENERAL TAB */}
           <Tabs.TabPane tab="GENERAL" key="1">
             <Row gutter={16}>

package/package.json

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