From 27fb820ae9081fb56957cf75e79eccd8a99edd52 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sat, 14 Feb 2026 19:14:48 +0000
Subject: [PATCH] =minor css changes, queue merge logic restructured, and double checking changes actually changed in cRUD.js before sending to server
---
assets/js/concise/UploadManager.js | 95 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 23 deletions(-)
diff --git a/assets/js/concise/UploadManager.js b/assets/js/concise/UploadManager.js
index 61682ec..b2f7c7c 100644
--- a/assets/js/concise/UploadManager.js
+++ b/assets/js/concise/UploadManager.js
@@ -672,7 +672,7 @@
}
}
- async queueUploads(endpoint, fieldId) {
+ async queueUploads(endpoint, fieldId, dependsOn = null) {
let data = new FormData();
const field = this.fields.get(fieldId);
if (!field) return;
@@ -688,12 +688,16 @@
if (isUpload) {
data.append('mode', field.config.mode);
- data.append('field_name', field.config.name);
+
+ data.append('field_name', field.config.repeaterPath || field.config.name);
data.append('fieldId', field.id);
data.append('field_type', field.config.type);
data.append('subtype', field.config.subtype);
data.append('item_id', field.config.itemID);
data.append('destination', field.config.destination);
+ if (dependsOn) {
+ data.append('depends_on', dependsOn);
+ }
}
let posts, uploadMap, files;
@@ -992,18 +996,27 @@
}
extractFieldConfig(fieldElement, autoUpload, imageMeta) {
- return {
+ const config = {
autoUpload: autoUpload,
showMeta: imageMeta,
- destination: fieldElement.dataset.destination || 'meta', //TODO: why do we need this?
+ destination: fieldElement.dataset.destination || 'meta',
content: this.extractFieldContent(fieldElement),
mode: fieldElement.dataset.mode || 'direct',
type: fieldElement.dataset.type || 'single',
name: fieldElement.dataset.field,
- itemID: this.extractFieldItemId(fieldElement)??0,
- maxFiles: parseInt(fieldElement.dataset.maxFiles)??25,
- subType: fieldElement.dataset.subtype?? 'image'
+ itemID: this.extractFieldItemId(fieldElement) ?? 0,
+ maxFiles: parseInt(fieldElement.dataset.maxFiles) ?? 25,
+ subType: fieldElement.dataset.subtype ?? 'image',
+ repeaterPath: null
};
+
+ const repeaterRow = fieldElement.closest('[data-index]');
+ const repeater = repeaterRow?.closest('[data-field][data-repeater-id]');
+ if (repeater && repeaterRow) {
+ config.repeaterPath = `${repeater.dataset.field}:${repeaterRow.dataset.index}:${config.name}`;
+ }
+
+ return config;
}
extractFieldContent(fieldElement) {
@@ -1019,12 +1032,17 @@
determineFieldId(fieldElement) {
let content = this.extractFieldContent(fieldElement);
content = (content === null) ? '' : content+'_';
-
let itemID = this.extractFieldItemId(fieldElement);
itemID = (itemID === null) ? '' : itemID+'_';
-
const field = fieldElement.dataset.field || '';
+ // If inside a repeater row, include repeater name + index for uniqueness
+ const repeaterRow = fieldElement.closest('[data-index]');
+ const repeater = repeaterRow?.closest('[data-field][data-repeater-id]');
+ if (repeater && repeaterRow) {
+ return `${content}${itemID}${repeater.dataset.field}_${repeaterRow.dataset.index}_${field}`;
+ }
+
return `${content}${itemID}${field}`;
}
@@ -1442,6 +1460,9 @@
}
getSubtypeFromURL(url) {
+ if (!url || url === '') {
+ return '';
+ }
const imgs = ['.webp', '.jpg', '.jpeg', '.png', '.gif', '.svg'];
const videos = ['.mp4', '.ogg', '.mov', '.webm', '.avi'];
@@ -1465,11 +1486,40 @@
if (!item) return;
const uploadId = item.dataset.uploadId;
+ const attachmentId = item.dataset.id;
+
+ if (!uploadId && !attachmentId) return;
if (!confirm('Remove this item?')) return;
- await this.removeUpload(uploadId);
+
+ if (uploadId) {
+ await this.removeUpload(uploadId);
+ } else {
+ const fieldId = this.getFieldIdFromElement(button);
+ item.remove();
+
+ if (fieldId) {
+ this.updateHiddenInput(fieldId);
+ this.maybeLockUploads(fieldId);
+ }
+ }
+
this.a11y.announce('Item removed');
}
+ updateHiddenInput(fieldId) {
+ const field = this.fields.get(fieldId);
+ if (!field?.ui.hidden) return;
+
+ const remaining = Array.from(field.ui.grid?.querySelectorAll(this.selectors.items.item) || [])
+ .map(el => el.dataset.id || el.dataset.uploadId)
+ .filter(Boolean);
+
+ const newValue = remaining.join(',');
+ if (field.ui.hidden.value === newValue) return;
+
+ field.ui.hidden.value = newValue;
+ field.ui.hidden.dispatchEvent(new Event('change', { bubbles: true }));
+ }
async setBulkUpload(uploads, key, value) {
const promises = Array.from(uploads).map(async (upload) => {
if (typeof upload === 'string') upload = await this.stores.uploads.get(upload);
@@ -1495,6 +1545,8 @@
async removeUpload(uploadId) {
let upload = this.stores.uploads.get(uploadId);
if (!upload) return;
+ const fieldId = upload.field; // grab before clearing
+
if (upload.group) {
let group = this.stores.groups.get(upload.group);
group.uploads = group.uploads.filter(id => id !== uploadId);
@@ -1506,10 +1558,11 @@
}
await this.clearUpload(uploadId);
- this.maybeLockUploads(upload.field);
+ this.updateHiddenInput(fieldId);
+ this.maybeLockUploads(fieldId);
- let handler = this.selectionHandlers.get(upload.field);
- if (handler){
+ let handler = this.selectionHandlers.get(fieldId);
+ if (handler) {
handler.deselect(uploadId);
}
@@ -1942,18 +1995,14 @@
return;
}
- // 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(',');
- }
+ this.updateHiddenInput(fieldId);
} else {
+ 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);
+
let group = this.stores.groups.get(groupId);
if (group) {
group.uploads = items;
--
Gitblit v1.10.0