From e0eb4657d2f25cd6b5d1d6bb2e611c6ca084b07f Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 6 Feb 2023 12:45:19 -0800
Subject: [PATCH] Resolve null displays of vehicle names.

---
 .../owner-detail-jobs.component.jsx           |  4 +++-
 .../vehicles-detail.page.container.jsx        | 23 +++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx b/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
index e6553e1ab..c69712a0b 100644
--- a/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
+++ b/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
@@ -34,7 +34,9 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       render: (text, record) =>
         record.vehicleid ? (
           <Link to={`/manage/vehicles/${record.vehicleid}`}>
-            {`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
+            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+              record.v_model_desc || ""
+            }`.trim()}
           </Link>
         ) : (
           t("jobs.errors.novehicle")
diff --git a/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx b/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx
index 9165cb3f6..77baa7bfd 100644
--- a/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx
+++ b/client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx
@@ -39,9 +39,11 @@ export function VehicleDetailContainer({
     document.title = t("titles.vehicledetail", {
       vehicle:
         data && data.vehicles_by_pk
-          ? `${data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr} ${
-              data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc
-            } ${data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc}`
+          ? `${(data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr) || ""} ${
+              (data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc) || ""
+            } ${
+              (data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc) || ""
+            }`
           : "",
     });
     setSelectedHeader("vehicles");
@@ -53,7 +55,14 @@ export function VehicleDetailContainer({
         label: t("titles.bc.vehicle-details", {
           vehicle:
             data && data.vehicles_by_pk
-              ? `${data.vehicles_by_pk.v_model_yr} ${data.vehicles_by_pk.v_make_desc} ${data.vehicles_by_pk.v_model_desc}`
+              ? `${
+                  (data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr) || ""
+                } ${
+                  (data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc) || ""
+                } ${
+                  (data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc) ||
+                  ""
+                }`
               : "",
         }),
       },
@@ -64,7 +73,11 @@ export function VehicleDetailContainer({
         CreateRecentItem(
           vehId,
           "vehicle",
-          `${data.vehicles_by_pk.v_vin} | ${data.vehicles_by_pk.v_model_yr} ${data.vehicles_by_pk.v_make_desc} ${data.vehicles_by_pk.v_model_desc}`,
+          `${data.vehicles_by_pk.v_vin || "N/A"} | ${
+            data.vehicles_by_pk.v_model_yr || ""
+          } ${data.vehicles_by_pk.v_make_desc || ""} ${
+            data.vehicles_by_pk.v_model_desc || ""
+          }`.trim(),
           `/manage/vehicles/${vehId}`
         )
       );