Skip to content

fix #5243: detect file data on multi-part uploads #5331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isXander wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −13
Open

fix #5243: detect file data on multi-part uploads #5331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions apps/frontend/src/providers/version/manage-version-modal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,15 +267,17 @@ export function createManageVersionContext(
if (primaryFileIndex) swapPrimaryFile(primaryFileIndex)
}

if (
filesToAdd.value.length === 1 &&
!editingVersion.value &&
modal.value?.currentStageIndex === 0
) {
if (await rejectOnRedundantWrappedZip(filesToAdd.value[0].file)) return

await addDetectedData()
modal.value?.nextStage()
if (!editingVersion.value && modal.value?.currentStageIndex === 0) {
if (primaryFileIndex !== null) {
const primaryFileData = filesToAdd.value[0]?.file
if (primaryFileData) {
if (await rejectOnRedundantWrappedZip(primaryFileData)) return
await addDetectedData(primaryFileData)
}
if (filesToAdd.value.length === 1 && primaryFileData) {
modal.value?.nextStage()
}
}
}

handlingNewFiles.value = false
Expand All @@ -286,7 +288,7 @@ export function createManageVersionContext(
filesToAdd.value[0] = { file }
}
if (await rejectOnRedundantWrappedZip(file)) return
await addDetectedData()
await addDetectedData(file)
}

async function swapPrimaryFile(index: number) {
Expand All @@ -297,7 +299,7 @@ export function createManageVersionContext(
;[files[0], files[index]] = [files[index], files[0]]

if (await rejectOnRedundantWrappedZip(files[0].file)) return
await addDetectedData()
await addDetectedData(files[0].file)
}

const tags = useGeneratedState()
Expand Down Expand Up @@ -490,10 +492,10 @@ export function createManageVersionContext(
return 0
}

const addDetectedData = async () => {
const addDetectedData = async (file?: File) => {
if (editingVersion.value) return

const primaryFileData = filesToAdd.value[0]?.file
const primaryFileData = file ?? filesToAdd.value[0]?.file
if (!primaryFileData) return

try {
Expand Down