CLEANUP Schedule modal now using redux. Deleted manual schedule modal. To be incorporated into generic.

This commit is contained in:
Patrick Fic
2020-04-02 12:37:15 -07:00
parent 828ca721db
commit 7254622f52
12 changed files with 177 additions and 322 deletions

View File

@@ -16,20 +16,9 @@ import {
FaRegStickyNote,
FaShieldAlt
} from "react-icons/fa";
import { useHistory } from "react-router-dom";
//import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
//import JobsDetailClaims from "../../components/jobs-detail-claims/jobs-detail-claims.component";
//import JobsDetailDatesComponent from "../../components/jobs-detail-dates/jobs-detail-dates.component";
//import JobsDetailFinancials from "../../components/jobs-detail-financial/jobs-detail-financial.component";
//import JobsDetailHeader from "../../components/jobs-detail-header/jobs-detail-header.component";
//import JobsDetailInsurance from "../../components/jobs-detail-insurance/jobs-detail-insurance.component";
//import JobsDocumentsContainer from "../../components/jobs-documents/jobs-documents.container";
//import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
//import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container";
//import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
//import EnterInvoiceModalContainer from "../../components/invoice-enter-modal/invoice-enter-modal.container";
import { useHistory, useLocation } from "react-router-dom";
import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
import queryString from "query-string";
const JobsLinesContainer = lazy(() =>
import("../../components/job-detail-lines/job-lines.container")
);
@@ -84,14 +73,13 @@ export default function JobsDetailPage({
mutationConvertJob,
handleSubmit,
refetch,
scheduleModalState,
updateJobStatus,
tab
updateJobStatus
}) {
const { t } = useTranslation();
const [form] = Form.useForm();
const history = useHistory();
const search = queryString.parse(useLocation().search);
const formItemLayout = {
labelCol: {
xs: { span: 12 },
@@ -118,12 +106,7 @@ export default function JobsDetailPage({
<Suspense
fallback={<LoadingSpinner message={t("general.labels.loadingapp")} />}
>
<ScheduleJobModalContainer
scheduleModalState={scheduleModalState}
jobId={job.id}
refetch={refetch}
/>
<ScheduleJobModalContainer />
<JobLineUpsertModalContainer />
<EnterInvoiceModalContainer />
@@ -168,14 +151,11 @@ export default function JobsDetailPage({
mutationConvertJob={mutationConvertJob}
refetch={refetch}
handleSubmit={handleSubmit}
scheduleModalState={scheduleModalState}
updateJobStatus={updateJobStatus}
/>
<Tabs
defaultActiveKey={history.location.search.substring(1) || null}
onChange={key =>
history.replace({ ...history.location, search: `?${key}` })
}
defaultActiveKey={search.tab}
onChange={key => history.push({ search: `?tab=${key}` })}
>
<Tabs.TabPane
tab={