diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx index 16df4941a..3f01e7157 100644 --- a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx +++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx @@ -1,4 +1,5 @@ -import { Checkbox, Divider, Table, Input } from "antd"; +import { SyncOutlined } from "@ant-design/icons"; +import { Checkbox, Divider, Input, Table, Button } from "antd"; import React from "react"; import { useTranslation } from "react-i18next"; import { Link } from "react-router-dom"; @@ -11,6 +12,7 @@ export default function JobsFindModalComponent({ jobsListLoading, importOptionsState, modalSearchState, + jobsListRefetch, }) { const { t } = useTranslation(); const [modalSearch, setModalSearch] = modalSearchState; @@ -138,6 +140,12 @@ export default function JobsFindModalComponent({ title={() => (
{t("jobs.labels.existing_jobs")} + { 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 4f53ea11d..40fa453be 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,14 +1,14 @@ +import { useQuery } from "@apollo/react-hooks"; import { Modal } from "antd"; import React from "react"; -import { useQuery } from "@apollo/react-hooks"; 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"; -import { selectBodyshop } from "../../redux/user/user.selectors"; -import { connect } from "react-redux"; -import { createStructuredSelector } from "reselect"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, }); @@ -29,10 +29,10 @@ export default connect( const { t } = useTranslation(); const jobsList = useQuery(QUERY_ALL_ACTIVE_JOBS, { - fetchPolicy: "network-only", variables: { statuses: bodyshop.md_ro_statuses.open_statuses || ["Open"], }, + skip: !modalProps.visible, }); const modalSearch = modalSearchState[0]; @@ -89,6 +89,7 @@ export default connect( setSelectedJob={setSelectedJob} importOptionsState={importOptionsState} jobsListLoading={jobsList.loading} + jobsListRefetch={jobsList.refetch} jobsList={jobsData} modalSearchState={modalSearchState} />