all lists on 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 1/3] ui: tape: improve tape-erase and add it to library view
Date: Tue, 16 Feb 2021 12:48:10 +0100	[thread overview]
Message-ID: <20210216114812.8406-1-d.csapak@proxmox.com> (raw)

refactor erase window, limit drives to changer if given

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/Makefile              |  1 +
 www/tape/ChangerStatus.js | 23 ++++++++++++++++++
 www/tape/TapeInventory.js | 42 ++++++--------------------------
 www/tape/window/Erase.js  | 51 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 34 deletions(-)
 create mode 100644 www/tape/window/Erase.js

diff --git a/www/Makefile b/www/Makefile
index 8391e68f..b82a91ed 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -18,6 +18,7 @@ TAPE_UI_FILES=						\
 	tape/form/KeySelector.js			\
 	tape/window/ChangerEdit.js			\
 	tape/window/DriveEdit.js			\
+	tape/window/Erase.js			\
 	tape/window/EncryptionEdit.js			\
 	tape/window/LabelMedia.js			\
 	tape/window/PoolEdit.js				\
diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js
index 017759c7..c51dea4b 100644
--- a/www/tape/ChangerStatus.js
+++ b/www/tape/ChangerStatus.js
@@ -91,6 +91,23 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 	    }).show();
 	},
 
+	erase: function(view, rI, cI, button, el, record) {
+	    let me = this;
+	    let vm = me.getViewModel();
+	    let label = record.data['label-text'];
+
+	    let changer = vm.get('changer');
+	    Ext.create('PBS.TapeManagement.EraseWindow', {
+		label,
+		changer,
+		listeners: {
+		    destroy: function() {
+			me.reload();
+		    },
+		},
+	    }).show();
+	},
+
 	load: function(view, rI, cI, button, el, record) {
 	    let me = this;
 	    let vm = me.getViewModel();
@@ -566,6 +583,12 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
 				    tooltip: gettext('Transfer'),
 				    isDisabled: (v, r, c, i, rec) => !rec.data['label-text'],
 				},
+				{
+				    iconCls: 'fa fa-trash-o',
+				    handler: 'erase',
+				    tooltip: gettext('Erase'),
+				    isDisabled: (v, r, c, i, rec) => !rec.data['label-text'],
+				},
 				{
 				    iconCls: 'fa fa-rotate-90 fa-upload',
 				    handler: 'load',
diff --git a/www/tape/TapeInventory.js b/www/tape/TapeInventory.js
index ec10f5c9..c369a393 100644
--- a/www/tape/TapeInventory.js
+++ b/www/tape/TapeInventory.js
@@ -41,40 +41,14 @@ Ext.define('PBS.TapeManagement.TapeInventory', {
 		return;
 	    }
 	    let label = selection[0].data['label-text'];
-	    Ext.create('Proxmox.window.Edit', {
-		title: gettext('Erase'),
-		url: `/api2/extjs/tape/drive`,
-		showProgress: true,
-		submitUrl: function(url, values) {
-		    let drive = values.drive;
-		    delete values.drive;
-		    return `${url}/${drive}/erase-media`;
-		},
-		method: 'POST',
-		items: [
-		    {
-			xtype: 'displayfield',
-			cls: 'pmx-hint',
-			value: gettext('Make sure to insert the tape into the selected drive.'),
-		    },
-		    {
-			xtype: 'pbsDriveSelector',
-			fieldLabel: gettext('Drive'),
-			name: 'drive',
-		    },
-		    {
-			xtype: 'displayfield',
-			name: 'label-text',
-			value: label,
-			submitValue: true,
-			fieldLabel: gettext('Media'),
-		    },
-		    {
-			xtype: 'proxmoxcheckbox',
-			fieldLabel: gettext('Fast Erase'),
-			name: 'fast',
-		    },
-		],
+	    let inChanger = selection[0].data.location.startsWith('online-');
+	    let changer;
+	    if (inChanger) {
+		changer = selection[0].data.location.slice("online-".length);
+	    }
+	    Ext.create('PBS.TapeManagement.EraseWindow', {
+		label,
+		changer,
 		listeners: {
 		    destroy: function() {
 			me.reload();
diff --git a/www/tape/window/Erase.js b/www/tape/window/Erase.js
new file mode 100644
index 00000000..61bd2130
--- /dev/null
+++ b/www/tape/window/Erase.js
@@ -0,0 +1,51 @@
+Ext.define('PBS.TapeManagement.EraseWindow', {
+    extend: 'Proxmox.window.Edit',
+    mixins: ['Proxmox.Mixin.CBind'],
+
+
+    changer: undefined,
+    label: undefined,
+
+    cbindData: function(config) {
+	let me = this;
+	return {};
+    },
+
+    title: gettext('Erase'),
+    url: `/api2/extjs/tape/drive`,
+    showProgress: true,
+    submitUrl: function(url, values) {
+	let drive = values.drive;
+	delete values.drive;
+	return `${url}/${drive}/erase-media`;
+    },
+
+    method: 'POST',
+    items: [
+	{
+	    xtype: 'displayfield',
+	    cls: 'pmx-hint',
+	    value: gettext('Make sure to insert the tape into the selected drive.'),
+	    cbind: {
+		hidden: '{changer}',
+	    },
+	},
+	{
+	    xtype: 'displayfield',
+	    name: 'label-text',
+	    submitValue: true,
+	    fieldLabel: gettext('Media'),
+	    cbind: {
+		value: '{label}',
+	    },
+	},
+	{
+	    xtype: 'pbsDriveSelector',
+	    fieldLabel: gettext('Drive'),
+	    name: 'drive',
+	    cbind: {
+		changer: '{changer}',
+	    },
+	},
+    ],
+});
-- 
2.20.1





             reply	other threads:[~2021-02-16 11:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-16 11:48 Dominik Csapak [this message]
2021-02-16 11:48 ` [pbs-devel] [PATCH proxmox-backup 2/3] ui: css: remove vertical align for pbs-tape-icon Dominik Csapak
2021-02-16 11:48 ` [pbs-devel] [PATCH proxmox-backup 3/3] ui: tape/BackupOverview: insert the tapes between media-set and snapshot Dominik Csapak
2021-02-16 12:06 ` [pbs-devel] applied: [PATCH proxmox-backup 1/3] ui: tape: improve tape-erase and add it to library view 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=20210216114812.8406-1-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal