Skip to content

Fix folder download #3264

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

Merged
merged 2 commits into from
Mar 14, 2024
Merged

Fix folder download #3264

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b067a3b
Fix folder download
Mar 14, 2024
52b043e
fix typos
Mar 14, 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
11 changes: 9 additions & 2 deletions web-app/src/screens/Console/Buckets/ListBuckets/Objects/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.

import { BucketObjectItem } from "./ListObjects/types";
import { encodeURLString } from "../../../../../common/utils";
import { decodeURLString, encodeURLString } from "../../../../../common/utils";
import { removeTrace } from "../../../ObjectBrowser/transferManager";
import store from "../../../../../store";
import { ContentType, PermissionResource } from "api/consoleApi";
Expand Down Expand Up @@ -64,6 +64,11 @@ export const downloadSelectedAsZip = async (
);
}
};

const isFolder = (objectPath: string) => {
return decodeURLString(objectPath).endsWith("/");
};

export const download = (
bucketName: string,
objectPath: string,
Expand Down Expand Up @@ -116,7 +121,9 @@ export const download = (
req.responseType = "blob";
req.onreadystatechange = () => {
if (req.readyState === XMLHttpRequest.DONE) {
let completeDownload = req.response.size === fileSize;
// Ensure object was downloaded fully, if it's a folder we don't get the fileSize
let completeDownload =
isFolder(objectPath) || req.response.size === fileSize;

if (req.status === StatusCodes.OK && completeDownload) {
const rspHeader = req.getResponseHeader("Content-Disposition");
Expand Down