Issues_Aug_2W #371
@ -1,8 +1,16 @@
|
|||||||
import React, { useEffect, useState, useMemo } from "react";
|
import React, { useEffect, useState, useMemo } from "react";
|
||||||
import { DirectoryRepository } from "../../repositories/DirectoryRepository";
|
import { DirectoryRepository } from "../../repositories/DirectoryRepository";
|
||||||
import NoteCardDirectoryEditable from "./NoteCardDirectoryEditable";
|
import NoteCardDirectoryEditable from "./NoteCardDirectoryEditable";
|
||||||
|
import { useSelectedproject } from "../../slices/apiDataManager";
|
||||||
|
|
||||||
|
const NotesCardViewDirectory = ({
|
||||||
|
notes,
|
||||||
|
setNotesForFilter,
|
||||||
|
searchText,
|
||||||
|
filterAppliedNotes,
|
||||||
|
}) => {
|
||||||
|
const projectId = useSelectedproject(); // ✅ get projectId from Redux
|
||||||
|
|
||||||
const NotesCardViewDirectory = ({ notes, setNotesForFilter, searchText, filterAppliedNotes }) => {
|
|
||||||
const [allNotes, setAllNotes] = useState([]);
|
const [allNotes, setAllNotes] = useState([]);
|
||||||
const [filteredNotes, setFilteredNotes] = useState([]);
|
const [filteredNotes, setFilteredNotes] = useState([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
@ -13,13 +21,15 @@ const NotesCardViewDirectory = ({ notes, setNotesForFilter, searchText, filterAp
|
|||||||
const pageSize = 20;
|
const pageSize = 20;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchNotes();
|
if (projectId) {
|
||||||
}, []);
|
fetchNotes(projectId);
|
||||||
|
}
|
||||||
|
}, [projectId]);
|
||||||
|
|
||||||
const fetchNotes = async () => {
|
const fetchNotes = async (projId) => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
try {
|
try {
|
||||||
const response = await DirectoryRepository.GetNotes(1000, 1);
|
const response = await DirectoryRepository.GetNotes(1000, 1, projId); // ✅ pass projectId
|
||||||
const fetchedNotes = response.data?.data || [];
|
const fetchedNotes = response.data?.data || [];
|
||||||
setAllNotes(fetchedNotes);
|
setAllNotes(fetchedNotes);
|
||||||
setNotesForFilter(fetchedNotes)
|
setNotesForFilter(fetchedNotes)
|
||||||
@ -122,7 +132,7 @@ const NotesCardViewDirectory = ({ notes, setNotesForFilter, searchText, filterAp
|
|||||||
prevNotes.map((n) => (n.id === updatedNote.id ? updatedNote : n))
|
prevNotes.map((n) => (n.id === updatedNote.id ? updatedNote : n))
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
onNoteDelete={() => fetchNotes()}
|
onNoteDelete={() => fetchNotes(projectId)} // ✅ reload with projectId
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
@ -210,7 +210,7 @@ const LoginPage = () => {
|
|||||||
Login With Password
|
Login With Password
|
||||||
</a>
|
</a>
|
||||||
) : (
|
) : (
|
||||||
<Link to="/auth/reqest/demo" className="registration-link">
|
<Link to="/market/enquire" className="registration-link">
|
||||||
Request a Demo
|
Request a Demo
|
||||||
</Link>
|
</Link>
|
||||||
)}
|
)}
|
||||||
|
@ -34,6 +34,8 @@ export const DirectoryRepository = {
|
|||||||
DeleteNote: (id, isActive) =>
|
DeleteNote: (id, isActive) =>
|
||||||
api.delete(`/api/directory/note/${id}?active=${isActive}`),
|
api.delete(`/api/directory/note/${id}?active=${isActive}`),
|
||||||
|
|
||||||
GetNotes: (pageSize, pageNumber) =>
|
GetNotes: (pageSize, pageNumber, projectId) =>
|
||||||
api.get(`/api/directory/notes?pageSize=${pageSize}&pageNumber=${pageNumber}`),
|
api.get(
|
||||||
|
`/api/directory/notes?pageSize=${pageSize}&pageNumber=${pageNumber}&projectId=${projectId}`
|
||||||
|
),
|
||||||
};
|
};
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { api } from "../utils/axiosClient";
|
import { api } from "../utils/axiosClient";
|
||||||
|
|
||||||
export const MarketRepository = {
|
export const MarketRepository = {
|
||||||
requestDemo: (data) => api.post("/api/market/inquiry", data),
|
requestDemo: (data) => api.post("/api/market/enquire", data),
|
||||||
getIndustries: () => api.get("api/market/industries"),
|
getIndustries: () => api.get("api/market/industries"),
|
||||||
};
|
};
|
||||||
|
@ -52,7 +52,7 @@ const router = createBrowserRouter(
|
|||||||
children: [
|
children: [
|
||||||
{ path: "/auth/login", element: <LoginPage /> },
|
{ path: "/auth/login", element: <LoginPage /> },
|
||||||
{ path: "/auth/login-otp", element: <LoginWithOtp /> },
|
{ path: "/auth/login-otp", element: <LoginWithOtp /> },
|
||||||
{ path: "/auth/reqest/demo", element: <RegisterPage /> },
|
{ path: "/market/enquire", element: <RegisterPage /> },
|
||||||
{ path: "/auth/forgot-password", element: <ForgotPasswordPage /> },
|
{ path: "/auth/forgot-password", element: <ForgotPasswordPage /> },
|
||||||
{ path: "/reset-password", element: <ResetPasswordPage /> },
|
{ path: "/reset-password", element: <ResetPasswordPage /> },
|
||||||
{ path: "/legal-info", element: <LegalInfoCard /> },
|
{ path: "/legal-info", element: <LegalInfoCard /> },
|
||||||
|
Loading…
x
Reference in New Issue
Block a user