error fixed

Author: uhakruthi1

src/components/BMDashboard/Equipment/List/EquipmentListModal.jsx

@@ -6,6 +6,19 @@ function EquipmentListModal({ modal, setModal, record, recordType }) {
   if (!record) return null;
 
   const toggle = () => setModal(false);
+  const renderUser = user => {
+    if (!user) {
+      return <span>-</span>;
+    }
+
+    const fullName = [user.firstName, user.lastName].filter(Boolean).join(' ') || 'Unknown User';
+
+    if (!user._id) {
+      return <span>{fullName}</span>;
+    }
+
+    return <a href={`/userprofile/${user._id}`}>{fullName}</a>;
+  };
 
   const headerTitle =
     {
@@ -33,15 +46,7 @@ function EquipmentListModal({ modal, setModal, record, recordType }) {
                   {(record.updateRecord || []).map(data => (
                     <tr key={data._id}>
                       <td>{moment.utc(data.date).format('LL')}</td>
-                      <td>
-                        {data.createdBy ? (
-                          <a href={`/userprofile/${data.createdBy._id}`}>
-                            {`${data.createdBy.firstName} ${data.createdBy.lastName}`}
-                          </a>
-                        ) : (
-                          <span>-</span>
-                        )}
-                      </td>
+                      <td>{renderUser(data.createdBy)}</td>
                     </tr>
                   ))}
                 </tbody>
@@ -64,15 +69,7 @@ function EquipmentListModal({ modal, setModal, record, recordType }) {
                       <td>{moment.utc(data.date).format('LL')}</td>
                       <td>{data.status || '-'}</td>
                       <td>{data.quantity || '-'}</td>
-                      <td>
-                        {data.requestedBy ? (
-                          <a href={`/userprofile/${data.requestedBy._id}`}>
-                            {`${data.requestedBy.firstName} ${data.requestedBy.lastName}`}
-                          </a>
-                        ) : (
-                          <span>-</span>
-                        )}
-                      </td>
+                      <td>{renderUser(data.requestedBy)}</td>
                     </tr>
                   ))}
                 </tbody>

src/components/BMDashboard/ItemList/RecordsModal.jsx

@@ -69,6 +69,23 @@ export function Record({ record, recordType, setRecord }) {
     if (value == null) return '-';
     return unit ? `${value} ${unit}` : `${value}`;
   };
+  const renderUser = user => {
+    if (!user) {
+      return <span>-</span>;
+    }
+
+    const fullName = [user.firstName, user.lastName].filter(Boolean).join(' ') || 'Unknown User';
+
+    if (!user._id) {
+      return <span>{fullName}</span>;
+    }
+
+    return (
+      <a href={`/userprofile/${user._id}`} className={darkMode ? styles.blue_link : ''}>
+        {fullName}
+      </a>
+    );
+  };
 
   const handleApprove = async (purchaseId, quantity) => {
     try {
@@ -122,15 +139,8 @@ export function Record({ record, recordType, setRecord }) {
                 <td>{moment.utc(data.date).format('LL')}</td>
                 <td>{formatQuantity(data.quantityUsed, record.itemType?.unit)}</td>
                 <td>{formatQuantity(data.quantityWasted, record.itemType?.unit)}</td>
-                <td>
-                  <a
-                    href={`/userprofile/${data.createdBy._id}`}
-                    className={darkMode ? styles.blue_link : ''}
-                  >
-                    {`${data.createdBy.firstName} ${data.createdBy.lastName}`}
-                  </a>
-                </td>
-                <td>{data?.createdBy?.email}</td>
+                <td>{renderUser(data.createdBy)}</td>
+                <td>{data?.createdBy?.email || '-'}</td>
               </tr>
             ))
           ) : (
@@ -169,15 +179,8 @@ export function Record({ record, recordType, setRecord }) {
                   <td>{priority}</td>
                   <td>{brandPref}</td>
                   <td>{quantity || '-'}</td>
-                  <td>
-                    <a
-                      href={`/userprofile/${requestedBy._id}`}
-                      className={darkMode ? styles.blue_link : ''}
-                    >
-                      {`${requestedBy.firstName} ${requestedBy.lastName}`}
-                    </a>
-                  </td>
-                  <td>{requestedBy.email}</td>
+                  <td>{renderUser(requestedBy)}</td>
+                  <td>{requestedBy?.email || '-'}</td>
                   <td>{moment(date).format('MM/DD/YY')}</td>
                   <td>{status}</td>
                   <td>

src/components/BMDashboard/ToolItemList/ToolRecordsModal.jsx

@@ -30,6 +30,20 @@ export default function RecordsModal({ modal, setModal, record, setRecord, recor
 }
 
 export function Record({ record, recordType }) {
+  const renderUser = user => {
+    if (!user) {
+      return <span>-</span>;
+    }
+
+    const fullName = [user.firstName, user.lastName].filter(Boolean).join(' ') || 'Unknown User';
+
+    if (!user._id) {
+      return <span>{fullName}</span>;
+    }
+
+    return <a href={`/userprofile/${user._id}`}>{fullName}</a>;
+  };
+
   if (recordType === 'Update') {
     return (
       <>
@@ -47,12 +61,7 @@ export function Record({ record, recordType }) {
               <tr key={index}>
                 <td>{moment.utc(data.date).format('LL')}</td>
                 <td>{data.condition}</td>
-                <td>
-                  <a href={`/userprofile/${data.createdBy._id}`}>
-                    {`${data.createdBy?.firstName || 'Unknown'} 
-                    ${data.createdBy?.lastName || 'Unknown'}`}
-                  </a>
-                </td>
+                <td>{renderUser(data.createdBy)}</td>
               </tr>
             );
           })}
@@ -82,11 +91,7 @@ export function Record({ record, recordType }) {
                   <td>{priority}</td>
                   <td>{makeModelPref}</td>
                   <td>{quantity || '-'}</td>
-                  <td>
-                    <a href={`/userprofile/${requestedBy?._id}`}>
-                      {`${requestedBy?.firstName || 'Unknown'} ${requestedBy?.lastName || 'User'}`}
-                    </a>
-                  </td>
+                  <td>{renderUser(requestedBy)}</td>
                   <td>{moment(date).format('MM/DD/YY')}</td>
                   <td>{status}</td>
                   <td>{usageDesc}</td>