From ac444cba221832c012c0435fdc8339fe9f37febb Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 11 May 2026 18:35:04 +0000
Subject: [PATCH] =Some changes to the CRUD.js editing, timeline post configuration
---
assets/js/concise/UploadManager.js | 90 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 68 insertions(+), 22 deletions(-)
diff --git a/assets/js/concise/UploadManager.js b/assets/js/concise/UploadManager.js
index b8d4df8..bc3c041 100644
--- a/assets/js/concise/UploadManager.js
+++ b/assets/js/concise/UploadManager.js
@@ -139,7 +139,8 @@
if (manyRefs.inputs) {
for (let input of manyRefs.inputs) {
- let wrapper = input.closest('[data-field]')??el;
+ let wrapper = input.closest('[data-field]')??input.closest('.radio-button')??el;
+
window.prefixInput(input, `${data.id??data.uploadId}-`, wrapper);
}
}
@@ -300,8 +301,6 @@
&& ['image_upload', 'video_upload', 'document_upload'].includes(operation.type)) {
let uploadIds = [];
- console.log('upload operation complete', operation);
-
if (operation.data) {
// Handle FormData
if (operation.data instanceof FormData) {
@@ -529,6 +528,8 @@
LISTENERS
*********************************************************************/
handleClick(e) {
+ if (!window.targetCheck(e, this.selectors.fields.field)) return;
+
//Open the file input if it's a dropzone
let dropZone = window.targetCheck(e, this.selectors.fields.dropZone);
if (dropZone && !e.target.matches('input, button, a')){
@@ -690,7 +691,8 @@
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);
@@ -992,23 +994,33 @@
if (data.config.type !== 'single') {
this.initSortable(data.id);
}
+ this.maybeLockUploads(data.id);
return data.id;
}
- extractFieldConfig(fieldElement, autoUpload, imageMeta) {
- return {
+ extractFieldConfig(el, autoUpload, imageMeta) {
+ const config = {
autoUpload: autoUpload,
showMeta: imageMeta,
- destination: fieldElement.dataset.destination || 'meta', //TODO: why do we need this?
- 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'
+ destination: el.dataset.destination || 'meta',
+ content: this.extractFieldContent(el),
+ mode: el.dataset.mode || 'direct',
+ type: el.dataset.type || 'single',
+ name: el.dataset.field,
+ itemID: this.extractFieldItemId(el) ?? 0,
+ maxFiles: ('max-files' in el.dataset) ? parseInt(el.dataset.maxFiles) : 0,
+ subType: el.dataset.subtype ?? 'image',
+ repeaterPath: null
};
+
+ const repeaterRow = el.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) {
@@ -1024,12 +1036,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}`;
}
@@ -1340,8 +1357,20 @@
let fieldId = uploads[0].field;
let field = document.querySelector(`[data-uploader="${fieldId}"]`);
if (!field) {
- console.log('No field found for '+fieldId);
- return;
+ if ('crudManager' in window && fieldId.startsWith(window.crudManager.content)) {
+ let [content, itemId, fieldName] = fieldId.split('_');
+ if (parseInt(itemId) > 0) {
+ window.crudManager.openEditModal(itemId);
+ field = document.querySelector(`[data-uploader="${fieldId}"]`);
+ } else {
+ console.log('No field found for '+fieldId);
+ return;
+ }
+ } else {
+ console.log('No field found for '+fieldId);
+ return;
+ }
+
}
let fieldData = this.fields.get(fieldId);
if (fieldData.groupUI.container) {
@@ -1447,6 +1476,9 @@
}
getSubtypeFromURL(url) {
+ if (!url || url === '') {
+ return '';
+ }
const imgs = ['.webp', '.jpg', '.jpeg', '.png', '.gif', '.svg'];
const videos = ['.mp4', '.ogg', '.mov', '.webm', '.avi'];
@@ -1466,6 +1498,7 @@
* @param button
*/
async handleRemoveItem(button) {
+ console.log('Handling remove upload');
const item = button.closest(this.selectors.items.item);
if (!item) return;
@@ -1495,10 +1528,23 @@
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)
+ .map(el => {
+ if (Object.hasOwn(el.dataset, 'id') && el.dataset.id > 0) {
+ return el.dataset.id;
+ }
+
+ if (Object.hasOwn(el.dataset, 'upload-id') && el.dataset.uploadId > 0) {
+ return el.dataset.uploadId;
+ }
+ //For timeline
+ return el.dataset.itemId;
+ })
.filter(Boolean);
- field.ui.hidden.value = remaining.join(',');
+ 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) {
@@ -1788,9 +1834,9 @@
let uploads = this.stores.uploads.filterByIndex({field: fieldId});
let count = uploads.length;
- let max = field.config.maxFiles??25;
+ let max = field.config.maxFiles??0;
- field.ui.dropZone.hidden = count >= max;
+ field.ui.dropZone.hidden = max > 0 && count >= max;
}
/*******************************************************************************
OPERATION METHODS
--
Gitblit v1.10.0