src/components/Directory/DirectorySchema.js

@@ -35,7 +35,7 @@ export const ContactSchema = z.object({
   tags: z
     .array(
       z.object({
-              id: z.string().nullable().optional(),
+        id: z.string().nullable(),
         name: z.string(),
       })
     )

src/components/Directory/ManageContact.jsx

@@ -87,7 +87,6 @@ const ManageContact = ({ contactId, closeModal }) => {
           : [{ label: "Office", phoneNumber: "" }],
 
         contactCategoryId: contactData.contactCategory?.id || "",
-        address: contactData?.address || "",
         projectIds: contactData.projects?.map((p) => p.id) || [],
         bucketIds: contactData.buckets?.map((b) => b.id) || [],
         tags: contactData.tags || [],
@@ -178,6 +177,7 @@ const ManageContact = ({ contactId, closeModal }) => {
   };
 
   const isPending = updating || creating;
+
   return (
     <FormProvider {...methods}>
       <form className="p-2 p-sm-0" onSubmit={handleSubmit(onSubmit)}>
@@ -205,13 +205,12 @@ const ManageContact = ({ contactId, closeModal }) => {
             <Label htmlFor={"organization"} required>
               Organization
             </Label>
-           <InputSuggestions
+            <InputSuggestions
-    organizationList={organizationList}
+              organizationList={organizationList}
-  value={watch("organization") || ""}
+              value={getValues("organization") || ""}
-  onChange={(val) => setValue("organization", val, { shouldValidate: true })}
+              onChange={(val) => setValue("organization", val)}
-  error={errors.organization?.message}
+              error={errors.organization?.message}
-/>
+            />
-
           </div>
         </div>
 
@@ -472,14 +471,13 @@ const ManageContact = ({ contactId, closeModal }) => {
 
         {/* Actions */}
         <div className="d-flex justify-content-end gap-3 py-2">
-          <button className="btn btn-sm btn-primary" type="submit" disabled={isPending}>
+          <button className="btn btn-sm btn-primary" type="submit">
             {isPending ? "Please Wait..." : "Submit"}
           </button>
           <button
             className="btn btn-sm btn-secondary"
             type="button"
             onClick={handleClosed}
-            disabled={isPending}
           >
             Cancel
           </button>

src/components/common/InputSuggestion.jsx

@@ -8,6 +8,7 @@ const InputSuggestions = ({
 }) => {
   const [filteredList, setFilteredList] = useState([]);
   const [showSuggestions, setShowSuggestions] = useState(false);
+
   const handleInputChange = (e) => {
     const val = e.target.value;
     onChange(val);

src/pages/employee/EmployeeList.jsx

@@ -221,10 +221,10 @@ useEffect(() => {
         recallEmployeeData(
           showInactive,
           showAllEmployees ? null : selectedProjectId
-        );
+        ); // Use selectedProjectId here
       }
     },
-    [employees, showInactive, showAllEmployees, selectedProjectId]
+    [employees, showInactive, showAllEmployees, selectedProjectId] // Add all relevant dependencies
   );
 
   useEffect(() => {
@@ -247,7 +247,7 @@ useEffect(() => {
       )}
 
       {showModal && (
-        <GlobalModel  
+        <GlobalModel
           isOpen={showModal}
           size="lg"
           closeModal={() => setShowModal(false)}
@@ -259,22 +259,40 @@ useEffect(() => {
           />
         </GlobalModel>
       )}
-        {IsDeleteModalOpen && (
+
-        <ConfirmModal
+      {IsDeleteModalOpen && (
-          isOpen={IsDeleteModalOpen}
+        <div
-          type="delete"
+          className={`modal fade  ${IsDeleteModalOpen ? "show" : ""}`}
-          header="Suspend Employee"
+          tabIndex="-1"
-          message="Are you sure you want suspend?"
+          role="dialog"
-          onSubmit={(id) =>
+          style={{
+            display: IsDeleteModalOpen ? "block" : "none",
+            backgroundColor: IsDeleteModalOpen
+              ? "rgba(0,0,0,0.5)"
+              : "transparent",
+          }}
+          aria-hidden="false"
+        >
+          <ConfirmModal
+            type={"delete"}
+            header={
+              selectedEmpFordelete?.isActive
+                ? "Suspend Employee"
+                : "Reactivate Employee"
+            }
+            message={`Are you sure you want to ${
+              selectedEmpFordelete?.isActive ? "suspend" : "reactivate"
+            } this employee?`}
+            onSubmit={() =>
               suspendEmployee({
-                employeeId:id ,
+                employeeId: selectedEmpFordelete.id,
                 active: !selectedEmpFordelete.isActive,
               })
             }
-          onClose={() => setIsDeleteModalOpen(false)}
+            onClose={() => setIsDeleteModalOpen(false)}
-          loading={employeeLodaing}
+            loading={employeeLodaing}
-          paramData={selectedEmpFordelete.id}
+          />
-        />
+        </div>
       )}
 
       <div className="container-fluid">
@@ -647,7 +665,7 @@ useEffect(() => {
                                       <button
                                         className="dropdown-item py-1"
                                         onClick={() =>
-                                          handleOpenDelete(item)
+                                          handleOpenDelete(item.id)
                                         }
                                       >
                                         <i className="bx bx-task-x bx-sm"></i>{" "}