From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 manager 5/6] ui: zfs create: switch to using widget-toolkit's multiDiskSelector
Date: Wed, 6 Oct 2021 11:18:52 +0200 [thread overview]
Message-ID: <20211006091853.82237-13-f.ebner@proxmox.com> (raw)
In-Reply-To: <20211006091853.82237-1-f.ebner@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
No changes from v1.
For this one, the dependency requirement is already new enough.
www/manager6/node/ZFS.js | 80 ++--------------------------------------
1 file changed, 4 insertions(+), 76 deletions(-)
diff --git a/www/manager6/node/ZFS.js b/www/manager6/node/ZFS.js
index 8ea364bf..2537ee5a 100644
--- a/www/manager6/node/ZFS.js
+++ b/www/manager6/node/ZFS.js
@@ -16,35 +16,13 @@ Ext.define('PVE.node.CreateZFS', {
throw "no node name specified";
}
- let update_disklist = function() {
- let grid = me.down('#disklist');
- let disks = grid.getSelection();
-
- disks.sort(function(a, b) {
- let aOrder = a.get('order') || 0;
- let bOrder = b.get('order') || 0;
- return aOrder - bOrder;
- });
-
- let selectedDevices = disks.map(disk => disk.get('devpath')).join(';');
-
- me.down('field[name=devices]').setValue(selectedDevices);
- };
-
Ext.apply(me, {
url: `/nodes/${me.nodename}/disks/zfs`,
method: 'POST',
items: [
{
xtype: 'inputpanel',
- onGetValues: values => values, // FIXME leftover?
column1: [
- {
- xtype: 'textfield',
- hidden: true,
- name: 'devices',
- allowBlank: false,
- },
{
xtype: 'proxmoxtextfield',
name: 'name',
@@ -99,62 +77,13 @@ Ext.define('PVE.node.CreateZFS', {
],
columnB: [
{
- xtype: 'grid',
+ xtype: 'pmxMultiDiskSelector',
+ name: 'devices',
+ nodename: me.nodename,
+ diskType: 'unused',
height: 200,
emptyText: gettext('No Disks unused'),
itemId: 'disklist',
- selModel: 'checkboxmodel',
- listeners: {
- selectionchange: update_disklist,
- },
- store: {
- proxy: {
- type: 'proxmox',
- url: `/api2/json/nodes/${me.nodename}/disks/list?type=unused`,
- },
- },
- columns: [
- {
- text: gettext('Device'),
- dataIndex: 'devpath',
- flex: 2,
- },
- {
- text: gettext('Model'),
- dataIndex: 'model',
- flex: 2,
- },
- {
- text: gettext('Serial'),
- dataIndex: 'serial',
- flex: 2,
- },
- {
- text: gettext('Size'),
- dataIndex: 'size',
- renderer: Proxmox.Utils.render_size,
- flex: 1,
- },
- {
- header: gettext('Order'),
- xtype: 'widgetcolumn',
- dataIndex: 'order',
- sortable: true,
- flex: 1,
- widget: {
- xtype: 'proxmoxintegerfield',
- minValue: 1,
- isFormField: false,
- listeners: {
- change: function(numberfield, value, old_value) {
- let record = numberfield.getWidgetRecord();
- record.set('order', value);
- update_disklist(record);
- },
- },
- },
- },
- ],
},
],
},
@@ -170,7 +99,6 @@ Ext.define('PVE.node.CreateZFS', {
});
me.callParent();
- me.down('#disklist').getStore().load();
},
});
--
2.30.2
next prev parent reply other threads:[~2021-10-06 9:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 9:18 [pve-devel] [PATCH-SERIES v2 storage/widget-toolkit/manager] disk creation and wiping improvements Fabian Ebner
2021-10-06 9:18 ` [pve-devel] [PATCH v2 storage 1/6] diskmanage: add change_parttype and is_partition helpers Fabian Ebner
2021-10-06 9:18 ` [pve-devel] [PATCH v2 storage 2/6] diskmanage: wipe blockdev: also change partition type Fabian Ebner
2021-10-06 9:18 ` [pve-devel] [PATCH v2 storage 3/6] diskmanage: don't set usage for unused partitions Fabian Ebner
2021-10-06 9:18 ` [pve-devel] [PATCH v2 storage 4/6] api: disks: initgpt: explicitly abort for partitions Fabian Ebner
2021-10-06 9:18 ` [pve-devel] [PATCH v2 storage 5/6] partially fix #2285: api: disks: allow partitions for creation paths Fabian Ebner
2021-10-06 9:18 ` [pve-devel] [PATCH v2 storage 6/6] api: disks: create: set correct partition type Fabian Ebner
2021-10-06 9:18 ` [pve-devel] [PATCH v2 widget-toolkit 1/1] disk list: allow wiping individual partitions Fabian Ebner
2021-11-11 20:42 ` [pve-devel] applied: " Thomas Lamprecht
2021-10-06 9:18 ` [pve-devel] [PATCH v2 manager 1/6] api: ceph: create osd: set correct parttype for DB/WAL Fabian Ebner
2021-10-06 9:18 ` [pve-devel] [RFC v2 manager 2/6] partially fix #2285: api: ceph: create osd: allow using partitions Fabian Ebner
2021-10-06 9:18 ` [pve-devel] [RFC v2 manager 3/6] api: ceph: create osd: set correct partition type Fabian Ebner
2021-10-06 9:18 ` [pve-devel] [RFC v2 manager 4/6] partially fix #2285: ui: ceph: allow selecting partitions Fabian Ebner
2021-10-06 9:18 ` Fabian Ebner [this message]
2021-10-06 9:18 ` [pve-devel] [PATCH v2 manager 6/6] partially fix #2285: ui: disk create: " Fabian Ebner
2021-10-07 13:28 ` [pve-devel] partially-applied: [PATCH-SERIES v2 storage/widget-toolkit/manager] disk creation and wiping improvements Thomas Lamprecht
2021-11-12 15:06 ` [pve-devel] applied-series: " Thomas Lamprecht
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=20211006091853.82237-13-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-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