Merge branch 'release/2025-04-25' into feature/IO-3213-Hit-and-Run-Toggle

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/components/jobs-detail-general/jobs-detail-general.component.jsx

client/src/components/jobs-detail-general/jobs-detail-general.component.jsx

@@ -1,5 +1,4 @@
 import { Col, Form, Input, InputNumber, Row, Select, Space, Switch } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -188,6 +187,9 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
             <Form.Item label={t("jobs.fields.tlos_ind")} name="tlos_ind" valuePropName="checked">
               <Switch disabled={jobRO} />
             </Form.Item>
+            <Form.Item label={t("jobs.fields.hit_and_run")} name="hit_and_run" valuePropName="checked">
+              <Switch disabled={jobRO} />
+            </Form.Item>
             <Form.Item label={t("jobs.fields.acv_amount")} name="acv_amount">
               <CurrencyInput disabled={jobRO} min={0} />
             </Form.Item>

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -10,6 +10,7 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
@@ -21,7 +22,6 @@ import ProductionListColumnComment from "../production-list-columns/production-l
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
-import dayjs from "../../utils/day";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -149,6 +149,14 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                   </Space>
                 </Tag>
               )}
+              {job.hit_and_run && (
+                <Tag color="green">
+                  <Space>
+                    <WarningFilled />
+                    <span>{t("jobs.fields.hit_and_run")}</span>
+                  </Space>
+                </Tag>
+              )}
             </Space>
           </div>
         </Card>

client/src/components/production-board-kanban/settings/FilterSettings.jsx

@@ -1,6 +1,7 @@
+import React from "react";
 import { Card, Form, Select } from "antd";
-import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
+import PropTypes from "prop-types";
 
 const FilterSettings = ({
   selectedMdInsCos,

client/src/components/production-board-kanban/settings/InformationSettings.jsx

@@ -1,9 +1,10 @@
 import { Card, Checkbox, Col, Form, Row } from "antd";
+import React from "react";
 import PropTypes from "prop-types";
 
 const InformationSettings = ({ t }) => (
-  <Card title={t("production.settings.information")} style={{ maxWidth: "100%", overflowX: "auto" }}>
-    <Row gutter={[16, 16]} wrap>
+  <Card title={t("production.settings.information")}>
+    <Row gutter={[16, 16]}>
       {[
         "model_info",
         "ownr_nm",
@@ -20,7 +21,7 @@ const InformationSettings = ({ t }) => (
         "subtotal",
         "tasks"
       ].map((item) => (
-        <Col xs={24} sm={12} md={8} lg={6} key={item}>
+        <Col span={4} key={item}>
           <Form.Item name={item} valuePropName="checked">
             <Checkbox>{t(`production.labels.${item}`)}</Checkbox>
           </Form.Item>

client/src/components/production-board-kanban/settings/LayoutSettings.jsx

@@ -1,8 +1,9 @@
 import { Card, Col, Form, Radio, Row } from "antd";
+import React from "react";
 import PropTypes from "prop-types";
 
 const LayoutSettings = ({ t }) => (
-  <Card title={t("production.settings.layout")} style={{ maxWidth: "100%", overflowX: "auto" }}>
+  <Card title={t("production.settings.layout")}>
     <Row gutter={[16, 16]}>
       {[
         {
@@ -47,9 +48,9 @@ const LayoutSettings = ({ t }) => (
           ]
         }
       ].map(({ name, label, options }) => (
-        <Col xs={24} sm={16} md={10} lg={8} key={name}>
+        <Col span={4} key={name}>
           <Form.Item name={name} label={label}>
-            <Radio.Group style={{ display: "flex", flexWrap: "nowrap" }}>
+            <Radio.Group>
               {options.map((option) => (
                 <Radio.Button key={option.value.toString()} value={option.value}>
                   {option.label}

client/src/components/production-board-kanban/settings/StatisticsSettings.jsx

@@ -1,7 +1,8 @@
-import { Card, Checkbox, Form } from "antd";
-import PropTypes from "prop-types";
 import { DragDropContext, Draggable, Droppable } from "../trello-board/dnd/lib/index.js";
 import { statisticsItems } from "./defaultKanbanSettings.js";
+import { Card, Checkbox, Form } from "antd";
+import React from "react";
+import PropTypes from "prop-types";
 
 const StatisticsSettings = ({ t, statisticsOrder, setStatisticsOrder, setHasChanges }) => {
   const onDragEnd = (result) => {

client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx

@@ -1,17 +1,17 @@
-import { SettingOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import { Button, Card, Col, Form, Popover, Row, Tabs } from "antd";
-import { isFunction } from "lodash";
-import PropTypes from "prop-types";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useNotification } from "../../../contexts/Notifications/notificationContext.jsx";
 import { UPDATE_KANBAN_SETTINGS } from "../../../graphql/user.queries.js";
 import { defaultKanbanSettings, mergeWithDefaults } from "./defaultKanbanSettings.js";
-import FilterSettings from "./FilterSettings.jsx";
-import InformationSettings from "./InformationSettings.jsx";
 import LayoutSettings from "./LayoutSettings.jsx";
+import InformationSettings from "./InformationSettings.jsx";
 import StatisticsSettings from "./StatisticsSettings.jsx";
+import FilterSettings from "./FilterSettings.jsx";
+import PropTypes from "prop-types";
+import { isFunction } from "lodash";
+import { useNotification } from "../../../contexts/Notifications/notificationContext.jsx";
+import { SettingOutlined } from "@ant-design/icons";
 
 function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bodyshop, data, onSettingsChange }) {
   const [form] = Form.useForm();
@@ -87,7 +87,7 @@ function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bod
   };
 
   const overlay = (
-    <Card style={{ maxWidth: "80vw", width: "100%"}}>
+    <Card style={{ minWidth: "80vw" }}>
       <Form form={form} onFinish={handleFinish} layout="vertical" onValuesChange={handleValuesChange}>
         <Tabs
           defaultActiveKey="1"

client/src/graphql/jobs.queries.js

@@ -512,6 +512,7 @@ export const GET_JOB_BY_PK = gql`
       est_ph1
       flat_rate_ats
       federal_tax_rate
+      hit_and_run
       id
       inproduction
       ins_addr1

client/src/translations/en_us/common.json

@@ -1765,6 +1765,7 @@
         "flat_rate_ats": "Flat Rate ATS?",
         "federal_tax_payable": "Federal Tax Payable",
         "federal_tax_rate": "Federal Tax Rate",
+        "hit_and_run": "Hit and Run",
         "ins_addr1": "Insurance Co. Address",
         "ins_city": "Insurance Co. City",
         "ins_co_id": "Insurance Co. ID",

client/src/translations/es/common.json

@@ -1765,6 +1765,7 @@
         "flat_rate_ats": "",
         "federal_tax_payable": "Impuesto federal por pagar",
         "federal_tax_rate": "",
+        "hit_and_run": "",
         "ins_addr1": "Dirección de Insurance Co.",
         "ins_city": "Ciudad de seguros",
         "ins_co_id": "ID de la compañía de seguros",

client/src/translations/fr/common.json

@@ -1766,6 +1766,7 @@
         "flat_rate_ats": "",
         "federal_tax_payable": "Impôt fédéral à payer",
         "federal_tax_rate": "",
+        "hit_and_run": "",
         "ins_addr1": "Adresse Insurance Co.",
         "ins_city": "Insurance City",
         "ins_co_id": "ID de la compagnie d'assurance",

hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "hit_and_run" boolean
+--  null default 'false';

hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "hit_and_run" boolean
+ null default 'false';