[PATCH v1 proxmox-backup 0/2] fix prune and sync count on datastores summary

[PATCH v1 proxmox-backup 0/2] fix prune and sync count on datastores summary

[Robert Obkircher]

The datastore id was incorrectly parsed from the worker id, so some
tasks weren't counted towards the total for their datastore.

Robert Obkircher (2):
  www: fix incorrect prune count on datastores summary
  www: fix incorrect sync count on datastores summary

 www/Utils.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

-- 
2.47.3

[PATCH v1 proxmox-backup 1/2] www: fix incorrect prune count on datastores summary

[Robert Obkircher]

The number of prune tasks was always zero because they were summed up
using an incorrect datastore ID. Taking only the part before the first
colon fixes this issue.

This caused some confusion in a forum thread about unexpected disk
usage.

Fixes: https://forum.proxmox.com/threads/183886
Signed-off-by: Robert Obkircher <r.obkircher@proxmox.com>
---
 www/Utils.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/www/Utils.js b/www/Utils.js
index bf4b025c7..8f382a3b4 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -280,7 +280,10 @@ Ext.define('PBS.Utils', {
         } else if (type === 'garbage_collection') {
             return id;
         } else if (type === 'prune') {
-            return id;
+            res = PBS.Utils.PRUNE_JOB_ID_RE.exec(id);
+            if (res) {
+                result = res[1];
+            }
         }
 
         return result;
@@ -410,6 +413,9 @@ Ext.define('PBS.Utils', {
                 ':',
         );
         me.BACKUP_JOB_ID_RE = new RegExp('^' + PROXMOX_SAFE_ID_REGEX + ':');
+        // Only parse the datastore for now, ignore the optional namespace.
+        // Examples: "datastore1::host/devel", "datastore2:"
+        me.PRUNE_JOB_ID_RE = new RegExp('^' + PROXMOX_SAFE_ID_REGEX + '(?::|$)');
 
         // do whatever you want here
         Proxmox.Utils.override_task_descriptions({
-- 
2.47.3

[PATCH v1 proxmox-backup 2/2] www: fix incorrect sync count on datastores summary

[Robert Obkircher]

Correctly extract the datastore id from the sync job worker id, so it
is counted on the datastores summary page.

Signed-off-by: Robert Obkircher <r.obkircher@proxmox.com>
---
 www/Utils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/Utils.js b/www/Utils.js
index 8f382a3b4..ed3806bfc 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -405,11 +405,11 @@ Ext.define('PBS.Utils', {
         me.VERIFICATION_JOB_ID_RE = new RegExp('^' + PROXMOX_SAFE_ID_REGEX + ':?');
         me.SYNC_JOB_ID_RE = new RegExp(
             '^' +
-                PROXMOX_SAFE_ID_REGEX +
+                '(?:' + PROXMOX_SAFE_ID_REGEX + '|-)' + // remote
                 ':' +
-                PROXMOX_SAFE_ID_REGEX +
+                PROXMOX_SAFE_ID_REGEX + // remote datastore
                 ':' +
-                PROXMOX_SAFE_ID_REGEX +
+                PROXMOX_SAFE_ID_REGEX + // local datastore
                 ':',
         );
         me.BACKUP_JOB_ID_RE = new RegExp('^' + PROXMOX_SAFE_ID_REGEX + ':');
-- 
2.47.3