[pbs-devel] [PATCH proxmox-backup 1/3] ui: tape/ChangerStatus: add Inventory column to drives/import-export

[pbs-devel] [PATCH proxmox-backup 1/3] ui: tape/ChangerStatus: add Inventory column to drives/import-export

[Dominik Csapak]

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

diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js
index c51dea4b..9837481b 100644
--- a/www/tape/ChangerStatus.js
+++ b/www/tape/ChangerStatus.js
@@ -470,6 +470,26 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 		Proxmox.Utils.setErrorMask(me.lookup('content'), err);
 	    }
 	},
+
+	renderIsLabeled: function(value, mD, record) {
+	    if (!record.data['label-text']) {
+		return "";
+	    }
+
+	    if (record.data['label-text'].startsWith("CLN")) {
+		return "";
+	    }
+
+	    if (!value) {
+		return gettext('Not Labeled');
+	    }
+
+	    let status = record.data.status;
+	    if (record.data.pool) {
+		return `${status} (${record.data.pool})`;
+	    }
+	    return status;
+	},
     },
 
     listeners: {
@@ -551,26 +571,8 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 			{
 			    text: gettext('Inventory'),
 			    dataIndex: 'is-labeled',
+			    renderer: 'renderIsLabeled',
 			    flex: 1,
-			    renderer: function(value, mD, record) {
-				if (!record.data['label-text']) {
-				    return "";
-				}
-
-				if (record.data['label-text'].startsWith("CLN")) {
-				    return "";
-				}
-
-				if (!value) {
-				    return gettext('Not Labeled');
-				}
-
-				let status = record.data.status;
-				if (record.data.pool) {
-				    return `${status} (${record.data.pool})`;
-				}
-				return status;
-			    },
 			},
 			{
 			    text: gettext('Actions'),
@@ -626,6 +628,12 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 				    flex: 1,
 				    renderer: (value) => value || '',
 				},
+				{
+				    text: gettext('Inventory'),
+				    dataIndex: 'is-labeled',
+				    renderer: 'renderIsLabeled',
+				    flex: 1,
+				},
 				{
 				    text: gettext("Name"),
 				    sortable: true,
@@ -716,6 +724,12 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 				    renderer: (value) => value || '',
 				    flex: 1,
 				},
+				{
+				    text: gettext('Inventory'),
+				    dataIndex: 'is-labeled',
+				    renderer: 'renderIsLabeled',
+				    flex: 1,
+				},
 				{
 				    text: gettext('Actions'),
 				    xtype: 'actioncolumn',
-- 
2.20.1

[pbs-devel] [PATCH proxmox-backup 2/3] ui: tape/ChangerStatus: rename 'slot' column to 'id'

[Dominik Csapak]

slot is already in the title of the grid, and hide it by default for
drives (the user does not need it there)

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

diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js
index 9837481b..c00ad979 100644
--- a/www/tape/ChangerStatus.js
+++ b/www/tape/ChangerStatus.js
@@ -558,7 +558,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 		    },
 		    columns: [
 			{
-			    text: gettext('Slot'),
+			    text: gettext('ID'),
 			    dataIndex: 'entry-id',
 			    width: 50,
 			},
@@ -618,8 +618,9 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 			    },
 			    columns: [
 				{
-				    text: gettext('Slot'),
+				    text: gettext('ID'),
 				    dataIndex: 'entry-id',
+				    hidden: true,
 				    width: 50,
 				},
 				{
@@ -711,10 +712,10 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 			    store: {
 				data: [],
 			    },
-			    title: gettext('Import-Export'),
+			    title: gettext('Import-Export Slots'),
 			    columns: [
 				{
-				    text: gettext('Slot'),
+				    text: gettext('ID'),
 				    dataIndex: 'entry-id',
 				    width: 50,
 				},
-- 
2.20.1

[pbs-devel] [PATCH proxmox-backup 3/3] ui: tape/ChangerStatus: adapt load/unload to WorkerTask

[Dominik Csapak]

those are now workertasks (behind a 'POST' request), so show the
progress with the upid

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

diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js
index c00ad979..d87b15f5 100644
--- a/www/tape/ChangerStatus.js
+++ b/www/tape/ChangerStatus.js
@@ -117,9 +117,12 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 
 	    Ext.create('Proxmox.window.Edit', {
 		isCreate: true,
+		autoShow: true,
 		submitText: gettext('OK'),
 		title: gettext('Load Media into Drive'),
 		url: `/api2/extjs/tape/drive`,
+		showProgress: true,
+		method: 'POST',
 		submitUrl: function(url, values) {
 		    let drive = values.drive;
 		    delete values.drive;
@@ -145,25 +148,26 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 			me.reload();
 		    },
 		},
-	    }).show();
+	    });
 	},
 
 	unload: async function(view, rI, cI, button, el, record) {
 	    let me = this;
 	    let drive = record.data.name;
-	    let driveGrid = me.lookup('drives');
-	    Proxmox.Utils.setErrorMask(driveGrid, true);
 	    try {
-		await PBS.Async.api2({
-		    method: 'PUT',
+		let response = await PBS.Async.api2({
+		    method: 'POST',
 		    timeout: 5*60*1000,
 		    url: `/api2/extjs/tape/drive/${encodeURIComponent(drive)}/unload`,
 		});
-		Proxmox.Utils.setErrorMask(driveGrid);
-		me.reload();
+
+		Ext.create('Proxmox.window.TaskProgress', {
+		    autoShow: true,
+		    upid: response.result.data,
+		    taskDone: () => me.reload(),
+		});
 	    } catch (error) {
 		Ext.Msg.alert(gettext('Error'), error);
-		Proxmox.Utils.setErrorMask(driveGrid);
 		me.reload();
 	    }
 	},
-- 
2.20.1

[pbs-devel] applied: [PATCH proxmox-backup 1/3] ui: tape/ChangerStatus: add Inventory column to drives/import-export

[Dietmar Maurer]

applied all 3 patches