From b8e1584575485c3e41646f6f00bd813e07194470 Mon Sep 17 00:00:00 2001 From: static Date: Sat, 18 Jan 2025 13:18:07 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=86=8C=ED=95=9C=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DirectoryEntries/DirectoryEntries.svelte | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte index 845f523..e2a187c 100644 --- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte +++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte @@ -7,7 +7,12 @@ type DirectoryInfo, type FileInfo, } from "$lib/modules/filesystem"; - import { fileUploadStatusStore, masterKeyStore, type FileUploadStatus } from "$lib/stores"; + import { + fileUploadStatusStore, + isFileUploading, + masterKeyStore, + type FileUploadStatus, + } from "$lib/stores"; import File from "./File.svelte"; import SubDirectory from "./SubDirectory.svelte"; import { SortBy, sortEntries } from "./service"; @@ -62,21 +67,14 @@ .concat( $fileUploadStatusStore .filter((statusStore) => { - const status = get(statusStore); - return ( - status.parentId === info.id && - status.status !== "uploaded" && - status.status !== "canceled" && - status.status !== "error" - ); + const { parentId, status } = get(statusStore); + return parentId === info.id && !isFileUploading(status); }) - .map( - (status): FileEntry => ({ - type: "uploading-file", - name: get(status).name, - info: status, - }), - ), + .map((status) => ({ + type: "uploading-file", + name: get(status).name, + info: status, + })), ); const sort = () => {