- the great reformat

Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-02-06 18:20:58 -05:00
parent 30c530bcc4
commit e83badb454
912 changed files with 108516 additions and 107493 deletions

View File

@@ -1,26 +1,27 @@
import React from "react";
import CourtesyCarCreateFormComponent from "../../components/courtesy-car-form/courtesy-car-form.component";
import CourtesyCarContractListComponent from "../../components/courtesy-car-contract-list/courtesy-car-contract-list.component";
import { Col, Divider, Row } from "antd";
import CourtesyCarContractListComponent
from "../../components/courtesy-car-contract-list/courtesy-car-contract-list.component";
import {Col, Divider, Row} from "antd";
export default function CourtesyCarDetailPageComponent({
contracts,
form,
saveLoading,
totalContracts,
}) {
return (
<Row gutter={[16, 16]}>
<Col span={24}>
<CourtesyCarCreateFormComponent form={form} saveLoading={saveLoading} />
</Col>
<Divider type="horizontal" />
<Col span={24}>
<CourtesyCarContractListComponent
contracts={contracts}
totalContracts={totalContracts}
/>
</Col>
</Row>
);
contracts,
form,
saveLoading,
totalContracts,
}) {
return (
<Row gutter={[16, 16]}>
<Col span={24}>
<CourtesyCarCreateFormComponent form={form} saveLoading={saveLoading}/>
</Col>
<Divider type="horizontal"/>
<Col span={24}>
<CourtesyCarContractListComponent
contracts={contracts}
totalContracts={totalContracts}
/>
</Col>
</Row>
);
}

View File

@@ -1,202 +1,199 @@
import { useMutation, useQuery } from "@apollo/client";
import { Form, notification } from "antd";
import {useMutation, useQuery} from "@apollo/client";
import {Form, notification} from "antd";
import dayjs from "../../utils/day";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useParams } from "react-router-dom";
import React, {useEffect, useState} from "react";
import {useTranslation} from "react-i18next";
import {connect} from "react-redux";
import {useLocation, useParams} from "react-router-dom";
import AlertComponent from "../../components/alert/alert.component";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
import { QUERY_CC_BY_PK, UPDATE_CC } from "../../graphql/courtesy-car.queries";
import {
addRecentItem,
setBreadcrumbs,
setSelectedHeader,
} from "../../redux/application/application.actions";
import { CreateRecentItem } from "../../utils/create-recent-item";
import {QUERY_CC_BY_PK, UPDATE_CC} from "../../graphql/courtesy-car.queries";
import {addRecentItem, setBreadcrumbs, setSelectedHeader,} from "../../redux/application/application.actions";
import {CreateRecentItem} from "../../utils/create-recent-item";
import UndefinedToNull from "./../../utils/undefinedtonull";
import CourtesyCarDetailPageComponent from "./courtesy-car-detail.page.component";
import NotFound from "../../components/not-found/not-found.component";
import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
import queryString from "query-string";
import { useLocation } from "react-router-dom";
import {pageLimit} from "../../utils/config";
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
addRecentItem: (item) => dispatch(addRecentItem(item)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
addRecentItem: (item) => dispatch(addRecentItem(item)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
});
export function CourtesyCarDetailPageContainer({
setBreadcrumbs,
addRecentItem,
setSelectedHeader,
}) {
const searchParams =queryString.parse(useLocation().search);
const { page, sortcolumn, sortorder } = searchParams;
setBreadcrumbs,
addRecentItem,
setSelectedHeader,
}) {
const searchParams = queryString.parse(useLocation().search);
const {page, sortcolumn, sortorder} = searchParams;
const { t } = useTranslation();
const [updateCourtesyCar] = useMutation(UPDATE_CC);
const [form] = Form.useForm();
const { ccId } = useParams();
const [saveLoading, setSaveLoading] = useState(false);
const { loading, error, data } = useQuery(QUERY_CC_BY_PK, {
variables: {
id: ccId,
offset: page ? (page - 1) * pageLimit : 0,
limit: pageLimit,
order: [
{
[sortcolumn || "start"]: sortorder
? sortorder === "descend"
? "desc"
: "asc"
: "desc",
const {t} = useTranslation();
const [updateCourtesyCar] = useMutation(UPDATE_CC);
const [form] = Form.useForm();
const {ccId} = useParams();
const [saveLoading, setSaveLoading] = useState(false);
const {loading, error, data} = useQuery(QUERY_CC_BY_PK, {
variables: {
id: ccId,
offset: page ? (page - 1) * pageLimit : 0,
limit: pageLimit,
order: [
{
[sortcolumn || "start"]: sortorder
? sortorder === "descend"
? "desc"
: "asc"
: "desc",
},
],
},
],
},
fetchPolicy: "network-only",
nextFetchPolicy: "network-only",
});
fetchPolicy: "network-only",
nextFetchPolicy: "network-only",
});
useEffect(() => {
setSelectedHeader("courtesycarsall");
useEffect(() => {
setSelectedHeader("courtesycarsall");
document.title = loading
? t("titles.app")
: error
? t("titles.app")
: t("titles.courtesycars-detail", {
id:
(data &&
data.courtesycars_by_pk &&
data.courtesycars_by_pk.fleet_number) ||
"",
});
setBreadcrumbs([
{ link: "/manage/courtesycars", label: t("titles.bc.courtesycars") },
{
link: `/manage/courtesycars/${
(data && data.courtesycars_by_pk && data.courtesycars_by_pk.id) || ""
}`,
label: t("titles.bc.courtesycars-detail", {
number:
(data &&
data.courtesycars_by_pk &&
data.courtesycars_by_pk.fleetnumber) ||
"",
}),
},
document.title = loading
? t("titles.app")
: error
? t("titles.app")
: t("titles.courtesycars-detail", {
id:
(data &&
data.courtesycars_by_pk &&
data.courtesycars_by_pk.fleet_number) ||
"",
});
setBreadcrumbs([
{link: "/manage/courtesycars", label: t("titles.bc.courtesycars")},
{
link: `/manage/courtesycars/${
(data && data.courtesycars_by_pk && data.courtesycars_by_pk.id) || ""
}`,
label: t("titles.bc.courtesycars-detail", {
number:
(data &&
data.courtesycars_by_pk &&
data.courtesycars_by_pk.fleetnumber) ||
"",
}),
},
]);
if (data && data.courtesycars_by_pk)
addRecentItem(
CreateRecentItem(
ccId,
"courtesycar",
data.courtesycars_by_pk.fleet_number || data.courtesycars_by_pk.vin,
`/manage/courtesycars/${ccId}`
)
);
}, [
t,
data,
error,
loading,
setBreadcrumbs,
ccId,
addRecentItem,
setSelectedHeader,
]);
if (data && data.courtesycars_by_pk)
addRecentItem(
CreateRecentItem(
ccId,
"courtesycar",
data.courtesycars_by_pk.fleet_number || data.courtesycars_by_pk.vin,
`/manage/courtesycars/${ccId}`
)
);
}, [
t,
data,
error,
loading,
setBreadcrumbs,
ccId,
addRecentItem,
setSelectedHeader,
]);
const handleFinish = async (values) => {
setSaveLoading(true);
const handleFinish = async (values) => {
setSaveLoading(true);
const result = await updateCourtesyCar({
variables: {
cc: {...UndefinedToNull(values, ["readiness"])},
ccId: ccId,
},
refetchQueries: ["QUERY_CC_BY_PK"],
awaitRefetchQueries: true,
});
const result = await updateCourtesyCar({
variables: {
cc: { ...UndefinedToNull(values, ["readiness"]) },
ccId: ccId,
},
refetchQueries: ["QUERY_CC_BY_PK"],
awaitRefetchQueries: true,
});
if (!!result.errors) {
notification["error"]({
message: t("courtesycars.errors.saving", { error: error }),
});
}
notification["success"]({
message: t("courtesycars.successes.saved"),
});
setSaveLoading(false);
};
useEffect(() => {
if (data && data.courtesycars_by_pk) {
form.resetFields();
form.resetFields();
}
}, [data, form]);
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
if (!!!data.courtesycars_by_pk) return <NotFound />;
return (
<RbacWrapper action="courtesycar:detail">
<Form
form={form}
autoComplete="no"
onFinish={handleFinish}
layout="vertical"
initialValues={
data
? {
...data.courtesycars_by_pk,
purchasedate: data.courtesycars_by_pk.purchasedate
? dayjs(data.courtesycars_by_pk.purchasedate)
: null,
servicestartdate: data.courtesycars_by_pk.servicestartdate
? dayjs(data.courtesycars_by_pk.servicestartdate)
: null,
serviceenddate: data.courtesycars_by_pk.serviceenddate
? dayjs(data.courtesycars_by_pk.serviceenddate)
: null,
leaseenddate: data.courtesycars_by_pk.leaseenddate
? dayjs(data.courtesycars_by_pk.leaseenddate)
: null,
nextservicedate: data.courtesycars_by_pk.nextservicedate
? dayjs(data.courtesycars_by_pk.nextservicedate)
: null,
registrationexpires: data.courtesycars_by_pk.registrationexpires
? dayjs(data.courtesycars_by_pk.registrationexpires)
: null,
insuranceexpires: data.courtesycars_by_pk.insuranceexpires
? dayjs(data.courtesycars_by_pk.insuranceexpires)
: null,
}
: {}
if (!!result.errors) {
notification["error"]({
message: t("courtesycars.errors.saving", {error: error}),
});
}
>
<CourtesyCarDetailPageComponent
contracts={data ? data.courtesycars_by_pk.cccontracts : []}
form={form}
saveLoading={saveLoading}
totalContracts={
data
? data.courtesycars_by_pk.cccontracts_aggregate.aggregate.count
: 0
}
/>
</Form>
</RbacWrapper>
);
notification["success"]({
message: t("courtesycars.successes.saved"),
});
setSaveLoading(false);
};
useEffect(() => {
if (data && data.courtesycars_by_pk) {
form.resetFields();
form.resetFields();
}
}, [data, form]);
if (loading) return <LoadingSpinner/>;
if (error) return <AlertComponent message={error.message} type="error"/>;
if (!!!data.courtesycars_by_pk) return <NotFound/>;
return (
<RbacWrapper action="courtesycar:detail">
<Form
form={form}
autoComplete="no"
onFinish={handleFinish}
layout="vertical"
initialValues={
data
? {
...data.courtesycars_by_pk,
purchasedate: data.courtesycars_by_pk.purchasedate
? dayjs(data.courtesycars_by_pk.purchasedate)
: null,
servicestartdate: data.courtesycars_by_pk.servicestartdate
? dayjs(data.courtesycars_by_pk.servicestartdate)
: null,
serviceenddate: data.courtesycars_by_pk.serviceenddate
? dayjs(data.courtesycars_by_pk.serviceenddate)
: null,
leaseenddate: data.courtesycars_by_pk.leaseenddate
? dayjs(data.courtesycars_by_pk.leaseenddate)
: null,
nextservicedate: data.courtesycars_by_pk.nextservicedate
? dayjs(data.courtesycars_by_pk.nextservicedate)
: null,
registrationexpires: data.courtesycars_by_pk.registrationexpires
? dayjs(data.courtesycars_by_pk.registrationexpires)
: null,
insuranceexpires: data.courtesycars_by_pk.insuranceexpires
? dayjs(data.courtesycars_by_pk.insuranceexpires)
: null,
}
: {}
}
>
<CourtesyCarDetailPageComponent
contracts={data ? data.courtesycars_by_pk.cccontracts : []}
form={form}
saveLoading={saveLoading}
totalContracts={
data
? data.courtesycars_by_pk.cccontracts_aggregate.aggregate.count
: 0
}
/>
</Form>
</RbacWrapper>
);
}
export default connect(
null,
mapDispatchToProps
null,
mapDispatchToProps
)(CourtesyCarDetailPageContainer);