fix(chat): add flag for updating new conversation (Issue #2267) (#2607)

Co-authored-by: Magomed-Elbi Dzhukalaev <magomed-elbi_dzhukalaev@epam.com> Co-authored-by: Ilya Bondar <ilya_bondar@epam.com>
epam · Nov 18, 2024 · 5904018 · 5904018
1 parent 777a3a2
commit 5904018
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/apps/chat/src/components/Chat/ModelList.tsx b/apps/chat/src/components/Chat/ModelList.tsx
@@ -35,6 +35,7 @@ import { SharingType } from '@/src/types/share';
 import { Translation } from '@/src/types/translation';
 
 import { ApplicationActions } from '@/src/store/application/application.reducers';
+import { ConversationsSelectors } from '@/src/store/conversations/conversations.reducers';
 import { useAppDispatch, useAppSelector } from '@/src/store/hooks';
 import { ModelsSelectors } from '@/src/store/models/models.reducers';
 import { SettingsSelectors } from '@/src/store/settings/settings.reducers';
@@ -84,6 +85,9 @@ const ModelGroup = ({
   const { t } = useTranslation(Translation.Chat);
 
   const recentModelsIds = useAppSelector(ModelsSelectors.selectRecentModelsIds);
+  const isNewConversationUpdating = useAppSelector(
+    ConversationsSelectors.selectIsNewConversationUpdating,
+  );
 
   const [isOpened, setIsOpened] = useState(false);
 
@@ -129,7 +133,7 @@ const ModelGroup = ({
         name: t('Edit'),
         dataQa: 'edit',
         display: !isPublicEntity,
-        disabled: isModifyDisabled,
+        disabled: isModifyDisabled || isNewConversationUpdating,
         Icon: IconPencilMinus,
         onClick: (e: React.MouseEvent) => {
           e.stopPropagation();
@@ -162,7 +166,8 @@ const ModelGroup = ({
       {
         name: t('Delete'),
         dataQa: 'delete',
-        disabled: isModifyDisabled && !isPublicEntity,
+        disabled:
+          (isModifyDisabled && !isPublicEntity) || isNewConversationUpdating,
         display: !isPublicEntity,
         Icon: IconTrashX,
         onClick: (e: React.MouseEvent) => {
@@ -181,6 +186,7 @@ const ModelGroup = ({
       handlePublish,
       handleOpenDeleteConfirmModal,
       isModifyDisabled,
+      isNewConversationUpdating,
     ],
   );
 
@@ -201,7 +207,7 @@ const ModelGroup = ({
         !disabled ? 'cursor-pointer' : 'cursor-not-allowed',
       )}
       onClick={(e) => {
-        if (disabled) {
+        if (disabled || isNewConversationUpdating) {
           return;
         }
         if (

diff --git a/apps/chat/src/store/conversations/conversations.reducers.ts b/apps/chat/src/store/conversations/conversations.reducers.ts
@@ -54,6 +54,7 @@ const initialState: ConversationsState = {
   loadedCharts: [],
   chartLoading: false,
   isActiveNewConversationRequest: false,
+  isNewConversationUpdating: false,
   isMessageSending: false,
   loadedCustomAttachmentsData: [],
   customAttachmentDataLoading: false,
@@ -76,6 +77,9 @@ export const conversationsSlice = createSlice({
       if (state.isMessageSending) {
         state.isMessageSending = false;
       }
+      if (state.isNewConversationUpdating) {
+        state.isNewConversationUpdating = false;
+      }
     },
     saveConversationFail: (state, { payload }: PayloadAction<Conversation>) => {
       state.conversations = state.conversations.map((conv) => {
@@ -88,11 +92,16 @@ export const conversationsSlice = createSlice({
 
         return conv;
       });
+      state.isNewConversationUpdating = false;
     },
     recreateConversation: (
       state,
-      _action: PayloadAction<{ new: Conversation; old: Conversation }>,
-    ) => state,
+      action: PayloadAction<{ new: Conversation; old: Conversation }>,
+    ) => {
+      if (!action.payload.old.messages.length) {
+        state.isNewConversationUpdating = true;
+      }
+    },
     recreateConversationFail: (
       state,
       {
@@ -102,6 +111,7 @@ export const conversationsSlice = createSlice({
         oldConversation: Conversation;
       }>,
     ) => {
+      state.isNewConversationUpdating = false;
       state.conversations = state.conversations.map((conv) => {
         if (conv.id === payload.newId) {
           const conversation = conv as Conversation;

diff --git a/apps/chat/src/store/conversations/conversations.selectors.ts b/apps/chat/src/store/conversations/conversations.selectors.ts
@@ -835,3 +835,10 @@ export const selectChosenFolderIds = createSelector(
     return { fullyChosenFolderIds, partialChosenFolderIds };
   },
 );
+
+export const selectIsNewConversationUpdating = createSelector(
+  [rootSelector],
+  (state) => {
+    return state.isNewConversationUpdating;
+  },
+);
diff --git a/apps/chat/src/store/conversations/conversations.types.ts b/apps/chat/src/store/conversations/conversations.types.ts
@@ -28,6 +28,7 @@ export interface ConversationsState {
   foldersStatus: UploadStatus;
   loadingFolderIds: string[];
   isActiveNewConversationRequest: boolean;
+  isNewConversationUpdating: boolean;
   isMessageSending: boolean;
   loadedCharts: { url: string; data: PlotParams }[];
   chartLoading: boolean;