Merged in feature/2021-07-16 (pull request #137)

feature/2021-07-16

client/src/components/documents-upload/documents-upload.utility.js

@@ -24,7 +24,7 @@ export const handleUpload = (ev, context) => {
   const fileName = ev.file.name || ev.filename;
 
   let key = `${bodyshop.id}/${jobId}/${fileName.replace(
-    /\.[^/.]+$/,
+    /[^a-zA-Z ]/g,
     ""
   )}-${new Date().getTime()}`;
   let extension = fileName.split(".").pop();

client/src/components/job-search-select/job-search-select.component.jsx

@@ -1,6 +1,6 @@
 import { LoadingOutlined } from "@ant-design/icons";
 import { useLazyQuery } from "@apollo/client";
-import { Empty, Select } from "antd";
+import { Empty, Select, Space, Tag } from "antd";
 import _ from "lodash";
 import React, { forwardRef, useEffect } from "react";
 import { useTranslation } from "react-i18next";
@@ -80,13 +80,18 @@ const JobSearchSelect = (
         {theOptions
           ? theOptions.map((o) => (
               <Option key={o.id} value={o.id} status={o.status}>
-                {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${
-                  o.ro_number || t("general.labels.na")
-                } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
-                  o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
-                }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
-                  o.v_model_desc || ""
-                }`}
+                <Space>
+                  <span>
+                    {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${
+                      o.ro_number || t("general.labels.na")
+                    } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
+                      o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
+                    }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
+                      o.v_model_desc || ""
+                    }`}
+                  </span>
+                  <Tag>{o.status}</Tag>
+                </Space>
               </Option>
             ))
           : null}

client/src/graphql/jobs.queries.js

@@ -1043,6 +1043,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
       v_make_desc
       v_model_desc
       v_model_yr
+      status
     }
   }
 `;

client/src/translations/en_us/common.json

@@ -2284,7 +2284,7 @@
 				"city": "City",
 				"cost_center": "Cost Center",
 				"country": "Country",
-				"discount": "Discount %",
+				"discount": "Discount % (as decimal)",
 				"display_name": "Display Name",
 				"due_date": "Payment Due Date",
 				"email": "Contact Email",

hasura/migrations/1626374103197_alter_table_public_vehicles_drop_constraint_vehicles_v_vin_shopid_key/down.yaml

@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: alter table "public"."vehicles" add constraint "vehicles_v_vin_shopid_key"
+      unique ("v_vin", "shopid");
+  type: run_sql

hasura/migrations/1626374103197_alter_table_public_vehicles_drop_constraint_vehicles_v_vin_shopid_key/up.yaml

@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: alter table "public"."vehicles" drop constraint "vehicles_v_vin_shopid_key";
+  type: run_sql