Compare commits

..

5 Commits

Author SHA1 Message Date
Pramod Mahajan
ad0be79943 updated cache 2025-05-21 16:28:44 +05:30
Pramod Mahajan
a076f1810f removed tab 2025-05-21 16:28:11 +05:30
Pramod Mahajan
c60409e108 changed toolbar position bottom to top 2025-05-21 16:27:51 +05:30
Pramod Mahajan
b4df17b7e0 unneeded margin removed 2025-05-21 16:27:17 +05:30
Pramod Mahajan
eb41a66a79 added delete not method inside driectoryrepository 2025-05-21 16:05:37 +05:30
6 changed files with 318 additions and 228 deletions

View File

@ -4,43 +4,109 @@ import moment from "moment";
import Avatar from "../common/Avatar"; import Avatar from "../common/Avatar";
import { DirectoryRepository } from "../../repositories/DirectoryRepository"; import { DirectoryRepository } from "../../repositories/DirectoryRepository";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
import {getCachedData} from "../../slices/apiDataManager"; import { cacheData, getCachedData } from "../../slices/apiDataManager";
import "../common/TextEditor/Editor.css" import "../common/TextEditor/Editor.css";
const NoteCardDirectory = ({ noteItem, contactId,setProfileContact }) => { const NoteCardDirectory = ({ noteItem, contactId, setProfileContact }) => {
const [editing, setEditing] = useState(false); const [editing, setEditing] = useState(false);
const [ editorValue, setEditorValue ] = useState( noteItem.note ); const [editorValue, setEditorValue] = useState(noteItem.note);
const [isLoading,setIsLoading] = useState(false) const [isLoading, setIsLoading] = useState(false);
const handleUpdateNote= async () => { const [isDeleting, setIsDeleting] = useState(false);
try const handleUpdateNote = async () => {
{ try {
console.log(editorValue) setIsLoading(true);
setIsLoading(true) const payload = {
const payload ={id:noteItem.id,note:editorValue,contactId:contactId} id: noteItem.id,
note: editorValue,
const response = await DirectoryRepository.UpdateNote(noteItem.id, payload); contactId: contactId,
setProfileContact((prev) => ({ };
...prev,
notes: prev.notes.map((note) =>
note.id === noteItem.id ? response?.data : note
),
})); const response = await DirectoryRepository.UpdateNote(
setEditing( false ); noteItem.id,
setIsLoading(false) payload
showToast("Note Updated successfully", "success") );
} catch ( error ) setProfileContact((prev) => ({
{ ...prev,
setIsLoading(false) notes: prev.notes.map((note) =>
const msg = error.reponse.data.message || error.message || "Error occured during API calling." note.id === noteItem.id ? response?.data : note
showToast("Failed to update note", "error"); ),
}));
const cached_contactProfile = getCachedData("Contact Profile");
if (
cached_contactProfile &&
cached_contactProfile.contactId === contactId
) {
const updatedProfile = {
...cached_contactProfile,
data: {
...cached_contactProfile?.data,
notes: cached_contactProfile?.data?.notes.map((note) =>
note.id === noteItem.id ? response?.data : note
),
},
};
cacheData("Contact Profile", updatedProfile);
}
setEditing(false);
setIsLoading(false);
showToast("Note Updated successfully", "success");
} catch (error) {
setIsLoading(false);
const msg =
error.reponse.data.message ||
error.message ||
"Error occured during API calling.";
showToast("Failed to update note", "error");
} }
}; };
const handleDeleteNote = async () => {
try {
setIsDeleting(true);
const resp = await DirectoryRepository.DeleteNote(noteItem.id);
setProfileContact((prev) => ({
...prev,
notes: prev.notes.filter((note) => note.id !== noteItem.id),
}));
const cachedContactProfile = getCachedData("Contact Profile");
if (
cachedContactProfile &&
cachedContactProfile.contactId === contactId
) {
const updatedCache = {
...cachedContactProfile,
data: {
...cachedContactProfile?.data,
notes: (cachedContactProfile?.data?.notes || []).filter(
(note) => note.id !== noteItem.id
),
},
};
cacheData("Contact Profile", updatedCache);
}
setIsDeleting(false);
showToast("Note Deleted Successfully", "success");
} catch (error) {
setIsDeleting(false);
const msg =
error.response?.data?.message ||
error.message ||
"Error occured during API calling";
showToast(msg, "error");
}
};
return ( return (
<div className="card p-1 shadow-sm border-1 mb-2" style={{ width: "fit-content", minWidth: "300px", borderRadius:"0px" }} key={noteItem.id} > <div
className="card p-1 shadow-sm border-1 mb-2 conntactNote"
style={{ width: "100%", minWidth: "300px", borderRadius: "0px" }}
key={noteItem.id}
>
<div className="d-flex justify-content-between align-items-center mb-1"> <div className="d-flex justify-content-between align-items-center mb-1">
<div className="d-flex align-items-center"> <div className="d-flex align-items-center">
<Avatar <Avatar
@ -58,38 +124,25 @@ const NoteCardDirectory = ({ noteItem, contactId,setProfileContact }) => {
</span> </span>
</div> </div>
</div> </div>
<div>
<div className="dropdown">
<i <i
className="bx bx-dots-vertical bx-xs cursor-pointer" className="bx bxs-edit bx-sm me-1 text-primary cursor-pointer"
role="button" onClick={() => setEditing(true)}
id={`dropdownMenuIcon-${noteItem.id}`}
data-bs-toggle="dropdown"
aria-expanded="false"
></i> ></i>
{!isDeleting && (
<ul <i
className="dropdown-menu dropdown-menu-end p-1" className="bx bx-trash bx-sm me-1 text-secondary cursor-pointer"
aria-labelledby={`dropdownMenuIcon-${noteItem.id}`} onClick={handleDeleteNote}
style={{ minWidth: "120px", fontSize: "0.85rem" }} ></i>
> )}
<li> {isDeleting && (
<button <div
className="dropdown-item py-1 px-2 small text-primary" class="spinner-border spinner-border-sm text-secondary"
onClick={() => setEditing(true)} role="status"
> >
<i className="bx bxs-edit bx-sm me-1"></i> Edit <span class="visually-hidden">Loading...</span>
</button> </div>
</li> )}
<li>
<button
className="dropdown-item py-1 px-2 text-danger small"
onClick={()=>{}}
>
<i className="bx bx-trash bx-sm me-1"></i> Delete
</button>
</li>
</ul>
</div> </div>
</div> </div>
@ -102,14 +155,21 @@ const NoteCardDirectory = ({ noteItem, contactId,setProfileContact }) => {
onChange={setEditorValue} onChange={setEditorValue}
theme="snow" theme="snow"
className="compact-editor" className="compact-editor"
/> />
<div className="d-flex justify-content-end gap-2"> <div className="d-flex justify-content-end gap-2">
<span className="text-secondary cursor-pointer" aria-disabled={isLoading} onClick={() => setEditing(false)}> <span
className="text-secondary cursor-pointer"
aria-disabled={isLoading}
onClick={() => setEditing(false)}
>
Cancel Cancel
</span> </span>
<span className="text-primary cursor-pointer" aria-disabled={isLoading} onClick={handleUpdateNote}> <span
{isLoading ? "Please Wait...":"Submit"} className="text-primary cursor-pointer"
aria-disabled={isLoading}
onClick={handleUpdateNote}
>
{isLoading ? "Please Wait..." : "Submit"}
</span> </span>
</div> </div>
</> </>

View File

@ -1,4 +1,4 @@
import React, {useEffect, useState} from "react"; import React, { useEffect, useState } from "react";
import Editor from "../common/TextEditor/Editor"; import Editor from "../common/TextEditor/Editor";
import Avatar from "../common/Avatar"; import Avatar from "../common/Avatar";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
@ -7,7 +7,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { showText } from "pdf-lib"; import { showText } from "pdf-lib";
import { DirectoryRepository } from "../../repositories/DirectoryRepository"; import { DirectoryRepository } from "../../repositories/DirectoryRepository";
import moment from "moment"; import moment from "moment";
import {getCachedData} from "../../slices/apiDataManager"; import { cacheData, getCachedData } from "../../slices/apiDataManager";
import NoteCardDirectory from "./NoteCardDirectory"; import NoteCardDirectory from "./NoteCardDirectory";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
@ -15,10 +15,10 @@ const schema = z.object({
note: z.string().min(1, { message: "Note is required" }), note: z.string().min(1, { message: "Note is required" }),
}); });
const NotesDirectory = ( {isLoading,contactProfile, setProfileContact} ) => const NotesDirectory = ({ isLoading, contactProfile, setProfileContact }) => {
{ const [NotesData, setNotesData] = useState();
const [ NotesData, setNotesData ] = useState() const [IsSubmitting, setIsSubmitting] = useState(false);
const[IsSubmitting,setIsSubmitting] = useState(false) const [addNote, setAddNote] = useState(false);
const { const {
register, register,
handleSubmit, handleSubmit,
@ -40,27 +40,35 @@ const NotesDirectory = ( {isLoading,contactProfile, setProfileContact} ) =>
const onSubmit = async (data) => { const onSubmit = async (data) => {
const newNote = { ...data, contactId: contactProfile?.id }; const newNote = { ...data, contactId: contactProfile?.id };
try try {
{ setIsSubmitting(true);
setIsSubmitting(true) const response = await DirectoryRepository.CreateNote(newNote);
const response = await DirectoryRepository.CreateNote( newNote );
const createdNote = response.data; const createdNote = response.data;
setProfileContact((prev) => ({ setProfileContact((prev) => ({
...prev, ...prev,
notes: [...(prev.notes || []), createdNote], notes: [...(prev.notes || []), createdNote],
})); }));
const cached_contactProfile = getCachedData("Contact Profile");
if (
cached_contactProfile &&
cached_contactProfile.contactId === contactProfile?.id
) {
const updatedProfile = {
...cached_contactProfile.data,
notes: [...(cached_contactProfile.notes || []), createdNote],
};
cacheData("Contact Profile", updatedProfile);
}
setValue("note", ""); setValue("note", "");
const result = response.data setIsSubmitting(false);
const cache_notes = getCachedData( "Contact Note" ) showToast("Note added successfully!", "success");
setAddNote(false);
setIsSubmitting(false) } catch (error) {
showToast("Note added successfully!", "success") setIsSubmitting(false);
} catch ( error )
{
setIsSubmitting(false)
const msg = const msg =
error.response.data.message || error.response.data.message ||
error.message || error.message ||
@ -75,26 +83,63 @@ const NotesDirectory = ( {isLoading,contactProfile, setProfileContact} ) =>
return ( return (
<div className="text-start"> <div className="text-start">
<form onSubmit={handleSubmit(onSubmit)}> <div
<Editor className={`${
value={noteValue} contactProfile?.notes?.length > 0
loading={IsSubmitting} ? "d-flex justify-content-between"
onChange={handleEditorChange} : "d-flex justify-content-end"
onCancel={onCancel} }`}
onSubmit={handleSubmit(onSubmit)} >
/> {contactProfile?.notes.length > 0 && (
{errors.notes && ( <p className="fw-semibold m-0">Notes :</p>
<p className="text-danger small mt-1">{errors.note.message}</p>
)} )}
</form> <a
className="small-text m-0 cursor-pointer"
onClick={() => setAddNote(!addNote)}
>
<u>
{addNote ? "" : "Add Note"}
<i
className={`bx ${addNote ? "bx-x" : "bx-pencil"} bx-xs`}
></i>{" "}
</u>{" "}
</a>
</div>
{addNote && (
<form onSubmit={handleSubmit(onSubmit)}>
<Editor
value={noteValue}
loading={IsSubmitting}
onChange={handleEditorChange}
onCancel={onCancel}
onSubmit={handleSubmit(onSubmit)}
/>
{errors.notes && (
<p className="text-danger small mt-1">{errors.note.message}</p>
)}
</form>
)}
<div <div
className=" justify-content-start overflow-auto px-1" className=" justify-content-start overflow-auto px-1"
style={{ maxHeight: "300px", minHeight: "100px" }} style={{ maxHeight: "300px" }}
> >
{isLoading && <div className="text-center"> <p>Loading...</p> </div>} {isLoading && (
{!isLoading && contactProfile?.notes?.map((noteItem) => ( <div className="text-center">
<NoteCardDirectory noteItem={noteItem} contactId={contactProfile?.id} setProfileContact={setProfileContact} key={noteItem.id} /> {" "}
))} <p>Loading...</p>{" "}
</div>
)}
{!isLoading &&
[...(contactProfile?.notes || [])]
.reverse()
.map((noteItem) => (
<NoteCardDirectory
noteItem={noteItem}
contactId={contactProfile?.id}
setProfileContact={setProfileContact}
key={noteItem.id}
/>
))}
</div> </div>
</div> </div>
); );

View File

@ -5,7 +5,7 @@ import moment from "moment";
import NotesDirectory from "./NotesDirectory"; import NotesDirectory from "./NotesDirectory";
const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => { const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => {
const { conatProfile ,loading} = useContactProfile(contact?.id); const { conatProfile, loading } = useContactProfile(contact?.id);
const [activeTab, setActiveTab] = useState("profile"); const [activeTab, setActiveTab] = useState("profile");
const [profileContact, setProfileContact] = useState(); const [profileContact, setProfileContact] = useState();
@ -14,7 +14,7 @@ const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => {
}, [conatProfile]); }, [conatProfile]);
return ( return (
<div className="p-1"> <div className="p-1">
<div className="text-center m-0 p-0"> <div className="text-center m-0 p-0">
<p className="fw-semibold fs-6 m-0">Contact Profile</p> <p className="fw-semibold fs-6 m-0">Contact Profile</p>
</div> </div>
<div> <div>
@ -36,106 +36,65 @@ const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => {
</span> </span>
</div> </div>
</div> </div>
<div className="d-flex flex-column text-start">
<hr className="my-1" /> {conatProfile?.contactEmails?.length > 0 && (
<div className="d-flex mb-2">
{/* Tabs */} <div style={{ width: "100px", minWidth: "100px" }}>
<p className="m-0">Email</p>
{loading && <div className="text-center"> <p>Loading...</p> </div>} </div>
{!loading && ( <div>
<ul className="nav nav-tabs mb-1 p0"> <ul className="list-inline mb-0">
<li className="nav-item"> {conatProfile.contactEmails.map((email, idx) => (
<button <li className="list-inline-item me-3" key={idx}>
className={`nav-link p-1 me-2 ${ <i className="bx bx-envelope bx-xs me-1"></i>
activeTab === "profile" ? "active" : "" {email.emailAddress}
}`} </li>
onClick={() => setActiveTab("profile")} ))}
> </ul>
Profile </div>
</button> </div>
</li> )}
<li className="nav-item "> {conatProfile?.contactPhones?.length > 0 && (
<button <div className="d-flex mb-2">
className={`nav-link text-start p-1 ${ <div style={{ width: "100px", minWidth: "100px" }}>
activeTab === "notes" ? "active" : "" <p className="m-0">Phone</p>
}`} </div>
onClick={() => setActiveTab("notes")} <div>
> <ul className="list-inline mb-0">
Notes<i className="bx bx-pencil bx-xs"></i> {conatProfile.contactPhones.map((phone, idx) => (
</button> <li className="list-inline-item me-3" key={idx}>
</li> <i className="bx bx-phone bx-xs me-1"></i>
{phone.phoneNumber}
</ul> </li>
)} ))}
</ul>
{/* Tab Content */} </div>
<div> </div>
{activeTab === "notes" && (
<NotesDirectory
isLoading={loading}
contactProfile={profileContact}
setProfileContact={setProfileContact}
/>
)} )}
{activeTab === "profile" && (
<div>
<div className="d-flex flex-column text-start">
{conatProfile?.contactEmails?.length > 0 && (
<div className="d-flex mb-2">
<div style={{ width: "100px", minWidth: "100px" }}>
<p className="m-0">Email</p>
</div>
<div>
<ul className="list-inline mb-0">
{conatProfile.contactEmails.map((email, idx) => (
<li className="list-inline-item me-3" key={idx}>
<i className="bx bx-envelope bx-xs me-1"></i>
{email.emailAddress}
</li>
))}
</ul>
</div>
</div>
)}
{conatProfile?.contactPhones?.length > 0 && (
<div className="d-flex mb-2">
<div style={{ width: "100px", minWidth: "100px" }}>
<p className="m-0">Phone</p>
</div>
<div>
<ul className="list-inline mb-0">
{conatProfile.contactPhones.map((phone, idx) => (
<li className="list-inline-item me-3" key={idx}>
<i className="bx bx-phone bx-xs me-1"></i>
{phone.phoneNumber}
</li>
))}
</ul>
</div>
</div>
)}
{conatProfile?.createdAt && ( {conatProfile?.createdAt && (
<div className="d-flex mb-2"> <div className="d-flex mb-2">
<div style={{ width: "100px", minWidth: "100px" }}> <div style={{ width: "100px", minWidth: "100px" }}>
<p className="m-0">Created</p> <p className="m-0">Created</p>
</div> </div>
<div> <div>
<ul className="list-inline mb-0"> <ul className="list-inline mb-0">
<li className="list-inline-item"> <li className="list-inline-item">
<i className="bx bx-calendar-week bx-xs me-1"></i> <i className="bx bx-calendar-week bx-xs me-1"></i>
{moment(conatProfile.createdAt).format( {moment(conatProfile.createdAt).format("MMMM, DD YYYY")}
"MMMM, DD YYYY" </li>
)} </ul>
</li>
</ul>
</div>
</div>
)}
</div> </div>
</div> </div>
)} )}
</div> </div>
<hr className="my-1" />
<NotesDirectory
isLoading={loading}
contactProfile={profileContact}
setProfileContact={setProfileContact}
/>
</div> </div>
</div> </div>
); );

View File

@ -1,6 +1,6 @@
.editor-wrapper { .editor-wrapper {
max-width: 800px; max-width: 800px;
margin: 20px auto; margin: 1px auto;
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
@ -69,40 +69,64 @@
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
float: left; float: left;
height: 24px; font-size: 15px;
padding: 2px 2px; padding: 2px 2px;
width: 28px; width: 28px;
} }
.ql-toolbar.ql-snow{
padding: 4px;
}
@media (max-width: 768px) { @media (max-width: 768px) {
.ql-toolbar.ql-snow .ql-formats { .ql-toolbar.ql-snow .ql-formats {
margin-right: 1px; margin-right: 1px;
align-items: center;
} }
} }
/* for small editor */
/* Editor height and text */ .ql-snow.ql-toolbar button,
.compact-editor .ql-editor { .ql-snow .ql-toolbar button {
min-height: 80px; /* Reduce editor height */ background: none;
font-size: 0.85rem; /* Smaller font */ border: none;
padding: 6px 10px; cursor: pointer;
display: inline-block;
height: 18px;
padding: 2px 2px;
width: 22px;
font-size: 14px;
/* REMOVE THIS to fix side-alignment */
/* float: left; */
vertical-align: middle;
} }
/* Toolbar size */ .ql-snow .ql-picker-label {
.compact-editor .ql-toolbar { font-size: 10px; /* Smaller text */
padding: 5px 8px; padding: 0 6px; /* Horizontal padding */
font-size: 0.85rem; height: 20px; /* Height of the label */
line-height: 20px; /* Match height to vertically center single-line text */
background-color: #eee;
border-radius: 0px;
cursor: pointer;
color: #333;
text-align: center;
width: 100%;
display: flex; /* Enable flexbox */
align-items: center; /* Vertical centering */
justify-content: center; /* Horizontal centering */
} }
/* Optional: smaller buttons & spacing */
.compact-editor .ql-toolbar button {
height: 24px;
width: 24px;
padding: 2px;
}
.compact-editor .ql-toolbar .ql-formats { /* Remove custom upward-opening styles */
margin-right: 6px; .ql-toolbar .ql-picker.ql-header .ql-picker-options {
top: 100%; /* Position it below the label */
bottom: auto; /* Cancel the upward positioning */
margin-top: 5px; /* Optional spacing */
} }
.ql-editor {
padding: 4px 15px;
}

View File

@ -34,16 +34,7 @@ const Editor = ({
return ( return (
<div className="editor-wrapper"> <div className="editor-wrapper">
<ReactQuill <div id="custom-toolbar" className="ql-toolbar ql-snow custom-toolbar">
value={value}
onChange={onChange}
modules={modules}
formats={formats}
theme="snow"
placeholder={placeholder}
/>
<div id="custom-toolbar" className="ql-toolbar ql-snow custom-toolbar">
<div className="d-flex justify-content-between align-items-center w-100"> <div className="d-flex justify-content-between align-items-center w-100">
{/* Left: Quill Format Buttons */} {/* Left: Quill Format Buttons */}
<span className="d-flex"> <span className="d-flex">
@ -70,8 +61,19 @@ const Editor = ({
</span> </span>
</span> </span>
{/* Right: Submit + Cancel Buttons */}
<div className="d-flex gap-2"> </div>
</div>
<ReactQuill
value={value}
onChange={onChange}
modules={modules}
formats={formats}
theme="snow"
placeholder={placeholder}
/>
{/* Right: Submit + Cancel Buttons */}
<div className="d-flex justify-content-end gap-2 p-1">
<span className="btn btn-xs btn-secondary" aria-disabled={loading} onClick={onCancel}> <span className="btn btn-xs btn-secondary" aria-disabled={loading} onClick={onCancel}>
Cancel Cancel
</span> </span>
@ -84,8 +86,7 @@ const Editor = ({
{loading ? "Please Wait..." : "Submit"} {loading ? "Please Wait..." : "Submit"}
</span> </span>
</div> </div>
</div>
</div>
</div> </div>
); );
}; };

View File

@ -11,5 +11,6 @@ export const DirectoryRepository = {
CreateNote: ( data ) => api.post( '/api/directory/note', data ), CreateNote: ( data ) => api.post( '/api/directory/note', data ),
GetNote: ( id ) => api.get( `/api/directory/note/${ id }` ), GetNote: ( id ) => api.get( `/api/directory/note/${ id }` ),
UpdateNote:(id,data)=>api.put(`/api/directory/note/${id }`,data ) UpdateNote: ( id, data ) => api.put( `/api/directory/note/${ id }`, data ),
DeleteNote:(id)=> api.delete(`/api/directory/note/${ id }`)
} }