diff --git a/client/src/components/production-list-columns/production-list-columns.add.component.jsx b/client/src/components/production-list-columns/production-list-columns.add.component.jsx index 0742235b5..8b671c54c 100644 --- a/client/src/components/production-list-columns/production-list-columns.add.component.jsx +++ b/client/src/components/production-list-columns/production-list-columns.add.component.jsx @@ -6,9 +6,11 @@ import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { selectTechnician } from "../../redux/tech/tech.selectors"; +import { selectBodyshop } from "../../redux/user/user.selectors"; const mapStateToProps = createStructuredSelector({ //currentUser: selectCurrentUser technician: selectTechnician, + bodyshop: selectBodyshop, }); const mapDispatchToProps = (dispatch) => ({ //setUserLanguage: language => dispatch(setUserLanguage(language)) @@ -21,6 +23,7 @@ export default connect( export function ProductionColumnsComponent({ columnState, technician, + bodyshop, tableState, }) { const [columns, setColumns] = columnState; @@ -29,9 +32,11 @@ export function ProductionColumnsComponent({ const handleAdd = (e) => { setColumns([ ...columns, - ...dataSource({ technician, state: tableState }).filter( - (i) => i.key === e.key - ), + ...dataSource({ + technician, + state: tableState, + activeStatuses: bodyshop.md_ro_statuses.active_statuses, + }).filter((i) => i.key === e.key), ]); }; @@ -39,7 +44,11 @@ export function ProductionColumnsComponent({ const menu = ( - {dataSource({ technician, state: tableState }) + {dataSource({ + technician, + state: tableState, + activeStatuses: bodyshop.md_ro_statuses.active_statuses, + }) .filter((i) => !columnKeys.includes(i.key)) .map((item) => ( {item.title} diff --git a/client/src/utils/sorters.js b/client/src/utils/sorters.js index bb111bb81..6e68ab8ee 100644 --- a/client/src/utils/sorters.js +++ b/client/src/utils/sorters.js @@ -9,11 +9,11 @@ export function alphaSort(a, b) { } export function dateSort(a, b) { - return new Date(b) - new Date(a); + return new Date(a) - new Date(b); } export function statusSort(a, b, statusList) { return ( - statusList.findIndex((x) => x === a) > statusList.findIndex((x) => x === b) + statusList.findIndex((x) => x === a) - statusList.findIndex((x) => x === b) ); }