- random cleanup

Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-01-12 17:40:23 -05:00
parent ba32a71786
commit d360bcbb71

View File

@@ -1,102 +1,90 @@
import { useQuery } from "@apollo/client"; import {useQuery} from "@apollo/client";
import { Modal } from "antd"; import {Modal} from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import {useTranslation} from "react-i18next";
import { connect } from "react-redux"; import {connect} from "react-redux";
import { createStructuredSelector } from "reselect"; import {createStructuredSelector} from "reselect";
import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries"; import {QUERY_ALL_ACTIVE_JOBS} from "../../graphql/jobs.queries";
import { selectBodyshop } from "../../redux/user/user.selectors"; import {selectBodyshop} from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component"; import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component"; import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import JobsFindModalComponent from "./jobs-find-modal.component"; import JobsFindModalComponent from "./jobs-find-modal.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
}); });
export default connect( export default connect(
mapStateToProps, mapStateToProps,
null null
)(function JobsFindModalContainer({ )(function JobsFindModalContainer({bodyshop, loading, error, selectedJob, setSelectedJob, importOptionsState, modalSearchState, partsQueueToggle, setPartsQueueToggle, ...modalProps }) {
bodyshop, const {t} = useTranslation();
loading,
error,
selectedJob,
setSelectedJob,
importOptionsState,
modalSearchState,
partsQueueToggle,
setPartsQueueToggle,
...modalProps
}) {
const { t } = useTranslation();
const jobsList = useQuery(QUERY_ALL_ACTIVE_JOBS, { const jobsList = useQuery(QUERY_ALL_ACTIVE_JOBS, {
variables: { variables: {
statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"], statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"],
}, },
skip: !modalProps.open, skip: !modalProps.open,
fetchPolicy: "network-only", fetchPolicy: "network-only",
nextFetchPolicy: "network-only", nextFetchPolicy: "network-only",
}); });
const modalSearch = modalSearchState[0]; const modalSearch = modalSearchState[0];
const jobsData = const jobsData =
jobsList.data && jobsList.data.jobs jobsList.data && jobsList.data.jobs
? modalSearch ? modalSearch
? jobsList.data.jobs.filter( ? jobsList.data.jobs.filter(
(j) => (j) =>
(j.ro_number || "") (j.ro_number || "")
.toLowerCase() .toLowerCase()
.includes(modalSearch.toLowerCase()) || .includes(modalSearch.toLowerCase()) ||
(j.ownr_fn || "") (j.ownr_fn || "")
.toLowerCase() .toLowerCase()
.includes(modalSearch.toLowerCase()) || .includes(modalSearch.toLowerCase()) ||
(j.ownr_ln || "") (j.ownr_ln || "")
.toLowerCase() .toLowerCase()
.includes(modalSearch.toLowerCase()) || .includes(modalSearch.toLowerCase()) ||
(j.status || "") (j.status || "")
.toLowerCase() .toLowerCase()
.includes(modalSearch.toLowerCase()) || .includes(modalSearch.toLowerCase()) ||
(j.v_make_desc || "") (j.v_make_desc || "")
.toLowerCase() .toLowerCase()
.includes(modalSearch.toLowerCase()) || .includes(modalSearch.toLowerCase()) ||
(j.v_model_desc || "") (j.v_model_desc || "")
.toLowerCase() .toLowerCase()
.includes(modalSearch.toLowerCase()) || .includes(modalSearch.toLowerCase()) ||
(j.clm_no || "") (j.clm_no || "")
.toLowerCase() .toLowerCase()
.includes(modalSearch.toLowerCase()) || .includes(modalSearch.toLowerCase()) ||
(j.plate_no || "") (j.plate_no || "")
.toLowerCase() .toLowerCase()
.includes(modalSearch.toLowerCase()) .includes(modalSearch.toLowerCase())
) )
: jobsList.data.jobs : jobsList.data.jobs
: null; : null;
return ( return (
<Modal <Modal
title={t("jobs.labels.existing_jobs")} title={t("jobs.labels.existing_jobs")}
width={"80%"} width={"80%"}
destroyOnClose destroyOnClose
okButtonProps={{ disabled: selectedJob ? false : true }} okButtonProps={{disabled: selectedJob ? false : true}}
{...modalProps} {...modalProps}
> >
{loading ? <LoadingSpinner /> : null} {loading ? <LoadingSpinner/> : null}
{error ? <AlertComponent message={error.message} type="error" /> : null} {error ? <AlertComponent message={error.message} type="error"/> : null}
{true ? ( <JobsFindModalComponent
<JobsFindModalComponent selectedJob={selectedJob}
selectedJob={selectedJob} setSelectedJob={setSelectedJob}
setSelectedJob={setSelectedJob} importOptionsState={importOptionsState}
importOptionsState={importOptionsState} jobsListLoading={jobsList.loading}
jobsListLoading={jobsList.loading} jobsListRefetch={jobsList.refetch}
jobsListRefetch={jobsList.refetch} jobsList={jobsData}
jobsList={jobsData} modalSearchState={modalSearchState}
modalSearchState={modalSearchState} partsQueueToggle={partsQueueToggle}
partsQueueToggle={partsQueueToggle} setPartsQueueToggle={setPartsQueueToggle}
setPartsQueueToggle={setPartsQueueToggle} />
/> </Modal>
) : null} );
</Modal>
);
}); });