admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/pages/jobs-available/jobs-available.page.container.jsx
View File

@@ -11,12 +11,7 @@ export default function JobsAvailablePageContainer() {
const [deleteJob] = useMutation(DELETE_AVAILABLE_JOB);
const { t } = useTranslation();
const estDataLazyLoad = useLazyQuery(
QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
{
fetchPolicy: "network-only"
}
);
const estDataLazyLoad = useLazyQuery(QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK);
useEffect(() => {
document.title = t("titles.jobsavailable");

34
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
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={

10
client/src/pages/jobs-detail/jobs-detail.page.container.jsx
View File

@@ -1,6 +1,6 @@
import { notification } from "antd";
import React, { useEffect, useState } from "react";
import { useMutation, useQuery } from "@apollo/react-hooks";
import { notification } from "antd";
import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
import AlertComponent from "../../components/alert/alert.component";
import SpinComponent from "../../components/loading-spinner/loading-spinner.component";
@@ -8,11 +8,9 @@ import { CONVERT_JOB_TO_RO, GET_JOB_BY_PK, UPDATE_JOB, UPDATE_JOB_STATUS } from
import JobsDetailPage from "./jobs-detail.page.component";
function JobsDetailPageContainer({ match }) {
const { jobId, tab } = match.params;
const { jobId } = match.params;
const { t } = useTranslation();
const scheduleModalState = useState(false);
const { loading, error, data, refetch } = useQuery(GET_JOB_BY_PK, {
variables: { id: jobId },
fetchPolicy: "network-only"
@@ -55,9 +53,7 @@ function JobsDetailPageContainer({ match }) {
mutationConvertJob={mutationConvertJob}
mutationUpdateJob={mutationUpdateJob}
refetch={refetch}
scheduleModalState={scheduleModalState}
updateJobStatus={updateJobStatus}
tab={tab}
/>
) : (
<AlertComponent message={t("jobs.errors.noaccess")} type="error" />