[#1306] Fix contact metadata problem (#1349)

* fix metadata for contact * correct key * linting
airyhq · Mar 23, 2021 · 2936fd5 · 2936fd5
1 parent d913165
commit 2936fd5
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 13 deletions.
diff --git a/frontend/ui/BUILD b/frontend/ui/BUILD
@@ -36,6 +36,7 @@ ts_web_library(
         "@npm//@reduxjs/toolkit",
         "@npm//reselect",
         "@npm//typesafe-actions",
+        "@npm//camelcase-keys",
     ],
 )
 

diff --git a/frontend/ui/src/components/AiryWebsocket/index.tsx b/frontend/ui/src/components/AiryWebsocket/index.tsx
@@ -2,6 +2,7 @@ import React, {useEffect, useState} from 'react';
 import _, {connect, ConnectedProps} from 'react-redux';
 import {WebSocketClient} from 'websocketclient';
 import {Message, Channel, MetadataEvent} from 'httpclient';
+import camelcaseKeys from 'camelcase-keys';
 
 import {env} from '../../env';
 import {StateModel} from '../../reducers';
@@ -28,7 +29,8 @@ const mapDispatchToProps = dispatch => ({
   addMessages: (conversationId: string, messages: Message[]) => dispatch(addMessagesAction({conversationId, messages})),
   onChannel: (channel: Channel) => dispatch(setChannelAction(channel)),
   getConversationInfo: (conversationId: string) => dispatch(getConversationInfo(conversationId)),
-  onMetadata: (metadataEvent: MetadataEvent) => dispatch(setMetadataAction(metadataEvent)),
+  onMetadata: (metadataEvent: MetadataEvent) =>
+    dispatch(camelcaseKeys(setMetadataAction(metadataEvent), {deep: true, stopPaths: ['metadata.user_data']})),
 });
 
 const connector = connect(mapStateToProps, mapDispatchToProps);

diff --git a/frontend/ui/src/reducers/data/conversations/index.ts b/frontend/ui/src/reducers/data/conversations/index.ts
@@ -1,6 +1,6 @@
 import {ActionType, getType} from 'typesafe-actions';
 import {combineReducers} from 'redux';
-import {cloneDeep, sortBy, merge, pickBy, pick} from 'lodash-es';
+import {cloneDeep, sortBy, merge, pickBy} from 'lodash-es';
 
 import {Conversation, ConversationFilter, Message} from 'httpclient';
 
@@ -207,8 +207,11 @@ function allReducer(
             ...state.items[action.payload.identifier],
             metadata: {
               // Ensure that there is always a display name present
-              ...pick(state.items[action.payload.identifier]?.metadata, 'contact.displayName'),
               ...(<MetadataEvent<ConversationMetadata>>action.payload).metadata,
+              contact: {
+                ...state.items[action.payload.identifier]?.metadata.contact,
+                ...(<MetadataEvent<ConversationMetadata>>action.payload).metadata.contact,
+              },
             },
           },
         },

diff --git a/lib/typescript/httpclient/endpoints/connectChatPluginChannel.ts b/lib/typescript/httpclient/endpoints/connectChatPluginChannel.ts
@@ -8,5 +8,5 @@ export default HttpClient.prototype.connectChatPluginChannel = async function (
 ) {
   const response = await this.doFetchFromBackend('channels.chatplugin.connect', camelcaseKeys(requestPayload));
 
-  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.userData']});
+  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.user_data']});
 };
diff --git a/lib/typescript/httpclient/endpoints/connectFacebookChannel.ts b/lib/typescript/httpclient/endpoints/connectFacebookChannel.ts
@@ -14,5 +14,5 @@ export default HttpClient.prototype.connectFacebookChannel = async function (
     image_url: requestPayload.imageUrl,
   });
 
-  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.userData']});
+  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.user_data']});
 };
diff --git a/lib/typescript/httpclient/endpoints/connectTwilioSmsChannel.ts b/lib/typescript/httpclient/endpoints/connectTwilioSmsChannel.ts
@@ -12,5 +12,5 @@ export default HttpClient.prototype.connectTwilioSmsChannel = async function (
     image_url: requestPayload.imageUrl,
   });
 
-  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.userData']});
+  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.user_data']});
 };
diff --git a/lib/typescript/httpclient/endpoints/connectTwilioWhatsappChannel.ts b/lib/typescript/httpclient/endpoints/connectTwilioWhatsappChannel.ts
@@ -12,5 +12,5 @@ export default HttpClient.prototype.connectTwilioWhatsappChannel = async functio
     image_url: requestPayload.imageUrl,
   });
 
-  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.userData']});
+  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.user_data']});
 };
diff --git a/lib/typescript/httpclient/endpoints/exploreFacebookChannels.ts b/lib/typescript/httpclient/endpoints/exploreFacebookChannels.ts
@@ -8,5 +8,5 @@ export default HttpClient.prototype.exploreFacebookChannels = async function (
 ) {
   const response = await this.doFetchFromBackend('facebook.channels.explore', requestPayload);
 
-  return camelcaseKeys(response.data, {deep: true, stopPaths: ['metadata.userData']});
+  return camelcaseKeys(response.data, {deep: true, stopPaths: ['metadata.user_data']});
 };
diff --git a/lib/typescript/httpclient/endpoints/getConversationInfo.ts b/lib/typescript/httpclient/endpoints/getConversationInfo.ts
@@ -7,5 +7,5 @@ export default HttpClient.prototype.getConversationInfo = async function (conver
     conversation_id: conversationId,
   });
 
-  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.userData']});
+  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.user_data']});
 };
diff --git a/lib/typescript/httpclient/endpoints/listChannels.ts b/lib/typescript/httpclient/endpoints/listChannels.ts
@@ -5,5 +5,5 @@ import {HttpClient} from '../client';
 export default HttpClient.prototype.listChannels = async function () {
   const response = await this.doFetchFromBackend('channels.list', {});
 
-  return camelcaseKeys(response.data, {deep: true, stopPaths: ['metadata.userData']});
+  return camelcaseKeys(response.data, {deep: true, stopPaths: ['metadata.user_data']});
 };
diff --git a/lib/typescript/httpclient/endpoints/listConversations.ts b/lib/typescript/httpclient/endpoints/listConversations.ts
@@ -12,7 +12,7 @@ export default HttpClient.prototype.listConversations = async function (
   const response: PaginatedPayload<any> = await this.doFetchFromBackend('conversations.list', conversationListRequest);
 
   const conversationData = response.data.map(messagePayload => ({
-    ...camelcaseKeys(messagePayload, {deep: true, stopPaths: ['metadata.userData']}),
+    ...camelcaseKeys(messagePayload, {deep: true, stopPaths: ['metadata.user_data']}),
     createdAt: new Date(messagePayload.created_at),
     lastMessage: mapMessage(messagePayload.last_message),
   }));

diff --git a/lib/typescript/httpclient/endpoints/updateChannel.ts b/lib/typescript/httpclient/endpoints/updateChannel.ts
@@ -12,5 +12,5 @@ export default HttpClient.prototype.updateChannel = async function (requestPaylo
     }),
   });
 
-  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.userData']});
+  return camelcaseKeys(response, {deep: true, stopPaths: ['metadata.user_data']});
 };
diff --git a/lib/typescript/websocketclient/index.ts b/lib/typescript/websocketclient/index.ts
@@ -47,7 +47,7 @@ export class WebSocketClient {
     const json: EventPayloadUnion = JSON.parse(body) as any;
     switch (json.type) {
       case 'channel':
-        this.callbackMap.onChannel?.(camelcaseKeys(json.payload, {deep: true, stopPaths: ['metadata.userData']}));
+        this.callbackMap.onChannel?.(camelcaseKeys(json.payload, {deep: true, stopPaths: ['metadata.user_data']}));
         break;
       case 'message':
         this.callbackMap.onMessage?.(json.payload.conversation_id, json.payload.channel_id, {