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

🐛 Fix custom download file helper with safari fallback #751

Merged
merged 2 commits into from
Nov 27, 2024
Merged

🐛 Fix custom download file helper with safari fallback #751

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66d104e
fix: custom download file helper with safari fallback
MontaGhanmy Nov 27, 2024
9e4ca15
ref: removed console logs
MontaGhanmy Nov 27, 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
42 changes: 36 additions & 6 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 @@ -17,6 +17,8 @@ import AlertManager from 'app/features/global/services/alert-manager-service';
import FeatureTogglesService, {
FeatureNames,
} from '@features/global/services/feature-toggles-service';
import Logger from '@features/global/framework/logger-service';

/**
* Returns the children of a drive item
* @returns
Expand All @@ -25,10 +27,38 @@ export const useDriveActions = (inPublicSharing?: boolean) => {
const companyId = useRouterCompany();
const sharedFilter = useRecoilValue(SharedWithMeFilterState);
const sortItem = useRecoilValue(DriveItemSort);
const [ paginateItem ] = useRecoilState(DriveItemPagination);
const [paginateItem] = useRecoilState(DriveItemPagination);
const { getQuota } = useUserQuota();
const AVEnabled = FeatureTogglesService.isActiveFeatureName(FeatureNames.COMPANY_AV_ENABLED);

/**
* Downloads a file from the given URL, ensuring compatibility across all browsers, including Safari.
*
* @param fileUrl - The URL of the file to download.
*/
const downloadFile = (fileUrl: string) => {
try {
// Attempt to open the URL in a new tab
const popupWindow = window.open(fileUrl, '_blank');

if (popupWindow) {
popupWindow.focus();
} else {
// Fallback for Safari or blocked pop-ups
const downloadLink = document.createElement('a');
downloadLink.href = fileUrl;
downloadLink.download = ''; // Suggests a download instead of navigation
downloadLink.target = '_self'; // Ensures it opens in the same tab

document.body.appendChild(downloadLink);
downloadLink.click();
document.body.removeChild(downloadLink);
}
} catch (error) {
Logger.error('Error during file download:', error);
}
};

const refresh = useRecoilCallback(
({ set, snapshot }) =>
async (parentId: string, resetPagination?: boolean) => {
Expand Down Expand Up @@ -112,7 +142,7 @@ export const useDriveActions = (inPublicSharing?: boolean) => {
// toggle confirm for user
AlertManager.confirm(
() => {
(window as any).open(url, '_blank').focus();
downloadFile(url);
},
() => {
return;
Expand All @@ -122,10 +152,10 @@ export const useDriveActions = (inPublicSharing?: boolean) => {
},
);
} else {
(window as any).open(url, '_blank').focus();
downloadFile(url);
}
} else {
(window as any).open(url, '_blank').focus();
downloadFile(url);
}
} catch (e) {
ToasterService.error(Languages.t('hooks.use-drive-actions.unable_download_file'));
Expand All @@ -139,7 +169,7 @@ export const useDriveActions = (inPublicSharing?: boolean) => {
try {
const triggerDownload = async () => {
const url = await DriveApiClient.getDownloadZipUrl(companyId, ids, isDirectory);
(window as any).open(url, '_blank').focus();
downloadFile(url);
};
if (AVEnabled) {
const containsMaliciousFiles =
Expand Down Expand Up @@ -254,7 +284,7 @@ export const useDriveActions = (inPublicSharing?: boolean) => {
},
[paginateItem, refresh],
);

const checkMalware = useCallback(
async (item: Partial<DriveItem>) => {
try {
Expand Down