UI fixes for manual job creation + owners pages + vehicles pages + all jobs BOD-155

client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.component.jsx

@@ -4,19 +4,24 @@ import { useTranslation } from "react-i18next";
 import JobsCreateVehicleInfoNewComponent from "./jobs-create-vehicle-info.new.component";
 import JobsCreateVehicleInfoSearchComponent from "./jobs-create-vehicle-info.search.component";
 
+const colSpan = {
+  sm: { span: 24 },
+  lg: { span: 12 },
+};
+
 export default function JobsCreateVehicleInfoComponent({ loading, vehicles }) {
   const { t } = useTranslation();
   return (
     <div>
       <Typography.Title>{t("jobs.labels.create.vehicleinfo")}</Typography.Title>
-      <Row>
-        <Col span={16}>
+      <Row gutter={[32, 32]}>
+        <Col {...colSpan}>
           <JobsCreateVehicleInfoSearchComponent
             loading={loading}
             vehicles={vehicles}
           />
         </Col>
-        <Col span={8}>
+        <Col {...colSpan}>
           <JobsCreateVehicleInfoNewComponent />
         </Col>
       </Row>

client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.container.jsx

@@ -9,9 +9,11 @@ export default function JobsCreateVehicleInfoContainer({ form }) {
   const [state] = useContext(JobCreateContext);
   const { loading, error, data } = useQuery(SEARCH_VEHICLE_BY_VIN, {
     variables: { vin: `%${state.vehicle.search}%` },
-    skip: !state.vehicle.search
+    skip: !state.vehicle.search,
   });
+
   if (error) return <AlertComponent message={error.message} type='error' />;
+
   return (
     <JobsCreateVehicleInfoComponent
       loading={loading}

client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.new.component.jsx

@@ -2,6 +2,7 @@ import { DatePicker, Form, Input, Checkbox } from "antd";
 import React, { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 export default function JobsCreateVehicleInfoNewComponent() {
   const [state, setState] = useContext(JobCreateContext);
@@ -18,178 +19,181 @@ export default function JobsCreateVehicleInfoNewComponent() {
             vehicle: {
               ...state.vehicle,
               new: !state.vehicle.new,
-              selectedid: null
-            }
+              selectedid: null,
+            },
           });
-        }}
-      >
+        }}>
         {t("jobs.labels.create.newvehicle")}
       </Checkbox>
-      <Form.Item
-        label={t("vehicles.fields.v_vin")}
-        name={["vehicle", "data", "v_vin"]}
-        rules={[
-          {
-            required: state.vehicle.new,
-            message: t("general.validation.required")
-          }
-        ]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.plate_no")}
-        name={["vehicle", "data", "plate_no"]}
-        rules={[
-          {
-            required: state.vehicle.new,
-            message: t("general.validation.required")
-          }
-        ]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.plate_st")}
-        name={["vehicle", "data", "plate_st"]}
-        rules={[
-          {
-            required: state.vehicle.new,
-            message: t("general.validation.required")
-          }
-        ]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_type")}
-        name={["vehicle", "data", "v_type"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_trimcode")}
-        name={["vehicle", "data", "v_trimcode"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_tone")}
-        name={["vehicle", "data", "v_tone"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_bstyle")}
-        name={["vehicle", "data", "v_bstyle"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_stage")}
-        name={["vehicle", "data", "v_stage"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_prod_dt")}
-        name={["vehicle", "data", "v_prod_dt"]}
-      >
-        <DatePicker disabled={!state.vehicle.new} />
-      </Form.Item>
-      {
-        //TODO Add handling for paint code json
-      }
-      <Form.Item
-        label={t("vehicles.fields.v_paint_codes")}
-        name={["vehicle", "data", "v_paint_codes"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_options")}
-        name={["vehicle", "data", "v_options"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_model_yr")}
-        name={["vehicle", "data", "v_model_yr"]}
-        rules={[
-          {
-            required: state.vehicle.new,
-            message: t("general.validation.required")
-          }
-        ]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_model_desc")}
-        name={["vehicle", "data", "v_model_desc"]}
-        rules={[
-          {
-            required: state.vehicle.new,
-            message: t("general.validation.required")
-          }
-        ]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.trim_color")}
-        name={["vehicle", "data", "trim_color"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_mldgcode")}
-        name={["vehicle", "data", "v_mldgcode"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_makecode")}
-        name={["vehicle", "data", "v_makecode"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_make_desc")}
-        name={["vehicle", "data", "v_make_desc"]}
-        rules={[
-          {
-            required: state.vehicle.new,
-            message: t("general.validation.required")
-          }
-        ]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_engine")}
-        name={["vehicle", "data", "v_engine"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_cond")}
-        name={["vehicle", "data", "v_cond"]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
-      <Form.Item
-        label={t("vehicles.fields.v_color")}
-        name={["vehicle", "data", "v_color"]}
-        rules={[
-          {
-            required: state.vehicle.new,
-            message: t("general.validation.required")
-          }
-        ]}
-      >
-        <Input disabled={!state.vehicle.new} />
-      </Form.Item>
+      
+      <LayoutFormRow header={t("vehicles.forms.detail")} grow>
+        <Form.Item
+          label={t("vehicles.fields.v_vin")}
+          name={["vehicle", "data", "v_vin"]}
+          rules={[
+            {
+              required: state.vehicle.new,
+              message: t("general.validation.required"),
+            },
+          ]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow grow>
+        <Form.Item
+          label={t("vehicles.fields.v_color")}
+          name={["vehicle", "data", "v_color"]}
+          rules={[
+            {
+              required: state.vehicle.new,
+              message: t("general.validation.required"),
+            },
+          ]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+        <Form.Item
+          label={t("vehicles.fields.v_model_yr")}
+          name={["vehicle", "data", "v_model_yr"]}
+          rules={[
+            {
+              required: state.vehicle.new,
+              message: t("general.validation.required"),
+            },
+          ]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
+
+      <LayoutFormRow grow>
+        <Form.Item
+          label={t("vehicles.fields.v_make_desc")}
+          name={["vehicle", "data", "v_make_desc"]}
+          rules={[
+            {
+              required: state.vehicle.new,
+              message: t("general.validation.required"),
+            },
+          ]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+        <Form.Item
+          label={t("vehicles.fields.v_model_desc")}
+          name={["vehicle", "data", "v_model_desc"]}
+          rules={[
+            {
+              required: state.vehicle.new,
+              message: t("general.validation.required"),
+            },
+          ]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
+
+      <LayoutFormRow header={t("vehicles.forms.registration")} grow>
+        <Form.Item
+          label={t("vehicles.fields.plate_st")}
+          name={["vehicle", "data", "plate_st"]}
+          rules={[
+            {
+              required: state.vehicle.new,
+              message: t("general.validation.required"),
+            },
+          ]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+        <Form.Item
+          label={t("vehicles.fields.plate_no")}
+          name={["vehicle", "data", "plate_no"]}
+          rules={[
+            {
+              required: state.vehicle.new,
+              message: t("general.validation.required"),
+            },
+          ]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
+
+      <LayoutFormRow header={t("vehicles.forms.misc")} grow>
+        <Form.Item
+          label={t("vehicles.fields.v_type")}
+          name={["vehicle", "data", "v_type"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+        <Form.Item
+          label={t("vehicles.fields.v_trimcode")}
+          name={["vehicle", "data", "v_trimcode"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow grow>
+        <Form.Item
+          label={t("vehicles.fields.v_tone")}
+          name={["vehicle", "data", "v_tone"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+        <Form.Item
+          label={t("vehicles.fields.v_bstyle")}
+          name={["vehicle", "data", "v_bstyle"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow grow>
+        <Form.Item
+          label={t("vehicles.fields.v_stage")}
+          name={["vehicle", "data", "v_stage"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+        <Form.Item
+          label={t("vehicles.fields.v_prod_dt")}
+          name={["vehicle", "data", "v_prod_dt"]}>
+          <DatePicker disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow grow>
+        <Form.Item
+          label={t("vehicles.fields.v_paint_codes")}
+          name={["vehicle", "data", "v_paint_codes"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+        <Form.Item
+          label={t("vehicles.fields.v_options")}
+          name={["vehicle", "data", "v_options"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow grow>
+        <Form.Item
+          label={t("vehicles.fields.trim_color")}
+          name={["vehicle", "data", "trim_color"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+        <Form.Item
+          label={t("vehicles.fields.v_mldgcode")}
+          name={["vehicle", "data", "v_mldgcode"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow grow>
+        <Form.Item
+          label={t("vehicles.fields.v_makecode")}
+          name={["vehicle", "data", "v_makecode"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+        <Form.Item
+          label={t("vehicles.fields.v_engine")}
+          name={["vehicle", "data", "v_engine"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
+
+      <LayoutFormRow grow>
+        <Form.Item
+          label={t("vehicles.fields.v_cond")}
+          name={["vehicle", "data", "v_cond"]}>
+          <Input disabled={!state.vehicle.new} />
+        </Form.Item>
+      </LayoutFormRow>
     </div>
   );
 }

client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.search.component.jsx

@@ -7,12 +7,12 @@ import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
 
 export default function JobsCreateVehicleInfoSearchComponent({
   loading,
-  vehicles
+  vehicles,
 }) {
   const [state, setState] = useContext(JobCreateContext);
   const [tableState, setTableState] = useState({
     sortedInfo: {},
-    filteredInfo: { text: "" }
+    filteredInfo: { text: "" },
   });
 
   const { t } = useTranslation();
@@ -28,7 +28,7 @@ export default function JobsCreateVehicleInfoSearchComponent({
         tableState.sortedInfo.order,
       render: (text, record) => (
         <Link to={"/manage/vehicles/" + record.id}>{record.v_vin}</Link>
-      )
+      ),
     },
     {
       title: t("vehicles.fields.description"),
@@ -38,7 +38,7 @@ export default function JobsCreateVehicleInfoSearchComponent({
         return (
           <span>{`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc} ${record.v_color}`}</span>
         );
-      }
+      },
     },
     {
       title: t("vehicles.fields.plate_no"),
@@ -46,56 +46,59 @@ export default function JobsCreateVehicleInfoSearchComponent({
       key: "plate",
       render: (text, record) => {
         return <span>{`${record.plate_st} | ${record.plate_no}`}</span>;
-      }
-    }
+      },
+    },
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
     setTableState({ ...tableState, filteredInfo: filters, sortedInfo: sorter });
   };
-  //TODO Implement searching & pagination
 
   return (
     <Table
       loading={loading}
       title={() => {
         return (
-          <Input.Search
-            placeholder="Search..."
-            onSearch={value => {
-              setState({
-                ...state,
-                vehicle: { ...state.vehicle, search: value }
-              });
-            }}
-            enterButton
-          />
+          <div className='imex-table-header'>
+            <Input.Search
+              className='imex-table-header__search'
+              placeholder={t("general.labels.search")}
+              onSearch={(value) => {
+                setState({
+                  ...state,
+                  vehicle: { ...state.vehicle, search: value },
+                });
+              }}
+              enterButton
+            />
+          </div>
         );
       }}
-      size="small"
+      size='small'
+      scroll={{ x: true }}
       pagination={{ position: "top" }}
-      columns={columns.map(item => ({ ...item }))}
-      rowKey="id"
+      columns={columns}
+      rowKey='id'
       dataSource={vehicles}
       onChange={handleTableChange}
       rowSelection={{
-        onSelect: props => {
+        onSelect: (props) => {
           setState({
             ...state,
             vehicle: {
               ...state.vehicle,
               new: false,
               selectedid: props.id,
-              vehicleObj: props
-            }
+              vehicleObj: props,
+            },
           });
         },
         type: "radio",
-        selectedRowKeys: [state.vehicle.selectedid]
+        selectedRowKeys: [state.vehicle.selectedid],
       }}
       onRow={(record, rowIndex) => {
         return {
-          onClick: event => {
+          onClick: (event) => {
             if (record) {
               if (record.id) {
                 setState({
@@ -104,8 +107,8 @@ export default function JobsCreateVehicleInfoSearchComponent({
                     ...state.vehicle,
                     new: false,
                     selectedid: record.id,
-                    vehicleObj: record
-                  }
+                    vehicleObj: record,
+                  },
                 });
 
                 return;
@@ -113,9 +116,9 @@ export default function JobsCreateVehicleInfoSearchComponent({
             }
             setState({
               ...state,
-              vehicle: { ...state.vehicle, selectedid: null, vehicleObj: null }
+              vehicle: { ...state.vehicle, selectedid: null, vehicleObj: null },
             });
-          }
+          },
         };
       }}
     />