From 94de71140be2d0c80bf6a2e03cb9381b37736ed5 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 06 Feb 2026 17:03:02 +0000
Subject: [PATCH] =Some minor CRUD.js and UploadManager.js tweaks
---
assets/js/concise/UploadManager.js | 126 ++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 24 deletions(-)
diff --git a/assets/js/concise/UploadManager.js b/assets/js/concise/UploadManager.js
index 0d57012..61682ec 100644
--- a/assets/js/concise/UploadManager.js
+++ b/assets/js/concise/UploadManager.js
@@ -109,7 +109,7 @@
break;
}
if (refs.details) {
- if (Object.hasOwn(data.field.config, 'showMeta') && !data.field.config.showMeta) {
+ if (Object.hasOwn(data, 'field') && Object.hasOwn(data.field,'config') && Object.hasOwn(data.field.config, 'showMeta') && !data.field.config.showMeta) {
refs.details.remove();
} else {
if(Object.hasOwn(data, 'id')) {
@@ -298,17 +298,83 @@
this.queue.subscribe((event, operation) => {
if ((event === 'operation-status' || event === 'cancel-operation')
&& ['image_upload', 'video_upload', 'document_upload'].includes(operation.type)) {
- const data = operation.data instanceof FormData
- ? this.stores.uploads.formDataToObject(operation.data)
- : operation.data;
+ let uploadIds = [];
- let uploads = data['upload_ids'];
- if (!uploads || uploads.length === 0) return;
- if (event === 'cancel-operation') return this.handleOperationCancelled(uploads);
- this.setBulkUpload(uploads, 'status', operation.status).then(()=>{});
+ if (operation.data) {
+ // Handle FormData
+ if (operation.data instanceof FormData) {
+ const dataObj = this.stores.uploads.formDataToObject(operation.data);
+ uploadIds = dataObj['upload_ids'] || [];
+ }
+ // Handle regular object
+ else {
+ uploadIds = operation.data['upload_ids'] || [];
+ }
+ }
+
+ // If not in data, check result (for completed operations from backend)
+ if (uploadIds.length === 0 && operation.result && operation.result.upload_ids) {
+ uploadIds = operation.result.upload_ids;
+ }
+
+ // Still no upload_ids? Log warning and bail
+ if (!uploadIds || uploadIds.length === 0) {
+ console.warn('[UploadManager] No upload_ids found for operation:', {
+ id: operation.id,
+ type: operation.type,
+ status: operation.status,
+ hasData: !!operation.data,
+ hasResult: !!operation.result
+ });
+ return;
+ }
+
+ // Handle cancellation
+ if (event === 'cancel-operation') {
+ return this.handleOperationCancelled(uploadIds);
+ }
+
+ // Update upload status based on operation status
+ this.setBulkUpload(uploadIds, 'status', operation.status).then(() => {
+ // Log for debugging
+ console.log(`[UploadManager] Updated ${uploadIds.length} uploads to status: ${operation.status}`);
+ });
+
+ // Handle completion
if (operation.status === 'completed') {
- uploads.forEach(upload => {
- this.removeUpload(upload).then(()=>{});
+ // For group uploads, mark as processed but keep for reference
+ if (operation.type === 'process_upload_groups') {
+ uploadIds.forEach(uploadId => {
+ this.setBulkUpload([uploadId], 'serverProcessed', true).then(() => {});
+ });
+
+ // Log created posts if available
+ if (operation.result && operation.result.created_posts) {
+ console.log('[UploadManager] Created posts:', operation.result.created_posts);
+ }
+
+ // Remove uploads after a delay to allow UI to update
+ setTimeout(() => {
+ uploadIds.forEach(uploadId => {
+ this.removeUpload(uploadId).then(() => {});
+ });
+ }, 2000);
+ }
+ // For direct uploads, remove immediately
+ else {
+ uploadIds.forEach(uploadId => {
+ this.removeUpload(uploadId).then(() => {});
+ });
+ }
+ }
+
+ // Handle failures
+ if (operation.status === 'failed' || operation.status === 'failed_permanent') {
+ console.error('[UploadManager] Operation failed:', {
+ id: operation.id,
+ type: operation.type,
+ uploadIds: uploadIds,
+ error: operation.error_message
});
}
}
@@ -348,7 +414,7 @@
fields: {
field: '[data-upload-field]',
input: 'input[type="file"]',
- dropZone: '.file-upload-container',
+ dropZone: '.file-upload-wrapper',
preview: '.preview-wrap',
grid: '.item-grid.preview',
progress: {
@@ -661,6 +727,13 @@
if (details) {
details.open = false;
}
+
+
+ this.notify('groups_uploaded', {
+ fieldId: fieldId,
+ posts: posts,
+ content: field.config.content,
+ });
}
if (operationId) {
field.operationId = operationId;
@@ -693,7 +766,7 @@
canMerge: mergable,
sendNow: endpoint === 'uploads/groups',
headers: {
- 'action_nonce': window.auth.getNonce('dash')
+ 'X-Action-Nonce': window.auth.getNonce('dash')
},
append: '_upload'
}
@@ -727,6 +800,7 @@
const fields = this.collectGroupFieldsFromDOM(groupElement, group.id);
const post = {
+ groupId: group.id,
images: [],
fields: fields
};
@@ -762,6 +836,7 @@
const remaining = uploads.filter(u => !u.group);
for (const upload of remaining) {
const post = {
+ groupId: window.generateID('group'),
images: [],
fields: {}
};
@@ -1009,8 +1084,9 @@
const processNext = async () => {
while (queue.length > 0) {
- const file = queue.shift();
- results.push(await this.processImage(file, maxWidth, maxHeight));
+ const entry = queue.shift();
+ const blob = await this.processImage(entry.file, maxWidth, maxHeight);
+ results.push({ uploadId: entry.uploadId, blob: blob });
}
};
@@ -1153,19 +1229,21 @@
const otherEntries = uploadEntries.filter(e => !e.file.type.startsWith('image/'));
// Process images in batches
- const processedBlobs = await this.processImages(
- imageEntries.map(e => e.file)
+ const processedImages = await this.processImages(
+ imageEntries.map(e => ({ file: e.file, uploadId: e.uploadId }))
);
// Update image uploads with processed blobs
- for (let i = 0; i < imageEntries.length; i++) {
- const { uploadId, upload } = imageEntries[i];
- upload.blob = processedBlobs[i];
- upload.fields.size = processedBlobs[i].size;
- upload.status = 'queued';
- await this.setUpload(uploadId, upload);
- processed++;
- this.updateFieldProgress(fieldId, processed, totalFiles, 'Processing files...');
+ for (const { uploadId, blob } of processedImages) {
+ const entry = imageEntries.find(e => e.uploadId === uploadId);
+ if (entry) {
+ entry.upload.blob = blob;
+ entry.upload.fields.size = blob.size;
+ entry.upload.status = 'queued';
+ await this.setUpload(uploadId, entry.upload);
+ processed++;
+ this.updateFieldProgress(fieldId, processed, totalFiles, 'Processing files...');
+ }
}
// Handle non-image files (no processing needed)
--
Gitblit v1.10.0