fix: all tests

Author: vip-git

src/client/shared/services/chat/__tests__/chat-service.spec.ts

@@ -7,6 +7,14 @@ import { ChatServiceEngine } from '..';
 const apolloClientMock = createMockClient();
 
 describe('Chat Service', () => {
+	it('can get chats', () => {
+		const allChats = ChatServiceEngine.requestChats({
+			apolloClientMock,
+			data: {}
+		});
+		expect(allChats).toStrictEqual({});
+	});
+
 	it('can get all chats', () => {
 		const allChats = ChatServiceEngine.requestAllChats({
 			apolloClientMock,

src/client/shared/services/chat/index.ts

@@ -80,6 +80,7 @@ class ChatService {
 
 export const ChatServiceEngine = {
 	requestAllChats: action => ChatService.getAllChats(action),
+	requestChats: action => ChatService.getChats(action),
 	requestAllChatsRest: action => ChatService.getChatsRest(action),
 	requestCreateChat: (payload: any) => ChatService.createChat(payload),
 	requestRemoveChat: (chatId: any) => ChatService.removeChat(chatId),

src/client/web/app/common/components/chat-box/__tests__/chat-box-component.spec.tsx

@@ -28,15 +28,15 @@ describe('ChatBoxComponent <ChatBoxComponent />', () => {
 					groupId={1}
 					title={'title'}
 					chatData={{}}
-					userData={{}}
+					userData={[]}
 					groupData={{}}
 				/>
 			</ThemeProvider>
 		);
 
 		// Interaction demo
 		expect(chatBoxComponent.text()).toEqual(
-			'<WithWidth(WithStyles(withI18nextTranslation(Chat))) />'
+			'<Chat />'
 		);
 
 		// Snapshot demo
@@ -57,7 +57,7 @@ describe('ChatBoxComponent <ChatBoxComponent />', () => {
 					groupId={1}
 					title={'title'}
 					chatData={{}}
-					userData={{}}
+					userData={[]}
 					groupData={{}}
 				/>
 			</ThemeProvider>

src/client/web/app/common/components/chat-box/chat-box.model.ts

@@ -6,8 +6,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
 import JWTDecode from 'jwt-decode';
-import i18next from 'i18next';
-import { withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 
 // Material UI
 import withWidth, { isWidthUp } from '@material-ui/core/withWidth';
@@ -44,19 +43,18 @@ import ModalForm from '@omega-web-components/modal-form';
 import Tabs from '@omega-web-components/tabs'; 
 import SettingsForm from '@omega-web-components/settings';
 import CreateGroupForm from '@omega-web-components/create-group';
-import ChatStyles from './styles';
+import useChatStyles from './styles';
 
-export const ChatBoxModel = {
+export const ChatBoxModel: any = {
   libraries: {
     React,
     Component,
     PropTypes,
     classNames,
     distanceInWordsToNow,
     JWTDecode,
-    i18next,
     SplitPane,
-    withTranslation,
+    useTranslation,
     reject,
     find
   },
@@ -118,6 +116,6 @@ export const ChatBoxModel = {
     GroupWorkIcon,
   },
   styles: {
-    ChatStyles,
+    useChatStyles,
   },
 };

src/client/web/app/common/components/chat-box/functional-components/chat-header.component.tsx

@@ -95,7 +95,7 @@ export const ChatHeaderComponent: React.FunctionComponent<ChatHeaderProps> = ({
 								<ListItem>
 									<Avatar
 										alt=''
-										src={githubUserData.avatar_url}
+										src={githubUserData?.avatar_url}
 										className={classes.avatar}
 									/>
 									<ListItemText primary={currentUsername} secondary='Online' />
@@ -125,7 +125,7 @@ export const ChatHeaderComponent: React.FunctionComponent<ChatHeaderProps> = ({
 								modalContent={() => (
 									<CreateGroupForm
 										groupMembers={groupMembers}
-										ownerId={githubUserData.id}
+										ownerId={githubUserData?.id}
 										ownerRealId={ownerRealId}
 										onSubmit={handleCreateGroup}
 										closeForm={() => modalHandleClose('createGroupForm')}

src/client/web/app/common/components/chat-box/functional-components/chat-main.component.tsx

@@ -36,7 +36,7 @@ export const ChatMainComponent: React.FunctionComponent<
 											key={`ChatItem-${chat.id}`}
 											className={classNames(
 												classes.conversation,
-												chat.ownerId === githubUserData.id
+												chat.ownerId === githubUserData?.id
 													? classes.conversationSent
 													: classes.conversationReceived
 											)}
@@ -47,15 +47,15 @@ export const ChatMainComponent: React.FunctionComponent<
 												style={{
 													marginRight: 10,
 													display:
-														chat.ownerId === githubUserData.id
+														chat.ownerId === githubUserData?.id
 															? 'none'
 															: 'block'
 												}}
 											/>
 											<div
 												className={classNames(
 													classes.body,
-													chat.ownerId === githubUserData.id
+													chat.ownerId === githubUserData?.id
 														? classes.bodySent
 														: classes.bodyReceived
 												)}
@@ -65,7 +65,7 @@ export const ChatMainComponent: React.FunctionComponent<
 													variant='caption'
 													className={classNames(
 														classes.date,
-														chat.ownerId === githubUserData.id
+														chat.ownerId === githubUserData?.id
 															? classes.dateSent
 															: classes.dateReceived
 													)}
@@ -76,14 +76,14 @@ export const ChatMainComponent: React.FunctionComponent<
 											</div>
 											<Avatar
 												alt=''
-												src={githubUserData.avatar_url}
+												src={githubUserData?.avatar_url}
 												style={{
 													float: 'right',
 													order: 2,
 													marginLeft: 10,
 													top: 25,
 													display:
-														chat.ownerId === githubUserData.id
+														chat.ownerId === githubUserData?.id
 															? 'block'
 															: 'none'
 												}}