사소한 리팩토링 2

This commit is contained in:
static
2025-01-18 13:18:07 +09:00
parent c24e84a79c
commit b8e1584575

View File

@@ -7,7 +7,12 @@
type DirectoryInfo, type DirectoryInfo,
type FileInfo, type FileInfo,
} from "$lib/modules/filesystem"; } 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 File from "./File.svelte";
import SubDirectory from "./SubDirectory.svelte"; import SubDirectory from "./SubDirectory.svelte";
import { SortBy, sortEntries } from "./service"; import { SortBy, sortEntries } from "./service";
@@ -62,21 +67,14 @@
.concat( .concat(
$fileUploadStatusStore $fileUploadStatusStore
.filter((statusStore) => { .filter((statusStore) => {
const status = get(statusStore); const { parentId, status } = get(statusStore);
return ( return parentId === info.id && !isFileUploading(status);
status.parentId === info.id &&
status.status !== "uploaded" &&
status.status !== "canceled" &&
status.status !== "error"
);
}) })
.map( .map((status) => ({
(status): FileEntry => ({ type: "uploading-file",
type: "uploading-file", name: get(status).name,
name: get(status).name, info: status,
info: status, })),
}),
),
); );
const sort = () => { const sort = () => {