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

Merged in release/2024-11-22 (pull request #1967)

Browse Source 
Release/2024 11 22 - IO-3040 IO-3001
This commit is contained in:
Patrick Fic
2024-11-28 15:57:01 +00:00
parent 352551e421 4d35976241
commit 9a49d1c69e
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/components/jobs-available-table/jobs-available-table.container.jsx
View File

@@ -1,6 +1,6 @@
import { gql, useApolloClient, useLazyQuery, useMutation, useQuery } from "@apollo/client"; import { gql, useApolloClient, useLazyQuery, useMutation, useQuery } from "@apollo/client";
import { useSplitTreatments } from "@splitsoftware/splitio-react"; import { useSplitTreatments } from "@splitsoftware/splitio-react";
import { Button, Col, Row, notification } from "antd"; import { Col, Row, notification } from "antd"; //import { Button, Col, Row, notification } from "antd";
import Axios from "axios"; import Axios from "axios";
import _ from "lodash"; import _ from "lodash";
import queryString from "query-string"; import queryString from "query-string";
@@ -408,8 +408,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
updateSchComp={updateSchComp} updateSchComp={updateSchComp}
setSchComp={setSchComp} setSchComp={setSchComp}
/> />
{ {/* {
{/* currentUser.email.includes("@rome.") || currentUser.email.includes("@imex.") ? ( currentUser.email.includes("@rome.") || currentUser.email.includes("@imex.") ? (
<Button <Button
onClick={async () => { onClick={async () => {
for (const record of data.available_jobs) { for (const record of data.available_jobs) {
@@ -425,8 +425,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
> >
Add all jobs as new. Add all jobs as new.
</Button> </Button>
) : null */} ) : null
} } */}
<Row gutter={[16, 16]}> <Row gutter={[16, 16]}>
<Col span={24}> <Col span={24}>
<JobsAvailableTableComponent <JobsAvailableTableComponent

7
client/src/components/report-center-modal/report-center-modal.component.jsx
View File

@@ -283,7 +283,12 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
}, },
{ {
validator: (_, value) => { validator: (_, value) => {
if (value && value[0] && value[1] && process.env.NODE_ENV === "production") { if (
(!import.meta.env.VITE_APP_IS_TEST && import.meta.env.PROD) &&
value &&
value[0] &&
value[1]
) {
const diffInDays = (value[1] - value[0]) / (1000 * 3600 * 24); const diffInDays = (value[1] - value[0]) / (1000 * 3600 * 24);
if (diffInDays > 92) { if (diffInDays > 92) {
return Promise.reject(t("general.validation.dateRangeExceeded")); return Promise.reject(t("general.validation.dateRangeExceeded"));