diff --git a/src/ModalProvider.jsx b/src/ModalProvider.jsx index d0d72a6e..13db2c2c 100644 --- a/src/ModalProvider.jsx +++ b/src/ModalProvider.jsx @@ -1,5 +1,4 @@ import React, { useEffect } from 'react' -// import ManageOrganization from './components/Organization/ManageOrganization' import { useOrganizationModal } from './hooks/useOrganization'; import OrganizationModal from './components/Organization/OrganizationModal'; diff --git a/src/components/Organization/AssignOrg.jsx b/src/components/Organization/AssignOrg.jsx index cbe43c7c..a17f9985 100644 --- a/src/components/Organization/AssignOrg.jsx +++ b/src/components/Organization/AssignOrg.jsx @@ -15,7 +15,7 @@ import { } from "../../hooks/useOrganization"; const AssignOrg = ({ setStep }) => { - const { isOpen, orgData, startStep, onOpen, flowType, prevStep,onClose } = + const { isOpen, orgData, startStep, onOpen, flowType, prevStep, onClose } = useOrganizationModal(); const selectedProject = useSelectedProject(); const { data: masterService, isLoading: isMasterserviceLoading } = @@ -24,7 +24,9 @@ const AssignOrg = ({ setStep }) => { useProjectAssignedServices(selectedProject); const { data: orgType, isLoading: orgLoading } = useOrganizationType(); - const { mutate: AssignToProject, isPending } = useAssignOrgToProject(()=>onClose()); + const { mutate: AssignToProject, isPending } = useAssignOrgToProject(() => + onClose() + ); const mergedServices = useMemo(() => { if (!masterService || !projectServices) return []; @@ -57,17 +59,17 @@ const AssignOrg = ({ setStep }) => { AssignToProject(payload); }; const handleEdit = () => { - onOpen({ startStep: 4 , orgData:orgData}); + onOpen({ startStep: 4, orgData: orgData }); }; - const handleBack =()=>{ - if(prevStep == 1 && flowType == "assign"){ - onOpen({ startStep: prevStep }) - }else if(prevStep == 1 && flowType == "assign"){ - onOpen({ startStep: 1 }) - }else{ - onOpen({ startStep: 2 }) + const handleBack = () => { + if (prevStep == 1 && flowType == "assign") { + onOpen({ startStep: prevStep }); + } else if (prevStep == 1 && flowType == "assign") { + onOpen({ startStep: 1 }); + } else { + onOpen({ startStep: 2 }); } - } + }; if (isMasterserviceLoading || isLoading) return
Loading....
; return ( @@ -150,17 +152,32 @@ const AssignOrg = ({ setStep }) => { - + + ))} - + + {errors.organizationTypeId && ( {errors.organizationTypeId.message} @@ -169,7 +186,9 @@ const AssignOrg = ({ setStep }) => {
- + {mergedServices?.map((service) => (
{ -
-
- - - ))} - - - {orgModal.orgData && ( -

- Don't have required organization, Please find using{" "} - setStep(2)} - > - SPRID - -

- )} - - -
- {!projectOrganizations && ( - - )} - - -
- - )} - - {/* ---------- STEP 1: Service Provider From Own Other Tenant ---------- */} - {step === 2 && ( -
-
- - -
- {/* ======== org list ======*/} -
- {OrgListbySPRID?.map((org) => ( -
-
- -
- -
-
-
-
Icing sweet gummies
- 15 minutes -
- In Meeting -
-
-
- -
-
-
-
- ))} -
- -
- - -
-
- )} - - - {/* ---------- STEP 2: Existing Organization Details ---------- */} - {step === 3 && ( - - )} - - {/* ---------- STEP 3: Add New Organization ---------- */} - {step === 4 && ( - -
-
- - - {errors.name && ( - {errors.name.message} - )} -
- -
- - - {errors.contactPerson && ( - - {errors.contactPerson.message} - - )} -
- -
- - - {errors.contactNumber && ( - - {errors.contactNumber.message} - - )} -
- -
- - - {errors.email && ( - {errors.email.message} - )} -
- -
- - {errors.serviceIds && ( - {errors.serviceIds.message} - )} -
- -
- -