Skip to content

Speakr is a personal, self-hosted web application designed for transcribing audio recordings

Python

fix upload notification appearance order

Murtaza Nasira0d2a13fd64d
diff --git a/static/js/app.modular.js b/static/js/app.modular.js
index 6af4c973..16c80309 100644
--- a/static/js/app.modular.js
+++ b/static/js/app.modular.js
@@ -317,7 +317,6 @@ document.addEventListener('DOMContentLoaded', async () => {
const pendingRecordingMode = ref(null);
const uploadDisclaimer = ref('');
const showUploadDisclaimerModal = ref(false);
- const pendingUploadFiles = ref([]);
const customBanner = ref('');
const showBanner = ref(true);
@@ -654,7 +653,7 @@ document.addEventListener('DOMContentLoaded', async () => {
isProcessingActive, pollInterval, progressPopupMinimized, progressPopupClosed,
maxFileSizeMB, chunkingEnabled, chunkingMode, chunkingLimit, chunkingLimitDisplay,
maxConcurrentUploads, recordingDisclaimer, showRecordingDisclaimerModal, pendingRecordingMode,
- uploadDisclaimer, showUploadDisclaimerModal, pendingUploadFiles,
+ uploadDisclaimer, showUploadDisclaimerModal,
customBanner, showBanner,
showAdvancedOptions, uploadLanguage, uploadMinSpeakers, uploadMaxSpeakers, uploadHotwords, uploadInitialPrompt,
availableTags, selectedTagIds, uploadTagSearchFilter,
@@ -1262,18 +1261,15 @@ document.addEventListener('DOMContentLoaded', async () => {
// Upload disclaimer handlers
const acceptUploadDisclaimer = () => {
showUploadDisclaimerModal.value = false;
- const files = pendingUploadFiles.value;
- pendingUploadFiles.value = [];
- // Temporarily clear disclaimer to prevent re-trigger, then re-queue
+ // Temporarily clear disclaimer to prevent re-trigger, then call startUpload
const saved = uploadDisclaimer.value;
uploadDisclaimer.value = '';
- uploadComposable.addFilesToQueue(files);
+ uploadComposable.startUpload();
uploadDisclaimer.value = saved;
};
const cancelUploadDisclaimer = () => {
showUploadDisclaimerModal.value = false;
- pendingUploadFiles.value = [];
};
// Add startUpload to utils for audio composable to use
diff --git a/static/js/modules/composables/upload.js b/static/js/modules/composables/upload.js
index 0ba23c16..6eb277f4 100644
--- a/static/js/modules/composables/upload.js
+++ b/static/js/modules/composables/upload.js
@@ -44,7 +44,7 @@ export function useUpload(state, utils) {
// View state
currentView,
// Upload disclaimer state
- uploadDisclaimer, showUploadDisclaimerModal, pendingUploadFiles
+ uploadDisclaimer, showUploadDisclaimerModal
} = state;
const { computed, nextTick, ref } = Vue;
@@ -156,12 +156,6 @@ export function useUpload(state, utils) {
// Add files to the upload queue
const addFilesToQueue = (files) => {
- // If upload disclaimer is set, show modal before queuing
- if (uploadDisclaimer.value && uploadDisclaimer.value.trim() !== '') {
- pendingUploadFiles.value = Array.from(files);
- showUploadDisclaimerModal.value = true;
- return;
- }
let filesAdded = 0;
for (const file of files) {
const fileObject = file.file ? file.file : file;
@@ -251,6 +245,11 @@ export function useUpload(state, utils) {
if (pendingFiles.length === 0) {
return;
}
+ // Show upload disclaimer if configured
+ if (uploadDisclaimer.value && uploadDisclaimer.value.trim() !== '') {
+ showUploadDisclaimerModal.value = true;
+ return;
+ }
// Update all queued files with current tags and ASR options
// AND change their status to 'ready' so they move to upload progress immediately
for (const item of uploadQueue.value) {