Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 Bug fixes #673

Merged
merged 3 commits into from
Oct 1, 2024
Merged

🐛 Bug fixes #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0aa23be
fix: #664 extra dividing line in action menu
Sep 29, 2024
2f2b77a
fix: #667 irrelevant warning when renaming a file shared with me by link
Sep 29, 2024
3b4431c
fix: #666 change tdrive to twake drive
MontaGhanmy Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tdrive/frontend/src/app/features/drive/hooks/use-drive-actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { useUserQuota } from 'features/users/hooks/use-user-quota';
* Returns the children of a drive item
* @returns
*/
export const useDriveActions = () => {
export const useDriveActions = (inPublicSharing?: boolean) => {
const companyId = useRouterCompany();
const sharedFilter = useRecoilValue(SharedWithMeFilterState);
const sortItem = useRecoilValue(DriveItemSort);
Expand Down Expand Up @@ -142,7 +142,7 @@ export const useDriveActions = () => {
try {
await DriveApiClient.update(companyId, id, update);
await refresh(id || '', true);
await refresh(parentId || '', true);
if (!inPublicSharing) await refresh(parentId || '', true);
if (update?.parent_id !== parentId) await refresh(update?.parent_id || '', true);
} catch (e) {
ToasterService.error(Languages.t('hooks.use-drive-actions.unable_update_file'));
Expand Down
2 changes: 1 addition & 1 deletion tdrive/frontend/src/app/views/client/body/drive/browser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default memo(

const selectedCount = Object.values(checked).filter(v => v).length;

const onBuildContextMenu = useOnBuildContextMenu(children, initialParentId);
const onBuildContextMenu = useOnBuildContextMenu(children, initialParentId, inPublicSharing);
const onBuildSortContextMenu = useOnBuildSortContextMenu();

const handleDragOver = (event: { preventDefault: () => void }) => {
Expand Down
33 changes: 21 additions & 12 deletions tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ import { hasAnyPublicLinkAccess } from '@features/files/utils/access-info-helper
/**
* This will build the context menu in different contexts
*/
export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: string) => {
export const useOnBuildContextMenu = (
children: DriveItem[],
initialParentId?: string,
inPublicSharing?: boolean,
) => {
const [checkedIds, setChecked] = useRecoilState(DriveItemSelectedList);
const checked = children.filter(c => checkedIds[c.id]);

Expand All @@ -55,15 +59,15 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s
const company = useRouterCompany();

function getIdsFromArray(arr: DriveItem[]): string[] {
return arr.map((obj) => obj.id);
return arr.map(obj => obj.id);
}

return useCallback(
async (parent?: Partial<DriveItemDetails> | null, item?: DriveItem) => {
if (!parent || !parent.access) return [];

try {
const inTrash = parent.path?.[0]?.id.includes('trash') || viewId?.includes("trash");
const inTrash = parent.path?.[0]?.id.includes('trash') || viewId?.includes('trash');
const isPersonal = item?.scope === 'personal';
const selectedCount = checked.length;

Expand All @@ -88,7 +92,7 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s
hide: access === 'read' || getPublicLinkToken() || inTrash,
onClick: () => setAccessModalState({ open: true, id: item.id }),
},
{ type: 'separator' },
{ type: 'separator', hide: inTrash },
{
type: 'menu',
icon: 'download-alt',
Expand All @@ -100,7 +104,7 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s
} else {
download(item.id);
}
}
},
},
/*TODO: fix loading of preview in new window and uncomment. See https://github.com/linagora/twake-drive/issues/603 .
{
Expand Down Expand Up @@ -144,13 +148,16 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s
icon: 'file-edit-alt',
text: Languages.t('components.item_context_menu.rename'),
hide: access === 'read' || inTrash,
onClick: () => setPropertiesModalState({ open: true, id: item.id }),
onClick: () => setPropertiesModalState({ open: true, id: item.id, inPublicSharing }),
},
{
type: 'menu',
icon: 'link',
text: Languages.t('components.item_context_menu.copy_link'),
hide: !item.access_info.public?.level || item.access_info.public?.level === 'none' || inTrash,
hide:
!item.access_info.public?.level ||
item.access_info.public?.level === 'none' ||
inTrash,
onClick: () => {
copyToClipboard(getPublicLink(item || parent?.item));
ToasterService.success(
Expand All @@ -165,7 +172,7 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s
hide: item.is_directory || inTrash,
onClick: () => setVersionModal({ open: true, id: item.id }),
},
{ type: 'separator', hide: access !== 'manage' || inTrash, },
{ type: 'separator', hide: access !== 'manage' || inTrash },
{
type: 'menu',
icon: 'trash',
Expand Down Expand Up @@ -304,10 +311,12 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s
if (parent.children && parent.children.length > 0) {
downloadZip([parent.item!.id]);
} else if (parent.item) {
console.log("Download folder itself");
console.log('Download folder itself');
download(parent.item.id);
} else {
console.error("Very strange, everything is null, you are trying to download undefined");
console.error(
'Very strange, everything is null, you are trying to download undefined',
);
}
},
},
Expand All @@ -322,13 +331,13 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s
);
},
},
{ type: 'separator', hide: parent.item!.id != 'root', },
{ type: 'separator', hide: parent.item!.id != 'root' },
{
type: 'menu',
text: Languages.t('components.item_context_menu.manage_users'),
hide: parent.item!.id != 'root',
onClick: () => setUsersModalState({ open: true }),
}
},
];
if (menu.length && newMenuActions.filter(a => !a.hide).length) {
menu = [...menu, { type: 'separator' }];
Expand Down
12 changes: 9 additions & 3 deletions tdrive/frontend/src/app/views/client/body/drive/modals/properties/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ import Languages from '@features/global/services/languages-service';
export type PropertiesModalType = {
open: boolean;
id: string;
inPublicSharing?: boolean;
};

export const PropertiesModalAtom = atom<PropertiesModalType>({
key: 'PropertiesModalAtom',
default: {
open: false,
id: '',
inPublicSharing: false,
},
});

Expand All @@ -27,15 +29,19 @@ export const PropertiesModal = () => {
return (
<Modal open={state.open} onClose={() => setState({ ...state, open: false })}>
{!!state.id && (
<PropertiesModalContent id={state.id} onClose={() => setState({ ...state, open: false })} />
<PropertiesModalContent
id={state.id}
onClose={() => setState({ ...state, open: false })}
inPublicSharing={state.inPublicSharing}
/>
)}
</Modal>
);
};

const PropertiesModalContent = ({ id, onClose }: { id: string; onClose: () => void }) => {
const PropertiesModalContent = ({ id, onClose, inPublicSharing }: { id: string; onClose: () => void, inPublicSharing?: boolean }) => {
const { item, refresh } = useDriveItem(id);
const { update } = useDriveActions();
const { update } = useDriveActions(inPublicSharing);
const [loading, setLoading] = useState(false);
const [name, setName] = useState('');

Expand Down
4 changes: 2 additions & 2 deletions tdrive/frontend/src/app/views/client/body/drive/shared.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default () => {
<Avatar avatar={group.logo} className="inline-block mr-3" size="sm" type="square" />
)}
<span className="text-white font-semibold" style={{ lineHeight: '32px' }}>
{group.name}
Twake Drive
</span>
</div>
<div className="shrink-0">
Expand All @@ -82,7 +82,7 @@ export default () => {
</div>
<div className="h-full main-view public p-4 pb-16">
<AccessChecker folderId={documentId} token={token}>
<Drive initialParentId={documentId} inPublicSharing />
<Drive initialParentId={documentId} inPublicSharing={true} />
</AccessChecker>
</div>
<MenusBodyLayer />
Expand Down