IO-1137 Download zip files with appropriate name.
This commit is contained in:
@@ -1,11 +1,17 @@
|
|||||||
import { Button } from "antd";
|
import { Button, Space } from "antd";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import React from "react";
|
import React, { useState } from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { logImEXEvent } from "../../firebase/firebase.utils";
|
import { logImEXEvent } from "../../firebase/firebase.utils";
|
||||||
|
import cleanAxios from "../../utils/CleanAxios";
|
||||||
|
import formatBytes from "../../utils/formatbytes";
|
||||||
|
|
||||||
export default function JobsDocumentsDownloadButton({ galleryImages }) {
|
export default function JobsDocumentsDownloadButton({
|
||||||
|
galleryImages,
|
||||||
|
identifier,
|
||||||
|
}) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
const [download, setDownload] = useState(null);
|
||||||
const imagesToDownload = [
|
const imagesToDownload = [
|
||||||
...galleryImages.images.filter((image) => image.isSelected),
|
...galleryImages.images.filter((image) => image.isSelected),
|
||||||
...galleryImages.other.filter((image) => image.isSelected),
|
...galleryImages.other.filter((image) => image.isSelected),
|
||||||
@@ -18,13 +24,68 @@ export default function JobsDocumentsDownloadButton({ galleryImages }) {
|
|||||||
ids: imagesToDownload.map((_) => _.key),
|
ids: imagesToDownload.map((_) => _.key),
|
||||||
})
|
})
|
||||||
.then((r) => {
|
.then((r) => {
|
||||||
window.open(r.data);
|
// window.open(r.data);
|
||||||
|
downloadAs(
|
||||||
|
r.data,
|
||||||
|
`${identifier || "images"}.zip`,
|
||||||
|
(progressEvent) => {
|
||||||
|
const percentage = Math.round(
|
||||||
|
(progressEvent.loaded * 100) / progressEvent.total
|
||||||
|
);
|
||||||
|
console.log(progressEvent, percentage);
|
||||||
|
setDownload((currentDownloadState) => {
|
||||||
|
return {
|
||||||
|
downloaded: progressEvent.loaded || 0,
|
||||||
|
speed:
|
||||||
|
(progressEvent.loaded || 0) -
|
||||||
|
((currentDownloadState && currentDownloadState.downloaded) ||
|
||||||
|
0),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
() => setDownload(null)
|
||||||
|
);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Button disabled={imagesToDownload.length < 1} onClick={handleDownload}>
|
<>
|
||||||
{t("documents.actions.download")}
|
<Button
|
||||||
</Button>
|
loading={!!download}
|
||||||
|
disabled={imagesToDownload.length < 1}
|
||||||
|
onClick={handleDownload}
|
||||||
|
>
|
||||||
|
<Space>
|
||||||
|
<span>{t("documents.actions.download")}</span>
|
||||||
|
{download && (
|
||||||
|
<span>{`(${formatBytes(download.downloaded)} @ ${formatBytes(
|
||||||
|
download.speed
|
||||||
|
)} / second)`}</span>
|
||||||
|
)}
|
||||||
|
</Space>
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const downloadAs = (url, name, onDownloadProgress, onCompleted) => {
|
||||||
|
cleanAxios
|
||||||
|
.get(url, {
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/octet-stream",
|
||||||
|
},
|
||||||
|
responseType: "blob",
|
||||||
|
onDownloadProgress: onDownloadProgress,
|
||||||
|
})
|
||||||
|
.then((response) => {
|
||||||
|
onCompleted && onCompleted();
|
||||||
|
const a = document.createElement("a");
|
||||||
|
const url = window.URL.createObjectURL(response.data);
|
||||||
|
a.href = url;
|
||||||
|
a.download = name;
|
||||||
|
a.click();
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.log("error", err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ function JobsDocumentsComponent({
|
|||||||
billId,
|
billId,
|
||||||
billsCallback,
|
billsCallback,
|
||||||
totalSize,
|
totalSize,
|
||||||
bodyshop,
|
downloadIdentifier,
|
||||||
ignoreSizeLimit,
|
ignoreSizeLimit,
|
||||||
}) {
|
}) {
|
||||||
const [galleryImages, setgalleryImages] = useState({ images: [], other: [] });
|
const [galleryImages, setgalleryImages] = useState({ images: [], other: [] });
|
||||||
@@ -117,7 +117,10 @@ function JobsDocumentsComponent({
|
|||||||
galleryImages={galleryImages}
|
galleryImages={galleryImages}
|
||||||
setGalleryImages={setgalleryImages}
|
setGalleryImages={setgalleryImages}
|
||||||
/>
|
/>
|
||||||
<JobsDocumentsDownloadButton galleryImages={galleryImages} />
|
<JobsDocumentsDownloadButton
|
||||||
|
galleryImages={galleryImages}
|
||||||
|
identifier={downloadIdentifier}
|
||||||
|
/>
|
||||||
<JobsDocumentsDeleteButton
|
<JobsDocumentsDeleteButton
|
||||||
galleryImages={galleryImages}
|
galleryImages={galleryImages}
|
||||||
deletionCallback={billsCallback || refetch}
|
deletionCallback={billsCallback || refetch}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ export default function JobsDocumentsContainer({
|
|||||||
return (
|
return (
|
||||||
<JobDocuments
|
<JobDocuments
|
||||||
data={(data && data.documents) || documentsList || []}
|
data={(data && data.documents) || documentsList || []}
|
||||||
|
downloadIdentifier={data && data.jobs_by_pk.ro_number}
|
||||||
totalSize={data && data.documents_aggregate.aggregate.sum.size}
|
totalSize={data && data.documents_aggregate.aggregate.sum.size}
|
||||||
billId={billId}
|
billId={billId}
|
||||||
jobId={jobId}
|
jobId={jobId}
|
||||||
|
|||||||
@@ -2,6 +2,10 @@ import { gql } from "@apollo/client";
|
|||||||
|
|
||||||
export const GET_DOCUMENTS_BY_JOB = gql`
|
export const GET_DOCUMENTS_BY_JOB = gql`
|
||||||
query GET_DOCUMENTS_BY_JOB($jobId: uuid!) {
|
query GET_DOCUMENTS_BY_JOB($jobId: uuid!) {
|
||||||
|
jobs_by_pk(id: $jobId) {
|
||||||
|
id
|
||||||
|
ro_number
|
||||||
|
}
|
||||||
documents_aggregate(where: { jobid: { _eq: $jobId } }) {
|
documents_aggregate(where: { jobid: { _eq: $jobId } }) {
|
||||||
aggregate {
|
aggregate {
|
||||||
sum {
|
sum {
|
||||||
|
|||||||
Reference in New Issue
Block a user