IO-766 Import job from disk scan.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { DownloadOutlined, SyncOutlined } from "@ant-design/icons";
|
||||
import { Button, Input, Space, Table } from "antd";
|
||||
import { Button, Input, notification, Space, Table } from "antd";
|
||||
import axios from "axios";
|
||||
import React, { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -16,7 +16,7 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
});
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(JobsAvailableScan);
|
||||
|
||||
export function JobsAvailableScan({ partnerVersion }) {
|
||||
export function JobsAvailableScan({ partnerVersion, refetch }) {
|
||||
const [estimatesOnDisk, setEstimatesOnDisk] = useState([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [searchText, setSearchText] = useState("");
|
||||
@@ -35,7 +35,12 @@ export function JobsAvailableScan({ partnerVersion }) {
|
||||
const response = await axios.post("http://localhost:1337/import/", {
|
||||
filepath,
|
||||
});
|
||||
console.log("response", response);
|
||||
if (response.data.success) {
|
||||
//Came through
|
||||
if(refetch) refetch()
|
||||
} else {
|
||||
notification["error"]({ message: t("jobs.errors.scanimport", {message: response.data.error}) });
|
||||
}
|
||||
setLoading(false);
|
||||
};
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ import {
|
||||
selectCurrentUser,
|
||||
} from "../../redux/user/user.selectors";
|
||||
import AlertComponent from "../alert/alert.component";
|
||||
import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
|
||||
import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
|
||||
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
|
||||
import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.container";
|
||||
@@ -364,6 +365,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
|
||||
addJobAsNew={addJobAsNew}
|
||||
addJobAsSupp={addJobAsSupp}
|
||||
/>
|
||||
<JobsAvailableScan refetch={refetch} />
|
||||
</LoadingSpinner>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -26,9 +26,10 @@ export function PartnerPingComponent({ setPartnerVersion }) {
|
||||
// Create an scoped async function in the hook
|
||||
async function checkPartnerStatus() {
|
||||
try {
|
||||
if (process.env.NODE_ENV === "development") return;
|
||||
//if (process.env.NODE_ENV === "development") return;
|
||||
const PartnerResponse = await axios.post("http://localhost:1337/ping/");
|
||||
const { appver, qbpath } = PartnerResponse.data;
|
||||
console.log("SETTING PARTNER VERSION.");
|
||||
setPartnerVersion(appver);
|
||||
console.log({ appver, qbpath });
|
||||
if (!qbpath) {
|
||||
|
||||
@@ -3,12 +3,11 @@ import React, { useEffect } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { connect } from "react-redux";
|
||||
import { Link } from "react-router-dom";
|
||||
import JobsAvailableScan from "../../components/jobs-available-scan/jobs-available-scan.component";
|
||||
import JobsAvailableTableContainer from "../../components/jobs-available-table/jobs-available-table.container";
|
||||
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
|
||||
import {
|
||||
setBreadcrumbs,
|
||||
setSelectedHeader,
|
||||
setSelectedHeader
|
||||
} from "../../redux/application/application.actions";
|
||||
|
||||
const mapDispatchToProps = (dispatch) => ({
|
||||
@@ -37,7 +36,6 @@ export function JobsAvailablePageContainer({
|
||||
<Button>{t("jobs.actions.manualnew")}</Button>
|
||||
</Link>
|
||||
<JobsAvailableTableContainer />
|
||||
<JobsAvailableScan />
|
||||
</div>
|
||||
</RbacWrapper>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user