From d360bcbb71311c38e1cf67aefeaa8651e6ee2785 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Fri, 12 Jan 2024 17:40:23 -0500 Subject: [PATCH] - random cleanup Signed-off-by: Dave Richer --- .../jobs-find-modal.container.jsx | 166 ++++++++---------- 1 file changed, 77 insertions(+), 89 deletions(-) diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx index 5394713df..76717d3ce 100644 --- a/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx +++ b/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx @@ -1,102 +1,90 @@ -import { useQuery } from "@apollo/client"; -import { Modal } from "antd"; +import {useQuery} from "@apollo/client"; +import {Modal} from "antd"; import React from "react"; -import { useTranslation } from "react-i18next"; -import { connect } from "react-redux"; -import { createStructuredSelector } from "reselect"; -import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries"; -import { selectBodyshop } from "../../redux/user/user.selectors"; +import {useTranslation} from "react-i18next"; +import {connect} from "react-redux"; +import {createStructuredSelector} from "reselect"; +import {QUERY_ALL_ACTIVE_JOBS} from "../../graphql/jobs.queries"; +import {selectBodyshop} from "../../redux/user/user.selectors"; import AlertComponent from "../alert/alert.component"; import LoadingSpinner from "../loading-spinner/loading-spinner.component"; import JobsFindModalComponent from "./jobs-find-modal.component"; + const mapStateToProps = createStructuredSelector({ - bodyshop: selectBodyshop, + bodyshop: selectBodyshop, }); export default connect( - mapStateToProps, - null -)(function JobsFindModalContainer({ - bodyshop, - loading, - error, - selectedJob, - setSelectedJob, - importOptionsState, - modalSearchState, - partsQueueToggle, - setPartsQueueToggle, - ...modalProps -}) { - const { t } = useTranslation(); + mapStateToProps, + null +)(function JobsFindModalContainer({bodyshop, loading, error, selectedJob, setSelectedJob, importOptionsState, modalSearchState, partsQueueToggle, setPartsQueueToggle, ...modalProps }) { + const {t} = useTranslation(); - const jobsList = useQuery(QUERY_ALL_ACTIVE_JOBS, { - variables: { - statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"], - }, - skip: !modalProps.open, - fetchPolicy: "network-only", - nextFetchPolicy: "network-only", - }); + const jobsList = useQuery(QUERY_ALL_ACTIVE_JOBS, { + variables: { + statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"], + }, + skip: !modalProps.open, + fetchPolicy: "network-only", + nextFetchPolicy: "network-only", + }); - const modalSearch = modalSearchState[0]; + const modalSearch = modalSearchState[0]; - const jobsData = - jobsList.data && jobsList.data.jobs - ? modalSearch - ? jobsList.data.jobs.filter( - (j) => - (j.ro_number || "") - .toLowerCase() - .includes(modalSearch.toLowerCase()) || - (j.ownr_fn || "") - .toLowerCase() - .includes(modalSearch.toLowerCase()) || - (j.ownr_ln || "") - .toLowerCase() - .includes(modalSearch.toLowerCase()) || - (j.status || "") - .toLowerCase() - .includes(modalSearch.toLowerCase()) || - (j.v_make_desc || "") - .toLowerCase() - .includes(modalSearch.toLowerCase()) || - (j.v_model_desc || "") - .toLowerCase() - .includes(modalSearch.toLowerCase()) || - (j.clm_no || "") - .toLowerCase() - .includes(modalSearch.toLowerCase()) || - (j.plate_no || "") - .toLowerCase() - .includes(modalSearch.toLowerCase()) - ) - : jobsList.data.jobs - : null; + const jobsData = + jobsList.data && jobsList.data.jobs + ? modalSearch + ? jobsList.data.jobs.filter( + (j) => + (j.ro_number || "") + .toLowerCase() + .includes(modalSearch.toLowerCase()) || + (j.ownr_fn || "") + .toLowerCase() + .includes(modalSearch.toLowerCase()) || + (j.ownr_ln || "") + .toLowerCase() + .includes(modalSearch.toLowerCase()) || + (j.status || "") + .toLowerCase() + .includes(modalSearch.toLowerCase()) || + (j.v_make_desc || "") + .toLowerCase() + .includes(modalSearch.toLowerCase()) || + (j.v_model_desc || "") + .toLowerCase() + .includes(modalSearch.toLowerCase()) || + (j.clm_no || "") + .toLowerCase() + .includes(modalSearch.toLowerCase()) || + (j.plate_no || "") + .toLowerCase() + .includes(modalSearch.toLowerCase()) + ) + : jobsList.data.jobs + : null; - return ( - - {loading ? : null} - {error ? : null} - {true ? ( - - ) : null} - - ); + return ( + + {loading ? : null} + {error ? : null} + + + ); });