From 47e77f9fac1155c536b2b87fec552c7fcce66fa6 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 01 Jun 2026 18:06:34 +0000
Subject: [PATCH] =Timeline block fixes. Next up: adding article schema classes
---
assets/js/concise/Queue.js | 105 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 78 insertions(+), 27 deletions(-)
diff --git a/assets/js/concise/Queue.js b/assets/js/concise/Queue.js
index d50488e..1122684 100644
--- a/assets/js/concise/Queue.js
+++ b/assets/js/concise/Queue.js
@@ -5,6 +5,10 @@
this.user = window.auth.getUser();
+ if (!this.user) {
+ return;
+ }
+
this.canUpdateUI = true;
this.isProcessing = false;
@@ -12,12 +16,12 @@
this.queue = new Map();
this.items = new Map();
this.subscribers = new Set();
+ this.loadFromStorage = false;
+ this.failedFetches = 0;
this.api = jvbSettings.api;
this.endpoint = 'queue';
- this.queueItems = new Map();
-
this.init();
}
init() {
@@ -28,7 +32,7 @@
this.initListeners();
this.initStore();
if (this.canUpdateUI && this.ui.panel) {
- this.popup = new window.jvbPopup({
+ this.popup = window.jvbPopup.registerPopup({
popup: this.ui.panel,
toggle: this.ui.toggle.button,
name: 'Queue Panel',
@@ -57,8 +61,8 @@
count: '.qtoggle .count'
},
refresh: {
- button: '#queue .refresh .refreshNow',
- countdown: '#queue .refresh .countdown'
+ button: '#queue .m-actions .refresh',
+ countdown: '#queue .m-actions .refresh .countdown'
},
popup: {
popup: '#queue .popup',
@@ -161,11 +165,15 @@
this.onlineHandler = this.handleOnline.bind(this);
this.offlineHandler = this.handleOffline.bind(this);
this.unloadHandler = this.handleBeforeUnload.bind(this);
+ this.visibilityHandler = this.handleVisibilityChange.bind(this);
document.addEventListener('click', this.clickHandler);
window.addEventListener('online', this.onlineHandler);
window.addEventListener('offline', this.offlineHandler);
- window.addEventListener('beforeunload', this.unloadHandler);
+
+ // window.addEventListener('beforeunload', this.unloadHandler);
+
+ document.addEventListener('visibilitychange', this.visibilityHandler);
}
handleOnline() {
this.updatePanel('synced');
@@ -176,6 +184,14 @@
handleOffline() {
this.updatePanel('offline');
}
+
+ handleVisibilityChange(e) {
+ if (this.isPolling && document.hidden) {
+ this.stopPolling();
+ } else {
+ this.maybeStartPolling();
+ }
+ }
handleBeforeUnload(e) {
if (!this.ui.panel) return;
const total = this.getQueueByStatus(this.pendingStatuses).length;
@@ -288,8 +304,8 @@
storeName: 'queue',
keyPath: 'id',
endpoint: this.endpoint,
- // TTL: Infinity,
- TTL: 5000,
+ TTL: Infinity,
+ isAuth: true,
indexes: [
{name: 'status', keyPath: 'status'},
{name: 'type', keyPath: 'type'},
@@ -476,7 +492,7 @@
}
try {
- const response = await fetch(
+ const response = await window.auth.fetch(
`${this.api}${this.endpoint}`,
{
method: 'POST',
@@ -574,21 +590,25 @@
this.updateOperationStatus(operation.id, 'uploading');
let requestBody;
+ let req;
if (operation.data instanceof FormData) {
operation.data.append('id', operation.id);
operation.data.append('user', window.auth.getUser());
requestBody = operation.data;
+ req = operation.data;
} else {
- requestBody = JSON.stringify({
+ req = {
...operation.data,
id: operation.id,
user: window.auth.getUser()
- });
+ };
+ requestBody = JSON.stringify(req);
operation.headers['Content-Type'] = 'application/json';
}
- if (requestBody === undefined || requestBody === null) return;
+ if (operation.endpoint === 'unknown' || requestBody === undefined || requestBody === null) return;
- const response = await fetch(
+
+ const response = await window.auth.fetch(
`${this.api}${operation.endpoint}`,
{
method: operation.method,
@@ -596,11 +616,14 @@
body: requestBody
}
);
+ console.log('Sending request with data: ', req);
const result = await response.json();
if (skip) {
operation.data = {};
}
+ console.log('Result: ', result);
if (response.ok && result.success) {
+ this.notify('sent-to-server', req);
if (result.id && operation.id !== result.id) {
operation = await this.handleServerMerge(operation, result);
} else {
@@ -684,10 +707,24 @@
}
getAllQueue() {
- let ops = [... new Set([
- ...Array.from(this.store.data.values()),
+ let index = new Set();
+
+ let ops = [
... Array.from(this.queue.values())
- ])];
+ ];
+ if (!this.loadFromStorage) {
+ this.loadFromStorage = true;
+ ops = [
+ ... ops,
+ ...Array.from(this.store.data.values())
+ ];
+
+ ops = ops.filter(el => {
+ const isAdded = index.has(el.id);
+ index.add(el.id);
+ return !isAdded;
+ });
+ }
//Sort operations by operation updated_at
return this.sortOperations(ops);
}
@@ -697,17 +734,19 @@
status = [status];
}
- let ops = [...new Set([
- ...Array.from(this.store.filterByIndex({status: status})),
- ...Array.from(this.queue.values()).filter(op => status.includes(op.status))
- ])];
- return this.sortOperations(ops);
+ let ops = this.getAllQueue();
+ return ops.filter(op => status.includes(op.status));
}
updateOperationStatus(itemID, status) {
let item = this.getQueue(itemID);
- if (!item || !this.statuses.includes(status)) return;
+ if (!item) return;
+ if (!this.statuses.includes(status)) {
+ console.log('Invalid status: ', status);
+ return;
+ }
+
item.status = status;
this.notify('operation-status', item);
this.setQueue(item);
@@ -748,7 +787,14 @@
try {
this.ui.refresh.button.classList.add('fetching');
this.store.clearCache();
- await this.store.fetch();
+ let response = await this.store.fetch();
+ if (response.status === 429) {
+ console.log('Too many requests. Waiting 30 seconds');
+ this.stopPolling();
+ this.startCountdown(30, () => this.runPollCycle());
+ return;
+ }
+
this.ui.refresh.button.classList.remove('fetching');
if (!this.maybeStartPolling()) {
this.stopPolling();
@@ -756,6 +802,8 @@
return;
}
} catch (error) {
+ this.stopPolling();
+ this.updatePanel('synced');
console.error('Polling error:', error);
}
@@ -816,9 +864,10 @@
this.ui.actions.retry.disabled = operations.filter(op => op.status === 'failed').length === 0;
this.ui.actions.clear.disabled = operations.filter(op => op.status === 'completed').length ===0;
- const activeCount = operations.filter(op =>
+ let activeCount = operations.filter(op =>
[...this.pendingStatuses, ...this.workingStatuses].includes(op.status)
- ).length;
+ );
+ activeCount = activeCount.length;
this.ui.toggle.count.hidden = activeCount === 0;
this.ui.toggle.count.textContent = activeCount;
@@ -896,7 +945,8 @@
let op = this.getQueue(opId);
let element = item.element;
- element.classList.remove(this.statuses);
+
+ element.classList.remove(... this.statuses);
element.classList.add(op.status);
let progress = this.getProgress(op);
@@ -1088,7 +1138,7 @@
// 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.clearQueue(operation.id);
this.removeOperationFromUI(operation.id);
}, 3000);
}
@@ -1126,3 +1176,4 @@
}
});
});
+
--
Gitblit v1.10.0