fix(chat): select folder on rename & create (Issue #2022, #2421) (#2768)

Co-authored-by: Magomed-Elbi Dzhukalaev <magomed-elbi_dzhukalaev@epam.com> Co-authored-by: Ilya Bondar <ilya_bondar@epam.com>
epam · Dec 12, 2024 · 444e660 · 444e660
1 parent a0ab0e7
commit 444e660
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/apps/chat/src/components/Chat/ChangePathDialog.tsx b/apps/chat/src/components/Chat/ChangePathDialog.tsx
@@ -154,9 +154,7 @@ export const ChangePathDialog = ({
         return;
       }
 
-      setSelectedFolderId(
-        constructPath(getFolderIdFromEntityId(folderId), newName),
-      );
+      setSelectedFolderId(newFolderId);
 
       if (error) {
         setErrorMessage(t(error) as string);
@@ -172,7 +170,7 @@ export const ChangePathDialog = ({
     (parentFolderId = rootFolderId) => {
       const folderName = getNextDefaultName(
         t(DEFAULT_FOLDER_NAME),
-        folders,
+        folders.filter((f) => f.folderId === parentFolderId),
         0,
         false,
         true,

diff --git a/apps/chat/src/store/prompts/prompts.reducers.ts b/apps/chat/src/store/prompts/prompts.reducers.ts
@@ -257,7 +257,9 @@ export const promptsSlice = createSlice({
       const name = payload.name.trim();
 
       state.temporaryFolders = state.temporaryFolders.map((folder) =>
-        folder.id !== payload.folderId ? folder : { ...folder, name },
+        folder.id !== payload.folderId
+          ? folder
+          : { ...folder, name, id: constructPath(folder.folderId, name) },
       );
     },
     resetNewFolderId: (state) => {