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

Feature/IO-1828 Front End Package Updates

client/src/components/chat-conversation-list/chat-conversation-list.component.jsx

@@ -1,19 +1,14 @@
-import {Badge, List, Space, Tag} from "antd";
+import {Badge, Card, List, Space, Tag} from "antd";
 import React from "react";
-import { connect } from "react-redux";
+import {connect} from "react-redux";
-import {
+import {AutoSizer, CellMeasurer, CellMeasurerCache, List as VirtualizedList,} from "react-virtualized";
-  AutoSizer,
+import {createStructuredSelector} from "reselect";
-  CellMeasurer,
+import {setSelectedConversation} from "../../redux/messaging/messaging.actions";
-  CellMeasurerCache,
+import {selectSelectedConversation} from "../../redux/messaging/messaging.selectors";
-  List as VirtualizedList,
+import {TimeAgoFormatter} from "../../utils/DateFormatter";
-} from "react-virtualized";
-import { createStructuredSelector } from "reselect";
-import { setSelectedConversation } from "../../redux/messaging/messaging.actions";
-import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
-import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import {OwnerNameDisplayFunction} from "../owner-name-display/owner-name-display.component";
-
+import _ from "lodash";
 import "./chat-conversation-list.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
@@ -30,14 +25,45 @@ function ChatConversationListComponent({
                                            selectedConversation,
                                            setSelectedConversation,
                                            loadMoreConversations,
-}) {
+                                       }) {
     const cache = new CellMeasurerCache({
         fixedWidth: true,
         defaultHeight: 60,
     });
 
-  const rowRenderer = ({ index, key, style, parent }) => {
+    const rowRenderer = ({index, key, style, parent}) => {
         const item = conversationList[index];
+        const cardContentRight =
+            <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
+        const cardContentLeft = item.job_conversations.length > 0
+            ? item.job_conversations.map((j, idx) => (
+                <Tag key={idx}>{j.job.ro_number}</Tag>
+            ))
+            : null;
+
+        const names = <>{_.uniq(item.job_conversations.map((j, idx) =>
+            OwnerNameDisplayFunction(j.job)
+        ))}</>
+
+        const cardTitle = <>
+            {item.label && <Tag color="blue">{item.label}</Tag>}
+            {item.job_conversations.length > 0 ? (
+                <Space direction="vertical">
+                    {names}
+                </Space>
+            ) : (
+                <Space>
+                    <PhoneFormatter>{item.phone_num}</PhoneFormatter>
+                </Space>
+            )}
+        </>
+        const cardExtra = <Badge count={item.messages_aggregate.aggregate.count || 0}/>
+
+        const getCardStyle = () =>
+            item.id === selectedConversation
+                ? { backgroundColor: 'rgba(128, 128, 128, 0.2)' }
+                : { backgroundColor: index % 2 === 0 ? '#f0f2f5' : '#ffffff' };
+
         return (
             <CellMeasurer
                 key={key}
@@ -56,37 +82,13 @@ function ChatConversationListComponent({
                             : null
                     }`}
                 >
-            <Space style={{padding: '12px 24px'}} size={"large"}>
+                    <Card style={getCardStyle()} bordered={false} size="small" extra={cardExtra} title={cardTitle}>
-              <Space>
+                        <div style={{display: 'inline-block', width: '70%', textAlign: 'left'}}>
-                {item.label && <Space>{item.label}</Space>}
+                            {cardContentLeft}
-                {item.job_conversations.length > 0 ? (
+                        </div>
-                    <Space direction="vertical">
+                        <div
-                      {item.job_conversations.map((j, idx) => (
+                            style={{display: 'inline-block', width: '30%', textAlign: 'right'}}>{cardContentRight}</div>
-                          <OwnerNameDisplay key={idx} ownerObject={j.job} />
+                    </Card>
-                      ))}
-                    </Space>
-                ) : (
-                    <Space>
-                      <PhoneFormatter>{item.phone_num}</PhoneFormatter>
-                    </Space>
-                )}
-              </Space>
-              <Space direction="vertical">
-                <Space>
-                  {item.job_conversations.length > 0
-                      ? item.job_conversations.map((j, idx) => (
-                          <Tag key={idx}>{j.job.ro_number}</Tag>
-                      ))
-                      : null}
-                </Space>
-                <Space>
-                  <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
-                </Space>
-              </Space>
-              <Space>
-                <Badge count={item.messages_aggregate.aggregate.count || 0} />
-              </Space>
-            </Space>
                 </List.Item>
             </CellMeasurer>
         );
@@ -95,14 +97,14 @@ function ChatConversationListComponent({
     return (
         <div className="chat-list-container">
             <AutoSizer>
-        {({ height, width }) => (
+                {({height, width}) => (
                     <VirtualizedList
                         height={height}
                         width={width}
                         rowCount={conversationList.length}
                         rowHeight={cache.rowHeight}
                         rowRenderer={rowRenderer}
-            onScroll={({ scrollTop, scrollHeight, clientHeight }) => {
+                        onScroll={({scrollTop, scrollHeight, clientHeight}) => {
                             if (scrollTop + clientHeight === scrollHeight) {
                                 loadMoreConversations();
                             }

client/src/components/chat-conversation-list/chat-conversation-list.styles.scss

@@ -1,16 +1,14 @@
-.chat-list-selected-conversation {
-  background-color: rgba(128, 128, 128, 0.2);
-}
 .chat-list-container {
   overflow: hidden;
   height: 100%;
   border: 1px solid gainsboro;
 }
 .chat-list-item {
+  .ant-card-head {
+    border: none;
+  }
   &:hover {
     cursor: pointer;
     color: #ff7a00;
   }
-
-  border-bottom: 1px solid gainsboro;
 }

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -1,18 +1,20 @@
-import { SyncOutlined } from "@ant-design/icons";
+import {SyncOutlined} from "@ant-design/icons";
-import { Button, Card, Input, Space, Table, Typography } from "antd";
+import {Button, Card, Input, Space, Table, Typography} from "antd";
 import axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
-import React, { useEffect, useState } from "react";
+import React, {useEffect, useState} from "react";
-import { useTranslation } from "react-i18next";
+import {useTranslation} from "react-i18next";
-import { connect } from "react-redux";
+import {connect} from "react-redux";
-import { Link, useNavigate, useLocation } from "react-router-dom";
+import {Link, useLocation, useNavigate} from "react-router-dom";
-import { createStructuredSelector } from "reselect";
+import {createStructuredSelector} from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {selectBodyshop} from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import {pageLimit} from "../../utils/config";
+import useLocalStorage from "../../utils/useLocalStorage";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import {pageLimit} from "../../utils/config";
+
 const mapStateToProps = createStructuredSelector({
     //currentUser: selectCurrentUser
     bodyshop: selectBodyshop,
@@ -21,14 +23,15 @@ const mapDispatchToProps = (dispatch) => ({
     //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
+export function JobsList({bodyshop, refetch, loading, jobs, total}) {
     const search = queryString.parse(useLocation().search);
     const [openSearchResults, setOpenSearchResults] = useState([]);
     const [searchLoading, setSearchLoading] = useState(false);
-  const { page, sortcolumn, sortorder } = search;
+    const [filter, setFilter] = useLocalStorage("filter_jobs_all", null);
+    const {page, sortcolumn, sortorder} = search;
     const history = useNavigate();
 
-  const { t } = useTranslation();
+    const {t} = useTranslation();
     const columns = [
         {
             title: t("jobs.fields.ro_number"),
@@ -53,11 +56,11 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
             render: (text, record) => {
                 return record.ownerid ? (
                     <Link to={"/manage/owners/" + record.ownerid}>
-            <OwnerNameDisplay ownerObject={record} />
+                        <OwnerNameDisplay ownerObject={record}/>
                     </Link>
                 ) : (
                     <span>
-            <OwnerNameDisplay ownerObject={record} />
+            <OwnerNameDisplay ownerObject={record}/>
           </span>
                 );
             },
@@ -69,7 +72,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
 
             ellipsis: true,
             render: (text, record) => (
-        <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
+                <StartChatButton phone={record.ownr_ph1} jobid={record.id}/>
             ),
         },
         {
@@ -79,7 +82,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
 
             ellipsis: true,
             render: (text, record) => (
-        <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
+                <StartChatButton phone={record.ownr_ph2} jobid={record.id}/>
             ),
         },
         {
@@ -93,8 +96,9 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
             render: (text, record) => {
                 return record.status || t("general.labels.na");
             },
+            filteredValue: filter?.status || null,
             filters: bodyshop.md_ro_statuses.statuses.map((s) => {
-        return { text: s, value: [s] };
+                return {text: s, value: [s]};
             }),
             onFilter: (value, record) => value.includes(record.status),
         },
@@ -189,7 +193,8 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
         } else {
             delete search.statusFilters;
         }
-    history({ search: queryString.stringify(search) });
+        setFilter(filters);
+        history({search: queryString.stringify(search)});
     };
 
     useEffect(() => {
@@ -221,13 +226,13 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
                     {search.search && (
                         <>
                             <Typography.Title level={4}>
-                {t("general.labels.searchresults", { search: search.search })}
+                                {t("general.labels.searchresults", {search: search.search})}
                             </Typography.Title>
                             <Button
                                 onClick={() => {
                                     delete search.search;
                                     delete search.page;
-                  history({ search: queryString.stringify(search) });
+                                    history({search: queryString.stringify(search)});
                                 }}
                             >
                                 {t("general.actions.clear")}
@@ -235,13 +240,13 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
                         </>
                     )}
                     <Button onClick={() => refetch()}>
-            <SyncOutlined />
+                        <SyncOutlined/>
                     </Button>
                     <Input.Search
                         placeholder={search.search || t("general.labels.search")}
                         onSearch={(value) => {
                             search.search = value;
-              history({ search: queryString.stringify(search) });
+                            history({search: queryString.stringify(search)});
                             searchJobs(value);
                         }}
                         loading={loading || searchLoading}
@@ -273,4 +278,5 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
         </Card>
     );
 }
+
 export default connect(mapStateToProps, mapDispatchToProps)(JobsList);

client/src/components/jobs-list/jobs-list.component.jsx

@@ -1,22 +1,18 @@
-import {
+import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined,} from "@ant-design/icons";
-    SyncOutlined,
+import {useQuery} from "@apollo/client";
-    ExclamationCircleFilled,
+import {Button, Card, Grid, Input, Space, Table, Tooltip} from "antd";
-    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, { useState } from "react";
+import React, {useState} from "react";
-import { useTranslation } from "react-i18next";
+import {useTranslation} from "react-i18next";
-import { connect } from "react-redux";
+import {connect} from "react-redux";
-import { Link, useNavigate, useLocation } from "react-router-dom";
+import {Link, useLocation, useNavigate} from "react-router-dom";
-import { createStructuredSelector } from "reselect";
+import {createStructuredSelector} from "reselect";
-import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
+import {QUERY_ALL_ACTIVE_JOBS} from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {selectBodyshop} from "../../redux/user/user.selectors";
-import { onlyUnique } from "../../utils/arrayHelper";
+import {onlyUnique} from "../../utils/arrayHelper";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
+import {alphaSort, statusSort} from "../../utils/sorters";
+import useLocalStorage from "../../utils/useLocalStorage";
 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";
@@ -25,13 +21,13 @@ const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
 });
 
-export function JobsList({ bodyshop }) {
+export function JobsList({bodyshop}) {
     const searchParams = queryString.parse(useLocation().search);
-    const { selected } = searchParams;
+    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, {
+    const {loading, error, data, refetch} = useQuery(QUERY_ALL_ACTIVE_JOBS, {
         variables: {
             statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
         },
@@ -39,16 +35,14 @@ export function JobsList({ bodyshop }) {
         nextFetchPolicy: "network-only",
     });
 
-    const [state, setState] = useState({
+    const [state, setState] = useState({sortedInfo: {}});
-        sortedInfo: {},
+    const [filter, setFilter] = useLocalStorage("filter_jobs_list", null);
-        filteredInfo: { text: "" },
-    });
 
-    const { t } = useTranslation();
+    const {t} = useTranslation();
     const history = useNavigate();
     const [searchText, setSearchText] = useState("");
 
-    if (error) return <AlertComponent message={error.message} type="error" />;
+    if (error) return <AlertComponent message={error.message} type="error"/>;
 
     const jobs = data
         ? searchText === ""
@@ -91,7 +85,8 @@ export function JobsList({ bodyshop }) {
         : [];
 
     const handleTableChange = (pagination, filters, sorter) => {
-        setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+        setState({...state, sortedInfo: sorter});
+        setFilter(filters);
     };
 
     const handleOnRowClick = (record) => {
@@ -126,14 +121,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>
@@ -156,11 +151,11 @@ export function JobsList({ bodyshop }) {
                         to={"/manage/owners/" + record.ownerid}
                         onClick={(e) => e.stopPropagation()}
                     >
-                        <OwnerNameDisplay ownerObject={record} />
+                        <OwnerNameDisplay ownerObject={record}/>
                     </Link>
                 ) : (
                     <span>
-            <OwnerNameDisplay ownerObject={record} />
+            <OwnerNameDisplay ownerObject={record}/>
           </span>
                 );
             },
@@ -172,7 +167,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}/>
             ),
         },
         {
@@ -182,7 +177,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}/>
             ),
         },
 
@@ -195,6 +190,7 @@ export function JobsList({ bodyshop }) {
             sorter: (a, b) => alphaSort(a.status, b.status),
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+            filteredValue: filter?.status || null,
             filters:
                 (jobs &&
                     jobs
@@ -205,7 +201,14 @@ export function JobsList({ bodyshop }) {
                                 text: s || "No Status*",
                                 value: [s],
                             };
-                        })) ||
+                        })
+                        .sort((a, b) =>
+                            statusSort(
+                                a.text,
+                                b.text,
+                                bodyshop.md_ro_statuses.active_statuses
+                            )
+                        )) ||
                 [],
             onFilter: (value, record) => value.includes(record.status),
         },
@@ -262,6 +265,7 @@ export function JobsList({ bodyshop }) {
             dataIndex: "ins_co_nm",
             key: "ins_co_nm",
             ellipsis: true,
+            filteredValue: filter?.ins_co_nm || null,
             filters:
                 (jobs &&
                     jobs
@@ -269,10 +273,11 @@ export function JobsList({ bodyshop }) {
                         .filter(onlyUnique)
                         .map((s) => {
                             return {
-                                text: s,
+                                text: s || "No Ins. Co.*",
                                 value: [s],
                             };
-                        })) ||
+                        })
+                        .sort((a, b) => alphaSort(a.text, b.text))) ||
                 [],
             onFilter: (value, record) => value.includes(record.ins_co_nm),
             responsive: ["md"],
@@ -298,6 +303,7 @@ export function JobsList({ bodyshop }) {
             ellipsis: true,
             responsive: ["xl"],
             filterSearch: true,
+            filteredValue: filter?.estimator || null,
             filters:
                 (jobs &&
                     jobs
@@ -305,10 +311,11 @@ export function JobsList({ bodyshop }) {
                         .filter(onlyUnique)
                         .map((s) => {
                             return {
-                                text: s || "N/A",
+                                text: s || "No Estimator*",
                                 value: [s],
                             };
-                        })) ||
+                        })
+                        .sort((a, b) => alphaSort(a.text, b.text))) ||
                 [],
             onFilter: (value, record) =>
                 value.includes(
@@ -350,7 +357,7 @@ export function JobsList({ bodyshop }) {
             extra={
                 <Space wrap>
                     <Button onClick={() => refetch()}>
-                        <SyncOutlined />
+                        <SyncOutlined/>
                     </Button>
                     <Input.Search
                         placeholder={t("general.labels.search")}
@@ -365,7 +372,7 @@ export function JobsList({ bodyshop }) {
         >
             <Table
                 loading={loading}
-                pagination={{ defaultPageSize: 50 }}
+                pagination={{defaultPageSize: 50}}
                 columns={columns}
                 rowKey="id"
                 dataSource={jobs}

client/src/components/jobs-ready-list/jobs-ready-list.component.jsx

@@ -1,34 +1,30 @@
-import {
+import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined,} from "@ant-design/icons";
-  BranchesOutlined,
+import {useQuery} from "@apollo/client";
-  ExclamationCircleFilled,
+import {Button, Card, Grid, Input, Space, Table, Tooltip} from "antd";
-  PauseCircleOutlined,
-  SyncOutlined,
-} 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, { useMemo, useState } from "react";
+import React, {useMemo, useState} from "react";
-import { useTranslation } from "react-i18next";
+import {useTranslation} from "react-i18next";
-import { connect } from "react-redux";
+import {connect} from "react-redux";
-import { Link, useNavigate, useLocation } from "react-router-dom";
+import {Link, useLocation, useNavigate} from "react-router-dom";
-import { createStructuredSelector } from "reselect";
+import {createStructuredSelector} from "reselect";
-import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
+import {QUERY_ALL_ACTIVE_JOBS} from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {selectBodyshop} from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { onlyUnique } from "../../utils/arrayHelper";
+import {onlyUnique} from "../../utils/arrayHelper";
-import { alphaSort } from "../../utils/sorters";
+import {pageLimit} from "../../utils/config";
+import {alphaSort, statusSort} from "../../utils/sorters";
+import useLocalStorage from "../../utils/useLocalStorage";
 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 {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
 });
 
-export function JobsReadyList({ bodyshop }) {
+export function JobsReadyList({bodyshop}) {
-  const searchParams =queryString.parse(useLocation().search);
+    const searchParams = queryString.parse(useLocation().search);
-  const { selected } = searchParams;
+    const {selected} = searchParams;
     const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
         .filter((screen) => !!screen[1])
         .slice(-1)[0];
@@ -44,7 +40,7 @@ export function JobsReadyList({ bodyshop }) {
         );
     }, [bodyshop.md_ro_statuses]);
 
-  const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
+    const {loading, error, data, refetch} = useQuery(QUERY_ALL_ACTIVE_JOBS, {
         variables: {
             statuses: readyStatuses,
             isConverted: true,
@@ -53,16 +49,14 @@ export function JobsReadyList({ bodyshop }) {
         nextFetchPolicy: "network-only",
     });
 
-  const [state, setState] = useState({
+    const [state, setState] = useState({sortedInfo: {}});
-    sortedInfo: {},
+    const [filter, setFilter] = useLocalStorage("filter_jobs_ready", null);
-    filteredInfo: { text: "" },
-  });
 
-  const { t } = useTranslation();
+    const {t} = useTranslation();
     const history = useNavigate();
     const [searchText, setSearchText] = useState("");
 
-  if (error) return <AlertComponent message={error.message} type="error" />;
+    if (error) return <AlertComponent message={error.message} type="error"/>;
 
     const jobs = data
         ? searchText === ""
@@ -105,7 +99,8 @@ export function JobsReadyList({ bodyshop }) {
         : [];
 
     const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+        setState({...state, sortedInfo: sorter});
+        setFilter(filters);
     };
 
     const handleOnRowClick = (record) => {
@@ -129,7 +124,6 @@ export function JobsReadyList({ bodyshop }) {
             sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
             sortOrder:
                 state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-
             render: (text, record) => (
                 <Link
                     to={"/manage/jobs/" + record.id}
@@ -138,14 +132,14 @@ export function JobsReadyList({ 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>
@@ -157,7 +151,6 @@ export function JobsReadyList({ bodyshop }) {
             dataIndex: "owner",
             key: "owner",
             ellipsis: true,
-
             responsive: ["md"],
             sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
             sortOrder:
@@ -168,11 +161,11 @@ export function JobsReadyList({ bodyshop }) {
                         to={"/manage/owners/" + record.owner.id}
                         onClick={(e) => e.stopPropagation()}
                     >
-            <OwnerNameDisplay ownerObject={record} />
+                        <OwnerNameDisplay ownerObject={record}/>
                     </Link>
                 ) : (
                     <span>
-            <OwnerNameDisplay ownerObject={record} />
+            <OwnerNameDisplay ownerObject={record}/>
           </span>
                 );
             },
@@ -184,7 +177,7 @@ export function JobsReadyList({ bodyshop }) {
             ellipsis: true,
             responsive: ["md"],
             render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
+                <ChatOpenButton phone={record.ownr_ph1} jobid={record.id}/>
             ),
         },
         {
@@ -194,19 +187,18 @@ export function JobsReadyList({ bodyshop }) {
             ellipsis: true,
             responsive: ["md"],
             render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+                <ChatOpenButton phone={record.ownr_ph2} jobid={record.id}/>
             ),
         },
-
         {
             title: t("jobs.fields.status"),
             dataIndex: "status",
             key: "status",
             ellipsis: true,
-
             sorter: (a, b) => alphaSort(a.status, b.status),
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+            filteredValue: filter?.status || null,
             filters:
                 (jobs &&
                     jobs
@@ -217,11 +209,17 @@ export function JobsReadyList({ bodyshop }) {
                                 text: s || "No Status*",
                                 value: [s],
                             };
-            })) ||
+                        })
+                        .sort((a, b) =>
+                            statusSort(
+                                a.text,
+                                b.text,
+                                bodyshop.md_ro_statuses.active_statuses
+                            )
+                        )) ||
                 [],
             onFilter: (value, record) => value.includes(record.status),
         },
-
         {
             title: t("jobs.fields.vehicle"),
             dataIndex: "vehicle",
@@ -274,6 +272,7 @@ export function JobsReadyList({ bodyshop }) {
             dataIndex: "ins_co_nm",
             key: "ins_co_nm",
             ellipsis: true,
+            filteredValue: filter?.ins_co_nm || null,
             filters:
                 (jobs &&
                     jobs
@@ -281,10 +280,11 @@ export function JobsReadyList({ bodyshop }) {
                         .filter(onlyUnique)
                         .map((s) => {
                             return {
-                text: s,
+                                text: s || "No Ins Co.*",
                                 value: [s],
                             };
-            })) ||
+                        })
+                        .sort((a, b) => alphaSort(a.text, b.text))) ||
                 [],
             onFilter: (value, record) => value.includes(record.ins_co_nm),
             responsive: ["md"],
@@ -295,7 +295,6 @@ export function JobsReadyList({ bodyshop }) {
             key: "clm_total",
             responsive: ["md"],
             ellipsis: true,
-
             sorter: (a, b) => a.clm_total - b.clm_total,
             sortOrder:
                 state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
@@ -306,9 +305,10 @@ export function JobsReadyList({ bodyshop }) {
         {
             title: t("jobs.labels.estimator"),
             dataIndex: "jobs.labels.estimator",
-      key: "jobs.labels.estimator",
+            key: "estimator",
             ellipsis: true,
             responsive: ["xl"],
+            filteredValue: filter?.estimator || null,
             filterSearch: true,
             filters:
                 (jobs &&
@@ -317,10 +317,11 @@ export function JobsReadyList({ bodyshop }) {
                         .filter(onlyUnique)
                         .map((s) => {
                             return {
-                text: s || "N/A",
+                                text: s || "No Estimator*",
                                 value: [s],
                             };
-            })) ||
+                        })
+                        .sort((a, b) => alphaSort(a.text, b.text))) ||
                 [],
             onFilter: (value, record) =>
                 value.includes(
@@ -363,7 +364,7 @@ export function JobsReadyList({ bodyshop }) {
                 <Space wrap>
                     <span>({readyStatuses && readyStatuses.join(", ")})</span>
                     <Button onClick={() => refetch()}>
-            <SyncOutlined />
+                        <SyncOutlined/>
                     </Button>
                     <Input.Search
                         placeholder={t("general.labels.search")}
@@ -378,7 +379,7 @@ export function JobsReadyList({ bodyshop }) {
         >
             <Table
                 loading={loading}
-        pagination={{ defaultPageSize: pageLimit }}
+                pagination={{defaultPageSize: pageLimit}}
                 columns={columns}
                 rowKey="id"
                 dataSource={jobs}

client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js

@@ -37,7 +37,6 @@ export function ScheduleCalendarHeaderComponent({
   events,
   ...otherProps
 }) {
-  console.log(`ScheduleCalendarHeaderComponent: ${label} Calculating: ${calculating}`)
   const ATSToday = useMemo(() => {
     if (!events) return [];
     return _.groupBy(

client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx

@@ -11,7 +11,7 @@ import HeaderComponent from "./schedule-calendar-header.component";
 import "./schedule-calendar.styles.scss";
 import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
 import { selectProblemJobs } from "../../redux/application/application.selectors";
-import { Alert, Collapse } from "antd";
+import {Alert, Collapse, Space} from "antd";
 import { useTranslation, Trans } from "react-i18next";
 import { Link } from "react-router-dom";
 
@@ -55,14 +55,16 @@ export function ScheduleCalendarWrapperComponent({
     <>
       <JobDetailCards />
       {problemJobs && problemJobs.length > 2 ? (
-        <Collapse>
+        <Collapse style={{marginBottom: '5px'}}>
           <Collapse.Panel
+            key="1"
             header={
               <span style={{ color: "tomato" }}>
                 {t("appointments.labels.severalerrorsfound")}
               </span>
             }
           >
+            <Space direction="vertical" style={{ width: '100%' }}>
               {problemJobs.map((problem) => (
                   <Alert
                       key={problem.id}
@@ -84,9 +86,13 @@ export function ScheduleCalendarWrapperComponent({
                       }
                   />
               ))}
+            </Space>
+
           </Collapse.Panel>
         </Collapse>
       ) : (
+          <Space direction="vertical" style={{ width: '100%', marginBottom: '5px' }}>
+            {
               problemJobs.map((problem) => (
                   <Alert
                       key={problem.id}
@@ -95,7 +101,7 @@ export function ScheduleCalendarWrapperComponent({
                         <Trans
                             i18nKey="appointments.labels.dataconsistency"
                             components={[
-                  <Link to={`/manage/jobs/${problem.id}`} target="_blank" />,
+                              <Link to={`/manage/jobs/${problem.id}`} target="_blank"/>,
                             ]}
                             values={{
                               ro_number: problem.ro_number,
@@ -105,6 +111,8 @@ export function ScheduleCalendarWrapperComponent({
                       }
                   />
               ))
+            }
+          </Space>
           )}
 
       <Calendar

client/src/index.js

@@ -12,7 +12,6 @@ import { persistor, store } from "./redux/store";
 import reportWebVitals from "./reportWebVitals";
 import "./translations/i18n";
 import "./utils/CleanAxios";
-import {ConfigProvider} from "antd";
 import {defaultTheme} from "@ant-design/compatible";
 //import { BrowserTracing } from "@sentry/tracing";
 //import "antd/dist/antd.css";
@@ -67,7 +66,7 @@ function App() {
 // https://ant.design/docs/react/migrate-less-variables
 // TODO - Client Update - At a later time it might be worth removing these defaults
 ReactDOM.createRoot(document.getElementById('root')).render(
-    <ConfigProvider theme={defaultTheme}>
+    <ConfigProvider>
         <App />
     </ConfigProvider>
 );

client/src/pages/manage/manage.page.component.jsx

@@ -362,11 +362,10 @@ export function Manage({conflict, bodyshop}) {
 
     return (
         <>
-            <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible} />
+            <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible}/>
-            <Layout className="layout-container">
+            <Layout style={{minHeight: '100vh'}}className="layout-container">
                 <UpdateAlert/>
                 <HeaderContainer/>
-
                 <Content className="content-container">
                     <PartnerPingComponent/>
                     <Sentry.ErrorBoundary fallback={<ErrorBoundary/>} showDialog>
@@ -374,6 +373,8 @@ export function Manage({conflict, bodyshop}) {
                     </Sentry.ErrorBoundary>
 
                     <FloatButton.BackTop style={{right: 100, bottom: 25}}/>
+
+                </Content>
                 <Footer>
                     <div
                         style={{
@@ -397,7 +398,6 @@ export function Manage({conflict, bodyshop}) {
                         </Link>
                     </div>
                 </Footer>
-                </Content>
             </Layout>
         </>
     );

client/src/translations/en_us/common.json

@@ -2621,6 +2621,7 @@
 				"open_orders": "Open Orders by Date",
 				"open_orders_csr": "Open Orders by CSR",
 				"open_orders_estimator": "Open Orders by Estimator",
+				"open_orders_excel": "Open Orders - Excel",
 				"open_orders_ins_co": "Open Orders by Insurance Company",
 				"open_orders_referral": "Open Orders by Referral Source",
 				"open_orders_specific_csr": "Open Orders filtered by CSR",

client/src/translations/es/common.json

@@ -2621,6 +2621,7 @@
 				"open_orders": "",
 				"open_orders_csr": "",
 				"open_orders_estimator": "",
+				"open_orders_excel": "",
 				"open_orders_ins_co": "",
 				"open_orders_referral": "",
 				"open_orders_specific_csr": "",

client/src/translations/fr/common.json

@@ -2621,6 +2621,7 @@
 				"open_orders": "",
 				"open_orders_csr": "",
 				"open_orders_estimator": "",
+				"open_orders_excel": "",
 				"open_orders_ins_co": "",
 				"open_orders_referral": "",
 				"open_orders_specific_csr": "",

client/src/utils/TemplateConstants.js

@@ -2026,6 +2026,19 @@ export const TemplateList = (type, context) => {
             },
             group: "customers",
           },
+          open_orders_excel: {
+            title: i18n.t("reportcenter.templates.open_orders_excel"),
+            subject: i18n.t("reportcenter.templates.open_orders_excel"),
+            key: "open_orders_excel",
+            //idtype: "vendor",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "jobs",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

server/data/kaizen.js

@@ -29,17 +29,24 @@ const ftpSetup = {
   password: process.env.KAIZEN_PASSWORD,
   debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
   algorithms: {
-    serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"],
+    serverHostKey: [
+      "ssh-rsa",
+      "ssh-dss",
+      "rsa-sha2-256",
+      "rsa-sha2-512",
+      "ecdsa-sha2-nistp256",
+      "ecdsa-sha2-nistp384",
+    ],
   },
 };
 
 exports.default = async (req, res) => {
   //Query for the List of Bodyshop Clients.
   logger.log("kaizen-start", "DEBUG", "api", null, null);
-  const kaizenShopsNames = ["SUMMIT", "STRATHMORE", "SUNRIDGE"];
+  const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE"];
 
   const { bodyshops } = await client.request(queries.GET_KAIZEN_SHOPS, {
-    shopname: kaizenShopsNames,
+    imexshopid: kaizenShopsIDs,
   });
 
   const specificShopIds = req.body.bodyshopIds; // ['uuid]

server/graphql-client/queries.js

@@ -1739,8 +1739,8 @@ exports.GET_ENTEGRAL_SHOPS = `query GET_ENTEGRAL_SHOPS {
   }
 }`;
 
-exports.GET_KAIZEN_SHOPS = `query GET_KAIZEN_SHOPS($shopname: [String]) {
+exports.GET_KAIZEN_SHOPS = `query GET_KAIZEN_SHOPS($imexshopid: [String]) {
-  bodyshops(where: {shopname: {_in: $shopname}}){
+  bodyshops(where: {imexshopid: {_in: $imexshopid}}){
       id
       shopname
       address1