From 94de71140be2d0c80bf6a2e03cb9381b37736ed5 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 06 Feb 2026 17:03:02 +0000
Subject: [PATCH] =Some minor CRUD.js and UploadManager.js tweaks
---
inc/rest/routes/QueueRoutes.php | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/inc/rest/routes/QueueRoutes.php b/inc/rest/routes/QueueRoutes.php
index 21fa98f..3c27a3a 100644
--- a/inc/rest/routes/QueueRoutes.php
+++ b/inc/rest/routes/QueueRoutes.php
@@ -85,7 +85,9 @@
$params = $request->get_params();
$user_id = absint($params['user']);
$status = sanitize_text_field($params['status']);
- $ids = array_map('trim', array_map('sanitize_text_field', explode(',', $params['ids'])));
+ $ids = !empty($params['ids'])
+ ? array_map('trim', array_map('sanitize_text_field', explode(',', $params['ids'])))
+ : [];
$limit = absint($params['limit']);
$cacheKey = $this->cache->generateKey(compact('user_id', 'status', 'ids', 'limit'));
@@ -93,7 +95,7 @@
return $cached;
}
- $data = $this->cache->remember($cacheKey, function() use ($user_id, $params) {
+ $data = $this->cache->tag("user:{$user_id}")->remember($cacheKey, function() use ($user_id, $params) {
$filters = $this->buildFilters($params);
$operations = JVB()->queue()->getUserOperations($user_id, $filters);
@@ -136,7 +138,10 @@
public function handleAction(WP_REST_Request $request): WP_REST_Response
{
$data = $request->get_params();
- $ids = array_map('trim', array_map('sanitize_text_field', explode(',', $data['ids'])));
+ $ids = is_array($data['ids'])
+ ? array_map('trim', array_map('sanitize_text_field', $data['ids']))
+ : array_map('trim', array_map('sanitize_text_field', explode(',', $data['ids'])));
+
$action = sanitize_text_field($data['action'] ?? '');
$user_id = absint($data['user']);
@@ -192,6 +197,7 @@
$items = array_map(fn($op) => [
'id' => $op->id,
'status' => $this->mapStateToStatus($op->state, $op->outcome),
+ 'progress_percentage' => $this->formatPercentage($op),
'progress_count' => $op->processedItems,
'count' => $op->totalItems,
'updated_at' => $this->formatTimestamp($op->completedAt ?? $op->startedAt ?? $op->scheduledAt),
@@ -255,21 +261,22 @@
);
}
- private function formatOperation(Operation $op, bool $full = false): array
+ private function formatOperation(Operation $op, bool $full = true): array
{
$formatted = [
'id' => $op->id,
'type' => $op->type,
'status' => $this->mapStateToStatus($op->state, $op->outcome),
'progress_count' => $op->processedItems,
+ 'progress_percentage' => $this->formatPercentage($op),
'count' => $op->totalItems,
'title' => $this->getOperationTitle($op->type, $op->requestData),
'created_at' => $this->formatTimestamp($op->scheduledAt),
'updated_at' => $this->formatTimestamp($op->completedAt ?? $op->startedAt ?? $op->scheduledAt),
];
- if ($op->processedItems > 0 && $op->totalItems > 0) {
- $formatted['progress_percentage'] = round(($op->processedItems / $op->totalItems) * 100);
+ if (!empty($op->result['merged_into'])) {
+ $formatted['merged_into'] = $op->result['merged_into'];
}
if ($op->errorMessage) {
@@ -292,6 +299,18 @@
return $formatted;
}
+ protected function formatPercentage(Operation $op):int
+ {
+ if ($op->totalItems > 0){
+ return round(($op->processedItems / $op->totalItems) * 100);
+ } else {
+ return match($op->state) {
+ 'pending','scheduled=' => 0,
+ 'processing' => 45,
+ 'completed' => 100
+ };
+ }
+ }
/**
* Map backend state/outcome to frontend status
* Backend uses: state (pending, scheduled, processing, completed) + outcome (pending, success, partial, failed, failed_permanent)
--
Gitblit v1.10.0