admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-766 Import job from disk scan.

Browse Source
This commit is contained in:
Patrick Fic
2021-03-18 08:46:54 -07:00
parent c27f66fdb3
commit 2284d8ec92
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
View File

@@ -1,5 +1,5 @@
import { DownloadOutlined, SyncOutlined } from "@ant-design/icons"; 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 axios from "axios";
import React, { useState } from "react"; import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
@@ -16,7 +16,7 @@ const mapDispatchToProps = (dispatch) => ({
}); });
export default connect(mapStateToProps, mapDispatchToProps)(JobsAvailableScan); export default connect(mapStateToProps, mapDispatchToProps)(JobsAvailableScan);
export function JobsAvailableScan({ partnerVersion }) { export function JobsAvailableScan({ partnerVersion, refetch }) {
const [estimatesOnDisk, setEstimatesOnDisk] = useState([]); const [estimatesOnDisk, setEstimatesOnDisk] = useState([]);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [searchText, setSearchText] = useState(""); const [searchText, setSearchText] = useState("");
@@ -35,7 +35,12 @@ export function JobsAvailableScan({ partnerVersion }) {
const response = await axios.post("http://localhost:1337/import/", { const response = await axios.post("http://localhost:1337/import/", {
filepath, 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); setLoading(false);
}; };

2
client/src/components/jobs-available-table/jobs-available-table.container.jsx
View File

@@ -30,6 +30,7 @@ import {
selectCurrentUser, selectCurrentUser,
} from "../../redux/user/user.selectors"; } from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component"; 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 JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
import LoadingSpinner from "../loading-spinner/loading-spinner.component"; import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.container"; import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.container";
@@ -364,6 +365,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
addJobAsNew={addJobAsNew} addJobAsNew={addJobAsNew}
addJobAsSupp={addJobAsSupp} addJobAsSupp={addJobAsSupp}
/> />
<JobsAvailableScan refetch={refetch} />
</LoadingSpinner> </LoadingSpinner>
); );
} }

3
client/src/components/partner-ping/partner-ping.component.jsx
View File

@@ -26,9 +26,10 @@ export function PartnerPingComponent({ setPartnerVersion }) {
// Create an scoped async function in the hook // Create an scoped async function in the hook
async function checkPartnerStatus() { async function checkPartnerStatus() {
try { 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 PartnerResponse = await axios.post("http://localhost:1337/ping/");
const { appver, qbpath } = PartnerResponse.data; const { appver, qbpath } = PartnerResponse.data;
console.log("SETTING PARTNER VERSION.");
setPartnerVersion(appver); setPartnerVersion(appver);
console.log({ appver, qbpath }); console.log({ appver, qbpath });
if (!qbpath) { if (!qbpath) {

4
client/src/pages/jobs-available/jobs-available.page.container.jsx
View File

@@ -3,12 +3,11 @@ import React, { useEffect } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { Link } from "react-router-dom"; 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 JobsAvailableTableContainer from "../../components/jobs-available-table/jobs-available-table.container";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component"; import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
import { import {
setBreadcrumbs, setBreadcrumbs,
setSelectedHeader, setSelectedHeader
} from "../../redux/application/application.actions"; } from "../../redux/application/application.actions";
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
@@ -37,7 +36,6 @@ export function JobsAvailablePageContainer({
<Button>{t("jobs.actions.manualnew")}</Button> <Button>{t("jobs.actions.manualnew")}</Button>
</Link> </Link>
<JobsAvailableTableContainer /> <JobsAvailableTableContainer />
<JobsAvailableScan />
</div> </div>
</RbacWrapper> </RbacWrapper>
); );