TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gaps in notifications when downloading empty albums

Browse Source
This commit is contained in:
Manav Rathi
2025-06-26 10:28:07 +05:30
parent e4fd78250d
commit 2fbce97f89
1 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
web/apps/photos/src/components/FilesDownloadProgress.tsx
View File

@@ -53,7 +53,7 @@ export const isFilesDownloadCompleted = (
);
};
export const isFilesDownloadCompletedWithErrors = (
const isFilesDownloadCompletedWithErrors = (
attributes: FilesDownloadProgressAttributes,
) => {
return (
@@ -129,42 +129,45 @@ export const FilesDownloadProgress: React.FC<FilesDownloadProgressProps> = ({
}
};
return (
<>
{attributesList.map((attributes, index) => (
<Notification
key={attributes.id}
horizontal="left"
sx={{ "&&": { bottom: `${index * 80 + 20}px` } }}
open={isFilesDownloadStarted(attributes)}
onClose={handleClose(attributes)}
keepOpenOnClick
attributes={{
color: isFilesDownloadCompletedWithErrors(attributes)
? "critical"
: "secondary",
title: isFilesDownloadCompletedWithErrors(attributes)
? t("download_failed")
: isFilesDownloadCompleted(attributes)
? t("download_complete")
: t("downloading_album", {
name: attributes.folderName,
}),
caption: isFilesDownloadCompleted(attributes)
? attributes.folderName
: t("download_progress", {
count: attributes.success + attributes.failed,
total: attributes.total,
}),
onClick: onShowCollection
? createHandleOnClick(
attributes.id,
onShowCollection,
)
: undefined,
}}
/>
))}
</>
);
const notifications: React.ReactNode[] = [];
let visibleIndex = 0;
for (const attributes of attributesList) {
// Skip attempted downloads of empty albums, which had no effect.
if (!isFilesDownloadStarted(attributes)) continue;
const index = visibleIndex++;
notifications.push(
<Notification
key={attributes.id}
horizontal="left"
sx={{ "&&": { bottom: `${index * 80 + 20}px` } }}
open={isFilesDownloadStarted(attributes)}
onClose={handleClose(attributes)}
keepOpenOnClick
attributes={{
color: isFilesDownloadCompletedWithErrors(attributes)
? "critical"
: "secondary",
title: isFilesDownloadCompletedWithErrors(attributes)
? t("download_failed")
: isFilesDownloadCompleted(attributes)
? t("download_complete")
: t("downloading_album", {
name: attributes.folderName,
}),
caption: isFilesDownloadCompleted(attributes)
? attributes.folderName
: t("download_progress", {
count: attributes.success + attributes.failed,
total: attributes.total,
}),
onClick: onShowCollection
? createHandleOnClick(attributes.id, onShowCollection)
: undefined,
}}
/>,
);
}
return notifications;
};