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

Report center filtering and shop info instance management.

Browse Source
This commit is contained in:
Patrick Fic
2024-03-12 09:40:39 -04:00
parent 53a55dd1ef
commit d9d30b59f0
9 changed files with 197 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
client/src/pages/jobs-create/jobs-create.component.jsx
View File

@@ -10,6 +10,7 @@ import JobsCreateOwnerInfoContainer from "../../components/jobs-create-owner-inf
import JobsCreateVehicleInfoContainer
from "../../components/jobs-create-vehicle-info/jobs-create-vehicle-info.container";
import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
import FormsFieldChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
export default function JobsCreateComponent({form}) {
const [pageIndex, setPageIndex] = useState(0);
@@ -41,6 +42,7 @@ export default function JobsCreateComponent({form}) {
const next = () => {
setPageIndex(pageIndex + 1);
console.log("NExt")
};
const prev = () => {
setPageIndex(pageIndex - 1);
@@ -57,24 +59,32 @@ export default function JobsCreateComponent({form}) {
<Button
type="primary"
onClick={() => {
form
.validateFields()
.then((r) => {
if (steps[pageIndex].validation) {
setErrorMessage(null);
next();
} else {
setErrorMessage(steps[pageIndex].error);
}
})
.catch((error) => console.log("error", error));
next();
// form
// .validateFields()
// .then((r) => {
// if (steps[pageIndex].validation) {
// setErrorMessage(null);
// next();
// } else {
// setErrorMessage(steps[pageIndex].error);
// }
// })
// .catch((error) => console.log("error", error));
}}
>
Next
</Button>
)}
{pageIndex === steps.length - 1 && (
<Button type="primary" htmlType="submit">
<Button type="primary" onClick={() => {
form
.validateFields()
.then((r) => {
})
.catch((error) => console.log("error", error));
form.submit()}}>
Done
</Button>
)}
@@ -91,18 +101,18 @@ export default function JobsCreateComponent({form}) {
cursor: "pointer",
fontWeight: idx === pageIndex && "bolder",
}}
onClick={() => {
form
.validateFields()
.then((r) => {
if (steps[pageIndex].validation) {
setErrorMessage(null);
setPageIndex(idx);
} else {
setErrorMessage(steps[pageIndex].error);
}
})
.catch((error) => console.log("error", error));
onClick={() => { setPageIndex(idx);
// form
// .validateFields()
// .then((r) => {
// if (steps[pageIndex].validation) {
// setErrorMessage(null);
// setPageIndex(idx);
// } else {
// setErrorMessage(steps[pageIndex].error);
// }
// })
// .catch((error) => console.log("error", error));
}}
/>
))}
@@ -132,7 +142,7 @@ export default function JobsCreateComponent({form}) {
) : (
<div>
<ProgressButtons top/>
<FormsFieldChanged form={form} />
{errorMessage ? (
<div>
<AlertComponent message={errorMessage} type="error"/>

2
client/src/pages/jobs-create/jobs-create.container.jsx
View File

@@ -153,7 +153,7 @@ function JobsCreateContainer({bodyshop, setBreadcrumbs, setSelectedHeader}) {
<JobCreateContext.Provider value={contextState}>
<RbacWrapper action="jobs:create">
<Form
scrollToFirstError
form={form}
onFinish={handleFinish}
layout="vertical"

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

@@ -15,6 +15,7 @@ import {selectBodyshop} from "../../redux/user/user.selectors";
import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";
import ShopTeamsContainer from "../../components/shop-teams/shop-teams.container";
import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -69,12 +70,15 @@ export function ShopPage({bodyshop, setSelectedHeader, setBreadcrumbs}) {
label: t("bodyshop.labels.licensing"),
children: <ShopInfoUsersComponent/>,
},
{
key: "csiq",
label: t("bodyshop.labels.csiq"),
children: <ShopCsiConfig/>,
});
);
if(HasFeatureAccess("csi")){
items.push({
key: "csiq",
label: t("bodyshop.labels.csiq"),
children: <ShopCsiConfig/>,
})
}
return (
<RbacWrapper action="shop:config">
<Tabs