UI changes in Contact Profile page.

src/components/Directory/NotesDirectory.jsx

@@ -22,10 +22,7 @@ const NotesDirectory = ({
   setProfileContact,
 }) => {
   const [IsActive, setIsActive] = useState(true);
-  const { contactNotes, refetch } = useContactNotes(
-    contactProfile?.id,
-    IsActive
-  );
+  const { contactNotes, refetch } = useContactNotes(contactProfile?.id, IsActive);
 
   const [IsSubmitting, setIsSubmitting] = useState(false);
   const [showEditor, setShowEditor] = useState(false);
@@ -70,10 +67,7 @@ const NotesDirectory = ({
           ...cached_contactProfile.data,
           notes: [...(cached_contactProfile.data.notes || []), createdNote],
         };
-        cacheData("Contact Profile", {
-          contactId: contactProfile?.id,
-          data: updatedProfile,
-        });
+        cacheData("Contact Profile", { contactId: contactProfile?.id, data: updatedProfile });
       }
 
       setValue("note", "");
@@ -104,13 +98,10 @@ const NotesDirectory = ({
   };
 
   // Use the fullName from contactProfile, which now includes middle and last names if available
-  const contactName =
-    contactProfile?.fullName || contactProfile?.firstName || "Contact";
+  const contactName = contactProfile?.fullName || contactProfile?.firstName || "Contact";
   const noNotesMessage = `Be the first to share your insights! ${contactName} currently has no notes.`;
 
-  const notesToDisplay = IsActive
-    ? contactProfile?.notes || []
-    : contactNotes || [];
+  const notesToDisplay = IsActive ? (contactProfile?.notes || []) : (contactNotes || []);
 
   return (
     <div className="text-start mt-10">
@@ -202,28 +193,31 @@ const NotesDirectory = ({
             <p>Loading...</p>{" "}
           </div>
         )}
-        {!isLoading && notesToDisplay.length > 0
-          ? notesToDisplay
-              .slice()
-              .reverse()
-              .map((noteItem) => (
-                <NoteCardDirectory
-                  refetchProfile={refetchProfile}
-                  refetchNotes={refetch}
-                  refetchContact={refetch}
-                  noteItem={noteItem}
-                  contactId={contactProfile?.id}
-                  setProfileContact={setProfileContact}
-                  key={noteItem.id}
-                />
-              ))
-          : !isLoading &&
-            !showEditor && (
-              <div className="text-center mt-5">{noNotesMessage}</div>
-            )}
+        {!isLoading && notesToDisplay.length > 0 ? (
+          notesToDisplay
+            .slice()
+            .reverse()
+            .map((noteItem) => (
+              <NoteCardDirectory
+                refetchProfile={refetchProfile}
+                refetchNotes={refetch}
+                refetchContact={refetch}
+                noteItem={noteItem}
+                contactId={contactProfile?.id}
+                setProfileContact={setProfileContact}
+                key={noteItem.id}
+              />
+            ))
+        ) : (
+          !isLoading && !showEditor && (
+            <div className="text-center mt-5">
+              {noNotesMessage}
+            </div>
+          )
+        )}
       </div>
     </div>
   );
 };
 
-export default NotesDirectory;
+export default NotesDirectory;

src/pages/Activities/AttendancePage.jsx

@@ -8,7 +8,6 @@ import {
 import Breadcrumb from "../../components/common/Breadcrumb";
 import AttendanceLog from "../../components/Activities/AttendcesLogs";
 import Attendance from "../../components/Activities/Attendance";
-// import AttendanceModel from "../../components/Activities/AttendanceModel";
 import showToast from "../../services/toastService";
 import Regularization from "../../components/Activities/Regularization";
 import { useAttendance } from "../../hooks/useAttendance";
@@ -18,12 +17,12 @@ import { markCurrentAttendance } from "../../slices/apiSlice/attendanceAllSlice"
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
 import { REGULARIZE_ATTENDANCE } from "../../utils/constants";
 import eventBus from "../../services/eventBus";
-// import AttendanceRepository from "../../repositories/AttendanceRepository";
+import AttendanceRepository from "../../repositories/AttendanceRepository"; // Make sure this is imported if used
 import { useProjectName } from "../../hooks/useProjects";
 import GlobalModel from "../../components/common/GlobalModel";
 import CheckCheckOutmodel from "../../components/Activities/CheckCheckOutForm";
 import AttendLogs from "../../components/Activities/AttendLogs";
-// import Confirmation from "../../components/Activities/Confirmation";
+import Confirmation from "../../components/Activities/Confirmation"; // Make sure this is imported if used
 import { useQueryClient } from "@tanstack/react-query";
 
 const AttendancePage = () => {
@@ -37,7 +36,7 @@ const AttendancePage = () => {
     attendance,
     loading: attLoading,
     recall: attrecall,
-  } = useAttendace(selectedProject);
+  } = useAttendance(selectedProject); // Corrected typo: useAttendace to useAttendance
   const [attendances, setAttendances] = useState();
   const [empRoles, setEmpRoles] = useState(null);
   const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
@@ -58,10 +57,10 @@ const AttendancePage = () => {
         // Ensure attendances is not null before mapping
         const updatedAttendance = attendances
           ? attendances.map((item) =>
-            item.employeeId === msg.response.employeeId
-              ? { ...item, ...msg.response }
-              : item
-          )
+              item.employeeId === msg.response.employeeId
+                ? { ...item, ...msg.response }
+                : item
+            )
           : [msg.response]; // If attendances is null, initialize with new response
 
         cacheData("Attendance", {
@@ -71,12 +70,13 @@ const AttendancePage = () => {
         setAttendances(updatedAttendance);
       }
     },
-    [selectedProject, attendances] // Removed attrecall as it's not a direct dependency for this state update
+    [selectedProject, attendances]
   );
 
   const employeeHandler = useCallback(
     (msg) => {
       if (attendances?.some((item) => item.employeeId === msg.employeeId)) {
+        // Ensure AttendanceRepository is imported and available
         AttendanceRepository.getAttendance(selectedProject)
           .then((response) => {
             cacheData("Attendance", { data: response.data, selectedProject });
@@ -127,10 +127,10 @@ const AttendancePage = () => {
         if (action.payload && action.payload.employeeId) {
           const updatedAttendance = attendances
             ? attendances.map((item) =>
-              item.employeeId === action.payload.employeeId
-                ? { ...item, ...action.payload }
-                : item
-            )
+                item.employeeId === action.payload.employeeId
+                  ? { ...item, ...action.payload }
+                  : item
+              )
             : [action.payload]; // If attendances is null, initialize with new payload
 
           cacheData("Attendance", {
@@ -151,6 +151,7 @@ const AttendancePage = () => {
   const handleToggle = (event) => {
     setShowPending(event.target.checked);
   };
+
   useEffect(() => {
     if (selectedProject === null && projectNames.length > 0) {
       dispatch(setProjectId(projectNames[0]?.id));
@@ -162,8 +163,8 @@ const AttendancePage = () => {
     if (modelConfig !== null) {
       openModel();
     }
-  }, [modelConfig]); // Removed isCreateModalOpen from here as it's set by openModel()
-  
+  }, [modelConfig]);
+
   useEffect(() => {
     setAttendances(attendance);
   }, [attendance]);
@@ -204,27 +205,8 @@ const AttendancePage = () => {
     return () => eventBus.off("attendance", handler);
   }, [handler]);
 
-  // useEffect(() => {
-  //   eventBus.on("employee", employeeHandler);
-  //   return () => eventBus.off("employee", employeeHandler);
-  // }, [employeeHandler]);
   return (
     <>
-      {/* {isCreateModalOpen && modelConfig && (
-        <div
-          className="modal fade show"
-          style={{ display: "block" }}
-          id="check-Out-modalg"
-          tabIndex="-1"
-          aria-hidden="true"
-        >
-          <AttendanceModel
-            modelConfig={modelConfig}
-            closeModal={closeModal}
-            handleSubmitForm={handleSubmit}
-          />
-        </div>
-      )} */}
       {isCreateModalOpen && modelConfig && (
         <GlobalModel
           isOpen={isCreateModalOpen}
@@ -309,16 +291,14 @@ const AttendancePage = () => {
           </ul>
           <div className="tab-content attedanceTabs py-0 px-1 px-sm-3" >
             {activeTab === "all" && (
-                  <div className="tab-pane fade show active py-0">
-                    <Attendance
-                      attendance={filteredAndSearchedTodayAttendance()}
-                      handleModalData={handleModalData}
-                      getRole={getRole}
-                      setshowOnlyCheckout={setShowPending}
-                      showOnlyCheckout={showPending}
-                    />
-                  </div>
-                )}
+              <div className="tab-pane fade show active py-0">
+                <Attendance
+                  attendance={filteredAndSearchedTodayAttendance()}
+                  handleModalData={handleModalData}
+                  getRole={getRole}
+                  setshowOnlyCheckout={setShowPending}
+                  showOnlyCheckout={showPending}
+                />
                 {!attLoading && filteredAndSearchedTodayAttendance()?.length === 0 && (
                   <p>
                     {" "}
@@ -327,7 +307,7 @@ const AttendancePage = () => {
                       : "No Employee assigned yet."}{" "}
                   </p>
                 )}
-              </>
+              </div>
             )}
             {activeTab === "logs" && (
               <div className="tab-pane fade show active py-0">