[pbs-devel] [PATCH proxmox-backup 1/3] ui: tape/BackupOverview: do not iterate over empty tapes

[pbs-devel] [PATCH proxmox-backup 1/3] ui: tape/BackupOverview: do not iterate over empty tapes

[Dominik Csapak]

tapes not belonging to a pool cannot contain data, so skip them

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/tape/BackupOverview.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/tape/BackupOverview.js b/www/tape/BackupOverview.js
index 6659d3ff..f4eb6654 100644
--- a/www/tape/BackupOverview.js
+++ b/www/tape/BackupOverview.js
@@ -46,6 +46,9 @@ Ext.define('PBS.TapeManagement.BackupOverview', {
 
 	    for (const entry of content_response.result.data) {
 		let pool = entry.pool;
+		if (pool === undefined) {
+		    continue; // pools not belonging to a pool cannot contain data
+		}
 		let media_set = entry['media-set-name'];
 		if (data[pool] === undefined) {
 		    data[pool] = {};
-- 
2.20.1

[pbs-devel] [PATCH proxmox-backup 2/3] ui: tape/TapeInventory: show expired status

[Dominik Csapak]

this is saved in a separate property, but show in status like
'proxmox-tape media list'

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/tape/TapeInventory.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/tape/TapeInventory.js b/www/tape/TapeInventory.js
index ba968752..ed45ab88 100644
--- a/www/tape/TapeInventory.js
+++ b/www/tape/TapeInventory.js
@@ -98,6 +98,9 @@ Ext.define('PBS.TapeManagement.TapeInventory', {
 	{
 	    text: gettext('Status'),
 	    dataIndex: 'status',
+	    renderer: function(value, mD, record) {
+		return record.data.expired ? 'expired' : value;
+	    },
 	    flex: 1,
 	},
     ],
-- 
2.20.1

[pbs-devel] [PATCH proxmox-backup 3/3] ui: tape/ChangerStatus: show more inventory info for tapes in slots

[Dominik Csapak]

do not only show if labeled, but the whole status (full/writeable/etc.)
and to which pool the tape belongs (if any)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/tape/ChangerStatus.js | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js
index 96eeadeb..76677158 100644
--- a/www/tape/ChangerStatus.js
+++ b/www/tape/ChangerStatus.js
@@ -405,7 +405,11 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 		let tapes = {};
 
 		for (const tape of tapes_list.result.data) {
-		    tapes[tape['label-text']] = true;
+		    tapes[tape['label-text']] = {
+			labeled: true,
+			pool: tape.pool,
+			status: tape.expired ? 'expired' : tape.status,
+		    };
 		}
 
 		let drive_entries = {};
@@ -421,7 +425,13 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 			entry = Ext.applyIf(entry, drive_entries[entry['entry-id']]);
 		    }
 
-		    entry['is-labeled'] = !!tapes[entry['label-text']];
+		    if (tapes[entry['label-text']] !== undefined) {
+			entry['is-labeled'] = true;
+			entry.pool = tapes[entry['label-text']].pool;
+			entry.status = tapes[entry['label-text']].status;
+		    } else {
+			entry['is-labeled'] = false;
+		    }
 
 		    data[type].push(entry);
 		}
@@ -516,9 +526,9 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 			    renderer: (value) => value || '',
 			},
 			{
-			    text: gettext('Labeled'),
+			    text: gettext('Inventory'),
 			    dataIndex: 'is-labeled',
-			    width: 80,
+			    flex: 1,
 			    renderer: function(value, mD, record) {
 				if (!record.data['label-text']) {
 				    return "";
@@ -528,7 +538,15 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 				    return "";
 				}
 
-				return Proxmox.Utils.format_boolean(value);
+				if (!value) {
+				    return gettext('Not Labeled');
+				}
+
+				let status = record.data.status;
+				if (record.data.pool) {
+				    return `${status} (${record.data.pool})`;
+				}
+				return status;
 			    },
 			},
 			{
-- 
2.20.1

[pbs-devel] applied: [PATCH proxmox-backup 1/3] ui: tape/BackupOverview: do not iterate over empty tapes

[Dietmar Maurer]

applied all 3 patches