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

Progress

Browse Source
This commit is contained in:
Dave Richer
2023-12-06 17:35:27 -05:00
parent a043f7be24
commit 5c164f807d
68 changed files with 279 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/pages/bills/bills.page.component.jsx
View File

@@ -5,7 +5,7 @@ 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 { Link, useNavigate, useLocation } from "react-router-dom";
import BillDeleteButton from "../../components/bill-delete-button/bill-delete-button.component";
import PartsOrderModalContainer from "../../components/parts-order-modal/parts-order-modal.container";
import PrintWrapperComponent from "../../components/print-wrapper/print-wrapper.component";
@@ -35,7 +35,7 @@ export function BillsListPage({
const [openSearchResults, setOpenSearchResults] = useState([]);
const [searchLoading, setSearchLoading] = useState(false);
const { page } = search;
const history = useHistory();
const history = useNavigate();
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: { text: "" },

4
client/src/pages/contract-create/contract-create.page.container.jsx
View File

@@ -3,7 +3,7 @@ import { Form, notification } from "antd";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useHistory, useLocation } from "react-router-dom";
import { useNavigate, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
import { INSERT_NEW_CONTRACT } from "../../graphql/cccontracts.queries";
@@ -30,7 +30,7 @@ export function ContractCreatePageContainer({
}) {
const [form] = Form.useForm();
const { t } = useTranslation();
const history = useHistory();
const history = useNavigate();
const location = useLocation();
const [loading, setLoading] = useState(false);
const selectedCarState = useState(null);

4
client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
View File

@@ -3,7 +3,7 @@ import { Form, notification } from "antd";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useHistory } from "react-router-dom";
import { useNavigate } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import CourtesyCarFormComponent from "../../components/courtesy-car-form/courtesy-car-form.component";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
@@ -30,7 +30,7 @@ export function CourtesyCarCreateContainer({
const [loading, setLoading] = useState(false);
const [insertCourtesyCar] = useMutation(INSERT_NEW_COURTESY_CAR);
const { t } = useTranslation();
const history = useHistory();
const history = useNavigate();
const handleFinish = async (values) => {
setLoading(true);

4
client/src/pages/dms-payables/dms-payables.container.jsx
View File

@@ -2,7 +2,7 @@ import { Button, Card, Col, notification, Row, Select, Space } from "antd";
import React, { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useHistory, useLocation } from "react-router-dom";
import { useNavigate, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import SocketIO from "socket.io-client";
import DmsAllocationsSummaryApComponent from "../../components/dms-allocations-summary-ap/dms-allocations-summary-ap.component";
@@ -42,7 +42,7 @@ export const socket = SocketIO(
export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
const { t } = useTranslation();
const [logLevel, setLogLevel] = useState("DEBUG");
const history = useHistory();
const history = useNavigate();
const [logs, setLogs] = useState([]);
const { state } = useLocation();

4
client/src/pages/dms/dms.container.jsx
View File

@@ -13,7 +13,7 @@ import queryString from "query-string";
import React, { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link, useHistory, useLocation } from "react-router-dom";
import { Link, useNavigate, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import SocketIO from "socket.io-client";
import AlertComponent from "../../components/alert/alert.component";
@@ -60,7 +60,7 @@ export const socket = SocketIO(
export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
const { t } = useTranslation();
const [logLevel, setLogLevel] = useState("DEBUG");
const history = useHistory();
const history = useNavigate();
const [logs, setLogs] = useState([]);
const search = queryString.parse(useLocation().search);
const { jobId } = search;

4
client/src/pages/export-logs/export-logs.page.component.jsx
View File

@@ -6,7 +6,7 @@ import queryString from "query-string";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link, useHistory, useLocation } from "react-router-dom";
import { Link, useNavigate, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import AlertComponent from "../../components/alert/alert.component";
import { QUERY_EXPORT_LOG_PAGINATED } from "../../graphql/accounting.queries";
@@ -21,7 +21,7 @@ const mapStateToProps = createStructuredSelector({
export function ExportLogsPageComponent({ bodyshop }) {
const searchParams = queryString.parse(useLocation().search);
const { page, sortcolumn, sortorder, search } = searchParams;
const history = useHistory();
const history = useNavigate();
const { loading, error, data, refetch } = useQuery(
QUERY_EXPORT_LOG_PAGINATED,

4
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -24,7 +24,7 @@ import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { FaHardHat, FaRegStickyNote, FaShieldAlt } from "react-icons/fa";
import { connect } from "react-redux";
import { useHistory, useLocation } from "react-router-dom";
import {useNavigate, useLocation} from "react-router-dom";
import { createStructuredSelector } from "reselect";
import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
@@ -77,7 +77,7 @@ export function JobsDetailPage({
}) {
const { t } = useTranslation();
const [form] = Form.useForm();
const history = useHistory();
const history = useNavigate();
const [loading, setLoading] = useState(false);
const search = queryString.parse(useLocation().search);

5
client/src/pages/landing/landing.page.jsx
View File

@@ -1,6 +1,6 @@
import React from "react";
import { connect } from "react-redux";
import { Redirect } from "react-router-dom";
import { useNavigate } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import { selectCurrentUser } from "../../redux/user/user.selectors";
import LandingPageStatic from "../../landing/index";
@@ -12,7 +12,8 @@ const mapStateToProps = createStructuredSelector({
export default connect(mapStateToProps, null)(LandingPage);
export function LandingPage({ currentUser }) {
if (currentUser.authorized) return <Redirect to={"/manage"} />;
const navigate = useNavigate();
if (currentUser.authorized) return navigate("/manage");
return <LandingPageStatic />;
//return <Redirect to={"/signin"} />;

6
client/src/pages/manage-root/manage-root.page.component.jsx
View File

@@ -1,10 +1,10 @@
import React from "react";
//import DashboardGridComponent from "../../components/dashboard-grid/dashboard-grid.component";
import { Redirect } from "react-router-dom";
import { useNavigate } from "react-router-dom";
export default function ManageRootPageComponent() {
//const client = useApolloClient();
return <Redirect to={`/manage/jobs`} />;
const navigate = useNavigate();
return navigate("/manage/jobs");
// return (
// <div>

10
client/src/pages/manage/manage.page.component.jsx
View File

@@ -3,7 +3,7 @@ import preval from "preval.macro";
import React, { lazy, Suspense, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link, Route, Switch } from "react-router-dom";
import { Link, Route, Routes } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import BreadCrumbs from "../../components/breadcrumbs/breadcrumbs.component";
import ChatAffixContainer from "../../components/chat-affix/chat-affix.container";
@@ -212,7 +212,7 @@ export function Manage({ match, conflict, bodyshop }) {
<Route exact path={`${match.path}/_test`} component={TestComponent} />
<Route exact path={`${match.path}`} component={ManageRootPage} />
<Route exact path={`${match.path}/jobs`} component={JobsPage} />
<Switch>
<Routes>
<Route
exact
path={`${match.path}/jobs/:jobId/intake`}
@@ -246,7 +246,7 @@ export function Manage({ match, conflict, bodyshop }) {
component={JobsCreateContainerPage}
/>
<Route path={`${match.path}/jobs/:jobId`} component={JobsDetailPage} />
</Switch>
</Routes>
<Route exact path={`${match.path}/temporarydocs/`} component={TempDocs} />
<Route
exact
@@ -258,7 +258,7 @@ export function Manage({ match, conflict, bodyshop }) {
path={`${match.path}/courtesycars/`}
component={CourtesyCarsPage}
/>
<Switch>
<Routes>
<Route
exact
path={`${match.path}/courtesycars/new`}
@@ -287,7 +287,7 @@ export function Manage({ match, conflict, bodyshop }) {
path={`${match.path}/courtesycars/:ccId`}
component={CourtesyCarDetailContainer}
/>
</Switch>
</Routes>
<Route exact path={`${match.path}/profile`} component={ProfilePage} />
<Route
exact

4
client/src/pages/parts-queue/parts-queue.page.component.jsx
View File

@@ -6,7 +6,7 @@ import queryString from "query-string";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link, useHistory, useLocation } from "react-router-dom";
import { Link, useNavigate, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import AlertComponent from "../../components/alert/alert.component";
import JobPartsQueueCount from "../../components/job-parts-queue-count/job-parts-queue-count.component";
@@ -32,7 +32,7 @@ export function PartsQueuePageComponent({ bodyshop }) {
sortorder,
statusFilters,
} = searchParams;
const history = useHistory();
const history = useNavigate();
const [filter, setFilter] = useLocalStorage("filter_parts_queue", null);
const { loading, error, data, refetch } = useQuery(QUERY_PARTS_QUEUE, {

4
client/src/pages/phonebook/phonebook.page.component.jsx
View File

@@ -6,7 +6,7 @@ import queryString from "query-string";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useHistory, useLocation } from "react-router-dom";
import { useNavigate, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import AlertComponent from "../../components/alert/alert.component";
import { QUERY_PHONEBOOK_PAGINATED } from "../../graphql/phonebook.queries";
@@ -27,7 +27,7 @@ const mapStateToProps = createStructuredSelector({
export function PhonebookPageComponent({ bodyshop, authLevel }) {
const searchParams = queryString.parse(useLocation().search);
const { page, sortcolumn, sortorder, search, phonebookentry } = searchParams;
const history = useHistory();
const history = useNavigate();
const { loading, error, data, refetch } = useQuery(
QUERY_PHONEBOOK_PAGINATED,

4
client/src/pages/phonebook/phonebook.page.container.jsx
View File

@@ -9,7 +9,7 @@ import {
import PhonebookPage from "./phonebook.page.component";
import { Drawer, Grid } from "antd";
import queryString from "query-string";
import { useHistory, useLocation } from "react-router-dom";
import { useNavigate, useLocation } from "react-router-dom";
import PhonebookFormContainer from "../../components/phonebook-form/phonebook-form.container";
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -31,7 +31,7 @@ export function PhonebookContainer({ setBreadcrumbs, setSelectedHeader }) {
}, [setBreadcrumbs, t, setSelectedHeader]);
const search = queryString.parse(useLocation().search);
const { phonebookentry } = search;
const history = useHistory();
const history = useNavigate();
const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
.filter((screen) => !!screen[1])

4
client/src/pages/scoreboard/scoreboard.page.container.jsx
View File

@@ -5,7 +5,7 @@ import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { FaShieldAlt } from "react-icons/fa";
import { connect } from "react-redux";
import { useHistory, useLocation } from "react-router-dom";
import { useNavigate, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
@@ -31,7 +31,7 @@ export function ScoreboardContainer({ setBreadcrumbs, setSelectedHeader }) {
const { t } = useTranslation();
const searchParams = queryString.parse(useLocation().search);
const { tab } = searchParams;
const history = useHistory();
const history = useNavigate();
useEffect(() => {
document.title = t("titles.scoreboard");
setSelectedHeader("scoreboard");

4
client/src/pages/shop-vendor/shop-vendor.page.component.jsx generated
View File

@@ -1,14 +1,14 @@
import { Drawer, Grid } from "antd";
import queryString from "query-string";
import React from "react";
import { useHistory, useLocation } from "react-router-dom";
import { useNavigate, useLocation } from "react-router-dom";
import VendorsFormContainer from "../../components/vendors-form/vendors-form.container";
import VendorsListContainer from "../../components/vendors-list/vendors-list.container";
export default function ShopVendorPageComponent() {
const search = queryString.parse(useLocation().search);
const { selectedvendor } = search;
const history = useHistory();
const history = useNavigate();
const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
.filter((screen) => !!screen[1])

4
client/src/pages/shop/shop.page.component.jsx
View File

@@ -1,6 +1,6 @@
import { Tabs } from "antd";
import React, { useEffect } from "react";
import { useHistory, useLocation } from "react-router-dom";
import { useNavigate, useLocation } from "react-router-dom";
import queryString from "query-string";
import { useTranslation } from "react-i18next";
import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
@@ -26,7 +26,7 @@ const mapDispatchToProps = (dispatch) => ({
export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
const { t } = useTranslation();
const history = useHistory();
const history = useNavigate();
const search = queryString.parse(useLocation().search);
useEffect(() => {

10
client/src/pages/tech/tech.page.component.jsx
View File

@@ -2,7 +2,7 @@ import { BackTop, Layout } from "antd";
import React, { Suspense, lazy, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Redirect, Route, Switch } from "react-router-dom";
import { useNavigate, Route, Routes } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import ErrorBoundary from "../../components/error-boundary/error-boundary.component";
@@ -50,16 +50,18 @@ const mapDispatchToProps = (dispatch) => ({
export function TechPage({ technician, match }) {
const { t } = useTranslation();
const navigate = useNavigate();
useEffect(() => {
document.title = t("titles.app");
}, [t]);
if (!technician) return navigate(`${match.path}/login`
);
return (
<Layout className="tech-layout-container">
<TechSider />
<Layout>
{technician ? null : <Redirect to={`${match.path}/login`} />}
<UpdateAlert />
<TechHeader />
@@ -74,7 +76,7 @@ export function TechPage({ technician, match }) {
<TimeTicketModalContainer />
<EmailOverlayContainer />
<PrintCenterModalContainer />
<Switch>
<Routes>
<Route
exact
path={`${match.path}/login`}
@@ -105,7 +107,7 @@ export function TechPage({ technician, match }) {
path={`${match.path}/board`}
component={ProductionBoardPage}
/>
</Switch>
</Routes>
</FeatureWrapper>
</Suspense>
</ErrorBoundary>