Merge branch 'contact-notes' into stage-main-12-3

Author: crayolakat

src/extensions/texter-sideboxes/contact-notes/react-component.js

@@ -15,29 +15,34 @@ export const showSidebox = ({ contact }) => {
   return contact;
 };
 
-export class TexterSideboxClass extends React.Component {
-  constructor(props) {
-    let customFields = props.contact.customFields;
-    if (typeof props.contact.customFields === "string") {
-      try {
-        customFields = JSON.parse(props.contact.customFields || "{}");
-      } catch (err) {
-        // eslint-disable-next-line no-console
-        console.warn(err);
-        customFields = {};
-      }
+const parseCustomFields = customFields => {
+  if (typeof customFields === "string") {
+    try {
+      customFields = JSON.parse(customFields || "{}");
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.warn(err);
+      customFields = {};
     }
+  }
+  return customFields;
+};
 
+export class TexterSideboxClass extends React.Component {
+  constructor(props) {
+    let parsedCustomFields = parseCustomFields(props.contact.customFields);
     super(props);
     this.state = {
-      notes: customFields.notes || "",
+      parsedCustomFields,
+      notes: parsedCustomFields.notes || "",
       isSaving: false,
       hasError: false
     };
   }
 
   componentDidUpdate() {
-    const { notes: contactNotes } = this.props.contact.customFields;
+    const { contact } = this.props;
+    const { notes: contactNotes } = parseCustomFields(contact.customFields);
     if (this.state.isSaving && contactNotes === this.state.notes) {
       this.setIsSaving(false);
     }
@@ -47,10 +52,11 @@ export class TexterSideboxClass extends React.Component {
 
   debouncedUpdate = _.debounce(
     async notes => {
+      const { parsedCustomFields } = this.state;
       const { contact, mutations } = this.props;
       try {
         const customFields = {
-          ...contact.customFields,
+          ...parsedCustomFields,
           notes
         };
         await mutations.updateContactCustomFields(JSON.stringify(customFields));

src/lib/scripts.js

@@ -89,7 +89,10 @@ const getScriptFieldValue = (contact, texter, fieldName) => {
   } else if (TOP_LEVEL_UPLOAD_FIELDS.indexOf(fieldName) !== -1) {
     result = contact[fieldName];
   } else {
-    const customFieldNames = JSON.parse(contact.customFields);
+    let customFieldNames = contact.customFields;
+    if (typeof customFieldNames === "string") {
+      customFieldNames = JSON.parse(contact.customFields);
+    }
     result = customFieldNames[fieldName];
   }
 

src/server/api/schema.js

@@ -1251,6 +1251,11 @@ const rootMutations = {
           (!cannedResponses.length || cannedResponses[0].usedFields)
         ) {
           const usedFields = campaign.usedFields;
+
+          const texterSideboxes = getConfig("TEXTER_SIDEBOXES") || "";
+          const shouldUseNotes = /contact-notes/.test(texterSideboxes);
+          if (shouldUseNotes) usedFields.notes = 1;
+
           if (cannedResponses.length && cannedResponses[0].usedFields) {
             Object.keys(cannedResponses[0].usedFields).forEach(f => {
               usedFields[f] = 1;

src/server/models/cacheable_queries/campaign-contact.js

@@ -563,9 +563,25 @@ const campaignContactCache = {
   updateCustomFields: async (contact, customFields, campaign, organization) => {
     /* eslint-disable no-param-reassign */
     try {
-      if (typeof customFields !== "string") {
-        customFields = JSON.stringify(customFields || {});
+      if (typeof customFields === "string") {
+        customFields = JSON.parse(customFields || "{}");
       }
+      /* we may not have all the customFields from the client,
+         so we need to fetch from the db and merge all of them */
+      const existingContact = await r
+        .knex("campaign_contact")
+        .select("custom_fields")
+        .where("id", contact.id)
+        .first();
+      const existingCustomFields = JSON.parse(
+        existingContact.custom_fields || "{}"
+      );
+
+      customFields = JSON.stringify({
+        ...existingCustomFields,
+        ...customFields
+      });
+
       const updatedAt = new Date();
       await r
         .knex("campaign_contact")