[PATCH pve-manager 1/4] ui: Add Display of WWID for ISCSI

[Felix Driessler <fdriessler@inett.de>]

Signed-off-by: Felix Driessler <fdriessler@inett.de>
---
 www/manager6/Utils.js               |  8 +++
 www/manager6/form/FileSelector.js   | 81 +++++++++++++++++++++--------
 www/manager6/storage/ContentView.js | 24 ++++++++-
 3 files changed, 89 insertions(+), 24 deletions(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 77dae42e..aa766f85 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1056,6 +1056,14 @@ Ext.define('PVE.Utils', {
             return Ext.String.htmlEncode(result);
         },
 
+        render_storage_wwid: function (value, metaData, record) {
+            let data = record.data;
+            if ('wwid' in data) {
+                return Ext.String.htmlEncode(data.wwid);
+            } else {
+                return undefined;
+            }
+        },
         render_serverity: function (value) {
             return PVE.Utils.log_severity_hash[value] || value;
         },
diff --git a/www/manager6/form/FileSelector.js b/www/manager6/form/FileSelector.js
index b8f6a8c2..47c187e8 100644
--- a/www/manager6/form/FileSelector.js
+++ b/www/manager6/form/FileSelector.js
@@ -15,6 +15,45 @@ Ext.define('PVE.form.FileSelector', {
         },
     },
 
+    initComponent: function () {
+        var me = this;
+
+        me.listConfig = Ext.apply({
+            width: 600,
+            columns: this.getColumns(false),
+        }, me.listConfig);
+
+        me.callParent();
+    },
+
+    getColumns: function (isIscsi) {
+        return [
+            {
+                header: gettext('Name'),
+                dataIndex: 'text',
+                hideable: false,
+                flex: 1,
+            },
+            ...isIscsi ? [{
+                header: 'WWID',
+                flex: 1,
+                renderer: PVE.Utils.render_storage_wwid,
+                dataIndex: 'wwid',
+            }] : [],
+            {
+                header: gettext('Format'),
+                width: 60,
+                dataIndex: 'format',
+            },
+            {
+                header: gettext('Size'),
+                width: 100,
+                dataIndex: 'size',
+                renderer: Proxmox.Utils.format_size,
+            },
+        ];
+    },
+
     setStorage: function (storage, nodename) {
         var me = this;
 
@@ -52,6 +91,25 @@ Ext.define('PVE.form.FileSelector', {
 
         me.store.removeAll();
         me.store.load();
+
+        let storageInfo = PVE.data.ResourceStore.findRecord(
+            'id',
+            `storage/${me.nodename}/${me.storage}`,
+            0, // startIndex
+            false, // anyMatch
+            true, // caseSensitive
+            true, // exactMatch
+        );
+
+        let res = storageInfo.data;
+        let plugin = res.plugintype;
+        let isIscsi = plugin === 'iscsi';
+
+        let grid = me.getPicker();
+
+        if (grid) {
+            grid.reconfigure(me.store, me.getColumns(isIscsi));
+        }
     },
 
     setNodename: function (nodename) {
@@ -69,27 +127,4 @@ Ext.define('PVE.form.FileSelector', {
 
     // An optional filter function
     filter: undefined,
-
-    listConfig: {
-        width: 600,
-        columns: [
-            {
-                header: gettext('Name'),
-                dataIndex: 'text',
-                hideable: false,
-                flex: 1,
-            },
-            {
-                header: gettext('Format'),
-                width: 60,
-                dataIndex: 'format',
-            },
-            {
-                header: gettext('Size'),
-                width: 100,
-                dataIndex: 'size',
-                renderer: Proxmox.Utils.format_size,
-            },
-        ],
-    },
 });
diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
index 75b81e69..94dd2f08 100644
--- a/www/manager6/storage/ContentView.js
+++ b/www/manager6/storage/ContentView.js
@@ -30,6 +30,19 @@ Ext.define(
             }
             const storage = me.storage;
 
+            let storageInfo = PVE.data.ResourceStore.findRecord(
+                'id',
+                `storage/${nodename}/${storage}`,
+                0, // startIndex
+                false, // anyMatch
+                true, // caseSensitive
+                true, // exactMatch
+            );
+
+            let res = storageInfo.data;
+            let plugin = res.plugintype;
+            let isIscsi = plugin === 'iscsi';
+
             var content = me.content;
             if (!content) {
                 throw 'no content type specified';
@@ -159,6 +172,12 @@ Ext.define(
                             .localeCompare(b.data.text.toString(), undefined, { numeric: true }),
                     dataIndex: 'text',
                 },
+                wwid: {
+                    header: 'WWID',
+                    flex: 2,
+                    renderer: PVE.Utils.render_storage_wwid,
+                    dataIndex: 'wwid',
+                },
                 notes: {
                     header: gettext('Notes'),
                     flex: 1,
@@ -192,7 +211,9 @@ Ext.define(
                 },
             };
 
-            let showColumns = me.showColumns || ['name', 'date', 'format', 'size'];
+            let showColumns = me.showColumns || isIscsi ?
+                ['name', 'date', 'format', 'size', 'wwid'] :
+                ['name', 'date', 'format', 'size'];
 
             Object.keys(availableColumns).forEach(function (key) {
                 if (!showColumns.includes(key)) {
@@ -224,6 +245,7 @@ Ext.define(
             extend: 'Ext.data.Model',
             fields: [
                 'volid',
+                'wwid',
                 'content',
                 'format',
                 'size',
-- 
2.52.0



Felix Driessler
Junior Systems Engineer // #GernPerDU

Linux - Open Source - IT Solutions

T: +49-681-410993-0
E: fdriessler@inett.de
https://www.inett.de



inett GmbH | Altenkesseler Strasse 17 / B8 | 66115 Saarbrücken | Germany

Vertrieb: vertrieb@inett.de // +49-681-410993-33
Support: support@inett.de // +49-681-410993-42





Geschäftsführung: Marco Gabriel | Amtsgericht Saarbrücken HRB 16588