+
{isLoading && (
{" "}
@@ -139,7 +128,8 @@ const NotesDirectory = ({ isLoading, contactProfile, setProfileContact }) => {
setProfileContact={setProfileContact}
key={noteItem.id}
/>
- ))}
+ ) )}
+
{!isLoading && contactProfile?.notes.length == 0 && !addNote && (
No Notes Found
) }
);
diff --git a/src/pages/Directory/Directory.jsx b/src/pages/Directory/Directory.jsx
index 8ec2c23e..dfbcbb81 100644
--- a/src/pages/Directory/Directory.jsx
+++ b/src/pages/Directory/Directory.jsx
@@ -6,7 +6,7 @@ import ManageDirectory from "../../components/Directory/ManageDirectory";
import ListViewDirectory from "../../components/Directory/ListViewDirectory";
import { useBuckets, useDirectory } from "../../hooks/useDirectory";
import { DirectoryRepository } from "../../repositories/DirectoryRepository";
-import { getCachedData } from "../../slices/apiDataManager";
+import { cacheData, getCachedData } from "../../slices/apiDataManager";
import showToast from "../../services/toastService";
import UpdateContact from "../../components/Directory/UpdateContact";
import CardViewDirectory from "../../components/Directory/CardViewDirectory";
@@ -14,6 +14,7 @@ import { useContactCategory } from "../../hooks/masterHook/useMaster";
import usePagination from "../../hooks/usePagination";
import { ITEMS_PER_PAGE } from "../../utils/constants";
import ProfileContactDirectory from "../../components/Directory/ProfileContactDirectory";
+import ConfirmModal from "../../components/common/ConfirmModal";
const Directory = () => {
const [isOpenModal, setIsOpenModal] = useState(false);
@@ -25,6 +26,11 @@ const Directory = () => {
const [searchText, setSearchText] = useState("");
const [listView, setListView] = useState(false);
const [selectedBucketIds, setSelectedBucketIds] = useState([]);
+ const [deleteContact, setDeleteContact] = useState(null);
+ const [IsDeleting, setIsDeletng] = useState(false);
+
+ const [tempSelectedBucketIds, setTempSelectedBucketIds] = useState([]);
+ const [tempSelectedCategoryIds, setTempSelectedCategoryIds] = useState([]);
const { contacts, loading } = useDirectory();
const { contactCategory, loading: contactCategoryLoading } =
@@ -61,36 +67,64 @@ const Directory = () => {
}
};
+ const handleDeleteContact = async () => {
+ try {
+ setIsDeletng(true);
+ const contacts_cache = getCachedData("contacts") || [];
+
+ const response = await DirectoryRepository.DeleteContact(deleteContact);
+ const updatedContacts = ContactList.filter((c) => c.id !== deleteContact);
+ setContactList(updatedContacts);
+ cacheData("Contacts", updatedContacts);
+ showToast("Contact deleted successfully", "success");
+ setDeleteContact(null);
+
+ setIsDeletng(false);
+ } catch (error) {
+ const msg =
+ error.response.data.message ||
+ error.message ||
+ "Error occured during API calling";
+ showToast(msg, "error");
+ setIsDeletng(false);
+ }
+ };
+
const closedModel = () => {
setIsOpenModal(false);
setSelectedContact(null);
setOpen_contact(null);
};
- useEffect(() => {
- setContactList(contacts);
- }, [contacts]);
-
const [selectedCategoryIds, setSelectedCategoryIds] = useState(
contactCategory.map((category) => category.id)
);
+ useEffect(() => {
+ setContactList(contacts);
+
+ // Set temp filter list only (UI checkboxes, not actual filtering yet)
+ setTempSelectedCategoryIds([]);
+ setTempSelectedBucketIds([]);
+ }, [contacts]);
+
const usedCategoryIds = [
...new Set(contacts.map((c) => c.contactCategory?.id)),
];
const filteredCategories = contactCategory.filter((category) =>
usedCategoryIds.includes(category.id)
);
- const handleCategoryChange = (id) => {
- setSelectedCategoryIds((prev) =>
+ const handleTempBucketChange = (id) => {
+ setTempSelectedBucketIds((prev) =>
+ prev.includes(id) ? prev.filter((bid) => bid !== id) : [...prev, id]
+ );
+ };
+
+ const handleTempCategoryChange = (id) => {
+ setTempSelectedCategoryIds((prev) =>
prev.includes(id) ? prev.filter((cid) => cid !== id) : [...prev, id]
);
};
- const handleBucketChange = (id) => {
- setSelectedBucketIds((prev) =>
- prev.includes(id) ? prev.filter((bid) => bid !== id) : [...prev, id]
- );
- };
const usedBucketIds = [
...new Set(contacts.flatMap((c) => c.bucketIds || [])),
];
@@ -117,6 +151,18 @@ const Directory = () => {
}).sort((a, b) => a.name.localeCompare(b.name));
}, [ContactList, searchText, selectedCategoryIds, selectedBucketIds]);
+ const applyFilter = () => {
+ setSelectedBucketIds(tempSelectedBucketIds);
+ setSelectedCategoryIds(tempSelectedCategoryIds);
+ };
+
+ const clearFilter = () => {
+ setTempSelectedBucketIds([]);
+ setTempSelectedCategoryIds([]);
+ setSelectedBucketIds([]);
+ setSelectedCategoryIds([]);
+ };
+
const { currentPage, totalPages, currentItems, paginate } = usePagination(
filteredContacts,
ITEMS_PER_PAGE
@@ -145,7 +191,7 @@ const Directory = () => {
@@ -179,6 +225,28 @@ const Directory = () => {
)}
)}
+ {deleteContact && (
+
+ setDeleteContact(null)}
+ loading={IsDeleting}
+ />
+
+ )}
+
@@ -219,69 +287,108 @@ const Directory = () => {
-
-
-
-
-
- Filter by
-
- {/* Bucket Filter */}
-
-
Buckets
- {filteredBuckets.map(({ id, name }) => (
-
- handleBucketChange(id)}
- />
-
-
- ))}
-
+
+
+
+
+
- {/* Category Filter */}
-
-
Categories
- {filteredCategories.map(({ id, name }) => (
-
-
handleCategoryChange(id)}
- />
-
+
+
+
Filter by
+
+ {/* Bucket Filter */}
+
+
Buckets
+
+ {filteredBuckets.map(({ id, name }) => (
+
+ handleTempBucketChange(id)}
+ />
+
+
+ ))}
- ))}
+
+
+ {/* Category Filter */}
+
+
Categories
+
+ {filteredCategories.map(({ id, name }) => (
+
+ handleTempCategoryChange(id)}
+ />
+
+
+ ))}
+
+
+
+
+
+
+
-
+
+
-
+
Loading...
}
- {!listView && !loading && currentItems.length == 0 && Not Found Contact
}
+ {!listView && !loading && currentItems.length == 0 && (
+ No Matching Contact Found
+ )}
{listView ? (
@@ -343,10 +452,7 @@ const Directory = () => {
| Category |
-
- Action
- |
+ Action |
@@ -355,13 +461,12 @@ const Directory = () => {
Loading... |
)}
- {!loading &&
- currentItems.length === 0 && (
-
- | Not Found Contact |
-
- )}
-
+ {!loading && currentItems.length === 0 && (
+
+ | No Matching Contact Found |
+
+ )}
+
{!loading &&
currentItems.map((contact) => (
{
contact={contact}
setSelectedContact={setSelectedContact}
setIsOpenModal={setIsOpenModal}
+ setOpen_contact={setOpen_contact}
+ setIsOpenModalNote={setIsOpenModalNote}
+ IsDeleted={setDeleteContact}
/>
))}
@@ -387,13 +495,14 @@ const Directory = () => {
setIsOpenModal={setIsOpenModal}
setOpen_contact={setOpen_contact}
setIsOpenModalNote={setIsOpenModalNote}
+ IsDeleted={setDeleteContact}
/>
))}
)}
- {!loading && (
+ {!loading && currentItems < ITEMS_PER_PAGE && (