1
0
mirror of https://github.com/immich-app/immich.git synced 2024-12-25 10:43:13 +02:00

fix(web): show warning if upload completed with errors (#3634)

This commit is contained in:
Russell Tan 2023-08-10 06:38:29 -07:00 committed by GitHub
parent a815592954
commit a8b01dc21a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions

View File

@ -10,6 +10,7 @@
let showDetail = true;
let uploadLength = 0;
let duplicateCount = 0;
let errorCount = 0;
let isUploading = false;
// Reactive action to update asset uploadLength whenever there is a new one added to the list
@ -26,6 +27,10 @@
uploadAssetsStore.duplicateCounter.subscribe((value) => {
duplicateCount = value;
});
uploadAssetsStore.errorCounter.subscribe((value) => {
errorCount = value;
});
</script>
{#if isUploading}
@ -33,10 +38,17 @@
in:fade={{ duration: 250 }}
out:fade={{ duration: 250, delay: 1000 }}
on:outroend={() => {
const errorInfo =
errorCount > 0 ? `Upload completed with ${errorCount} error${errorCount > 1 ? 's' : ''}` : 'Upload success';
const type = errorCount > 0 ? NotificationType.Warning : NotificationType.Info;
notificationController.show({
message: 'Upload success, refresh the page to see new upload assets',
type: NotificationType.Info,
message: `${errorInfo}, refresh the page to see new upload assets`,
type,
});
uploadAssetsStore.errorCounter.set(0);
if (duplicateCount > 0) {
notificationController.show({
message: `Skipped ${duplicateCount} duplicate picture${duplicateCount > 1 ? 's' : ''}`,

View File

@ -4,6 +4,7 @@ import type { UploadAsset } from '../models/upload-asset';
function createUploadStore() {
const uploadAssets = writable<Array<UploadAsset>>([]);
const duplicateCounter = writable(0);
const errorCounter = writable(0);
const { subscribe } = uploadAssets;
@ -36,6 +37,7 @@ function createUploadStore() {
return {
subscribe,
errorCounter,
duplicateCounter,
isUploading,
addNewUploadAsset,

View File

@ -173,6 +173,8 @@ async function fileUploader(
}
function handleUploadError(asset: File, respBody = '{}', extraMessage?: string) {
uploadAssetsStore.errorCounter.update((count) => count + 1);
try {
const res = JSON.parse(respBody);