Merge pull request #1956 from daostack/feature/CW-1954-new-stream-sys…

…tem-message Add FE system message for new stream created - Use BE text #1954
daostack · Aug 11, 2023 · e5ab376 · e5ab376
2 parents e254fa4 + c7a90c9
commit e5ab376
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/shared/components/Chat/ChatMessage/utils/getTextFromSystemMessage.tsx b/src/shared/components/Chat/ChatMessage/utils/getTextFromSystemMessage.tsx
@@ -119,7 +119,7 @@ const getCommonMemberAddedSystemMessageText = async (
 
 export const getTextFromSystemMessage = async (
   data: TextData,
-): Promise<Text[]> => {
+): Promise<Text[] | null> => {
   const { systemMessage } = data;
   let text: Text[] = [];
 
@@ -147,8 +147,7 @@ export const getTextFromSystemMessage = async (
       );
       break;
     default:
-      text = [];
-      break;
+      return null;
   }
 
   return text.map((item, index) => (

diff --git a/src/shared/components/Chat/ChatMessage/utils/getTextFromTextEditorString.tsx b/src/shared/components/Chat/ChatMessage/utils/getTextFromTextEditorString.tsx
@@ -99,7 +99,11 @@ export const getTextFromTextEditorString = async (
   } = data;
 
   if (systemMessage) {
-    return await getTextFromSystemMessage(data);
+    const systemMessageText = await getTextFromSystemMessage(data);
+
+    if (systemMessageText) {
+      return systemMessageText;
+    }
   }
 
   const textEditorValue = parseStringToTextEditorValue(textEditorString);

diff --git a/src/shared/constants/systemDiscussionMessage.ts b/src/shared/constants/systemDiscussionMessage.ts
@@ -2,4 +2,5 @@ export enum SystemDiscussionMessageType {
   CommonMemberAdded = "common-member-added",
   CommonEdited = "common-edited",
   CommonCreated = "common-created",
+  FeedItemCreated = "feed-item-created",
 }
diff --git a/src/shared/models/DiscussionMessage.tsx b/src/shared/models/DiscussionMessage.tsx
@@ -94,10 +94,21 @@ export interface CommonEditedSystemMessage extends BaseSystemDiscussionMessage {
   };
 }
 
+export interface CommonFeedItemCreatedSystemMessage
+  extends BaseSystemDiscussionMessage {
+  systemMessageType: SystemDiscussionMessageType.FeedItemCreated;
+  systemMessageData: {
+    commonType: SystemMessageCommonType;
+    commonId: string;
+    userId: string;
+  };
+}
+
 export type SystemDiscussionMessage =
   | CommonCreatedSystemMessage
   | CommonMemberAddedSystemMessage
-  | CommonEditedSystemMessage;
+  | CommonEditedSystemMessage
+  | CommonFeedItemCreatedSystemMessage;
 
 export type DiscussionMessage = UserDiscussionMessage | SystemDiscussionMessage;