Added ownr_co_nm to owner display fields. BOD-256

client/src/components/contract-jobs/contract-jobs.component.jsx

@@ -7,12 +7,12 @@ export default function ContractsJobsComponent({
   loading,
   data,
   selectedJob,
-  handleSelect
+  handleSelect,
 }) {
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: { text: "" },
-    search: ""
+    search: "",
   });
 
   const { t } = useTranslation();
@@ -35,7 +35,7 @@ export default function ContractsJobsComponent({
         <span>
           {record.ro_number ? record.ro_number : "EST-" + record.est_number}
         </span>
-      )
+      ),
     },
     {
       title: t("jobs.fields.owner"),
@@ -49,12 +49,14 @@ export default function ContractsJobsComponent({
       render: (text, record) => {
         return record.owner ? (
           <span>
-            {record.ownr_fn} {record.ownr_ln}
+            {record.ownr_fn} {record.ownr_ln} {record.ownr_co_nm || ""}
           </span>
         ) : (
-          <span>{`${record.ownr_fn} ${record.ownr_ln}`}</span>
+          <span>{`${record.ownr_fn} ${record.ownr_ln} ${
+            record.ownr_co_nm || ""
+          }`}</span>
         );
-      }
+      },
     },
     {
       title: t("jobs.fields.status"),
@@ -67,7 +69,7 @@ export default function ContractsJobsComponent({
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => {
         return record.status || t("general.labels.na");
-      }
+      },
     },
 
     {
@@ -79,13 +81,14 @@ export default function ContractsJobsComponent({
       render: (text, record) => {
         return record.vehicleid ? (
           <span>
-            {`${record.v_model_yr || ""} ${record.v_make_desc ||
-              ""} ${record.v_model_desc || ""}`}
+            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+              record.v_model_desc || ""
+            }`}
           </span>
         ) : (
           t("jobs.errors.novehicle")
         );
-      }
+      },
     },
     {
       title: t("vehicles.fields.plate_no"),
@@ -102,7 +105,7 @@ export default function ContractsJobsComponent({
         ) : (
           t("general.labels.unknown")
         );
-      }
+      },
     },
     {
       title: t("jobs.fields.clm_no"),
@@ -119,8 +122,8 @@ export default function ContractsJobsComponent({
         ) : (
           t("general.labels.unknown")
         );
-      }
-    }
+      },
+    },
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
@@ -131,7 +134,7 @@ export default function ContractsJobsComponent({
     state.search === ""
       ? data
       : data.filter(
-          j =>
+          (j) =>
             (j.est_number || "")
               .toString()
               .toLowerCase()
@@ -140,6 +143,9 @@ export default function ContractsJobsComponent({
               .toString()
               .toLowerCase()
               .includes(state.search.toLowerCase()) ||
+            (j.ownr_co_nm || "")
+              .toLowerCase()
+              .includes(state.search.toLowerCase()) ||
             (j.ownr_fn || "")
               .toLowerCase()
               .includes(state.search.toLowerCase()) ||
@@ -160,7 +166,6 @@ export default function ContractsJobsComponent({
               .includes(state.search.toLowerCase())
         );
 
-
   return (
     <Table
       loading={loading}
@@ -168,19 +173,19 @@ export default function ContractsJobsComponent({
         <Input.Search
           placeholder={t("general.labels.search")}
           value={state.search}
-          onChange={e => setState({ ...state, search: e.target.value })}
+          onChange={(e) => setState({ ...state, search: e.target.value })}
         />
       )}
       size="small"
       pagination={{ position: "top" }}
-      columns={columns.map(item => ({ ...item }))}
+      columns={columns.map((item) => ({ ...item }))}
       rowKey="id"
       dataSource={filteredData}
       onChange={handleTableChange}
       rowSelection={{
         onSelect: handleSelect,
         type: "radio",
-        selectedRowKeys: [selectedJob]
+        selectedRowKeys: [selectedJob],
       }}
     />
   );