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

🐛 Fix upload in shared with me directory (#543)

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-05-29 10:27:13 +01:00
committed by GitHub
parent 3cf164787f
commit 6ee9bbe3f2
3 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tdrive/frontend/src/app/views/client/body/drive/browser.tsx
+31 -23
View File
@@ -239,7 +239,7 @@ export default memo(
{viewId == 'shared-with-me' ? (
<>
<Suspense fallback={<></>}>
<DrivePreview items={documents}/>
<DrivePreview items={documents} />
</Suspense>
<SharedFilesTable />
</>
@@ -263,9 +263,8 @@ export default memo(
}}
onDragOver={handleDragOver}
onDrop={handleDrop}
>
{role == "admin" && <UsersModal />}
{role == 'admin' && <UsersModal />}
<VersionsModal />
<AccessModal />
<PublicLinkModal />
@@ -274,7 +273,7 @@ export default memo(
<ConfirmTrashModal />
<ConfirmModal />
<Suspense fallback={<></>}>
<DrivePreview items={documents}/>
<DrivePreview items={documents} />
</Suspense>
<div
className={
@@ -350,7 +349,12 @@ export default memo(
</div>
</div>
) : (
<HeaderPath path={path || []} inTrash={inTrash} setParentId={setParentId} inPublicSharing={inPublicSharing} />
<HeaderPath
path={path || []}
inTrash={inTrash}
setParentId={setParentId}
inPublicSharing={inPublicSharing}
/>
)}
<div className="grow" />
@@ -375,17 +379,17 @@ export default memo(
)}
</div>
<DndContext sensors={sensors} onDragEnd={handleDragEnd} onDragStart={handleDragStart}>
<div className="grow overflow-auto">
{folders.length > 0 && (
<>
<Title className="mb-2 block">{Languages.t('scenes.app.drive.folders')}</Title>
<Title className="mb-2 block">
{Languages.t('scenes.app.drive.folders')}
</Title>
{folders.map((child, index) => (
<Droppable id={index} key={index}>
<FolderRow
<FolderRow
key={index}
className={
(index === 0 ? 'rounded-t-md ' : '') +
@@ -393,7 +397,9 @@ export default memo(
}
item={child}
onClick={() => {
const route = RouterServices.generateRouteFromState({dirId: child.id});
const route = RouterServices.generateRouteFromState({
dirId: child.id,
});
history.push(route);
if (inPublicSharing) return setParentId(child.id);
}}
@@ -420,7 +426,11 @@ export default memo(
<>
<Base>{Languages.t('scenes.app.drive.drag_and_drop')}</Base>
<br />
<Button onClick={() => uploadItemModal()} theme="primary" className="mt-4">
<Button
onClick={() => uploadItemModal()}
theme="primary"
className="mt-4"
>
{Languages.t('scenes.app.drive.add_doc')}
</Button>
</>
@@ -428,25 +438,23 @@ export default memo(
</div>
)}
{documents.map((child, index) => (
draggableMarkup(index, child)
))}
{documents.map((child, index) => draggableMarkup(index, child))}
<DragOverlay>
{activeIndex ? (
<DocumentRowOverlay className={
(activeIndex === 0 ? 'rounded-t-md ' : '') +
(activeIndex === documents.length - 1 ? 'rounded-b-md ' : '')}
item={activeChild}
></DocumentRowOverlay>
): null}
<DocumentRowOverlay
className={
(activeIndex === 0 ? 'rounded-t-md ' : '') +
(activeIndex === documents.length - 1 ? 'rounded-b-md ' : '')
}
item={activeChild}
></DocumentRowOverlay>
) : null}
</DragOverlay>
</div>
</DndContext>
</div>
</div>
</UploadZone>
)}
</>
);
},
tdrive/frontend/src/app/views/client/side-bar/actions.tsx
+3 -3
View File
@@ -14,7 +14,7 @@ import { UploadModelAtom, UploadModal } from '../body/drive/modals/upload'
import { Button } from '@atoms/button/button';
import Languages from "features/global/services/languages-service";
import { useCurrentUser } from 'app/features/users/hooks/use-current-user';
import RouterServices from '@features/router/services/router-service';
import useRouteState from 'app/features/router/hooks/use-route-state';
export const CreateModalWithUploadZones = ({ initialParentId }: { initialParentId?: string }) => {
const companyId = useRouterCompany();
@@ -95,8 +95,8 @@ export const CreateModalWithUploadZones = ({ initialParentId }: { initialParentI
export default () => {
const { user } = useCurrentUser();
const { viewId } = RouterServices.getStateFromRoute();
const [parentId, _] = useRecoilState(DriveCurrentFolderAtom({ initialFolderId: 'user_'+user?.id }));
const { viewId, dirId } = useRouteState();
const [parentId, _] = useRecoilState(DriveCurrentFolderAtom({ initialFolderId: dirId || viewId || 'user_'+user?.id }));
const { access, item } = useDriveItem(parentId);
const { children: trashChildren } = useDriveItem(viewId === 'trash' ? 'trash' : 'trash_'+user?.id);
const uploadZoneRef = useRef<UploadZone | null>(null);
tdrive/frontend/src/app/views/client/side-bar/index.tsx
-1
View File
@@ -44,7 +44,6 @@ export default () => {
if (sharedWithMe) folderType = 'shared';
useEffect(() => {
console.log('PARENT ID CHANGED: ', parentId);
!itemId && !dirId && viewId && setParentId(viewId);
dirId && viewId && setParentId(dirId);
}, [viewId, itemId, dirId]);