MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(front): enable channel uploads by passing channel uuid instead of whole object

This commit is contained in:
ArneBo 2025-05-03 15:44:34 +02:00 committed by Arne Bollinger
parent ce6b93802d
commit 000dd3e55d
1 changed files with 54 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
front/src/components/channels/UploadForm.vue
View File

@ -281,7 +281,7 @@ const uploadedFilesById = computed(() => uploadedFiles.value.reduce((acc: Record
// //
const baseImportMetadata = computed(() => ({ const baseImportMetadata = computed(() => ({
channel: selectedChannel, channel: selectedChannel.value?.uuid ?? null,
import_status: 'draft', import_status: 'draft',
import_metadata: { license: values.license, album: values.album } import_metadata: { license: values.license, album: values.album }
})) }))
@ -291,9 +291,13 @@ const uploadImportData = reactive({} as Record<string, Metadata>)
const audioMetadata = reactive({} as Record<string, Record<string, string>>) const audioMetadata = reactive({} as Record<string, Record<string, string>>)
const uploadData = reactive({} as Record<string, { import_metadata: Metadata }>) const uploadData = reactive({} as Record<string, { import_metadata: Metadata }>)
const patchUpload = async (id: string, data: Record<string, Metadata>) => { const patchUpload = async (id: string, data: Record<string, Metadata>) => {
const response = await axios.patch(`uploads/${id}/`, data) try {
uploadData[id] = response.data const response = await axios.patch(`uploads/${id}/`, data)
uploadImportData[id] = response.data.import_metadata uploadData[id] = response.data
uploadImportData[id] = response.data.import_metadata
} catch (error) {
useErrorHandler(error as Error)
}
} }
const fetchAudioMetadata = async (uuid: string) => { const fetchAudioMetadata = async (uuid: string) => {
@ -572,49 +576,57 @@ defineExpose({
</div> </div>
<Loader v-else-if="file.active && !file.response" /> <Loader v-else-if="file.active && !file.response" />
</div> </div>
<h4 class="ui header"> <Layout
<template v-if="file.metadata.title"> stack
{{ file.metadata.title }} gap-8
</template> >
<template v-else> <span v-if="file.error">
{{ file.name }} {{ file.error?.toString() }}
</template> </span>
<div class="sub header"> <h4 class="ui header">
<template v-if="file.response?.uuid"> <template v-if="file.metadata.title">
{{ humanSize(file.size ?? 0) }} {{ file.metadata.title }}
<template v-if="file.response.duration">
<span class="middle middledot symbol" />
<human-duration :duration="file.response.duration" />
</template>
</template> </template>
<template v-else> <template v-else>
<span v-if="file.active"> {{ file.name }}
{{ t('components.channels.UploadForm.status.uploading') }}
</span>
<span v-else-if="file.error">
{{ t('components.channels.UploadForm.status.errored') }}
</span>
<span v-else>
{{ t('components.channels.UploadForm.status.pending') }}
</span>
<span class="middle middledot symbol" />
{{ humanSize(file.size ?? 0) }}
<span class="middle middledot symbol" />
{{ parseFloat(file.progress ?? '0') }}
<span class="percent symbol" />
</template> </template>
<span class="middle middledot symbol" /> <div class="sub header">
<a @click.stop.prevent="remove(file)"> <template v-if="file.response?.uuid">
{{ t('components.channels.UploadForm.button.remove') }} {{ humanSize(file.size ?? 0) }}
</a> <template v-if="file.response.duration">
<template v-if="file.error"> <span class="middle middledot symbol" />
<human-duration :duration="file.response.duration" />
</template>
</template>
<template v-else>
<span v-if="file.active">
{{ t('components.channels.UploadForm.status.uploading') }}
</span>
<span v-else-if="file.error">
{{ t('components.channels.UploadForm.status.errored') }}
</span>
<span v-else>
{{ t('components.channels.UploadForm.status.pending') }}
</span>
<span class="middle middledot symbol" />
{{ humanSize(file.size ?? 0) }}
<span class="middle middledot symbol" />
{{ parseFloat(file.progress ?? '0') }}
<span class="percent symbol" />
</template>
<span class="middle middledot symbol" /> <span class="middle middledot symbol" />
<a @click.stop.prevent="retry(file)"> <a @click.stop.prevent="remove(file)">
{{ t('components.channels.UploadForm.button.retry') }} {{ t('components.channels.UploadForm.button.remove') }}
</a> </a>
</template> <template v-if="file.error">
</div> <span class="middle middledot symbol" />
</h4> <a @click.stop.prevent="retry(file)">
{{ t('components.channels.UploadForm.button.retry') }}
</a>
</template>
</div>
</h4>
</Layout>
</div> </div>
</Alert> </Alert>
</template> </template>