ui-soxo-bootstrap-core 2.5.4 → 2.5.6

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react';
-import './staff-add.scss';
+
 import { Modal, Tabs, Input, Form, Row, Col, message, Checkbox, Select } from 'antd';
 import { useTranslation, Button } from './../../../../lib/';
 import { UsersAPI } from '../../..';
@@ -163,20 +163,20 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
     return Promise.resolve();
   };
 
- const validateSerial = (_, value) => {
-   if (!value) {
-     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();
-   }
+    // 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));
+    const exists = staffList.some((staff) => String(staff.slNo) === String(value));
 
-   return exists ? Promise.reject('Serial Number already exists') : Promise.resolve();
- };
+    return exists ? Promise.reject('Serial Number already exists') : Promise.resolve();
+  };
 
   /** -------------------------------
    *  UTIL – Enter Key Navigation
@@ -215,6 +215,8 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
     });
   };
 
+  const existing = staffData || {};
+
   /** -------------------------------
    *  SUBMIT HANDLER
    * ------------------------------- */
@@ -225,19 +227,19 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
       id: values.id,
       shortName: values.shortName,
       description: values.description,
-      designationPtr: values.designation || null,
-      phone: values.phone1 || null,
-      mobile: values.phone1 || null,
-      alternateMobile: values.phone2 || null,
-      email: values.email1 || null,
-      alternateEmail: values.email2 || null,
-      remarks: values.remarks || null,
-      slNo: values.slno ? Number(values.slno) : null,
+      designationPtr: values.designation ?? existing.designationPtr ?? null,
+      phone: values.phone1 ?? existing.phone ?? null,
+      mobile: values.phone1 ?? existing.mobile ?? null,
+      alternateMobile: values.phone2 ?? existing.alternateMobile ?? null,
+      email: values.email1 ?? existing.email ?? null,
+      alternateEmail: values.email2 ?? existing.alternateEmail ?? null,
+      remarks: values.remarks ?? existing.remarks ?? null,
+      slNo: values.slno ?? existing.slNo ?? null,
       active: values.active === 'Y' ? 'Y' : 'N',
-      address1: values.address1 || null,
-      address2: values.address2 || null,
-      place: values.place || null,
-      zip: values.zip || null,
+      address1: values.address1 ?? existing.address1 ?? null,
+      address2: values.address2 ?? existing.address2 ?? null,
+      place: values.place ?? existing.place ?? null,
+      zip: values.zip ?? existing.zip ?? null,
     };
 
     try {
@@ -279,10 +281,7 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
               name="id"
               validateTrigger="onChange"
               hasFeedback={!editMode}
-              rules={[
-                { required: true, message: 'Code is required' },
-                { validator: validateInput },
-              ]}
+              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>
@@ -383,7 +382,7 @@ const StaffAdd = ({ visible, onCancel, staffId, staffData, onSuccess }) => {
                   name="slno"
                   rules={[{ message: 'only numbers are allowed', pattern: /^\d*$/ }, { validator: validateSerial }]}
                 >
-                  <Input autoComplete="off" maxLength={5} placeholder="Enter Serial Number" onKeyDown={handleEnterKey}  />
+                  <Input autoComplete="off" maxLength={5} placeholder="Enter Serial Number" onKeyDown={handleEnterKey} />
                 </Form.Item>
               </Col>
 

package/package.json

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