From 4982e3ce4e0166d57873836bf5444f1b86457b5d Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 29 Apr 2021 11:29:26 -0700
Subject: [PATCH] IO-969 Phonebook insert error fix.

---
 bodyshop_translations.babel                   | 86 +++++++++----------
 .../phonebook-form.component.jsx              |  4 +-
 client/src/index.js                           |  6 +-
 .../phonebook/phonebook.page.component.jsx    |  6 +-
 client/src/translations/en_us/common.json     |  6 +-
 client/src/translations/es/common.json        |  6 +-
 client/src/translations/fr/common.json        |  6 +-
 7 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index d45726083..b02d06147 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -27072,6 +27072,48 @@
                             <folder_node>
                                 <name>fields</name>
                                 <children>
+                                    <concept_node>
+                                        <name>address1</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>address2</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>category</name>
                                         <definition_loaded>false</definition_loaded>
@@ -27303,48 +27345,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>street1</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
-                                    <concept_node>
-                                        <name>street2</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                 </children>
                             </folder_node>
                             <folder_node>
diff --git a/client/src/components/phonebook-form/phonebook-form.component.jsx b/client/src/components/phonebook-form/phonebook-form.component.jsx
index bcb0bb653..4a27d97a8 100644
--- a/client/src/components/phonebook-form/phonebook-form.component.jsx
+++ b/client/src/components/phonebook-form/phonebook-form.component.jsx
@@ -58,10 +58,10 @@ export default function PhonebookFormComponent({
         <Form.Item label={t("phonebook.fields.category")} name="category">
           <Input />
         </Form.Item>
-        <Form.Item label={t("phonebook.fields.street1")} name="street1">
+        <Form.Item label={t("phonebook.fields.address1")} name="address1">
           <Input />
         </Form.Item>
-        <Form.Item label={t("phonebook.fields.street2")} name="street2">
+        <Form.Item label={t("phonebook.fields.address2")} name="address2">
           <Input />
         </Form.Item>
       </LayoutFormRow>
diff --git a/client/src/index.js b/client/src/index.js
index 7eb7b6985..cf0b0f711 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -14,8 +14,8 @@ import AppContainer from "./App/App.container";
 import LoadingSpinner from "./components/loading-spinner/loading-spinner.component";
 import "./index.css";
 import { persistor, store } from "./redux/store";
-import * as serviceWorkerRegistration from "./serviceWorkerRegistration";
 import reportWebVitals from "./reportWebVitals";
+import * as serviceWorkerRegistration from "./serviceWorkerRegistration";
 import "./translations/i18n";
 import "./utils/CleanAxios";
 require("dotenv").config();
@@ -55,7 +55,7 @@ ReactDOM.render(
 
 const onServiceWorkerUpdate = (registration) => {
   console.log("onServiceWorkerUpdate", registration);
-  const key = `open${Date.now()}`;
+
   const btn = (
     <Button
       type="primary"
@@ -79,7 +79,7 @@ const onServiceWorkerUpdate = (registration) => {
     description: i18n.t("general.messages.newversionmessage"),
     duration: 0,
     btn,
-    key,
+    key: "updateavailable",
   });
 };
 
diff --git a/client/src/pages/phonebook/phonebook.page.component.jsx b/client/src/pages/phonebook/phonebook.page.component.jsx
index 2d99e8b3c..0340cda9f 100644
--- a/client/src/pages/phonebook/phonebook.page.component.jsx
+++ b/client/src/pages/phonebook/phonebook.page.component.jsx
@@ -99,9 +99,9 @@ export function PhonebookPageComponent({ bodyshop }) {
       render: (text, record) => <ChatOpenButton phone={text} />,
     },
     {
-      title: t("phonebook.fields.street1"),
-      dataIndex: "street1",
-      key: "street1",
+      title: t("phonebook.fields.address1"),
+      dataIndex: "address1",
+      key: "address1",
     },
     {
       title: t("phonebook.fields.city"),
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 6cd7f8728..7141740b5 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1623,6 +1623,8 @@
 				"saving": "Error saving phonebook entry. {{error}}"
 			},
 			"fields": {
+				"address1": "Street 1",
+				"address2": "Street 2",
 				"category": "Category",
 				"city": "City",
 				"company": "Company",
@@ -1633,9 +1635,7 @@
 				"lastname": "Last Name",
 				"phone1": "Phone 1",
 				"phone2": "Phone 2",
-				"state": "state",
-				"street1": "Street 1",
-				"street2": "Street 2"
+				"state": "state"
 			},
 			"labels": {
 				"vendorcategory": "Vendor"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 8ea654516..fc9798503 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1623,6 +1623,8 @@
 				"saving": ""
 			},
 			"fields": {
+				"address1": "",
+				"address2": "",
 				"category": "",
 				"city": "",
 				"company": "",
@@ -1633,9 +1635,7 @@
 				"lastname": "",
 				"phone1": "",
 				"phone2": "",
-				"state": "",
-				"street1": "",
-				"street2": ""
+				"state": ""
 			},
 			"labels": {
 				"vendorcategory": ""
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 4a2d41bd0..2b8c8f63e 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1623,6 +1623,8 @@
 				"saving": ""
 			},
 			"fields": {
+				"address1": "",
+				"address2": "",
 				"category": "",
 				"city": "",
 				"company": "",
@@ -1633,9 +1635,7 @@
 				"lastname": "",
 				"phone1": "",
 				"phone2": "",
-				"state": "",
-				"street1": "",
-				"street2": ""
+				"state": ""
 			},
 			"labels": {
 				"vendorcategory": ""