Compare commits

...

4 Commits

Author SHA1 Message Date
Gutts-n
2bbf313489 Fixed error to remove anchor from document 2024-01-25 16:45:39 -03:00
Gutts-n
c26b76368d Fixed error to remove anchor from document 2024-01-25 16:43:47 -03:00
Gutts-n
058d23678a Added changeset to the PR 2024-01-25 16:16:49 -03:00
Gutts-n
540a08934c Changed behavior of the download data bucket viewer component 2024-01-25 16:10:22 -03:00
4 changed files with 18 additions and 58 deletions

View File

@@ -0,0 +1,5 @@
---
'@portaljs/components': patch
---
Fixed error to remove anchor from document

View File

@@ -0,0 +1,5 @@
---
'@portaljs/components': patch
---
Changed the download behaviour of the bucket viewer component and removed loading component while downloading

View File

@@ -10,7 +10,6 @@ export interface BucketViewerProps {
onLoadTotalNumberOfItems?: (total: number) => void; onLoadTotalNumberOfItems?: (total: number) => void;
domain: string; domain: string;
downloadConfig?: { downloadConfig?: {
downloadingMessageComponent?: ReactNode;
hoverOfTheFileComponent?: ReactNode; hoverOfTheFileComponent?: ReactNode;
}; };
suffix?: string; suffix?: string;
@@ -47,14 +46,10 @@ export function BucketViewer({
}: BucketViewerProps) { }: BucketViewerProps) {
suffix = suffix ?? '/'; suffix = suffix ?? '/';
const { downloadingMessageComponent, hoverOfTheFileComponent } = const { hoverOfTheFileComponent } = downloadConfig ?? {};
downloadConfig ?? {};
const [isLoading, setIsLoading] = useState<boolean>(false); const [isLoading, setIsLoading] = useState<boolean>(false);
const [showDownloadComponentOnLine, setShowDownloadComponentOnLine] = const [showDownloadComponentOnLine, setShowDownloadComponentOnLine] =
useState(-1); useState(-1);
const [showDownloadLoadingOnFile, setShowDownloadLoadingOnFile] = useState(
new Map<string, boolean>()
);
const [currentPage, setCurrentPage] = useState<number>(0); const [currentPage, setCurrentPage] = useState<number>(0);
const [lastPage, setLastPage] = useState<number>(0); const [lastPage, setLastPage] = useState<number>(0);
const [bucketFiles, setBucketFiles] = useState<BucketViewerData[]>([]); const [bucketFiles, setBucketFiles] = useState<BucketViewerData[]>([]);
@@ -136,31 +131,13 @@ export function BucketViewer({
(data, i) => ( (data, i) => (
<ul <ul
onClick={() => { onClick={() => {
const anchorId = `download_anchor_${data.fileName} `; const a: HTMLAnchorElement = document.createElement('a');
const a: HTMLAnchorElement = a.href = data.downloadFileUri;
(document.getElementById( a.target = `_blank`;
anchorId a.download = data.fileName;
) as HTMLAnchorElement | null) ?? document.createElement('a');
a.id = anchorId;
if (a.download) a.click();
else {
setShowDownloadLoadingOnFile((lastState) => {
lastState.set(data.fileName, true);
return new Map(lastState);
});
fetch(data.downloadFileUri)
.then((res) => res.blob())
.then((res) => {
setShowDownloadLoadingOnFile((lastState) => {
lastState.set(data.fileName, false);
return new Map(lastState);
});
a.href = URL.createObjectURL(res);
a.download = res.name ?? data.fileName;
document.body.appendChild(a); document.body.appendChild(a);
a.click(); a.click();
}); document.body.removeChild(a);
}
}} }}
key={i} key={i}
onMouseEnter={() => setShowDownloadComponentOnLine(i)} onMouseEnter={() => setShowDownloadComponentOnLine(i)}
@@ -184,13 +161,6 @@ export function BucketViewer({
<></> <></>
)} )}
</div> </div>
{showDownloadLoadingOnFile.get(data.fileName) ? (
downloadingMessageComponent ?? (
<label>Downloading file...</label>
)
) : (
<></>
)}
</div> </div>
</ul> </ul>
) )

View File

@@ -95,23 +95,3 @@ export const WithComponentOnHoverOfEachBucketFile: Story = {
}, },
}, },
}; };
export const WithLoadingComponentWhileDownloadTheBucketFile: Story = {
name: 'With loading component while download the bucket file',
args: {
domain: 'https://ssen-smart-meter.datopian.workers.dev',
suffix: '/',
downloadConfig: { downloadingMessageComponent: 'COMPONENT....' },
dataMapperFn: async (rawData: Response) => {
const result = await rawData.json();
return result.objects.map((e) => ({
downloadFileUri: e.downloadLink,
fileName: e.key.replace(/^(\w+\/)/g, ''),
dateProps: {
date: new Date(e.uploaded),
dateFormatter: (date) => date.toLocaleDateString(),
},
}));
},
},
};