Skip to content

Commit

Permalink
fix: fix move of list items in shared accounts
Browse files Browse the repository at this point in the history
  • Loading branch information
giuliano176 committed May 10, 2023
1 parent 0e4c15a commit 5bb6230
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions src/views/sidebar/commons/folder-selector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import styled from 'styled-components';
import ModalAccordionCustomComponent from '../parts/edit/modal-accordion-custom-component';
import { FOLDER_VIEW } from '../../../carbonio-ui-commons/constants';
import { getFolderTranslatedName } from '../utils';
import { getRootAccountName } from '../../../helpers/folders';

const ContainerEl = styled(Container)`
overflow-y: auto;
Expand Down Expand Up @@ -65,20 +66,11 @@ export const FolderSelector = ({
return (): void => window.removeEventListener('resize', calculateAvailableWidth);
}, [accordionRef]);

const getFolderRootName = useCallback((id: any): string | undefined => {
const _folder = getFolder(id);
if (_folder?.parent) {
return getFolderRootName(_folder.l);
}
if (_folder) {
return _folder.name;
}
return undefined;
}, []);
const rootName = useMemo(() => getRootAccountName(folder), [folder]);

const rootName = useMemo(() => getFolderRootName(folderId), [folderId, getFolderRootName]);

const filteredFolders = folders.filter((item) => item.name === rootName);
const filteredFolders = folders.filter((item) =>
rootName ? item.name === rootName : item.id === FOLDERS.USER_ROOT
);

const flattenFolders = useCallback(
(arr: Array<Folder>): Array<Folder> => {
Expand Down

0 comments on commit 5bb6230

Please sign in to comment.