public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 3/3] ui: tape/ChangerStatus: show more inventory info for tapes in slots
Date: Tue,  9 Feb 2021 15:40:44 +0100	[thread overview]
Message-ID: <20210209144044.17782-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210209144044.17782-1-d.csapak@proxmox.com>

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





  parent reply	other threads:[~2021-02-09 14:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-09 14:40 [pbs-devel] [PATCH proxmox-backup 1/3] ui: tape/BackupOverview: do not iterate over empty tapes Dominik Csapak
2021-02-09 14:40 ` [pbs-devel] [PATCH proxmox-backup 2/3] ui: tape/TapeInventory: show expired status Dominik Csapak
2021-02-09 14:40 ` Dominik Csapak [this message]
2021-02-10  5:22 ` [pbs-devel] applied: [PATCH proxmox-backup 1/3] ui: tape/BackupOverview: do not iterate over empty tapes Dietmar Maurer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210209144044.17782-3-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal