From 7a9054bb3f033c98067b3196378311dae54c5fbf Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 20 Jan 2026 01:31:53 +0000
Subject: [PATCH] =OperationQueue refactor to the JVBase/managers/queue namespace
---
assets/js/concise/UploadManager.js | 824 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 471 insertions(+), 353 deletions(-)
diff --git a/assets/js/concise/UploadManager.js b/assets/js/concise/UploadManager.js
index b48d38c..f2e9188 100644
--- a/assets/js/concise/UploadManager.js
+++ b/assets/js/concise/UploadManager.js
@@ -3,6 +3,7 @@
this.a11y = window.jvbA11y;
this.queue = window.jvbQueue;
this.error = window.jvbError;
+ this.templates = window.jvbTemplates;
this.subscribers = new Set();
@@ -21,6 +22,232 @@
this.previewUrls = new Set();
this.initElements();
this.initListeners();
+ this.defineTemplates();
+ }
+
+ defineTemplates() {
+ const T = this.templates;
+ const images = this;
+
+ T.define('uploadItem', {
+ refs: {
+ select: '[name="select-item"]',
+ featured: '[name="featured"]',
+ img: 'img',
+ video: 'video',
+ file: 'label > span',
+ details: 'details',
+ },
+ manyRefs: {
+ inputs: 'input',
+ },
+ setup({el, refs, manyRefs, data}) {
+ const isNewUpload = Object.hasOwn(data, 'file');
+ let mimeType;
+ let url;
+ let alt;
+ let previewUrl = false;
+ if (isNewUpload) {
+ el.dataset.uploadId = data.uploadId;
+ mimeType = images.getSubtypeFromMime(data.file.type)||'image';
+ url = (mimeType !== 'document') ? images.createPreviewUrl(data.file) : false;
+ previewUrl = url;
+ alt = data.file.name||'';
+ } else {
+ el.dataset.id = data.id;
+ mimeType = images.getSubtypeFromURL(data.medium??data.src);
+ url = data.medium??data.src;
+ alt = data['image-alt-text']??'';
+ }
+
+
+ el.dataset.subtype = mimeType;
+
+ if (refs.featured) {
+ refs.featured.value = data.uploadId;
+ }
+ switch (mimeType) {
+ case 'image':
+ if (refs.img) {
+ refs.img.src = url;
+ refs.img.alt = alt;
+
+ if (previewUrl) refs.img.dataset.previewUrl = previewUrl;
+ }
+ if (refs.video) refs.video.remove();
+ if (refs.file) refs.file.remove();
+ break;
+ case 'video':
+ if (refs.video) {
+ refs.video.src = url;
+ refs.video.alt = alt;
+ if (previewUrl) refs.video.dataset.previewUrl = previewUrl;
+ }
+ if (refs.img) refs.img.remove();
+ if (refs.file) refs.file.remove();
+ break;
+ case 'document':
+ if (refs.preview) {
+ let ext = data.file.name.split('.').pop()?.toLowerCase()??'';
+ let map = {
+ 'pdf': 'file-pdf', 'csv': 'file-csv',
+ 'doc': 'file-doc', 'docx': 'file-doc',
+ 'txt': 'file-txt', 'xls': 'file-xls', 'xlsx': 'file-xls'
+ };
+ let icon = window.getIcon(map[ext]??'file');
+ refs.preview.innerText = data.file.name??data.title;
+ refs.preview.prepend(icon);
+ }
+ if (refs.img) refs.img.remove();
+ if (refs.video) refs.video.remove();
+ break;
+ }
+ if (refs.details) {
+ refs.details.append(T.create('uploadMeta'));
+ }
+
+
+ el.draggable = el.dataset.mode !== 'single';
+
+ if (manyRefs.inputs) {
+ for (let input of manyRefs.inputs) {
+ window.prefixInput(input, `${data.uploadId}-`);
+ }
+ }
+ }
+ });
+
+ T.define('uploadMeta', {
+ refs: {
+ alt: '[name="alt_text"]',
+ title: '[name="image-title"]',
+ description: '[name="image-caption"]',
+ },
+ setup({el, refs, manyRefs, data}) {
+ if (Object.hasOwn(data, 'alt') && refs.alt) {
+ refs.alt.value = data.alt;
+ }
+ if (Object.hasOwn(data, 'title') && refs.title) {
+ refs.title.value = data.title;
+ }
+ if (Object.hasOwn(data, 'description') && refs.description) {
+ refs.description.value = data.description;
+ }
+ }
+ });
+
+ T.define('imageGroup', {
+ refs: {
+ selectAll: '[data-select-all]',
+ fields: '.fields',
+ details: 'details',
+ grid: '.item-grid',
+ },
+ setup({el, refs, manyRefs, data}) {
+ el.dataset.groupId = data.groupId;
+ if (refs.selectAll) {
+ window.prefixInput(refs.selectAll, `select-all-${data.groupId}`, true);
+ }
+ let fields = T.create('groupMetadata', {groupId: data.groupId});
+ if (fields) {
+ refs.fields.append(fields);
+ } else {
+ refs.details.remove();
+ }
+ if (refs.grid) {
+ refs.grid.dataset.groupId = data.groupId;
+ }
+ }
+ });
+
+ T.define('groupMetadata', {
+ manyRefs: {
+ inputs: 'input,textarea,select'
+ },
+ setup({el, refs, manyRefs, data}) {
+ if (refs.inputs) {
+ refs.inputs.forEach(input => {
+ window.prefixInput(input, `${data.groupId}-`);
+ });
+ }
+ }
+ });
+
+ T.define('restoreNotification', {
+ refs: {
+ details: '.details',
+ wrap: '.wrap',
+ },
+ setup({el, refs, manyRefs, data}) {
+ if (refs.details) {
+ let source = data.bySource.size > 1 ? ` across ${data.bySource.size} pages` : '';
+ let upload = data.pendingUploads.length > 1 ? 'uploads' : 'upload';
+ refs.details.textContent = `${data.pendingUploads.length} ${upload} can be recovered${source}`;
+ }
+ if (!refs.wrap) {
+ console.warn('No wrap element in template');
+ return;
+ }
+ let i = 1;
+ for (const [src, uploads] of data.bySource) {
+ let data = {
+ index: i,
+ isCurrent: src === window.location.href,
+ src: src,
+ uploads: uploads
+ };
+ refs.wrap.append(T.create('restoreField', data));
+ i++;
+ }
+ }
+ });
+
+ T.define('restoreField', {
+ refs: {
+ h3: 'h3',
+ a: 'h3 a',
+ grid: '.item-grid'
+ },
+ async setup({el, refs, manyRefs, data}) {
+ let fieldId = images.registerField(el, false, `recovery_${data.index}`);
+ if (data.isCurrent) {
+ el.open = true;
+
+ refs.a?.remove();
+ if (refs.h3) {
+ refs.h3.textContent = 'From this page:';
+ }
+
+ } else {
+ if (refs.a) {
+ refs.a.href = data.src;
+ refs.a.title = 'Navigate to page and restore';
+ refs.a.textContent = data.src;
+ }
+ }
+
+ let filtered = [... new Set(data.uploads.map(upload => upload.group??'preview'))];
+ for (let groupId of filtered) {
+ let group = (groupId === 'preview') ? true : images.stores.groups.get(groupId);
+ if (!group) continue;
+
+ let element = await images.createGroupElement(groupId, fieldId);
+ let groupGrid = element.querySelector('.item-grid');
+ let groupUploads = data.uploads.filter(upload => upload.group === (groupId === 'preview') ? null : groupId);
+
+ for (const [key, value] of Object.entries(group.fields??{})) {
+ let field = element.querySelector(`input[name*="${key}"]`);
+ if (field) field.value = value;
+ }
+
+ for (let upload of groupUploads) {
+ let item = await images.createUpload(upload.id, images.formatFile(upload), fieldId);
+ groupGrid.append(item);
+ }
+ refs.grid.append(element);
+ }
+ }
+ });
}
initStores() {
@@ -34,7 +261,7 @@
{ name: 'field', keyPath: 'field' },
{ name: 'status', keyPath: 'status' },
{ name: 'group', keyPath: 'group' },
- { name: 'src', keyPath: 'src' }
+ { name: 'src', keyPath: 'src' },
],
},
{
@@ -57,32 +284,23 @@
this.stores.uploads.subscribe(this.handleStores.bind(this, 'uploads'));
this.stores.groups.subscribe(this.handleStores.bind(this, 'groups'));
this.queue.subscribe((event, operation) => {
- if (!['uploads', 'uploads/meta', 'uploads/groups'].includes(operation.endpoint)) {
- return;
+ 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 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.status === 'completed') {
+ uploads.forEach(upload => {
+ this.removeUpload(upload).then(()=>{});
+ });
+ }
}
-
- const fieldId = operation.data instanceof FormData
- ? operation.data.get('fieldId')
- : operation.data?.fieldId;
- if (!fieldId) {
- return;
- }
- switch (event) {
- case 'cancel-operation':
- this.handleOperationCancelled(fieldId).then(()=>{});
- break;
- case 'operation-status':
- this.handleFieldStatus(fieldId, operation).then(()=>{});
- break;
- case 'operation-completed':
- this.handleOperationComplete(operation, fieldId).then(()=>{});
- break;
- case 'operation-failed':
- case 'operation-failed-permanent':
- this.handleOperationFailed(operation, fieldId).then(()=>{});
- break;
- }
});
}
@@ -94,7 +312,7 @@
if (event === 'data-ready') {
this.stores.ready.push(storeName);
if (this.storesReady()) {
- this.checkRecovery();
+ this.checkRecovery().then(()=>{});
}
}
}
@@ -127,9 +345,9 @@
details: '.file-upload-container .progress .details',
icon: '.file-upload-container .progress .icon'
},
- selectAll: '[name="select-all-uploads"]',
+ selectAll: '[data-select-all]',
actions: '.selection-actions',
- count: '.selection-count',
+ count: '.selected .info',
hidden: 'input[type="hidden"]'
},
// groups = selectors that affect groups as a whole
@@ -150,8 +368,8 @@
total: '.group-content .group-count'
},
items: {
- item: '[data-upload-id]',
- checkbox: '[name*="select-item"]',
+ item: '.item.upload',
+ checkbox: '[name="select-item"]',
featured: '[name="featured"]',
image: 'img',
details: 'details',
@@ -295,23 +513,36 @@
this.queueUploadMeta(e).then(()=>{});
}
}
- handleGroupMetaChange(input) {
- const element = input.closest(this.selectors.group.fields);
- if (!element) return;
+ handleGroupMetaChange(input) {
+ // Get the groupId directly from the input's data attribute
+ const groupId = input.dataset.groupId;
+ if (!groupId) return;
- const groupId = element.dataset.groupId;
- const group = this.stores.groups.get(groupId); // Changed from this.groups
+ // Capture values immediately (before debouncer)
+ const inputName = input.name;
+ const inputValue = input.value;
+
+ // Extract the field name from the input name
+ // Names are like "groupId[post_title]" or "groupId_post_title"
+ const name = inputName
+ .replace(`${groupId}[`, '')
+ .replace(`${groupId}_`, '')
+ .replace(']', '');
+
+ // Schedule the save with captured values
+ window.debouncer.schedule(`group-meta-${groupId}-${name}`, async () => {
+ const group = this.stores.groups.get(groupId);
if (!group) return;
- window.debouncer.schedule(`group-meta-${groupId}`, async (input, groupId) => {
- let name = input.name
- .replace(`${groupId}_`, '')
- .replace(`${groupId}[`, '')
- .replace(']', '');
- group.fields[name] = input.value;
- await this.setGroup(groupId, group);
- }, 300);
- }
+ // Initialize fields object if it doesn't exist
+ if (!group.fields) {
+ group.fields = {};
+ }
+
+ group.fields[name] = inputValue;
+ await this.setGroup(groupId, group);
+ }, 300);
+ }
handleDragEnter(e) {
if (!e.dataTransfer.types.includes('Files')) return;
const dropZone = e.target.closest(this.selectors.fields.dropZone);
@@ -348,7 +579,9 @@
const fieldId = this.getFieldIdFromElement(dropZone);
if (fieldId) {
- this.processFiles(fieldId, files).then(()=>{});
+ this.processFiles(fieldId, files).then(()=>{
+ this.updateHandlerItems(fieldId);
+ });
this.a11y.announce(`${files.length} file(s) dropped for upload`);
}
}
@@ -439,6 +672,7 @@
},
append: '_upload'
}
+
try {
return await this.queue.addToQueue(operation);
} catch (error) {
@@ -459,12 +693,17 @@
let files = [];
for (const group of groups) {
+ const groupElement = this.groups.get(group.id)?.element;
+ const fields = this.collectGroupFieldsFromDOM(groupElement, group.id);
+
const post = {
images: [],
- fields: group.fields??{}
+ fields: fields
};
- const groupUploads = uploads.filter(u => u.group === group.id);
+ // Use helper to get uploads in stored order
+ const groupUploads = this.getGroupUploadsInOrder(group);
+
for (const upload of groupUploads) {
const file = this.formatFile(upload);
if (file) {
@@ -473,10 +712,13 @@
upload_id: upload.id,
index: uploadMap.length
};
- let uploadEl = this.uploads.get(upload.id);
- if (uploadEl.ui?.featured?.checked) {
+
+ const uploadEl = this.uploads.get(upload.id);
+ const featuredInput = uploadEl?.element?.querySelector(`input[name="${group.id}_featured"]`);
+ if (featuredInput?.checked) {
post.fields.featured = upload.id;
}
+
post.images.push(imageData);
uploadMap.push(upload.id);
}
@@ -484,8 +726,8 @@
posts.push(post);
}
+ // Handle remaining uploads not in any group
const remaining = uploads.filter(u => !u.group);
-
for (const upload of remaining) {
const post = {
images: [],
@@ -495,7 +737,6 @@
const file = this.formatFile(upload);
if (file) {
files.push(file);
-
const imageData = {
upload_id: upload.id,
index: uploadMap.length
@@ -505,9 +746,42 @@
}
posts.push(post);
}
+
return {posts, uploadMap, files};
}
+ getGroupUploadsInOrder(group) {
+ if (!group.uploads || group.uploads.length === 0) return [];
+
+ return group.uploads
+ .map(uploadId => this.stores.uploads.get(uploadId))
+ .filter(Boolean); // Remove any that don't exist
+ }
+
+ collectGroupFieldsFromDOM(groupElement, groupId) {
+ if (!groupElement) return {};
+
+ const fields = {};
+ const inputs = groupElement.querySelectorAll('input, textarea, select');
+
+ inputs.forEach(input => {
+ // Extract field name from input name like "groupId[post_title]"
+ const name = input.name
+ .replace(`${groupId}[`, '')
+ .replace(`${groupId}_`, '')
+ .replace(']', '');
+
+ // Skip system fields like featured, select-all
+ if (['featured', 'select-all'].some(skip => name.includes(skip))) return;
+
+ if (input.value) {
+ fields[name] = input.value;
+ }
+ });
+
+ return fields;
+ }
+
collectUploads(fieldId) {
let uploads = this.stores.uploads.filterByIndex({field: fieldId});
if (uploads.length === 0) return;
@@ -544,37 +818,6 @@
return await this.sendToQueue('uploads/meta', queueData, 'Uploading Meta', '', true);
}
- async handleOperationComplete(operation, fieldId) {
- const response = operation.response;
-
- // Handle direct upload results (from uploads endpoint)
- if (response?.data) {
- const results = Array.isArray(response.data) ? response.data : Object.values(response.data);
- for (const result of results) {
- if (result.upload_id && result.attachment_id) {
- const upload = this.stores.uploads.get(result.upload_id);
- if (upload) {
- upload.attachmentId = result.attachment_id;
- upload.status = 'completed';
- await this.stores.uploads.save(upload);
- }
- }
- }
- }
-
- // Clear completed uploads and groups
- const uploads = this.stores.uploads.filterByIndex({field: fieldId});
- const groups = this.stores.groups.filterByIndex({field: fieldId});
-
- await Promise.all([
- ...uploads
- .filter(upload => upload.status === 'completed')
- .map(upload => this.clearUpload(upload.id)),
- ...groups.map(group => this.stores.groups.delete(group.id))
- ]);
-
- this.notify('uploads-complete', { fieldId, response });
- }
/*********************************************************************
FIELD LOGIC
*********************************************************************/
@@ -879,17 +1122,6 @@
const pendingUploads = this.stores.uploads.filterByIndex({status: ['local_processing', 'queued', 'uploading']});
if (pendingUploads.length === 0) return;
- let notification = window.getTemplate('restoreNotification');
- if (!notification) {
- this.error.log(
- 'No restore notification',
- {
- component: 'UploadManager',
- src: window.location.href
- }
- );
- return;
- }
// Group by source page
const bySource = new Map();
pendingUploads.forEach(upload => {
@@ -898,76 +1130,26 @@
bySource.get(src).push(upload);
});
- const currentSrc = window.location.href;
+ let data = {
+ bySource: bySource,
+ pendingUploads: pendingUploads
+ };
-
- let source = bySource.size > 1 ? ` across ${bySource.size} pages` : '';
- let upload = pendingUploads.length > 1 ? 'uploads' : 'upload';
- let message = `${pendingUploads.length} ${upload} can be recovered${source}`;
-
- let details = notification.querySelector('.details');
- if (details) {
- details.textContent = message;
- }
-
- let i = 1;
- for (const [src, uploads] of bySource) {
- let template = window.getTemplate('restoreField');
- if (!template) continue;
- let fieldId = this.registerField(template,false, 'recovery_'+i);
- let field = this.fields.get(fieldId);
- i++;
- let isCurrent = src === currentSrc;
- let [
- h3,
- a,
- grid
- ] = [
- template.querySelector('h3'),
- template.querySelector('h3 a'),
- template.querySelector('.item-grid')
- ];
-
- template.open = isCurrent;
- if (!isCurrent) {
- [a.href, a.title,a.textContent] =
- [src, 'Navigate to Page and Restore', src];
- } else {
- a.remove();
- h3.textContent = 'From this page:';
- }
-
- let filteredGroupIds = [...new Set(uploads.map(upload => upload.group??'preview'))];
-
- for (let groupId of filteredGroupIds) {
- let group = (groupId === 'preview') ? true : this.stores.groups.get(groupId);
- if (!group) continue;
-
- let groupElement = await this.createGroupElement(groupId,field.id);
- let groupGrid = groupElement.querySelector('.item-grid');
- let theseUploads = uploads.filter(upload => upload.group === (groupId === 'preview') ? null : groupId);
- for (const [key, value] of Object.entries(group.fields ?? {})) {
- let field = groupElement.querySelector(`input[name*="${key}"]`);
- if (field) field.value = value;
- }
- for (let upload of theseUploads) {
- let item = await this.createUpload(upload.id, this.formatFile(upload), field.id);
- groupGrid.append(item);
- }
-
- grid.append(groupElement);
- }
- notification.querySelector('.wrap').append(template);
- }
- document.body.append(notification);
- notification = document.querySelector('dialog.restore-uploads');
+ document.body.append(this.templates.create('restoreNotification', data));
+ let notification = document.querySelector('dialog.restore-uploads');
this.restoreModal = new window.jvbModal(notification);
- this.restoreSelection = new window.jvbHandleSelection({
- container: notification,
- wrapper: '.restore-uploads .wrap',
- bulkControls: '.selection-actions',
- selectAll: '#select-all-restore',
- count: '.selection-count'
+ this.restoreSelection = new window.jvbHandleSelection(notification,
+ {
+ wrapper: {
+ wrapper: '.restore-field',
+ id: 'selection'
+ },
+ items: '.item-grid.restore',
+ selectAll: {
+ bulkControls: '.selection-actions',
+ checkbox: '#select-all-restore',
+ count: '.selection-count'
+ }
});
this.restoreModal.handleOpen();
}
@@ -1011,10 +1193,9 @@
let usedIds = [];
for (let gr of groups) {
-
let group = this.stores.groups.get(gr);
- await this.createGroup(fieldId,gr);
- let element = this.groups.get(gr);
+ await this.createGroup(fieldId, gr);
+ let element = this.groups.get(gr);
let theseUploads = uploads.filter(upload => upload.group === gr);
if (group && this.groups.has(gr)) {
@@ -1097,82 +1278,27 @@
UPLOAD METHODS
*******************************************************************************/
async createUpload(uploadId, file, fieldId) {
- let image = window.getTemplate('uploadItem');
- if (!image) return null;
-
let field = this.fields.get(fieldId);
if (!field) return null;
- image.dataset.uploadId = uploadId;
- let mimeType = this.getSubtypeFromMime(file.type)||'image';
- image.dataset.subtype = mimeType;
-
- let [featured, img, video, preview, details] = [
- image.querySelector('[name="featured"]'),
- image.querySelector('img'),
- image.querySelector('video'),
- image.querySelector('label > span'),
- image.querySelector('details')
- ];
-
- if (featured) featured.value = uploadId;
- switch (mimeType) {
- case 'image':
- if (img) {
- const previewUrl = this.createPreviewUrl(file);
- img.src = previewUrl;
- img.alt = file.name || '';
- img.dataset.previewUrl = previewUrl;
- }
- video?.remove();
- preview?.remove();
- break;
- case 'video':
- if (video){
- const previewUrl = this.createPreviewUrl(file);
- video.src = previewUrl;
- video.dataset.previewUrl = previewUrl;
- }
- img?.remove();
- preview?.remove();
- break;
- case 'document':
- let ext = file.name.split('.').pop()?.toLowerCase()??'';
- let map = {
- 'pdf': 'file-pdf', 'csv': 'file-csv',
- 'doc': 'file-doc', 'docx': 'file-doc',
- 'txt': 'file-txt', 'xls': 'file-xls', 'xlsx': 'file-xls'
- };
- let icon = window.getIcon(map[ext]??'file');
- if (preview) {
- preview.innerText = file.name;
- preview.prepend(icon);
- }
- img?.remove();
- video?.remove();
- break;
- }
-
- if (details) {
- let template = window.getTemplate('uploadMeta');
- if (template) details.append(template);
- }
-
- image.draggable = field.config.type !== 'single'??false;
-
- image.querySelectorAll('input').forEach(input => {
- let id = input.id;
- if (id) {
- let newId = id + uploadId;
- let label = input.parentNode.querySelector(`label[for="${id}"]`);
- input.id = newId;
- if (label) label.htmlFor = newId;
- }
- });
-
- return image;
+ let data = {
+ uploadId: uploadId,
+ file: file,
+ field: field,
+ };
+ return this.templates.create('uploadItem', data);
}
+ getSubtypeFromURL(url) {
+ const imgs = ['.webp', '.jpg', '.jpeg', '.png', '.gif', '.svg'];
+ const videos = ['.mp4', '.ogg', '.mov', '.webm', '.avi'];
+
+ const path = url.split('?')[0].toLowerCase();
+
+ if (imgs.some(ext => path.endsWith(ext))) return 'image';
+ if (videos.some(ext => path.endsWith(ext))) return 'video';
+ return 'document';
+ }
getSubtypeFromMime(mimeType) {
if (mimeType.startsWith('image/')) return 'image';
if (mimeType.startsWith('video/')) return 'video';
@@ -1194,6 +1320,9 @@
async setBulkUpload(uploads, key, value) {
const promises = Array.from(uploads).map(async (upload) => {
+ if (typeof upload === 'string') upload = await this.stores.uploads.get(upload);
+ if (!upload) return;
+
if (key === 'status') {
await this.setUploadStatus(upload, value);
}
@@ -1204,6 +1333,8 @@
}
async setUploadStatus(upload, status) {
+ if (typeof upload === 'string') upload = await this.stores.uploads.get(upload);
+ if (!upload) return;
if (upload.progress) {
window.showProgress(upload.progress, this.getStatusProgress(status), 100, this.getStatusText(status), this.queue.icons[status]??'');
}
@@ -1217,6 +1348,8 @@
group.uploads = group.uploads.filter(id => id !== uploadId);
if (group.uploads.length === 0) {
await this.removeGroup(group.id, false);
+ } else {
+ await this.stores.groups.save(group);
}
}
@@ -1273,13 +1406,18 @@
const element = this.createGroupElement(groupId, fieldId);
if (!element) return null;
- field.groupUI.grid.append(element);
+ const emptyGroup = field.groupUI.empty;
+ if (emptyGroup?.nextSibling) {
+ field.groupUI.grid.insertBefore(element, emptyGroup.nextSibling);
+ } else {
+ field.groupUI.grid.append(element);
+ }
// Create Sortable for this group's grid
const grid = element.querySelector('.item-grid');
if (grid) {
grid.dataset.groupId = groupId;
- this.createSortableForGrid(fieldId, grid, groupId);
+ this.createSortable(fieldId, grid, groupId);
}
let storedData = this.stores.groups.data.has(groupId)
@@ -1292,52 +1430,19 @@
}
createGroupElement(groupId, fieldId = null) {
- let element = window.getTemplate('imageGroup');
- if (!element) return;
- element.dataset.groupId = groupId;
- if (fieldId) {
- element.dataset.fieldId = fieldId;
+ let data = {
+ groupId: groupId,
+ fieldId: fieldId,
}
-
- const selectAll = element.querySelector('[data-select-all]');
- if (selectAll) {
- const newId = `select-all-${groupId}`;
- const label = element.querySelector(`label[for="${selectAll.id}"]`);
- selectAll.id = newId;
- selectAll.name = newId;
- if (label) label.htmlFor = newId;
- }
-
- let fields = window.getTemplate('groupMetadata');
- let container = element.querySelector('.fields');
- if (fields && container) {
- container.append(fields);
-
- let title = container.querySelector('[name="post_title"]');
- let excerpt = container.querySelector('[name="post_excerpt"]');
-
- if (title) {
- title.id = `${groupId}_title`;
- title.name = `${groupId}[post_title]`;
- }
- if (excerpt) {
- excerpt.id = `${groupId}_excerpt`;
- excerpt.name = `${groupId}[post_excerpt]`;
- }
- } else {
- element.querySelector('details')?.remove();
- }
-
- const grid = element.querySelector('.item-grid');
- if (grid) {
- grid.dataset.groupId = groupId;
- }
+ let element = this.templates.create('imageGroup', data);
this.groups.set(groupId, {
element: element,
ui: window.uiFromSelectors(this.selectors.group, element)
});
+
+ this.getSelectionHandler(fieldId)?.addWrapper(element);
return element;
}
@@ -1389,12 +1494,19 @@
group.uploads = group.uploads.filter(id => id !== uploadId);
if (group.uploads.length === 0) {
await this.removeGroup(group.id, false);
+ } else {
+ await this.stores.groups.save(group);
}
}
}
//clear any selection
if (element.ui.checkbox) element.ui.checkbox.checked = false;
+ // Remove from field-level selection
+ const fieldHandler = this.selectionHandlers.get(upload.field);
+ if (fieldHandler && fieldHandler.isSelected(uploadId)) {
+ fieldHandler.deselect(uploadId);
+ }
if (this.selected.get(upload.field)?.has(uploadId)) {
this.selected.get(upload.field).delete(uploadId);
}
@@ -1408,15 +1520,18 @@
if (group) {
group.uploads.push(uploadId);
upload.group = groupId;
- this.stores.groups.save(group);
+ await this.stores.groups.save(group);
}
}
let target = (groupId) ? this.groups.get(groupId)?.ui.grid : field.ui.grid;
if (target) {
- target.append(element.element)
+ target.append(element.element);
+ if (groupId) {
+ await this.handleReorder(upload.field, groupId);
+ }
}
- this.stores.uploads.save(upload);
+ await this.stores.uploads.save(upload);
}
handleDeleteGroup(button) {
@@ -1454,14 +1569,22 @@
keepUploads ? this.addToGroup(uploadId, null) : this.removeUpload(uploadId)
)
);
+ const field = this.fields.get(group.field);
+ if (field) {
+ const sortableKey = this.getGroupKey(group.field, groupId);
+ const selectionHandler = this.selectionHandlers.get(sortableKey);
+ if (selectionHandler?.destroy) {
+ selectionHandler.destroy();
+ }
+ this.selectionHandlers.get(group.field)?.removeWrapper(element.element);
- // Destroy the Sortable for this group
- const sortableKey = this.getGroupKey(group.field, groupId);
- const sortable = this.sortables.get(sortableKey);
- if (sortable?.destroy) {
- sortable.destroy();
+ // Existing sortable cleanup
+ const sortable = this.sortables.get(sortableKey);
+ if (sortable?.destroy) {
+ sortable.destroy();
+ }
+ this.sortables.delete(sortableKey);
}
- this.sortables.delete(sortableKey);
if (element?.element) {
element.element.remove();
@@ -1486,30 +1609,11 @@
/*******************************************************************************
OPERATION METHODS
*******************************************************************************/
- async handleOperationCancelled(fieldId) {
- const uploads = this.stores.uploads.filterByIndex({field: fieldId});
- const groups = this.stores.groups.filterByIndex({field: fieldId});
-
- await Promise.all([
- ...uploads.map(upload => this.removeUpload(upload.id)),
- ...groups.map(group => this.removeGroup(group.id, false))
- ]);
- this.a11y.announce('Upload Cancelled');
- }
-
- async handleOperationFailed(operation, fieldId) {
- // Mark uploads as failed, maybe show retry UI
- await this.setBulkUpload(
- this.stores.uploads.filterByIndex({field: fieldId}),
- 'status',
- 'failed'
- );
- }
-
- async handleFieldStatus(fieldId, operation) {
- let status = operation.status;
- let uploads = this.stores.uploads.filterByIndex({field: fieldId});
- await this.setBulkUpload(uploads, 'status', status);
+ async handleOperationCancelled(uploads) {
+ if (uploads.length === 0) return;
+ uploads.forEach(upload => {
+ this.removeUpload(upload);
+ });
}
/*******************************************************************************
SELECTION HANDLERS
@@ -1524,20 +1628,26 @@
if (!this.selectionHandlers.has(key)) {
let field = this.fields.get(fieldId);
if (!field) return;
- let handler = new window.jvbHandleSelection({
- container: field.element,
- item: this.selectors.items.item,
- count: this.selectors.fields.count,
- bulkControls: this.selectors.fields.actions,
- checkbox: this.selectors.items.checkbox,
- selectAll: this.selectors.fields.selectAll,
- wrapper: `${this.selectors.fields.preview}, ${this.selectors.group.item}`,
+ if (field.config.destination !== 'post_group') return;
+ let handler = new window.jvbHandleSelection(field.element, {
+ selectAll: {
+ checkbox: this.selectors.fields.selectAll,
+ count: this.selectors.fields.count,
+ bulkControls: this.selectors.fields.actions
+ },
+ item: {
+ item: this.selectors.items.item,
+ checkbox: this.selectors.items.checkbox,
+ idAttribute: 'uploadId',
+ },
+ wrapper: {
+ wrapper: '.preview-wrap, .upload-group',
+ id: 'groupId'
+ },
});
handler.subscribe((event, data) => {
this.selected.set(fieldId, data.selectedItems);
- console.log(Array.from(this.selected));
- this.syncSortableSelection(fieldId, data.selectedItems);
});
this.selectionHandlers.set(key, handler);
@@ -1545,6 +1655,11 @@
return this.selectionHandlers.get(key);
}
+ updateHandlerItems(fieldId) {
+ let handler = this.getSelectionHandler(fieldId);
+ if (!handler) return;
+ handler.collectItems();
+ }
/*******************************************************************************
SORTABLE
*******************************************************************************/
@@ -1583,11 +1698,24 @@
selectedClass: 'selected',
avoidImplicitDeselect: true,
group: { name: fieldId, pull: true, put: true },
- ghostClass: 'ghost',
- chosenClass: 'chosen',
dragClass: 'dragging',
- onStart: () => this.syncSortableSelection(fieldId),
+ onStart: (evt) => {
+ // Get the dragged item's ID
+ const draggedItem = evt.item;
+ const uploadId = draggedItem?.dataset.uploadId;
+
+ // Get the selected items Set for this field
+ const selectedItems = this.selected.get(fieldId);
+
+ // If the dragged item isn't selected, select it
+ if (uploadId && (!selectedItems || !selectedItems.has(uploadId))) {
+ const handler = this.selectionHandlers.get(fieldId);
+ if (handler) {
+ handler.select(uploadId);
+ }
+ }
+ },
onEnd: (evt) => this.sortableDrop(evt, fieldId),
});
@@ -1633,65 +1761,51 @@
async sortableDrop(evt, fieldId) {
const dropTarget = evt.to;
-
const items = evt.items?.length > 0 ? Array.from(evt.items) : [evt.item];
const uploadIds = items.map(item => item.dataset.uploadId).filter(Boolean);
if (uploadIds.length === 0) return;
- // Determine target group from the grid's data attribute
const targetGroupId = dropTarget.dataset.groupId || null;
- await Promise.all(
- uploadIds.map(uploadId => this.addToGroup(uploadId, targetGroupId))
- );
+ // Process sequentially to avoid race conditions
+ for (const uploadId of uploadIds) {
+ await this.addToGroup(uploadId, targetGroupId);
+ }
+ await this.handleReorder(fieldId, targetGroupId);
this.selectionHandlers.get(fieldId)?.clearSelection();
}
- syncSortableSelection(fieldId) {
- const selectedItems = this.selected.get(fieldId) || new Set();
-
- for (const [uploadId, uploadData] of this.uploads) {
- const upload = this.stores.uploads.get(uploadId);
- if (!upload || upload.field !== fieldId) continue;
-
- const element = uploadData.element;
- if (!element) continue;
-
- const shouldBeSelected = selectedItems.has(uploadId);
-
- if (shouldBeSelected && !element.classList.contains('selected')) {
- Sortable.utils.select(element);
- } else if (!shouldBeSelected && element.classList.contains('selected')) {
- Sortable.utils.deselect(element);
- }
- }
- }
-
handleReorder(fieldId, groupId = null) {
- let target = (groupId) ? this.groups.get(groupId)?.ui.grid : this.fields.get(fieldId)?.ui.grid;
+ let target = (groupId)
+ ? this.groups.get(groupId)?.ui.grid
+ : this.fields.get(fieldId)?.ui.grid;
+
if (!target) {
- console.log ('Couldn\'t Reorder items...');
+ console.log('Couldn\'t Reorder items...');
return;
}
- //Get current order from DOM
- let items = Array.from(target.querySelectorAll(this.selectors.items.item+':not(.ghost)'))
+
+ // Get current order from DOM
+ let items = Array.from(target.children)
+ .filter(el => el.matches(this.selectors.items.item) && !el.classList.contains('ghost'))
.map(upload => upload.dataset.uploadId)
.filter(id => id);
-
if (!groupId) {
let hiddenInput = this.fields.get(fieldId)?.ui.hidden;
if (hiddenInput) {
hiddenInput.value = items.join(',');
}
} else {
- let group = this.groups.get(groupId);
+ let group = this.stores.groups.get(groupId);
if (group) {
group.uploads = items;
+ this.stores.groups.save(group).then(()=>{});
}
}
+
this.a11y.announce('Items reordered');
}
/*******************************************************************************
@@ -1739,6 +1853,10 @@
})
]);
+ if (this.restoreModal) {
+ this.cleanupRestore();
+ }
+
this.a11y.announce('Cache cleared for this page');
}
--
Gitblit v1.10.0