eduvia/workavia-drive
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix router navigation (#396)

Browse Source 
Co-authored-by: Monta <monta@HP-ProBook-445-14-inch-G9-Notebook-PC-505aadfc.localdomain>
This commit is contained in:
Montassar Ghanmy
2024-03-04 23:16:08 +01:00
committed by GitHub
parent 2b2638d36b
commit 8c2b84ed84
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tdrive/frontend/src/app/views/client/body/drive/browser.tsx
+2 -2
View File
@@ -383,8 +383,8 @@ export default memo(
} }
item={child} item={child}
onClick={() => { onClick={() => {
const route = RouterServices.generateRouteFromState({dirId: child.id}); // const route = RouterServices.generateRouteFromState({dirId: child.id});
history.push(route); // history.push(route);
return setParentId(child.id); return setParentId(child.id);
}} }}
checked={checked[child.id] || false} checked={checked[child.id] || false}
tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx
+1 -1
View File
@@ -58,7 +58,7 @@ export const DocumentRow = ({
console.log("DEVICE:: " + device); console.log("DEVICE:: " + device);
if (device != "ios" && device != "android") { if (device != "ios" && device != "android") {
history.push(RouterServices.generateRouteFromState({companyId: company, itemId: item.id, dirId: ''})); history.push(RouterServices.generateRouteFromState({companyId: company, itemId: item.id, dirId: ''}));
open(item); //open(item);
} }
}; };
tdrive/frontend/src/app/views/client/body/drive/header-path.tsx
+4 -4
View File
@@ -33,13 +33,13 @@ export default ({
inTrash={inTrash || false} inTrash={inTrash || false}
path={path} path={path}
onClick={(viewId, dirId) => { onClick={(viewId, dirId) => {
history.push( /*history.push(
RouterServices.generateRouteFromState({ RouterServices.generateRouteFromState({
companyId: company, companyId: company,
viewId, viewId,
dirId, dirId,
}), }),
); );*/
setParentId(dirId ? dirId : viewId); setParentId(dirId ? dirId : viewId);
}} }}
/> />
@@ -128,7 +128,7 @@ const PathItem = ({
const { user } = useCurrentUser(); const { user } = useCurrentUser();
const { viewId } = RouterServices.getStateFromRoute(); const { viewId } = RouterServices.getStateFromRoute();
const { access: trashAccess } = useDriveItem('trash'); const { access: trashAccess } = useDriveItem('trash');
const isInSharedWithMe = viewId === "shared_with_me"; const isInSharedWithMe = viewId === 'shared_with_me';
return ( return (
<div className="flex items-center"> <div className="flex items-center">
<a <a
@@ -202,7 +202,7 @@ const PathItem = ({
{item?.access_info?.public?.level && item?.access_info?.public?.level !== 'none' && ( {item?.access_info?.public?.level && item?.access_info?.public?.level !== 'none' && (
<PublicIcon className="h-5 w-5 ml-2" /> <PublicIcon className="h-5 w-5 ml-2" />
)} )}
{first && !!user?.id && viewId != "shared_with_me" && ( {first && !!user?.id && viewId != 'shared_with_me' && (
<span className="ml-2 -mr-1 text-gray-700"> <span className="ml-2 -mr-1 text-gray-700">
<ChevronDownIcon className="w-4 h-4" /> <ChevronDownIcon className="w-4 h-4" />
</span> </span>
tdrive/frontend/src/app/views/client/side-bar/index.tsx
+5 -5
View File
@@ -44,6 +44,7 @@ export default () => {
if (sharedWithMe) folderType = 'shared'; if (sharedWithMe) folderType = 'shared';
useEffect(() => { useEffect(() => {
console.log('PARENT ID CHANGED: ', parentId);
!itemId && !dirId && viewId && setParentId(viewId); !itemId && !dirId && viewId && setParentId(viewId);
dirId && viewId && setParentId(dirId); dirId && viewId && setParentId(dirId);
}, [viewId, itemId, dirId]); }, [viewId, itemId, dirId]);
@@ -76,7 +77,7 @@ export default () => {
dirId: '', dirId: '',
}), }),
); );
setParentId('user_' + user?.id); // setParentId('user_' + user?.id);
}} }}
size="lg" size="lg"
theme="white" theme="white"
@@ -92,6 +93,7 @@ export default () => {
{FeatureTogglesService.isActiveFeatureName(FeatureNames.COMPANY_SHARED_DRIVE) && ( {FeatureTogglesService.isActiveFeatureName(FeatureNames.COMPANY_SHARED_DRIVE) && (
<Button <Button
onClick={() => { onClick={() => {
// setParentId('root')
history.push( history.push(
RouterServices.generateRouteFromState({ RouterServices.generateRouteFromState({
companyId: company, companyId: company,
@@ -100,7 +102,6 @@ export default () => {
dirId: '', dirId: '',
}), }),
); );
setParentId('root');
}} }}
size="lg" size="lg"
theme="white" theme="white"
@@ -108,7 +109,6 @@ export default () => {
'w-full mb-1 ' + (folderType === 'home' && viewId == 'root' ? activeClass : '') 'w-full mb-1 ' + (folderType === 'home' && viewId == 'root' ? activeClass : '')
} }
> >
<CloudIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.home')} <CloudIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.home')}
</Button> </Button>
)} )}
@@ -123,7 +123,7 @@ export default () => {
dirId: '', dirId: '',
}), }),
); );
setParentId('shared_with_me'); // setParentId('shared_with_me');
}} }}
size="lg" size="lg"
theme="white" theme="white"
@@ -164,7 +164,7 @@ export default () => {
dirId: '', dirId: '',
}), }),
); );
setParentId('trash_' + user?.id); // setParentId('trash_' + user?.id);
}} }}
size="lg" size="lg"
theme="white" theme="white"