diff --git a/src/components/ServiceProject/ServiceBranch.jsx b/src/components/ServiceProject/ServiceBranch.jsx
deleted file mode 100644
index fc0bf1ac..00000000
--- a/src/components/ServiceProject/ServiceBranch.jsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import React, { useState } from 'react'
-import GlobalModel from '../common/GlobalModel';
-import ManageBranch from './ManageBranch';
-import { Pagination } from 'swiper/modules';
-import { useBranches } from '../../hooks/useServiceProject';
-import { ITEMS_PER_PAGE } from '../../utils/constants';
-import { useDebounce } from '../../utils/appUtils';
-import { useParams } from 'react-router-dom';
-
-const ServiceBranch = () => {
-
- const [ManageServiceBranch, setManageServiceBranch] = useState({
- IsOpen: null,
- branchId: null,
- });
-
- const { projectId } = useParams();
-
- const [search, setSearch] = useState("");
- const [currentPage, setCurrentPage] = useState(1);
- const debouncedSearch = useDebounce(search, 500);
-
- const { data, isLoading, isError, error } = useBranches(
- projectId,
- true,
- ITEMS_PER_PAGE,
- currentPage,
- debouncedSearch,
- );
- const paginate = (page) => {
- if (page >= 1 && page <= (data?.totalPages ?? 1)) {
- setCurrentPage(page);
- }
- };
-
- const ServiceBranch = [
- {
- key: "branchName",
- label: "Branch Name",
- align: "text-start",
- getValue: (e) => e?.branchName || "N/A",
- },
- ];
- return (
-
-
-
-
-
-
-
-
-
-
- {/* {Array.isArray(filteredData) && filteredData.length > 0 && ( */}
-
-
-
- {ServiceBranch.map((col) => (
- |
- {col.label}
- |
- ))}
- Action |
-
-
-
- {isLoading ? (
-
- |
- Loading...
- |
-
- ) : isError ? (
-
- |
- {error?.message || "Error loading branches"}
- |
-
- ) : data?.data?.length > 0 ? (
- data.data.map((branch) => (
-
- {ServiceBranch.map((col) => (
- |
- {col.getValue(branch)}
- |
- ))}
-
-
- setManageServiceBranch({
- IsOpen: true,
- branchId: branch.id,
- })
- }
- />
- |
-
- ))
- ) : (
-
- |
- No Branch Found
- |
-
- )}
-
-
- {/* )} */}
- {/* {!filteredData ||
- filteredData.length === 0
- && (
-
- {isError ? (
{error.message}
) : (
No Recurring Expense Found
)}
-
- )} */}
-
-
- {ManageServiceBranch.IsOpen && (
-
- setManageServiceBranch({ IsOpen: null, branchId: null })
- }
- >
-
- setManageServiceBranch({ IsOpen: null, branchId: null })
- }
- // requestToEdit={ManageServiceBranch.branchId}
- />
-
- )}
-
- {/*
*/}
-
-
- )
-}
-
-export default ServiceBranch
diff --git a/src/components/ServiceProject/ServiceProfile.jsx b/src/components/ServiceProject/ServiceProfile.jsx
new file mode 100644
index 00000000..30864106
--- /dev/null
+++ b/src/components/ServiceProject/ServiceProfile.jsx
@@ -0,0 +1,95 @@
+import React from 'react'
+import { formatUTCToLocalTime } from '../../utils/dateUtils'
+
+const ServiceProfile = ({data,setIsOpenModal}) => {
+ return (
+
+
+
+ {" "}
+
+ Project Profile
+
+
+
+
+
+ -
+
+
+ Name:
+
+
+
+ {data.name}
+
+
+ -
+
+
+ Nick Name:
+
+ {data.shortName}
+
+ -
+
+
+ Assign Date:
+
+
+ {data.assignedDate ? formatUTCToLocalTime(data.assignedDate) : "NA"}
+
+
+
+ -
+
+
+ Status:
+
+ {data?.status.status}
+
+ -
+
+
+ Contact:
+
+ {data.contactName}
+
+ -
+ {/* Label section with icon */}
+
+
+ Address:
+
+
+ {/* Content section that wraps nicely */}
+
+ {data.address}
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default ServiceProfile
diff --git a/src/components/ServiceProject/ServiceProjectBranch/ManageBranch.jsx b/src/components/ServiceProject/ServiceProjectBranch/ManageBranch.jsx
new file mode 100644
index 00000000..34cc0530
--- /dev/null
+++ b/src/components/ServiceProject/ServiceProjectBranch/ManageBranch.jsx
@@ -0,0 +1,183 @@
+import React, { useEffect } from "react";
+import { useProjectName } from "../../../hooks/useProjects";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import Label from "../../common/Label";
+import {
+ useCreateBranch,
+ useServiceProjects,
+ useUpdateBranch,
+} from "../../../hooks/useServiceProject";
+import { useAppForm } from "../../../hooks/appHooks/useAppForm";
+import { useParams } from "react-router-dom";
+import { BranchSchema, defaultBranches } from "../ServiceProjectSchema";
+
+const ManageBranch = ({ closeModal, BranchToEdit = null }) => {
+ const { data } = {};
+ const { projectId } = useParams();
+ const schema = BranchSchema();
+ const {
+ register,
+ control,
+ watch,
+ handleSubmit,
+ setValue,
+ reset,
+ formState: { errors },
+ } = useAppForm({
+ resolver: zodResolver(schema),
+ defaultValues: {
+ ...defaultBranches,
+ projectId: projectId || "",
+ },
+ });
+
+ const handleClose = () => {
+ reset();
+ closeModal();
+ };
+
+ useEffect(() => {
+ if (BranchToEdit && data) {
+ reset({
+ branchName: data.branchName || "",
+ projectId: data.project?.id || projectId || "",
+ contactInformation: data.contactInformation || "",
+ address: data.address || "",
+ branchType: data.branchType || "",
+ googleMapUrl: data.googleMapUrl || "",
+ });
+ }
+ }, [data, reset]);
+
+ const { mutate: CreateServiceBranch, isPending: createPending } =
+ useCreateBranch(() => {
+ handleClose();
+ });
+ const { mutate: ServiceBranchUpdate, isPending } = useUpdateBranch(() =>
+ handleClose()
+ );
+
+ const onSubmit = (fromdata) => {
+ let payload = {
+ ...fromdata,
+ projectId,
+ };
+ if (BranchToEdit) {
+ const editPayload = { ...payload, id: data.id };
+ ServiceBranchUpdate({ id: data.id, payload: editPayload });
+ } else {
+ CreateServiceBranch(payload);
+ }
+ };
+
+ return (
+
+
+ {BranchToEdit ? "Update Branch" : "Create Branch"}
+
+
+
+ );
+};
+
+export default ManageBranch;
diff --git a/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx b/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx
new file mode 100644
index 00000000..0cae102a
--- /dev/null
+++ b/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx
@@ -0,0 +1,174 @@
+import React, { useState } from "react";
+import GlobalModel from "../../common/GlobalModel";
+import ManageBranch from "./ManageBranch";
+import { useBranches } from "../../../hooks/useServiceProject";
+import { ITEMS_PER_PAGE } from "../../../utils/constants";
+import { useDebounce } from "../../../utils/appUtils";
+import { useParams } from "react-router-dom";
+import Pagination from "../../common/Pagination";
+
+const ServiceBranch = () => {
+ const { projectId } = useParams();
+
+ const [manageState, setManageState] = useState({
+ IsOpen: false,
+ branchId: null,
+ });
+
+ const [search, setSearch] = useState("");
+ const [currentPage, setCurrentPage] = useState(1);
+ const debouncedSearch = useDebounce(search, 500);
+
+ const { data, isLoading, isError, error } = useBranches(
+ projectId,
+ true,
+ ITEMS_PER_PAGE - 10,
+ currentPage,
+ debouncedSearch
+ );
+
+ const paginate = (page) => {
+ if (page >= 1 && page <= (data?.totalPages ?? 1)) {
+ setCurrentPage(page);
+ }
+ };
+
+ const columns = [
+ {
+ key: "branchName",
+ label: "Name",
+ align: "text-start",
+ getValue: (e) => e?.branchName || "N/A",
+ },
+ ];
+
+ return (
+
+
+ {/* Header Section */}
+
+
+
+
+ Branches
+
+
+
+
+
+
+
+
+
+
+
+
+ {columns.map((col) => (
+ |
+ {col.label}
+ |
+ ))}
+ Action |
+
+
+
+
+ {isLoading && (
+
+ |
+ Loading...
+ |
+
+ )}
+
+ {isError && (
+
+ |
+ {error?.message || "Error loading branches"}
+ |
+
+ )}
+
+ {!isLoading &&
+ !isError &&
+ data?.data?.length > 0 &&
+ data.data.map((branch) => (
+
+ {columns.map((col) => (
+ |
+ {col.getValue(branch)}
+ |
+ ))}
+
+
+ setManageState({
+ IsOpen: true,
+ branchId: branch.id,
+ })
+ }
+ />
+ |
+
+ ))}
+
+ {!isLoading &&
+ !isError &&
+ (!data?.data || data.data.length === 0) && (
+
+ |
+ No Branch Found
+ |
+
+ )}
+
+
+
+ {data?.data?.length > 0 && (
+
+ )}
+
+
+ {manageState.IsOpen && (
+
setManageState({ IsOpen: false, branchId: null })}
+ >
+
+ setManageState({ IsOpen: false, branchId: null })
+ }
+ />
+
+ )}
+
+
+ );
+};
+
+export default ServiceBranch;
diff --git a/src/components/ServiceProject/ServiceProjectProfile.jsx b/src/components/ServiceProject/ServiceProjectProfile.jsx
index 05a05fd3..2a04be99 100644
--- a/src/components/ServiceProject/ServiceProjectProfile.jsx
+++ b/src/components/ServiceProject/ServiceProjectProfile.jsx
@@ -5,17 +5,26 @@ import { formatUTCToLocalTime } from "../../utils/dateUtils";
import ManageServiceProject from "./ManageServiceProject";
import GlobalModel from "../common/GlobalModel";
import { SpinnerLoader } from "../common/Loader";
-import ServiceBranch from "./ServiceBranch";
+import ServiceBranch from "./ServiceProjectBranch/ServiceBranch";
+import ServiceProfile from "./ServiceProfile";
const ServiceProjectProfile = () => {
const { projectId } = useParams();
const [IsOpenModal, setIsOpenModal] = useState(false);
const { data, isLoading, isError, error } = useServiceProject(projectId);
- if (isLoading) return
+ if (isLoading)
+ return (
+
+
+
+ );
return (
<>
{IsOpenModal && (
-
setIsOpenModal(false)}>
+ setIsOpenModal(false)}
+ >
setIsOpenModal(false)}
@@ -25,101 +34,12 @@ const ServiceProjectProfile = () => {
-
-
-
- {" "}
-
- Project Profile
-
-
-
-
-
- -
-
-
- Name:
-
-
- {/* Content section that wraps nicely */}
-
- {data.name}
-
-
- -
-
-
- Nick Name:
-
- {data.shortName}
-
- -
-
-
- Assign Date:
-
-
- {data.assignedDate ? formatUTCToLocalTime(data.assignedDate) : "NA"}
-
-
-
- -
-
-
- Status:
-
- {data?.status.status}
-
- -
-
-
- Contact:
-
- {data.contactName}
-
- -
- {/* Label section with icon */}
-
-
- Address:
-
-
- {/* Content section that wraps nicely */}
-
- {data.address}
-
-
-
-
-
- - {/* Added mt-4 for some top margin */}
-
- {/* Added mt-4 for some top margin */}
-
-
-
-
-
-
-
-
-
+
-
+
-
-
);
diff --git a/src/components/ServiceProject/ServiceProjectSchema.jsx b/src/components/ServiceProject/ServiceProjectSchema.jsx
index 9a14605c..38013cae 100644
--- a/src/components/ServiceProject/ServiceProjectSchema.jsx
+++ b/src/components/ServiceProject/ServiceProjectSchema.jsx
@@ -50,6 +50,10 @@ export const defaultProjectValues = {
//#endregion
+
+
+
+
//#region JobSchema
export const TagSchema = z.object({
@@ -115,3 +119,54 @@ export const defaultJobValue = {
};
//#endregion
+
+
+
+
+
+//#region Branch
+
+export const BranchSchema = () =>
+ z.object({
+ projectId: z
+ .string()
+ .trim()
+ .min(1, { message: "Project is required" }),
+
+ branchName: z
+ .string()
+ .trim()
+ .min(1, { message: "Branch Name is required" }),
+
+ contactInformation: z
+ .string()
+ .trim()
+ .min(1, { message: "Contact Information is required" }),
+
+ address: z
+ .string()
+ .trim()
+ .min(1, { message: "Address is required" }),
+
+ branchType: z
+ .string()
+ .trim()
+ .min(1, { message: "Branch Type is required" }),
+
+ googleMapUrl: z
+ .string()
+ .trim()
+ .url({ message: "Enter a valid Google Map URL" }),
+ });
+
+export const defaultBranches = {
+ branchName: "",
+ projectId: "",
+ contactInformation: "",
+ address: "",
+ branchType: "",
+ googleMapUrl: "",
+};
+
+
+//#endregion
\ No newline at end of file
diff --git a/src/components/Tenant/SubScriptionHistory.jsx b/src/components/Tenant/SubScriptionHistory.jsx
index a587a84e..3972f3d8 100644
--- a/src/components/Tenant/SubScriptionHistory.jsx
+++ b/src/components/Tenant/SubScriptionHistory.jsx
@@ -104,8 +104,7 @@ const SubScriptionHistory = ({ tenantId }) => {
diff --git a/src/components/common/GlobalModal/CommentEditor.jsx b/src/components/common/GlobalModal/CommentEditor.jsx
index 68d4e353..5d4dc626 100644
--- a/src/components/common/GlobalModal/CommentEditor.jsx
+++ b/src/components/common/GlobalModal/CommentEditor.jsx
@@ -28,7 +28,6 @@ const CommentEditor = () => {
const [value, setValue] = useState("");
const handleSubmit = () => {
- console.log("Comment:", value);
// Submit or handle content
};
diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index 25caf14b..75467399 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -411,7 +411,6 @@ export const useUpdateProject = (onSuccessCallback) => {
},
onError: (error) => {
- console.log(error);
showToast(error?.message || "Error while updating project", "error");
},
});
diff --git a/src/hooks/useServiceProject.jsx b/src/hooks/useServiceProject.jsx
index f5baa4b7..3278fa2a 100644
--- a/src/hooks/useServiceProject.jsx
+++ b/src/hooks/useServiceProject.jsx
@@ -308,7 +308,6 @@ export const useBranches = (
pageNumber,
searchString
);
- console.log(resp)
return resp.data;
},
enabled: !!projectId,