From 4f9019f266fbd5817c8da579f33194868bd6bdcb Mon Sep 17 00:00:00 2001
From: Xavier Abad <77491413+masterprog-cmd@users.noreply.github.com>
Date: Fri, 13 Sep 2024 09:35:43 +0200
Subject: [PATCH 1/7] fix(breadcrumbs): rename folder correctly

---
 .../EditItemNameDialog/EditItemNameDialog.tsx | 17 +++------
 src/app/drive/views/DriveView/DriveView.tsx   |  1 +
 .../BreadcrumbsMenu/BreadcrumbsMenuDrive.tsx  | 36 ++++++++++++-------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx b/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx
index e0f255b38..cf9128e83 100644
--- a/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx
+++ b/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx
@@ -1,4 +1,4 @@
-import { FC, useEffect, useState } from 'react';
+import { FC, useState } from 'react';
 import { useAppDispatch } from 'app/store/hooks';
 import storageThunks from 'app/store/slices/storage/storage.thunks';
 import Button from 'app/shared/components/Button/Button';
@@ -17,17 +17,12 @@ type EditItemNameDialogProps = {
 };
 
 const EditItemNameDialog: FC<EditItemNameDialogProps> = ({ item, isOpen, resourceToken, onClose, onSuccess }) => {
-  const [newItemName, setNewItemName] = useState('');
+  const dispatch = useAppDispatch();
+  const { translate } = useTranslationContext();
+  const [newItemName, setNewItemName] = useState(translate('modals.newFolderModal.placeholder'));
   const [error, setError] = useState('');
   const [isLoading, setIsLoading] = useState(false);
 
-  const { translate } = useTranslationContext();
-  const dispatch = useAppDispatch();
-
-  useEffect(() => {
-    setNewItemName(item?.plainName ?? '');
-  }, [item]);
-
   const handleOnClose = (newName = ''): void => {
     setIsLoading(false);
     const newItem = newName.length > 0 ? ({ ...item, plainName: newName } as DriveItemData) : undefined;
@@ -72,7 +67,6 @@ const EditItemNameDialog: FC<EditItemNameDialogProps> = ({ item, isOpen, resourc
         <p className="text-2xl font-medium text-gray-100" data-cy="editItemNameDialogTitle">
           {translate('modals.renameItemDialog.title')}
         </p>
-
         <Input
           disabled={isLoading}
           className={`${error !== '' ? 'error' : ''}`}
@@ -80,7 +74,7 @@ const EditItemNameDialog: FC<EditItemNameDialogProps> = ({ item, isOpen, resourc
           inputDataCy="editItemNameDialogInput"
           label={translate('modals.renameItemDialog.label')}
           value={newItemName}
-          placeholder={newItemName}
+          placeholder={translate('modals.newFolderModal.placeholder')}
           onChange={(name) => {
             setNewItemName(name);
             setError('');
@@ -89,7 +83,6 @@ const EditItemNameDialog: FC<EditItemNameDialogProps> = ({ item, isOpen, resourc
           message={error}
           autofocus
         />
-
         <div className="flex flex-row items-center justify-end space-x-2">
           <Button
             disabled={isLoading}
diff --git a/src/app/drive/views/DriveView/DriveView.tsx b/src/app/drive/views/DriveView/DriveView.tsx
index a9de4491d..7db07740d 100644
--- a/src/app/drive/views/DriveView/DriveView.tsx
+++ b/src/app/drive/views/DriveView/DriveView.tsx
@@ -104,6 +104,7 @@ const DriveView = (props: DriveViewProps) => {
   const goFolder = async (folderUuid: string, workspacesToken?: string) => {
     try {
       const folderMeta = await newStorageService.getFolderMeta(folderUuid, workspacesToken);
+      dispatch(uiActions.setCurrentEditingBreadcrumbNameDirty(''));
 
       dispatch(
         storageThunks.goToFolderThunk({
diff --git a/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuDrive.tsx b/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuDrive.tsx
index 9aea10b1d..9613ea69c 100644
--- a/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuDrive.tsx
+++ b/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuDrive.tsx
@@ -1,3 +1,4 @@
+import { useEffect, useState } from 'react';
 import { Menu, Transition } from '@headlessui/react';
 import {
   CaretDown,
@@ -10,17 +11,18 @@ import {
   Info,
 } from '@phosphor-icons/react';
 import { ReactComponent as MoveActionIcon } from 'assets/icons/move.svg';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import { useTranslationContext } from '../../../../i18n/provider/TranslationProvider';
 import moveItemsToTrash from '../../../../../use_cases/trash/move-items-to-trash';
-import { DriveItemData, DriveItemDetails } from 'app/drive/types';
-import { useAppDispatch, useAppSelector } from 'app/store/hooks';
+import { DriveItemData, DriveItemDetails, FolderPath } from '../../../../drive/types';
+import { useAppDispatch, useAppSelector } from '../../../../store/hooks';
 import { uiActions } from '../../../../store/slices/ui';
-import useDriveItemStoreProps from 'app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps';
-import { getAppConfig } from 'app/core/services/config.service';
+import useDriveItemStoreProps from '../../../../drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps';
+import { getAppConfig } from '../../../../core/services/config.service';
 import { BreadcrumbsMenuProps } from '../types';
-import storageThunks from 'app/store/slices/storage/storage.thunks';
+import storageThunks from '../../../../store/slices/storage/storage.thunks';
 import { storageActions } from '../../../../store/slices/storage';
-import shareService from 'app/share/services/share.service';
+import shareService from '../../../../share/services/share.service';
+import { getAncestorsAndSetNamePath } from '../../../../store/slices/storage/storage.thunks/goToFolderThunk';
 
 const BreadcrumbsMenuDrive = (props: BreadcrumbsMenuProps): JSX.Element => {
   const { onItemClicked } = props;
@@ -33,12 +35,22 @@ const BreadcrumbsMenuDrive = (props: BreadcrumbsMenuProps): JSX.Element => {
   const path = getAppConfig().views.find((view) => view.path === location.pathname);
   const pathId = path?.id;
   const isSharedView = pathId === 'shared';
+  const [itemName, setItemName] = useState(props.item.label);
 
-  const findCurrentFolder = (currentBreadcrumb) => {
+  useEffect(() => {
+    if (breadcrumbDirtyName) {
+      getAncestorsAndSetNamePath(currentBreadcrumb.uuid, dispatch);
+      setItemName(breadcrumbDirtyName);
+    } else {
+      setItemName(props.item.label);
+    }
+  }, [breadcrumbDirtyName]);
+
+  const findCurrentFolder = (currentBreadcrumb: FolderPath) => {
     const foldersList: DriveItemData[] = [];
 
-    for (const itemsInAllitems in allItems) {
-      const selectedFolder = allItems[itemsInAllitems].find((item) => item?.id === currentBreadcrumb?.id);
+    for (const itemsInAllItems in allItems) {
+      const selectedFolder = allItems[itemsInAllItems].find((item) => item?.uuid === currentBreadcrumb?.uuid);
       if (selectedFolder) foldersList.push(selectedFolder);
     }
     return foldersList;
@@ -96,8 +108,8 @@ const BreadcrumbsMenuDrive = (props: BreadcrumbsMenuProps): JSX.Element => {
         focus-visible:bg-gray-5"
       >
         <div className="flex max-w-fit flex-1 flex-row items-center truncate">
-          <span title={breadcrumbDirtyName || props.item.label} className="max-w-sm flex-1 truncate">
-            {breadcrumbDirtyName || props.item.label}
+          <span title={itemName} className="max-w-sm flex-1 truncate">
+            {itemName}
           </span>
           <CaretDown weight="fill" className={`ml-1 h-3 w-3 ${isSharedView && 'hidden'}`} />
         </div>

From c8c812e642769074ea428f3d39ae6b505bbf2d04 Mon Sep 17 00:00:00 2001
From: Xavier Abad <77491413+masterprog-cmd@users.noreply.github.com>
Date: Mon, 16 Sep 2024 10:25:51 +0200
Subject: [PATCH 2/7] fix(rename): item name when opening the rename item

---
 .../drive/components/EditItemNameDialog/EditItemNameDialog.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx b/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx
index cf9128e83..97f03dbe9 100644
--- a/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx
+++ b/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx
@@ -74,7 +74,7 @@ const EditItemNameDialog: FC<EditItemNameDialogProps> = ({ item, isOpen, resourc
           inputDataCy="editItemNameDialogInput"
           label={translate('modals.renameItemDialog.label')}
           value={newItemName}
-          placeholder={translate('modals.newFolderModal.placeholder')}
+          placeholder={newItemName}
           onChange={(name) => {
             setNewItemName(name);
             setError('');

From b49f63550eeaeb7f0f7250c056dd58516213b0ac Mon Sep 17 00:00:00 2001
From: Xavier Abad <77491413+masterprog-cmd@users.noreply.github.com>
Date: Mon, 16 Sep 2024 14:48:56 +0200
Subject: [PATCH 3/7] fix: renamed folder names for breadcrumbs

---
 .../components/DriveExplorer/DriveExplorer.tsx |  7 +++++--
 .../BreadcrumbsMenu/BreadcrumbsMenuDrive.tsx   | 18 ++----------------
 .../Containers/BreadcrumbsDriveView.tsx        | 11 +++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/app/drive/components/DriveExplorer/DriveExplorer.tsx b/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
index 6629b4a93..f6f952a72 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
@@ -71,6 +71,7 @@ import WarningMessageWrapper from '../WarningMessage/WarningMessageWrapper';
 import './DriveExplorer.scss';
 import { DriveTopBarItems } from './DriveTopBarItems';
 import DriveTopBarActions from './components/DriveTopBarActions';
+import { getAncestorsAndSetNamePath } from 'app/store/slices/storage/storage.thunks/goToFolderThunk';
 
 const TRASH_PAGINATION_OFFSET = 50;
 export const UPLOAD_ITEMS_LIMIT = 3000;
@@ -426,14 +427,16 @@ const DriveExplorer = (props: DriveExplorerProps): JSX.Element => {
   };
 
   const onCloseEditItemDialog = (newItem) => {
+    const newItemName = newItem.plainName ?? newItem.name;
     if (newItem && editNameItem) {
       if (isFileViewerOpen) {
-        dispatch(uiActions.setCurrentEditingNameDirty(newItem.plainName ?? newItem.name));
+        dispatch(uiActions.setCurrentEditingNameDirty(newItemName));
       } else if (itemToRename && editNameItem.isFolder) {
-        dispatch(uiActions.setCurrentEditingBreadcrumbNameDirty(newItem.plainName ?? newItem.name));
+        dispatch(uiActions.setCurrentEditingBreadcrumbNameDirty(newItemName));
       }
     }
     dispatch(storageActions.setItemToRename(null));
+    getAncestorsAndSetNamePath(newItem.uuid, dispatch);
     setEditNameItem(null);
   };
 
diff --git a/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuDrive.tsx b/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuDrive.tsx
index 9613ea69c..4ed65b4bc 100644
--- a/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuDrive.tsx
+++ b/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuDrive.tsx
@@ -1,4 +1,3 @@
-import { useEffect, useState } from 'react';
 import { Menu, Transition } from '@headlessui/react';
 import {
   CaretDown,
@@ -16,13 +15,11 @@ import moveItemsToTrash from '../../../../../use_cases/trash/move-items-to-trash
 import { DriveItemData, DriveItemDetails, FolderPath } from '../../../../drive/types';
 import { useAppDispatch, useAppSelector } from '../../../../store/hooks';
 import { uiActions } from '../../../../store/slices/ui';
-import useDriveItemStoreProps from '../../../../drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps';
 import { getAppConfig } from '../../../../core/services/config.service';
 import { BreadcrumbsMenuProps } from '../types';
 import storageThunks from '../../../../store/slices/storage/storage.thunks';
 import { storageActions } from '../../../../store/slices/storage';
 import shareService from '../../../../share/services/share.service';
-import { getAncestorsAndSetNamePath } from '../../../../store/slices/storage/storage.thunks/goToFolderThunk';
 
 const BreadcrumbsMenuDrive = (props: BreadcrumbsMenuProps): JSX.Element => {
   const { onItemClicked } = props;
@@ -31,20 +28,9 @@ const BreadcrumbsMenuDrive = (props: BreadcrumbsMenuProps): JSX.Element => {
   const allItems = useAppSelector((state) => state.storage.levels);
   const namePath = useAppSelector((state) => state.storage.namePath);
   const currentBreadcrumb = namePath[namePath.length - 1];
-  const { breadcrumbDirtyName } = useDriveItemStoreProps();
   const path = getAppConfig().views.find((view) => view.path === location.pathname);
   const pathId = path?.id;
   const isSharedView = pathId === 'shared';
-  const [itemName, setItemName] = useState(props.item.label);
-
-  useEffect(() => {
-    if (breadcrumbDirtyName) {
-      getAncestorsAndSetNamePath(currentBreadcrumb.uuid, dispatch);
-      setItemName(breadcrumbDirtyName);
-    } else {
-      setItemName(props.item.label);
-    }
-  }, [breadcrumbDirtyName]);
 
   const findCurrentFolder = (currentBreadcrumb: FolderPath) => {
     const foldersList: DriveItemData[] = [];
@@ -108,8 +94,8 @@ const BreadcrumbsMenuDrive = (props: BreadcrumbsMenuProps): JSX.Element => {
         focus-visible:bg-gray-5"
       >
         <div className="flex max-w-fit flex-1 flex-row items-center truncate">
-          <span title={itemName} className="max-w-sm flex-1 truncate">
-            {itemName}
+          <span title={props.item.label} className="max-w-sm flex-1 truncate">
+            {props.item.label}
           </span>
           <CaretDown weight="fill" className={`ml-1 h-3 w-3 ${isSharedView && 'hidden'}`} />
         </div>
diff --git a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
index a8859c933..fe15b8353 100644
--- a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
+++ b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
@@ -9,6 +9,9 @@ import { uiActions } from 'app/store/slices/ui';
 import { t } from 'i18next';
 import BreadcrumbsMenuDrive from '../BreadcrumbsMenu/BreadcrumbsMenuDrive';
 import { BreadcrumbItemData } from '../types';
+import useDriveItemStoreProps from 'app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps';
+import { getAncestorsAndSetNamePath } from 'app/store/slices/storage/storage.thunks/goToFolderThunk';
+import { useEffect } from 'react';
 
 interface BreadcrumbsDriveViewProps {
   namePath: FolderPath[];
@@ -18,6 +21,14 @@ const BreadcrumbsDriveView = (props: BreadcrumbsDriveViewProps) => {
   const { namePath } = props;
   const dispatch = useAppDispatch();
   const { selectedWorkspace } = useAppSelector((state: RootState) => state.workspaces);
+  const currentBreadcrumb = namePath[namePath.length - 1];
+  const { breadcrumbDirtyName } = useDriveItemStoreProps();
+
+  useEffect(() => {
+    if (breadcrumbDirtyName) {
+      getAncestorsAndSetNamePath(currentBreadcrumb.uuid, dispatch);
+    }
+  }, [breadcrumbDirtyName]);
 
   const breadcrumbDriveViewItems = (): BreadcrumbItemData[] => {
     const items: BreadcrumbItemData[] = [];

From 50e4e751432862ec019052851beab22b29337447 Mon Sep 17 00:00:00 2001
From: Xavier Abad <77491413+masterprog-cmd@users.noreply.github.com>
Date: Mon, 16 Sep 2024 14:55:50 +0200
Subject: [PATCH 4/7] fix: remove unused function

---
 src/app/drive/components/DriveExplorer/DriveExplorer.tsx  | 2 --
 .../components/EditItemNameDialog/EditItemNameDialog.tsx  | 8 ++++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/drive/components/DriveExplorer/DriveExplorer.tsx b/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
index f6f952a72..5262a4e3f 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
@@ -71,7 +71,6 @@ import WarningMessageWrapper from '../WarningMessage/WarningMessageWrapper';
 import './DriveExplorer.scss';
 import { DriveTopBarItems } from './DriveTopBarItems';
 import DriveTopBarActions from './components/DriveTopBarActions';
-import { getAncestorsAndSetNamePath } from 'app/store/slices/storage/storage.thunks/goToFolderThunk';
 
 const TRASH_PAGINATION_OFFSET = 50;
 export const UPLOAD_ITEMS_LIMIT = 3000;
@@ -436,7 +435,6 @@ const DriveExplorer = (props: DriveExplorerProps): JSX.Element => {
       }
     }
     dispatch(storageActions.setItemToRename(null));
-    getAncestorsAndSetNamePath(newItem.uuid, dispatch);
     setEditNameItem(null);
   };
 
diff --git a/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx b/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx
index 97f03dbe9..78e8ecb78 100644
--- a/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx
+++ b/src/app/drive/components/EditItemNameDialog/EditItemNameDialog.tsx
@@ -1,4 +1,4 @@
-import { FC, useState } from 'react';
+import { FC, useEffect, useState } from 'react';
 import { useAppDispatch } from 'app/store/hooks';
 import storageThunks from 'app/store/slices/storage/storage.thunks';
 import Button from 'app/shared/components/Button/Button';
@@ -19,9 +19,13 @@ type EditItemNameDialogProps = {
 const EditItemNameDialog: FC<EditItemNameDialogProps> = ({ item, isOpen, resourceToken, onClose, onSuccess }) => {
   const dispatch = useAppDispatch();
   const { translate } = useTranslationContext();
-  const [newItemName, setNewItemName] = useState(translate('modals.newFolderModal.placeholder'));
   const [error, setError] = useState('');
   const [isLoading, setIsLoading] = useState(false);
+  const [newItemName, setNewItemName] = useState('');
+
+  useEffect(() => {
+    setNewItemName(item?.plainName ?? '');
+  }, [item]);
 
   const handleOnClose = (newName = ''): void => {
     setIsLoading(false);

From 5d02d40bee1af8c53e2a15139bbb951d7e4f84d4 Mon Sep 17 00:00:00 2001
From: Xavier Abad <77491413+masterprog-cmd@users.noreply.github.com>
Date: Mon, 16 Sep 2024 16:55:26 +0200
Subject: [PATCH 5/7] fix: clean currentEditingBreadcrumb state

---
 src/app/drive/components/DriveExplorer/DriveExplorer.tsx     | 5 ++---
 src/app/drive/views/DriveView/DriveView.tsx                  | 1 -
 .../Breadcrumbs/Containers/BreadcrumbsDriveView.tsx          | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/drive/components/DriveExplorer/DriveExplorer.tsx b/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
index 5262a4e3f..6629b4a93 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
@@ -426,12 +426,11 @@ const DriveExplorer = (props: DriveExplorerProps): JSX.Element => {
   };
 
   const onCloseEditItemDialog = (newItem) => {
-    const newItemName = newItem.plainName ?? newItem.name;
     if (newItem && editNameItem) {
       if (isFileViewerOpen) {
-        dispatch(uiActions.setCurrentEditingNameDirty(newItemName));
+        dispatch(uiActions.setCurrentEditingNameDirty(newItem.plainName ?? newItem.name));
       } else if (itemToRename && editNameItem.isFolder) {
-        dispatch(uiActions.setCurrentEditingBreadcrumbNameDirty(newItemName));
+        dispatch(uiActions.setCurrentEditingBreadcrumbNameDirty(newItem.plainName ?? newItem.name));
       }
     }
     dispatch(storageActions.setItemToRename(null));
diff --git a/src/app/drive/views/DriveView/DriveView.tsx b/src/app/drive/views/DriveView/DriveView.tsx
index 7db07740d..a9de4491d 100644
--- a/src/app/drive/views/DriveView/DriveView.tsx
+++ b/src/app/drive/views/DriveView/DriveView.tsx
@@ -104,7 +104,6 @@ const DriveView = (props: DriveViewProps) => {
   const goFolder = async (folderUuid: string, workspacesToken?: string) => {
     try {
       const folderMeta = await newStorageService.getFolderMeta(folderUuid, workspacesToken);
-      dispatch(uiActions.setCurrentEditingBreadcrumbNameDirty(''));
 
       dispatch(
         storageThunks.goToFolderThunk({
diff --git a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
index fe15b8353..6971c4a10 100644
--- a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
+++ b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
@@ -27,6 +27,7 @@ const BreadcrumbsDriveView = (props: BreadcrumbsDriveViewProps) => {
   useEffect(() => {
     if (breadcrumbDirtyName) {
       getAncestorsAndSetNamePath(currentBreadcrumb.uuid, dispatch);
+      dispatch(uiActions.setCurrentEditingBreadcrumbNameDirty(''));
     }
   }, [breadcrumbDirtyName]);
 

From 95e43dec6042591cd9c3eed93845a0863db4fe06 Mon Sep 17 00:00:00 2001
From: Xavier Abad <77491413+masterprog-cmd@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:06:45 +0200
Subject: [PATCH 6/7] fix: get ancestors when updating folder name from
 breadcrumb

---
 .../drive/components/DriveExplorer/DriveExplorer.tsx |  3 ++-
 .../BreadcrumbsMenu/BreadcrumbsMenuBackups.tsx       |  6 ++----
 .../Breadcrumbs/Containers/BreadcrumbsDriveView.tsx  | 12 ------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/app/drive/components/DriveExplorer/DriveExplorer.tsx b/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
index 6629b4a93..306093899 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
@@ -71,6 +71,7 @@ import WarningMessageWrapper from '../WarningMessage/WarningMessageWrapper';
 import './DriveExplorer.scss';
 import { DriveTopBarItems } from './DriveTopBarItems';
 import DriveTopBarActions from './components/DriveTopBarActions';
+import { getAncestorsAndSetNamePath } from 'app/store/slices/storage/storage.thunks/goToFolderThunk';
 
 const TRASH_PAGINATION_OFFSET = 50;
 export const UPLOAD_ITEMS_LIMIT = 3000;
@@ -430,7 +431,7 @@ const DriveExplorer = (props: DriveExplorerProps): JSX.Element => {
       if (isFileViewerOpen) {
         dispatch(uiActions.setCurrentEditingNameDirty(newItem.plainName ?? newItem.name));
       } else if (itemToRename && editNameItem.isFolder) {
-        dispatch(uiActions.setCurrentEditingBreadcrumbNameDirty(newItem.plainName ?? newItem.name));
+        getAncestorsAndSetNamePath(newItem.uuid, dispatch);
       }
     }
     dispatch(storageActions.setItemToRename(null));
diff --git a/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuBackups.tsx b/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuBackups.tsx
index 32c043e2f..68643a815 100644
--- a/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuBackups.tsx
+++ b/src/app/shared/components/Breadcrumbs/BreadcrumbsMenu/BreadcrumbsMenuBackups.tsx
@@ -4,7 +4,6 @@ import { useTranslationContext } from '../../../../i18n/provider/TranslationProv
 import { downloadItemsThunk } from '../../../../store/slices/storage/storage.thunks/downloadItemsThunk';
 import { useAppDispatch, useAppSelector } from '../../../../store/hooks';
 import { uiActions } from '../../../../store/slices/ui';
-import useDriveItemStoreProps from '../../../../drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps';
 import { getAppConfig } from '../../../../core/services/config.service';
 import { BreadcrumbsMenuProps } from '../types';
 import { DriveItemData } from '../../../../drive/types';
@@ -12,7 +11,6 @@ import { DriveItemData } from '../../../../drive/types';
 const BreadcrumbsMenuBackups = (props: BreadcrumbsMenuProps): JSX.Element => {
   const { translate } = useTranslationContext();
   const dispatch = useAppDispatch();
-  const { breadcrumbDirtyName } = useDriveItemStoreProps();
   const currentDevice = useAppSelector((state) => state.backups.currentDevice);
   const currentFolder = useAppSelector((state) => state.backups.currentFolder);
   const path = getAppConfig().views.find((view) => view.path === location.pathname);
@@ -39,8 +37,8 @@ const BreadcrumbsMenuBackups = (props: BreadcrumbsMenuProps): JSX.Element => {
         focus-visible:bg-gray-5"
       >
         <div className="flex max-w-fit flex-1 flex-row items-center truncate">
-          <span title={breadcrumbDirtyName || props.item.label} className="max-w-sm flex-1 truncate">
-            {breadcrumbDirtyName || props.item.label}
+          <span title={props.item.label} className="max-w-sm flex-1 truncate">
+            {props.item.label}
           </span>
           <CaretDown weight="fill" className={`ml-1 h-3 w-3 ${isSharedView && 'hidden'}`} />
         </div>
diff --git a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
index 6971c4a10..a8859c933 100644
--- a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
+++ b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
@@ -9,9 +9,6 @@ import { uiActions } from 'app/store/slices/ui';
 import { t } from 'i18next';
 import BreadcrumbsMenuDrive from '../BreadcrumbsMenu/BreadcrumbsMenuDrive';
 import { BreadcrumbItemData } from '../types';
-import useDriveItemStoreProps from 'app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps';
-import { getAncestorsAndSetNamePath } from 'app/store/slices/storage/storage.thunks/goToFolderThunk';
-import { useEffect } from 'react';
 
 interface BreadcrumbsDriveViewProps {
   namePath: FolderPath[];
@@ -21,15 +18,6 @@ const BreadcrumbsDriveView = (props: BreadcrumbsDriveViewProps) => {
   const { namePath } = props;
   const dispatch = useAppDispatch();
   const { selectedWorkspace } = useAppSelector((state: RootState) => state.workspaces);
-  const currentBreadcrumb = namePath[namePath.length - 1];
-  const { breadcrumbDirtyName } = useDriveItemStoreProps();
-
-  useEffect(() => {
-    if (breadcrumbDirtyName) {
-      getAncestorsAndSetNamePath(currentBreadcrumb.uuid, dispatch);
-      dispatch(uiActions.setCurrentEditingBreadcrumbNameDirty(''));
-    }
-  }, [breadcrumbDirtyName]);
 
   const breadcrumbDriveViewItems = (): BreadcrumbItemData[] => {
     const items: BreadcrumbItemData[] = [];

From 00b14a41c01e058b92dd75073b383b331b836340 Mon Sep 17 00:00:00 2001
From: Xavier Abad <77491413+masterprog-cmd@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:12:16 +0200
Subject: [PATCH 7/7] fix: remove breadcrumb dirty name from redux

---
 .../hooks/useDriveStoreProps.tsx              |   3 -
 .../EditFolderNameDialog.tsx                  | 121 ------------------
 .../BreadcrumbsItem/BreadcrumbsItem.tsx       |   2 -
 src/app/store/slices/ui/index.ts              |   8 --
 4 files changed, 134 deletions(-)
 delete mode 100644 src/app/drive/components/EditFolderNameDialog/EditFolderNameDialog.tsx

diff --git a/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps.tsx b/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps.tsx
index 3f0520b07..ea7ed05aa 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps.tsx
@@ -15,7 +15,6 @@ interface DriveItemStoreProps {
   isDriveItemInfoMenuOpen: boolean;
   isEditingName: (item: DriveItemData) => boolean;
   dirtyName: string;
-  breadcrumbDirtyName: string;
 }
 
 const useDriveItemStoreProps = (): DriveItemStoreProps => {
@@ -38,7 +37,6 @@ const useDriveItemStoreProps = (): DriveItemStoreProps => {
   const isDriveItemInfoMenuOpen = useAppSelector((state: RootState) => state.ui.isDriveItemInfoMenuOpen);
   const isEditingName = useAppSelector(isEditingNameSelector);
   const dirtyName = useAppSelector((state: RootState) => state.ui.currentEditingNameDirty);
-  const breadcrumbDirtyName = useAppSelector((state: RootState) => state.ui.currentEditingBreadcrumbNameDirty);
 
   return {
     isSomeItemSelected,
@@ -51,7 +49,6 @@ const useDriveItemStoreProps = (): DriveItemStoreProps => {
     isDriveItemInfoMenuOpen,
     isEditingName,
     dirtyName,
-    breadcrumbDirtyName,
   };
 };
 
diff --git a/src/app/drive/components/EditFolderNameDialog/EditFolderNameDialog.tsx b/src/app/drive/components/EditFolderNameDialog/EditFolderNameDialog.tsx
deleted file mode 100644
index d70fe0f02..000000000
--- a/src/app/drive/components/EditFolderNameDialog/EditFolderNameDialog.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useAppDispatch, useAppSelector } from 'app/store/hooks';
-import { RootState } from 'app/store';
-import { uiActions } from 'app/store/slices/ui';
-import storageThunks from 'app/store/slices/storage/storage.thunks';
-import Button from 'app/shared/components/Button/Button';
-import Input from 'app/shared/components/Input';
-import Modal from 'app/shared/components/Modal';
-import { DriveItemData } from '../../types';
-import { DriveFolderMetadataPayload } from 'app/drive/types/index';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { useSelector } from 'react-redux';
-import { storageActions } from 'app/store/slices/storage';
-
-const EditFolderNameDialog = (): JSX.Element => {
-  const { translate } = useTranslationContext();
-  const itemToRename = useSelector((state: RootState) => state.storage.itemToRename);
-  const allItems = useAppSelector((state) => state.storage.levels);
-  const namePath = useAppSelector((state) => state.storage.namePath);
-  const currentBreadcrumb = namePath.slice(-1);
-
-  const [itemName, setItemName] = useState('');
-  const [error, setError] = useState('');
-  const [isLoading, setIsLoading] = useState(false);
-  const dispatch = useAppDispatch();
-  const isOpen = useAppSelector((state: RootState) => state.ui.isEditFolderNameDialog);
-
-  const findCurrentFolder = (currentBreadcrumb) => {
-    const foldersList: DriveItemData[] = [];
-
-    for (const itemsInAllItems in allItems) {
-      const selectedFolder = allItems[itemsInAllItems].find((item) => item.id === currentBreadcrumb[0].id);
-      if (selectedFolder) foldersList.push(selectedFolder);
-    }
-    return foldersList;
-  };
-
-  const currentItem = itemToRename ? itemToRename : findCurrentFolder(currentBreadcrumb);
-
-  useEffect(() => {
-    setItemName(itemToRename ? itemToRename?.name : currentBreadcrumb[0]?.name);
-  }, [namePath, itemToRename]);
-
-  const onClose = (): void => {
-    setIsLoading(false);
-    dispatch(storageActions.setItemToRename(null));
-    dispatch(uiActions.setIsEditFolderNameDialog(false));
-  };
-
-  const renameItem = async () => {
-    const item = currentItem[0]?.isFolder ? currentItem[0] : currentItem;
-    const metadata: DriveFolderMetadataPayload = { itemName: itemName };
-
-    if (itemName === item?.name) {
-      onClose();
-    } else if (itemName && itemName.trim().length > 0) {
-      setIsLoading(true);
-      await dispatch(storageThunks.updateItemMetadataThunk({ item, metadata }))
-        .unwrap()
-        .then(() => {
-          setIsLoading(false);
-          dispatch(
-            itemToRename
-              ? uiActions.setCurrentEditingNameDirty(itemName)
-              : uiActions.setCurrentEditingBreadcrumbNameDirty(itemName),
-          );
-          onClose();
-        })
-        .catch((e) => {
-          const errorMessage = e?.message?.includes('already exists') && translate('error.creatingFolder');
-          setError(errorMessage);
-          setIsLoading(false);
-          return e;
-        });
-    } else {
-      setError(translate('error.folderCannotBeEmpty'));
-    }
-  };
-
-  const onRenameButtonClicked = (e) => {
-    e.preventDefault();
-    if (!isLoading) {
-      setError('');
-      renameItem();
-    }
-  };
-
-  return (
-    <Modal maxWidth="max-w-sm" isOpen={isOpen} onClose={onClose}>
-      <form className="flex flex-col space-y-5" onSubmit={(e) => onRenameButtonClicked(e)}>
-        <p className="text-2xl font-medium text-gray-100">{translate('modals.renameItemDialog.title')}</p>
-
-        <Input
-          disabled={isLoading}
-          className={`${error !== '' ? 'error' : ''}`}
-          label={translate('modals.renameItemDialog.label')}
-          value={itemName}
-          placeholder={itemName}
-          onChange={(name) => {
-            setItemName(name);
-            setError('');
-          }}
-          accent={error ? 'error' : undefined}
-          message={error}
-          autofocus
-        />
-
-        <div className="flex flex-row items-center justify-end space-x-2">
-          <Button disabled={isLoading} variant="secondary" onClick={onClose}>
-            {translate('actions.cancel')}
-          </Button>
-          <Button type="submit" loading={isLoading} variant="primary">
-            {translate('actions.rename')}
-          </Button>
-        </div>
-      </form>
-    </Modal>
-  );
-};
-
-export default EditFolderNameDialog;
diff --git a/src/app/shared/components/Breadcrumbs/BreadcrumbsItem/BreadcrumbsItem.tsx b/src/app/shared/components/Breadcrumbs/BreadcrumbsItem/BreadcrumbsItem.tsx
index 279a20767..51126aefd 100644
--- a/src/app/shared/components/Breadcrumbs/BreadcrumbsItem/BreadcrumbsItem.tsx
+++ b/src/app/shared/components/Breadcrumbs/BreadcrumbsItem/BreadcrumbsItem.tsx
@@ -13,7 +13,6 @@ import {
   handleRepeatedUploadingFiles,
   handleRepeatedUploadingFolders,
 } from '../../../../store/slices/storage/storage.thunks/renameItemsThunk';
-import { uiActions } from '../../../../store/slices/ui';
 import { BreadcrumbItemData, BreadcrumbsMenuProps } from '../types';
 interface BreadcrumbsItemProps {
   item: BreadcrumbItemData;
@@ -125,7 +124,6 @@ const BreadcrumbsItem = (props: BreadcrumbsItemProps): JSX.Element => {
   );
 
   const onItemClicked = (item: BreadcrumbItemData): void => {
-    dispatch(uiActions.setCurrentEditingBreadcrumbNameDirty(''));
     if (item.active) {
       item.onClick && item.onClick();
     }
diff --git a/src/app/store/slices/ui/index.ts b/src/app/store/slices/ui/index.ts
index 87917851d..dbd25fdce 100644
--- a/src/app/store/slices/ui/index.ts
+++ b/src/app/store/slices/ui/index.ts
@@ -33,7 +33,6 @@ interface UISliceState {
   currentFileInfoMenuItem: FileInfoMenuItem | null;
   currentEditingNameDriveItem: DriveItemData | null;
   currentEditingNameDirty: string;
-  currentEditingBreadcrumbNameDirty: string;
   isToastNotificationOpen: boolean;
   isGlobalSearch: boolean;
 }
@@ -69,7 +68,6 @@ const initialState: UISliceState = {
   currentFileInfoMenuItem: null,
   currentEditingNameDriveItem: null,
   currentEditingNameDirty: '',
-  currentEditingBreadcrumbNameDirty: '',
   isToastNotificationOpen: false,
   isGlobalSearch: false,
 };
@@ -174,12 +172,6 @@ export const uiSlice = createSlice({
     ) => {
       state.currentEditingNameDirty = action.payload;
     },
-    setCurrentEditingBreadcrumbNameDirty: (
-      state: UISliceState,
-      action: PayloadAction<UISliceState['currentEditingBreadcrumbNameDirty']>,
-    ) => {
-      state.currentEditingBreadcrumbNameDirty = action.payload;
-    },
     resetState: (state: UISliceState) => {
       Object.assign(state, initialState);
     },