From 4dd7f7e258d382dbf73ff5beb1f43e03476b36cf Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 10 Feb 2026 21:08:23 +0000
Subject: [PATCH] =Taxonomy selector fixes in Form.php and TaxonomySelector.js
---
assets/js/concise/Queue.js | 282 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 244 insertions(+), 38 deletions(-)
diff --git a/assets/js/concise/Queue.js b/assets/js/concise/Queue.js
index db25262..a4ed3b1 100644
--- a/assets/js/concise/Queue.js
+++ b/assets/js/concise/Queue.js
@@ -5,6 +5,7 @@
this.user = window.auth.getUser();
+
this.canUpdateUI = true;
this.isProcessing = false;
this.isPolling = false;
@@ -15,6 +16,8 @@
this.api = jvbSettings.api;
this.endpoint = 'queue';
+ this.queueItems = new Map();
+
this.init();
}
init() {
@@ -24,13 +27,14 @@
this.initElements();
this.initListeners();
this.initStore();
- if (this.canUpdateUI) {
- this.popup = new window.jvbPopup({
+ if (this.canUpdateUI && this.ui.panel) {
+ this.popup = window.jvbPopup.registerPopup({
popup: this.ui.panel,
toggle: this.ui.toggle.button,
name: 'Queue Panel',
});
}
+ this.defineTemplates();
}
initElements() {
@@ -130,6 +134,7 @@
actions: {
cancel: 'button.cancel',
retry: 'button.retry',
+ refresh: 'button.refresh',
dismiss: 'button.dismiss',
}
},
@@ -138,6 +143,17 @@
if (!this.ui.panel) this.canUpdateUI = false;
}
+ defineTemplates() {
+ const T = window.jvbTemplates;
+
+ T.define('emptyState');
+ T.define('queueItem', {
+ setup({el, refs, manyRefs, data}) {
+ el.dataset.id = data.id;
+ }
+ });
+ }
+
initListeners() {
this.activityListeners = null;
@@ -161,6 +177,7 @@
this.updatePanel('offline');
}
handleBeforeUnload(e) {
+ if (!this.ui.panel) return;
const total = this.getQueueByStatus(this.pendingStatuses).length;
if (total > 0) {
// Modern browsers ignore custom messages, but this triggers the native dialog
@@ -173,9 +190,19 @@
if (!window.targetCheck(e, this.selectors.panel+', '+this.selectors.toggle.button)) return;
const refresh = window.targetCheck(e, this.selectors.refresh.button);
if (refresh) {
+ this.ui.refresh.button.classList.add('fetching');
this.store.clearCache();
this.store.clearFilters();
- this.store.fetch();
+ this.store.fetch().finally(() => {
+ this.ui.refresh.button.classList.remove('fetching');
+ });
+ return;
+ }
+
+
+ const refreshPage = window.targetCheck(e, this.selectors.actions.refresh);
+ if (refreshPage) {
+ this.handleRefresh(opId);
return;
}
@@ -266,6 +293,9 @@
{name: 'status', keyPath: 'status'},
{name: 'type', keyPath: 'type'},
],
+ filters: {
+ user: window.auth.getUser()
+ },
showLoading: false,
}
)
@@ -273,22 +303,90 @@
this.store.subscribe((event, data) => {
switch (event) {
case 'data-loaded':
+ const serverOps = this.store.getAll();
+
+ serverOps.forEach(serverOp => {
+ const localOp = this.queue.get(serverOp.id);
+ const mapped = this.mapServerOperation(serverOp);
+
+ this.queue.set(mapped.id, mapped);
+
+ // Notify if changed
+ if (localOp && localOp.status !== mapped.status) {
+ this.notify('operation-status', mapped);
+ }
+ });
+
+ this.maybeStartPolling();
+ this.updateUI();
+ break;
+
case 'items-save':
this.maybeStartPolling();
this.updateUI();
break;
+
case 'item-saved':
- if (data.previousItem && data.previousItem.status !== data.item.status) {
- this.updateOperationStatus(data.item.id, data.item.status);
+ if (data.item) {
+ this.queue.set(data.item.id, data.item);
+ if (data.previousItem?.status !== data.item.status) {
+ this.notify('operation-status', data.item);
+ }
}
this.maybeStartPolling();
break;
- default:
-
- break;
}
});
}
+
+ /**
+ * Handle refresh button click - clears cache for the relevant store
+ */
+ handleRefresh(opId) {
+ const op = this.getQueue(opId);
+ if (!op) return;
+
+ // Determine which store to refresh based on operation type
+ let storeName = null;
+
+ // Map operation types to store names
+ const typeToStore = {
+ 'content_update': op.data?.posts ? Object.values(op.data.posts)[0]?.content : null,
+ 'batch_creation': op.data?.content,
+ 'image_upload': 'uploads',
+ 'video_upload': 'uploads',
+ 'document_upload': 'uploads',
+ };
+
+ storeName = typeToStore[op.type];
+
+ // If we found a store name, clear its cache
+ if (storeName && window.jvbStore) {
+ const store = window.jvbStore.stores.get(storeName);
+ if (store) {
+ window.jvbStore.clearCache(storeName);
+ window.jvbStore.fetch(storeName);
+
+ // Give visual feedback
+ const button = this.items.get(opId)?.ui?.actions?.refresh;
+ if (button) {
+ const originalText = button.querySelector('span').textContent;
+ button.querySelector('span').textContent = 'Refreshed!';
+ button.disabled = true;
+
+ setTimeout(() => {
+ button.querySelector('span').textContent = originalText;
+ button.disabled = false;
+ }, 2000);
+ }
+ }
+ } else {
+ // Fallback: just reload the page if we can't determine the store
+ if (confirm('Refresh the page to see changes?')) {
+ window.location.reload();
+ }
+ }
+ }
/****************************************************************************
OPERATIONS
****************************************************************************/
@@ -334,14 +432,16 @@
const existingOps = Array.from(this.getAllQueue()).filter(op=> {
return op.status === 'queued' &&
- op.endpoint === item.endpoint &&
- op.canMerge
+ op.endpoint === item.endpoint &&
+ op.canMerge
});
if (existingOps.length > 0) {
const existing = existingOps[0];
existing.data = window.deepMerge(existing.data, item.data);
existing.timestamp = Date.now();
+ this.setQueue(existing);
+
this.updateOperationStatus(existing.id, existing.status);
this.updateUI();
this.trackActivity();
@@ -366,9 +466,12 @@
}
if (statusOrId.length ===0) return;
if (!['cancel', 'dismiss', 'retry'].includes(action)) return;
+
const shouldRemove = ['cancel', 'dismiss'].includes(action);
if (shouldRemove) {
- statusOrId.forEach(id => this.removeOperationUI(id));
+ statusOrId.forEach(id => {
+ this.removeOperationUI(id)
+ });
}
try {
@@ -382,7 +485,7 @@
},
body: JSON.stringify({
action,
- ids: statusOrId,
+ ids: Array.isArray(statusOrId) ? statusOrId : [statusOrId],
user: this.user
})
}
@@ -396,7 +499,10 @@
}
statusOrId.forEach(id => {
let item = this.getQueue(id);
- this.notify(`${action}-operation`, item);
+ if (item) {
+ this.notify(`${action}-operation`, item);
+ }
+
if (shouldRemove) {
this.clearQueue(id);
} else {
@@ -441,7 +547,13 @@
}
this.setProcessing(false);
- this.stopActivityTracking();
+ const remainingQueue = this.getQueueByStatus('queued');
+ if (remainingQueue.length === 0) {
+ this.stopActivityTracking();
+ } else {
+ // Still have queued items, restart activity tracking
+ this.trackActivity();
+ }
this.toggleQueue(this.maybeStartPolling());
}
@@ -463,13 +575,13 @@
let requestBody;
if (operation.data instanceof FormData) {
operation.data.append('id', operation.id);
- operation.data.append('user', this.user);
+ operation.data.append('user', window.auth.getUser());
requestBody = operation.data;
} else {
requestBody = JSON.stringify({
...operation.data,
id: operation.id,
- user: this.user
+ user: window.auth.getUser()
});
operation.headers['Content-Type'] = 'application/json';
}
@@ -633,8 +745,10 @@
if (!this.isPolling) return;
try {
+ this.ui.refresh.button.classList.add('fetching');
this.store.clearCache();
await this.store.fetch();
+ this.ui.refresh.button.classList.remove('fetching');
if (!this.maybeStartPolling()) {
this.stopPolling();
this.updatePanel('synced');
@@ -649,6 +763,10 @@
}
startCountdown(count, onComplete) {
+ if (!this.ui.refresh.countdown) {
+ console.warn('Countdown element not found');
+ return;
+ }
this.ui.refresh.countdown.classList.add('counting');
this.ui.refresh.countdown.textContent = count;
@@ -727,7 +845,7 @@
if (sortedOps.length === 0) {
window.removeChildren(this.ui.items.container);
- const empty = window.getTemplate('emptyQueue');
+ const empty = window.jvbTemplates.create('emptyQueue');
this.ui.items.container.append(empty);
this.a11y.announce('No items in queue');
return;
@@ -761,9 +879,7 @@
}
createOperationElement(op) {
- const el = window.getTemplate('queueItem');
- el.dataset.id = op.id;
-
+ const el = window.jvbTemplates.create('queueItem', op);
const item = {
element: el,
ui: window.uiFromSelectors(this.selectors.item, el)
@@ -812,21 +928,32 @@
item.ui.actions['retry'].hidden = op.status !=='failed';
}
if (item.ui.actions.dismiss) item.ui.actions.dismiss.hidden = this.pendingStatuses.includes(op.status);
+ if (item.ui.actions.refresh) {
+ item.ui.actions.refresh.hidden = op.status !== 'completed';
+ }
}
- getProgress(op) {
- if (op.progress) return op.progress;
- if (!this.statuses.includes(op.status)) return 0;
- let statusProgress = {
- 'queued': 10,
- 'uploading': 25,
- 'pending': 40,
- 'processing':70,
- 'completed':100,
- 'failed':0,
- 'failed_permanent':0
- };
- return statusProgress[op.status]??0;
+ getProgress(op) {
+ // Check server-provided percentage first
+ if (op.progress_percentage !== undefined) {
+ return op.progress_percentage;
}
+ // Legacy: check old 'progress' field
+ if (op.progress !== undefined) {
+ return op.progress;
+ }
+ // Fallback to status-based calculation
+ if (!this.statuses.includes(op.status)) return 0;
+ const statusProgress = {
+ 'queued': 10,
+ 'uploading': 25,
+ 'pending': 40,
+ 'processing': 70,
+ 'completed': 100,
+ 'failed': 0,
+ 'failed_permanent': 0
+ };
+ return statusProgress[op.status] ?? 0;
+ }
removeOperationUI(opId) {
let op = this.items.get(opId);
if (!op) return;
@@ -834,7 +961,7 @@
}
updatePanel(status = 'syncing') {
- if (!this.panelStatuses.includes(status)) return;
+ if (!this.ui.panel || !this.panelStatuses.includes(status)) return;
this.ui.panel.classList.remove(...this.panelStatuses);
this.ui.panel.classList.add(status);
}
@@ -851,7 +978,8 @@
'processing': 'Processing',
'completed': 'Completed',
'failed': 'Failed',
- 'failed_permanent': 'Failed permanently'
+ 'failed_permanent': 'Failed permanently',
+ 'merged': 'Merged'
};
return labels[status];
}
@@ -867,11 +995,26 @@
case 'pending':
return item.position ? `Position ${item.position} in queue` : 'In server queue';
case 'processing':
- return item.progress ? `${item.progress}% complete` : 'Processing...';
+ // Show progress count if available
+ if (item.count && item.progress_count !== undefined) {
+ const processed = item.progress_count;
+ const total = item.count;
+ const percentage = Math.round((processed / total) * 100);
+ return `Processing ${processed}/${total} items (${percentage}%)`;
+ }
+ // Fallback to percentage only
+ if (item.progress_percentage !== undefined) {
+ return `${item.progress_percentage}% complete`;
+ }
+ return 'Processing...';
case 'completed':
- return 'Successfully completed';
+ return 'Successfully completed. Refresh to see changes.';
+ case 'merged':
+ return item.merged_into
+ ? `Merged with another operation (${item.merged_into.substring(0, 8)}...)`
+ : 'Merged with another operation';
case 'failed':
- return `Failed: ${item.lastError || 'Unknown error'} (Retry ${item.retries}/${this.config.maxRetries})`;
+ return `Failed: ${item.lastError || 'Unknown error'} (Retry ${item.retries}/${2})`;
case 'failed_permanent':
return `Failed: ${item.lastError || 'Unknown error'}`;
default:
@@ -879,6 +1022,7 @@
}
}
toggleQueue(on = true) {
+ if (!this.ui.panel) return;
this.ui.panel.hidden = !on;
this.ui.toggle.button.hidden = !on;
}
@@ -886,6 +1030,68 @@
this.isProcessing = on;
this.ui.toggle.button.classList.toggle('saving', on);
}
+
+ /**
+ * Map server operation format to frontend format
+ * Server uses: type, data (requestData), status (from state/outcome)
+ * Frontend uses: endpoint, data, status, headers, method, etc.
+ */
+ mapServerOperation(serverOp) {
+ const localOp = this.queue.get(serverOp.id);
+
+ // If we have local operation data, preserve it
+ if (localOp && localOp.endpoint) {
+ const mappedOp = {
+ ...localOp,
+ ...serverOp,
+ endpoint: localOp.endpoint,
+ method: localOp.method,
+ headers: localOp.headers,
+ progress_percentage: serverOp.progress_percentage,
+ progress_count: serverOp.progress_count,
+ count: serverOp.count
+ };
+
+ if (serverOp.merged_into) {
+ this.handleMergedOperation(mappedOp);
+ }
+ }
+
+
+ // Minimal mapping for server-only operations
+ // Extract endpoint from type if possible, otherwise use type
+ const endpoint = serverOp.type ? serverOp.type.replace('_update', '').replace('_', '/') : 'unknown';
+
+ const mappedOp = {
+ ...serverOp,
+ endpoint: endpoint,
+ method: 'POST',
+ headers: { ...this.headers },
+ };
+ if (serverOp.merged_into) {
+ this.handleMergedOperation(mappedOp);
+ }
+ return mappedOp
+ }
+
+ /**
+ * Handle merged operations
+ * The target operation already has merged data from server,
+ * so we just need to clean up the merged operation locally
+ */
+ handleMergedOperation(operation) {
+ if (!operation.merged_into) return;
+
+ console.log(`[Queue] Operation ${operation.id} merged into ${operation.merged_into}`);
+
+ // Auto-dismiss merged operation after brief display
+ // The target operation already has all the merged data from server
+ setTimeout(() => {
+ this.store.delete(operation.id);
+ this.removeOperationFromUI(operation.id);
+ }, 3000);
+ }
+
/****************************************************************************
SUBSCRIPTION
****************************************************************************/
--
Gitblit v1.10.0