fix: typeorm fixes (#86)

* fix: typeorm fixes * fix: types in tests * fix: tests once more * fix: message body type * fix: spread messages and use type from sdk * fix: use latest immutable version * chore: fix message type * chore: bump dependencies * refactor: fix chatbox * refactor: fix i18next deps * refactor: remove useMembers hook * refactor: update mention type * refactor: fix issues * fix: do not send mentions * fix: test and fixture data --------- Co-authored-by: pyphilia <[email protected]> Release-As: v2.0.0-rc.1
graasp · May 31, 2023 · 84f4e38 · 84f4e38
1 parent 2c82a72
commit 84f4e38
Show file tree

Hide file tree

Showing 26 changed files with 1,675 additions and 1,644 deletions.
diff --git a/cypress/components/mention-button.cy.tsx b/cypress/components/mention-button.cy.tsx
@@ -7,7 +7,7 @@ import {
   mentionButtonCypress,
 } from '../../src/config/selectors';
 import { spyMethod } from '../fixtures/chat_messages';
-import { mockUseMembers, mockUseMentions } from '../fixtures/mockHooks';
+import { mockUseMentions } from '../fixtures/mockHooks';
 
 describe('Mention Button', () => {
   it('should show mention button', () => {
@@ -22,7 +22,6 @@ describe('Mention Button', () => {
         deleteMentionFunction={deleteMentionSpy}
         patchMentionFunction={patchMentionSpy}
         useMentions={mockUseMentions}
-        useMembers={mockUseMembers}
       />,
     ).then(() => {
       cy.get(dataCyWrapper(mentionButtonCypress)).should('exist').click();

diff --git a/cypress/components/mention-parsing.cy.tsx b/cypress/components/mention-parsing.cy.tsx
@@ -31,7 +31,7 @@ describe('Mention Highlighting', () => {
         currentMember={convertJs(MEMBERS.ANNA)}
         members={convertJs(Object.values(MEMBERS))}
         messages={convertJs([annaMessage, allMessage])}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     );
     cy.get(dataCyWrapper(messageIdCyWrapper(annaMessage.id))).should(

diff --git a/cypress/components/message-actions.cy.tsx b/cypress/components/message-actions.cy.tsx
@@ -28,7 +28,7 @@ describe('Message actions', () => {
         currentMember={convertJs(MEMBERS.ANNA)}
         members={convertJs(Object.values(MEMBERS))}
         messages={convertJs(CHAT_MESSAGES)}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     );
   });
@@ -57,7 +57,7 @@ describe('Delete action', () => {
         members={convertJs(Object.values(MEMBERS))}
         messages={convertJs(CHAT_MESSAGES)}
         deleteMessageFunction={deleteMessageSpy}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     );
     cy.get(dataCyWrapper(messageActionsButtonCypress))
@@ -84,7 +84,7 @@ describe('Edit action', () => {
         messages={convertJs(CHAT_MESSAGES)}
         editMessageFunction={editMessageSpy}
         sendMessageFunction={sendMessageSpy}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     );
 
@@ -131,7 +131,7 @@ describe('Edit action', () => {
     const secondMessageIndex = 1;
     cy.get(dataCyWrapper(editBannerOldTextCypress)).should(
       'contain.text',
-      CHAT_MESSAGES.filter((m) => m.creator === CURRENT_MEMBER.id)[
+      CHAT_MESSAGES.filter((m) => m.creator?.id === CURRENT_MEMBER.id)[
         firstMessageIndex
       ].body,
     );
@@ -140,7 +140,7 @@ describe('Edit action', () => {
       .click();
     cy.get(dataCyWrapper(editMenuItemCypress)).click();
     const oldTextMessage = CHAT_MESSAGES.filter(
-      (m) => m.creator === CURRENT_MEMBER.id,
+      (m) => m.creator?.id === CURRENT_MEMBER.id,
     )[secondMessageIndex].body;
     cy.get(dataCyWrapper(editBannerOldTextCypress)).should(
       'contain.text',

diff --git a/cypress/components/render-ui.cy.tsx b/cypress/components/render-ui.cy.tsx
@@ -1,10 +1,10 @@
 /// <reference types="../support/cypress" />
-import { v4 } from 'uuid';
-
 import React from 'react';
 
 import { convertJs } from '@graasp/sdk';
 
+import { v4 } from 'uuid';
+
 import Chatbox from '../../src/components/Chatbox/Chatbox';
 import {
   dataCyWrapper,
@@ -29,7 +29,7 @@ describe('Render Avatar', () => {
         currentMember={convertJs(MEMBERS.ANNA)}
         members={convertJs(Object.values(MEMBERS))}
         messages={convertJs(CHAT_MESSAGES)}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     );
   });
@@ -42,7 +42,7 @@ describe('Render Avatar', () => {
         currentMember={convertJs(MEMBERS.ANNA)}
         members={convertJs(Object.values(MEMBERS))}
         messages={convertJs(CHAT_MESSAGES)}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     );
     cy.get(`@${fakeHookName}`).should('have.been.called');
@@ -58,7 +58,7 @@ describe('Autofocus input field', () => {
         currentMember={convertJs(MEMBERS.ANNA)}
         members={convertJs(Object.values(MEMBERS))}
         messages={convertJs(CHAT_MESSAGES)}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     ).then(() =>
       cy.get(`#${inputTextFieldTextAreaCypress}`).should('be.focused'),
@@ -94,7 +94,7 @@ describe('Messages container', () => {
             id: lastId,
           },
         ])}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     ).then(() => {
       cy.get(dataCyWrapper(messageIdCyWrapper(lastId))).should('be.visible');

diff --git a/cypress/components/send-message.cy.tsx b/cypress/components/send-message.cy.tsx
@@ -1,10 +1,10 @@
 /// <reference types="../support/cypress"/>
-import { List } from 'immutable';
-
 import React from 'react';
 
 import { convertJs } from '@graasp/sdk';
 
+import { List } from 'immutable';
+
 import Chatbox from '../../src/components/Chatbox/Chatbox';
 import {
   charCounterCypress,
@@ -33,7 +33,7 @@ describe('Enter text', () => {
         currentMember={convertJs(MEMBERS.ANNA)}
         members={List(convertJs(Object.values(MEMBERS)))}
         messages={List(convertJs(CHAT_MESSAGES))}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     );
   });
@@ -67,7 +67,7 @@ describe('Send message', () => {
         members={List(convertJs(Object.values(MEMBERS)))}
         messages={List(convertJs(CHAT_MESSAGES))}
         sendMessageFunction={sendMessageSpy}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     );
     cy.get(dataCyWrapper(inputTextFieldCypress)).type(inputText);
@@ -86,7 +86,7 @@ describe('Send message', () => {
         members={List(convertJs(Object.values(MEMBERS)))}
         messages={List(convertJs(CHAT_MESSAGES))}
         sendMessageFunction={sendMessageSpy}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     );
     cy.get(dataCyWrapper(inputTextFieldCypress))
@@ -108,7 +108,7 @@ describe('Message Length', () => {
         members={List(convertJs(Object.values(MEMBERS)))}
         messages={List(convertJs(CHAT_MESSAGES))}
         sendMessageFunction={sendMessageSpy}
-        useAvatarHook={fakeHook}
+        useAvatarUrl={fakeHook}
       />,
     );
   });

diff --git a/cypress/fixtures/chat_messages.ts b/cypress/fixtures/chat_messages.ts
@@ -1,55 +1,73 @@
+import {
+  ChatMessage,
+  FolderItemType,
+  ItemType,
+  buildPathFromIds,
+} from '@graasp/sdk';
+
 import { v4 } from 'uuid';
 
 import { getMentionMarkupFromMember } from '../../src';
-import { ChatMessage } from '../../src/types';
 import { CURRENT_MEMBER, MEMBERS } from './members';
 
 export const CHAT_ID = v4();
+export const ITEM_CHAT: FolderItemType = {
+  id: CHAT_ID,
+  name: 'Item chat',
+  description: 'A description',
+  path: buildPathFromIds(CHAT_ID),
+  type: ItemType.FOLDER,
+  extra: { [ItemType.FOLDER]: { childrenOrder: [] } },
+  settings: {},
+  creator: CURRENT_MEMBER,
+  createdAt: new Date(),
+  updatedAt: new Date(),
+};
 export const MOCK_MESSAGE_BODY = 'This is a message';
 
 export const getMockMessage = ({
   member = CURRENT_MEMBER,
   message = MOCK_MESSAGE_BODY,
 }): ChatMessage => ({
   id: v4(),
-  chatId: CHAT_ID,
-  creator: member.id,
-  createdAt: new Date().toISOString(),
-  updatedAt: new Date().toISOString(),
+  item: ITEM_CHAT,
+  creator: member,
+  createdAt: new Date(),
+  updatedAt: new Date(),
   body: message,
 });
 
-export const CHAT_MESSAGES = [
+export const CHAT_MESSAGES: ChatMessage[] = [
   {
     id: v4(),
-    chatId: CHAT_ID,
-    creator: CURRENT_MEMBER.id,
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
+    item: ITEM_CHAT,
+    creator: CURRENT_MEMBER,
+    createdAt: new Date(),
+    updatedAt: new Date(),
     body: 'Some really long text that is going to be wrapped to the next line i think, we need to test.\nOn multiple lines',
   },
   {
     id: v4(),
-    chatId: CHAT_ID,
-    creator: MEMBERS.BOB.id,
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
+    item: ITEM_CHAT,
+    creator: MEMBERS.BOB,
+    createdAt: new Date(),
+    updatedAt: new Date(),
     body: 'A lengthy response to the previous message that i think a lot of people will like to read, since it really goes in deep into the topic.\nAnd here also a preview of the next topic.\n\nSigned Bob',
   },
   {
     id: v4(),
-    chatId: CHAT_ID,
-    creator: MEMBERS.BOB.id,
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
+    item: ITEM_CHAT,
+    creator: MEMBERS.BOB,
+    createdAt: new Date(),
+    updatedAt: new Date(),
     body: 'And here a text with 2\n\nLine breaks',
   },
   {
     id: v4(),
-    chatId: CHAT_ID,
-    creator: CURRENT_MEMBER.id,
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
+    item: ITEM_CHAT,
+    creator: CURRENT_MEMBER,
+    createdAt: new Date(),
+    updatedAt: new Date(),
     body: 'Message',
   },
 ];

diff --git a/cypress/fixtures/item.ts b/cypress/fixtures/item.ts
@@ -0,0 +1,16 @@
+import { Item, ItemType } from '@graasp/sdk';
+
+import { CURRENT_MEMBER } from './members';
+
+export const MOCK_ITEM: Item = {
+  id: 'some-id',
+  name: 'my mock item',
+  description: 'a description',
+  path: 'some-id',
+  settings: {},
+  creator: CURRENT_MEMBER,
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: ItemType.FOLDER,
+  extra: {},
+};