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

Merged in release/2023-12-01 (pull request #1103)

Browse Source 
Reversion

Approved-by: Allan Carr
This commit is contained in:
Dave Richer
2023-12-04 16:50:13 +00:00
committed by Allan Carr
parent 1c400cd456 d8420f472c
commit 92c8b54f85
1 changed files with 105 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

248
client/src/components/jobs-list/jobs-list.component.jsx
View File

@@ -1,120 +1,105 @@
import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined,} from "@ant-design/icons";
import {useQuery} from "@apollo/client";
import {Button, Card, Grid, Input, Space, Table, Tooltip, Typography} from "antd";
import {
SyncOutlined,
ExclamationCircleFilled,
PauseCircleOutlined,
BranchesOutlined,
} from "@ant-design/icons";
import { useQuery } from "@apollo/client";
import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
import queryString from "query-string";
import React, {useEffect, useState} from "react";
import {useTranslation} from "react-i18next";
import {connect} from "react-redux";
import {Link, useHistory, useLocation} from "react-router-dom";
import {createStructuredSelector} from "reselect";
import {QUERY_ALL_ACTIVE_JOBS_PAGINATED} from "../../graphql/jobs.queries";
import {selectBodyshop} from "../../redux/user/user.selectors";
import {onlyUnique} from "../../utils/arrayHelper";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link, useHistory, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
import { onlyUnique } from "../../utils/arrayHelper";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { alphaSort } from "../../utils/sorters";
import AlertComponent from "../alert/alert.component";
import ChatOpenButton from "../chat-open-button/chat-open-button.component";
import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
import {flattenDeep} from "lodash";
import { pageLimit } from '../../utils/config';
import axios from "axios";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
const mapDispatchToProps = () => ({
});
export function JobsList({bodyshop,}) {
const search = queryString.parse(useLocation().search);
const [openSearchResults, setOpenSearchResults] = useState([]);
const [searchLoading, setSearchLoading] = useState(false);
const {page, selected, sortorder, sortcolumn} = search;
export function JobsList({ bodyshop }) {
const searchParams = queryString.parse(useLocation().search);
const { selected } = searchParams;
const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
.filter((screen) => !!screen[1])
.slice(-1)[0];
const {loading, error, data, refetch} = useQuery(QUERY_ALL_ACTIVE_JOBS_PAGINATED, {
const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
variables: {
offset: page ? (page - 1) * pageLimit : 0,
limit: pageLimit,
statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
order: [
{
[sortcolumn || "ro_number"]:
sortorder && sortorder !== "false"
? (sortorder === "descend"
? "desc"
: "asc")
: "desc",
},
],
},
fetchPolicy: "network-only",
nextFetchPolicy: "network-only",
});
const total = data?.jobs_aggregate?.aggregate?.count || 0;
const [state, setState] = useState({
filteredInfo: {text: ""},
sortedInfo: {},
filteredInfo: { text: "" },
});
const {t} = useTranslation();
const { t } = useTranslation();
const history = useHistory();
const [searchText, setSearchText] = useState("");
const jobs = data?.jobs || [];
if (error) return <AlertComponent message={error.message} type="error" />;
const jobs = data
? searchText === ""
? data.jobs
: data.jobs.filter(
(j) =>
(j.ro_number || "")
.toString()
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.ownr_co_nm || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.comments || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.ownr_fn || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.ownr_ln || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
(j.plate_no || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.v_model_desc || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.est_ct_fn || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.est_ct_ln || "")
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.v_make_desc || "")
.toLowerCase()
.includes(searchText.toLowerCase())
)
: [];
const handleTableChange = (pagination, filters, sorter) => {
// TODO: Is this needed?
setState({...state, filteredInfo: filters});
search.page = pagination.current;
search.sortcolumn = sorter.column && sorter.column.key;
search.sortorder = sorter.order;
if (filters.status) {
search.statusFilters = JSON.stringify(flattenDeep(filters.status));
} else {
delete search.statusFilters;
}
history.push({search: queryString.stringify(search)});
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
};
useEffect(() => {
if (search.search && search.search.trim() !== "") {
searchJobs().catch(e => {
console.error('Something went wrong searching for jobs in the job-list component', e);
});
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
if (error) return <AlertComponent message={error.message} type="error"/>;
async function searchJobs(value) {
try {
setSearchLoading(true);
const searchData = await axios.post("/search", {
search: value || search.search,
index: "jobs",
});
setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
} catch (error) {
console.log("Error while fetching search results", error);
} finally {
setSearchLoading(false);
}
}
const handleOnRowClick = (record) => {
if (record) {
if (record.id) {
history.push({
search: queryString.stringify({
...search,
...searchParams,
selected: record.id,
}),
});
@@ -127,9 +112,11 @@ export function JobsList({bodyshop,}) {
title: t("jobs.fields.ro_number"),
dataIndex: "ro_number",
key: "ro_number",
sorter: true,
sorter: (a, b) =>
parseInt((a.ro_number || "0").replace(/\D/g, "")) -
parseInt((b.ro_number || "0").replace(/\D/g, "")),
sortOrder:
sortcolumn === "ro_number" && sortorder,
state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
render: (text, record) => (
<Link
@@ -139,14 +126,14 @@ export function JobsList({bodyshop,}) {
<Space>
{record.ro_number || t("general.labels.na")}
{record.production_vars && record.production_vars.alert ? (
<ExclamationCircleFilled className="production-alert"/>
<ExclamationCircleFilled className="production-alert" />
) : null}
{record.suspended && (
<PauseCircleOutlined style={{color: "orangered"}}/>
<PauseCircleOutlined style={{ color: "orangered" }} />
)}
{record.iouparent && (
<Tooltip title={t("jobs.labels.iou")}>
<BranchesOutlined style={{color: "orangered"}}/>
<BranchesOutlined style={{ color: "orangered" }} />
</Tooltip>
)}
</Space>
@@ -158,20 +145,22 @@ export function JobsList({bodyshop,}) {
dataIndex: "owner",
key: "owner",
ellipsis: true,
responsive: ["md"],
sorter: false,
sortOrder: sortcolumn === "owner" && sortorder,
sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
sortOrder:
state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
render: (text, record) => {
return record.ownerid ? (
<Link
to={"/manage/owners/" + record.ownerid}
onClick={(e) => e.stopPropagation()}
>
<OwnerNameDisplay ownerObject={record}/>
<OwnerNameDisplay ownerObject={record} />
</Link>
) : (
<span>
<OwnerNameDisplay ownerObject={record}/>
<OwnerNameDisplay ownerObject={record} />
</span>
);
},
@@ -183,7 +172,7 @@ export function JobsList({bodyshop,}) {
ellipsis: true,
responsive: ["md"],
render: (text, record) => (
<ChatOpenButton phone={record.ownr_ph1} jobid={record.id}/>
<ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
),
},
{
@@ -193,7 +182,7 @@ export function JobsList({bodyshop,}) {
ellipsis: true,
responsive: ["md"],
render: (text, record) => (
<ChatOpenButton phone={record.ownr_ph2} jobid={record.id}/>
<ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
),
},
@@ -202,9 +191,10 @@ export function JobsList({bodyshop,}) {
dataIndex: "status",
key: "status",
ellipsis: true,
sorter: true,
sorter: (a, b) => alphaSort(a.status, b.status),
sortOrder:
sortcolumn === "status" && sortorder,
state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
filters:
(jobs &&
jobs
@@ -219,6 +209,7 @@ export function JobsList({bodyshop,}) {
[],
onFilter: (value, record) => value.includes(record.status),
},
{
title: t("jobs.fields.vehicle"),
dataIndex: "vehicle",
@@ -246,10 +237,11 @@ export function JobsList({bodyshop,}) {
dataIndex: "plate_no",
key: "plate_no",
ellipsis: true,
responsive: ["md"],
sorter: true,
sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
sortOrder:
sortcolumn === "plate_no" && sortorder,
state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
},
{
title: t("jobs.fields.clm_no"),
@@ -257,9 +249,9 @@ export function JobsList({bodyshop,}) {
key: "clm_no",
ellipsis: true,
responsive: ["md"],
sorter: true,
sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
sortOrder:
sortcolumn === "clm_no" && sortorder,
state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
render: (text, record) =>
`${record.clm_no || ""}${
record.po_number ? ` (PO: ${record.po_number})` : ""
@@ -291,9 +283,10 @@ export function JobsList({bodyshop,}) {
key: "clm_total",
responsive: ["md"],
ellipsis: true,
sorter: true,
sorter: (a, b) => a.clm_total - b.clm_total,
sortOrder:
sortcolumn === "clm_total" && sortorder,
state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
render: (text, record) => (
<CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
),
@@ -356,57 +349,26 @@ export function JobsList({bodyshop,}) {
title={t("titles.bc.jobs-active")}
extra={
<Space wrap>
{search.search && (
<>
<Typography.Title level={4}>
{t("general.labels.searchresults", { search: search.search })}
</Typography.Title>
<Button
onClick={() => {
delete search.search;
delete search.page;
history.push({ search: queryString.stringify(search) });
}}
>
{t("general.actions.clear")}
</Button>
</>
)}
<Button onClick={() => refetch()}>
<SyncOutlined />
</Button>
<Input.Search
placeholder={search.search || t("general.labels.search")}
onSearch={(value) => {
search.search = value;
history.push({ search: queryString.stringify(search) });
searchJobs(value);
placeholder={t("general.labels.search")}
onChange={(e) => {
setSearchText(e.target.value);
}}
loading={loading || searchLoading}
value={searchText}
enterButton
/>
</Space>
}
>
<Table
loading={loading || searchLoading }
pagination={
search?.search
? {
pageSize: pageLimit,
showSizeChanger: false,
}
: {
pageSize: pageLimit,
current: parseInt(page || 1),
total: total,
showSizeChanger: false,
}
}
loading={loading}
pagination={{ defaultPageSize: 50 }}
columns={columns}
rowKey="id"
dataSource={search?.search ? openSearchResults : jobs}
dataSource={jobs}
scroll={{
x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
}}
@@ -418,9 +380,9 @@ export function JobsList({bodyshop,}) {
type: "radio",
}}
onChange={handleTableChange}
onRow={(record) => {
onRow={(record, rowIndex) => {
return {
onClick: () => {
onClick: (event) => {
handleOnRowClick(record);
},
};
@@ -430,4 +392,4 @@ export function JobsList({bodyshop,}) {
);
}
export default connect(mapStateToProps, mapDispatchToProps)(JobsList);
export default connect(mapStateToProps, null)(JobsList);