- 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,14 +1,15 @@
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,
}); });
@@ -16,19 +17,8 @@ const mapStateToProps = createStructuredSelector({
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: {
@@ -79,12 +69,11 @@ export default connect(
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}
@@ -96,7 +85,6 @@ export default connect(
partsQueueToggle={partsQueueToggle} partsQueueToggle={partsQueueToggle}
setPartsQueueToggle={setPartsQueueToggle} setPartsQueueToggle={setPartsQueueToggle}
/> />
) : null}
</Modal> </Modal>
); );
}); });