Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1319)

- Fix for IO-2540
This commit is contained in:
Dave Richer
2024-03-05 20:30:50 +00:00
5 changed files with 20 additions and 2 deletions

View File

@@ -27,6 +27,7 @@ export function ProductionColumnsComponent({
bodyshop, bodyshop,
data, data,
tableState, tableState,
refetch,
}) { }) {
const [columns, setColumns] = columnState; const [columns, setColumns] = columnState;
const {t} = useTranslation(); const {t} = useTranslation();
@@ -50,6 +51,7 @@ export function ProductionColumnsComponent({
data, data,
state: tableState, state: tableState,
activeStatuses: bodyshop.md_ro_statuses.active_statuses, activeStatuses: bodyshop.md_ro_statuses.active_statuses,
refetch,
}); });
const menu = { const menu = {

View File

@@ -26,7 +26,7 @@ import ProductionListColumnCategory from "./production-list-columns.status.categ
import ProductionListColumnStatus from "./production-list-columns.status.component"; import ProductionListColumnStatus from "./production-list-columns.status.component";
import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component"; import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
const r = ({technician, state, activeStatuses, data, bodyshop}) => { const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
return [ return [
{ {
title: i18n.t("jobs.actions.viewdetail"), title: i18n.t("jobs.actions.viewdetail"),
@@ -473,6 +473,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop}) => {
), ),
render: (text, record) => ( render: (text, record) => (
<ProductionListEmployeeAssignment <ProductionListEmployeeAssignment
refetch={refetch}
record={record} record={record}
type="employee_body" type="employee_body"
/> />
@@ -493,6 +494,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop}) => {
render: (text, record) => ( render: (text, record) => (
<ProductionListEmployeeAssignment <ProductionListEmployeeAssignment
record={record} record={record}
refetch={refetch}
type="employee_prep" type="employee_prep"
/> />
), ),
@@ -509,7 +511,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop}) => {
bodyshop.employees?.find((e) => e.id === b.employee_csr)?.first_name bodyshop.employees?.find((e) => e.id === b.employee_csr)?.first_name
), ),
render: (text, record) => ( render: (text, record) => (
<ProductionListEmployeeAssignment record={record} type="employee_csr"/> <ProductionListEmployeeAssignment refetch={refetch} record={record} type="employee_csr"/>
), ),
}, },
{ {
@@ -529,6 +531,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop}) => {
render: (text, record) => ( render: (text, record) => (
<ProductionListEmployeeAssignment <ProductionListEmployeeAssignment
record={record} record={record}
refetch={refetch}
type="employee_refinish" type="employee_refinish"
/> />
), ),

View File

@@ -33,6 +33,7 @@ export function ProductionListEmpAssignment({
insertAuditTrail, insertAuditTrail,
bodyshop, bodyshop,
record, record,
refetch,
type, type,
}) { }) {
const {t} = useTranslation(); const {t} = useTranslation();
@@ -64,6 +65,9 @@ export function ProductionListEmpAssignment({
}), }),
}); });
} }
await refetch();
setLoading(false); setLoading(false);
}; };
const handleRemove = async (operation) => { const handleRemove = async (operation) => {
@@ -89,6 +93,9 @@ export function ProductionListEmpAssignment({
}), }),
}); });
} }
await refetch();
setLoading(false); setLoading(false);
}; };

View File

@@ -18,6 +18,7 @@ const mapStateToProps = createStructuredSelector({
}); });
export function ProductionListTable({ export function ProductionListTable({
refetch,
bodyshop, bodyshop,
technician, technician,
currentUser, currentUser,
@@ -38,6 +39,7 @@ export function ProductionListTable({
return { return {
...ProductionListColumns({ ...ProductionListColumns({
bodyshop, bodyshop,
refetch,
technician, technician,
state, state,
data: data, data: data,
@@ -95,6 +97,7 @@ export function ProductionListTable({
...ProductionListColumns({ ...ProductionListColumns({
technician, technician,
state, state,
refetch,
data: data, data: data,
activeStatuses: bodyshop.md_ro_statuses.active_statuses, activeStatuses: bodyshop.md_ro_statuses.active_statuses,
}).find((e) => e.key === k.key), }).find((e) => e.key === k.key),

View File

@@ -64,6 +64,7 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
return { return {
...ProductionListColumns({ ...ProductionListColumns({
bodyshop, bodyshop,
refetch,
technician, technician,
state, state,
data, data,
@@ -84,6 +85,7 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
...ProductionListColumns({ ...ProductionListColumns({
bodyshop, bodyshop,
technician, technician,
refetch,
state, state,
data: data, data: data,
activeStatuses: bodyshop.md_ro_statuses.active_statuses, activeStatuses: bodyshop.md_ro_statuses.active_statuses,
@@ -262,6 +264,7 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
state={state} state={state}
setState={setState} setState={setState}
setColumns={setColumns} setColumns={setColumns}
refetch={refetch}
data={data} data={data}
/> />