fix(chat): fix unicode splitting and not delete if create fails (Issue …

…#1018) (#1020)
epam · Mar 11, 2024 · 647729d · 647729d
1 parent 0671397
commit 647729d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 25 deletions.
diff --git a/apps/chat/src/store/conversations/conversations.epics.ts b/apps/chat/src/store/conversations/conversations.epics.ts
@@ -2200,32 +2200,35 @@ const recreateConversationEpic: AppEpic = (action$) =>
   action$.pipe(
     filter(ConversationsActions.recreateConversation.match),
     mergeMap(({ payload }) => {
-      return zip(
-        ConversationService.createConversation(payload.new),
-        ConversationService.deleteConversation(
-          getConversationInfoFromId(payload.old.id),
-        ),
-      ).pipe(
-        switchMap(() => EMPTY),
-        catchError((err) => {
-          console.error(err);
-          return concat(
-            of(
-              ConversationsActions.recreateConversationFail({
-                newId: payload.new.id,
-                oldConversation: payload.old,
-              }),
+      return ConversationService.createConversation(payload.new)
+        .pipe(
+          switchMap(() =>
+            ConversationService.deleteConversation(
+              getConversationInfoFromId(payload.old.id),
             ),
-            of(
-              UIActions.showErrorToast(
-                translate(
-                  'An error occurred while saving the conversation. Please refresh the page.',
+          ),
+        )
+        .pipe(
+          switchMap(() => EMPTY),
+          catchError((err) => {
+            console.error(err);
+            return concat(
+              of(
+                ConversationsActions.recreateConversationFail({
+                  newId: payload.new.id,
+                  oldConversation: payload.old,
+                }),
+              ),
+              of(
+                UIActions.showErrorToast(
+                  translate(
+                    'An error occurred while saving the conversation. Please refresh the page.',
+                  ),
                 ),
               ),
-            ),
-          );
-        }),
-      );
+            );
+          }),
+        );
     }),
   );
 

diff --git a/apps/chat/src/utils/app/common.ts b/apps/chat/src/utils/app/common.ts
@@ -8,6 +8,7 @@ import { MAX_ENTITY_LENGTH } from '@/src/constants/default-ui-settings';
 
 import trimEnd from 'lodash-es/trimEnd';
 import uniq from 'lodash-es/uniq';
+import { substring } from 'stringz';
 
 /**
  * Combine entities. If there are the same ids then will be used entity from entities1 i.e. first in array
@@ -99,7 +100,7 @@ export const prepareEntityName = (name: string, forRenaming = false) => {
         .filter(Boolean)[0] ?? '';
 
   if (clearName.length > MAX_ENTITY_LENGTH) {
-    return trimEndDots(clearName.substring(0, MAX_ENTITY_LENGTH));
+    return trimEndDots(substring(clearName, 0, MAX_ENTITY_LENGTH));
   }
 
   return trimEndDots(clearName);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -75,6 +75,7 @@
     "rehype-sanitize": "^5.0.1",
     "remark-gfm": "^3.0.1",
     "rxjs": "^7.8.1",
+    "stringz": "^2.1.0",
     "svgo": "^3.0.2",
     "tslib": "^2.6.0"
   },