BOD-21 Bug fixes for production columns.

This commit is contained in:
Patrick Fic
2020-04-23 10:34:52 -07:00
parent 7544549e10
commit faa93a5e21
12 changed files with 182 additions and 67 deletions

View File

@@ -0,0 +1,33 @@
import { notification } from "antd";
import i18n from "i18next";
import { UPDATE_JOB } from "../../graphql/jobs.queries";
export default function AddToProduction(
apolloClient,
jobId,
completionCallback
) {
//get a list of all fields on the job
apolloClient
.mutate({
mutation: UPDATE_JOB,
variables: { jobId: jobId, job: { inproduction: true } },
})
.then((res) => {
notification["success"]({
message: i18n.t("jobs.successes.addedtoproduction"),
});
if (completionCallback) completionCallback();
})
.catch((error) => {
notification["errors"]({
message: i18n.t("jobs.errors.addingtoproduction", {
error: JSON.stringify(error),
}),
});
});
//insert the new job. call the callback with the returned ID when done.
return;
}

View File

@@ -1,15 +1,15 @@
import React from "react";
import { Menu, Dropdown, Button, Popconfirm } from "antd";
import { useTranslation } from "react-i18next";
import { DownCircleFilled } from "@ant-design/icons";
import { Link } from "react-router-dom";
import DuplicateJob from "./jobs-detail-header-actions.duplicate";
import { useApolloClient } from "@apollo/react-hooks";
import { Button, Dropdown, Menu, Popconfirm } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link, useHistory } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
import { useHistory } from "react-router-dom";
import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
bodyshop: selectBodyshop,
@@ -23,22 +23,27 @@ export function JobsDetailHeaderActions({ job, bodyshop }) {
const client = useApolloClient();
const history = useHistory();
const statusmenu = (
<Menu key="popovermenu">
<Menu.Item key="cccontract">
<Menu key='popovermenu'>
<Menu.Item key='cccontract'>
<Link
to={{
pathname: "/manage/courtesycars/contracts/new",
state: { jobId: job.id },
}}
>
}}>
{t("menus.jobsactions.newcccontract")}
</Link>
</Menu.Item>
<Menu.Item key="duplicatejob">
<Menu.Item
key='addtoproduction'
disabled={!!!job.converted}
onClick={() => AddToProduction(client, job.id)}>
{t("jobs.actions.addtoproduction")}
</Menu.Item>
<Menu.Item key='duplicatejob'>
<Popconfirm
title={t("jobs.labels.duplicateconfirm")}
okText="Yes"
cancelText="No"
okText='Yes'
cancelText='No'
onClick={(e) => e.stopPropagation()}
onConfirm={() =>
DuplicateJob(
@@ -50,15 +55,14 @@ export function JobsDetailHeaderActions({ job, bodyshop }) {
}
)
}
getPopupContainer={(trigger) => trigger.parentNode}
>
getPopupContainer={(trigger) => trigger.parentNode}>
{t("menus.jobsactions.duplicate")}
</Popconfirm>
</Menu.Item>
</Menu>
);
return (
<Dropdown overlay={statusmenu} key="changestatus">
<Dropdown overlay={statusmenu} key='changestatus'>
<Button>
{t("general.labels.actions")} <DownCircleFilled />
</Button>