[pve-devel] [PATCH v4 manager 4/4] ui: content view: remove dead code

Matthias Heiserer m.heiserer at proxmox.com
Mon Apr 4 15:02:11 CEST 2022


These lines were only used by grid/BackupView, which gets deleted in
this series.

Signed-off-by: Matthias Heiserer <m.heiserer at proxmox.com>
---
No changes from v2/v3

 www/manager6/storage/ContentView.js | 43 ++++++-----------------------
 1 file changed, 8 insertions(+), 35 deletions(-)

diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
index 2874b71e..56c11037 100644
--- a/www/manager6/storage/ContentView.js
+++ b/www/manager6/storage/ContentView.js
@@ -147,58 +147,31 @@ Ext.define('PVE.storage.ContentView', {
 	    },
 	);
 
-	let availableColumns = {
-	    'name': {
+	const columns = [
+	    {
 		header: gettext('Name'),
 		flex: 2,
 		sortable: true,
 		renderer: PVE.Utils.render_storage_content,
 		dataIndex: 'text',
 	    },
-	    'notes': {
-		header: gettext('Notes'),
-		flex: 1,
-		renderer: Ext.htmlEncode,
-		dataIndex: 'notes',
-	    },
-	    'protected': {
-		header: `<i class="fa fa-shield"></i>`,
-		tooltip: gettext('Protected'),
-		width: 30,
-		renderer: v => v ? `<i data-qtip="${gettext('Protected')}" class="fa fa-shield"></i>` : '',
-		sorter: (a, b) => (b.data.protected || 0) - (a.data.protected || 0),
-		dataIndex: 'protected',
-	    },
-	    'date': {
+	    {
 		header: gettext('Date'),
 		width: 150,
 		dataIndex: 'vdate',
 	    },
-	    'format': {
+	    {
 		header: gettext('Format'),
 		width: 100,
 		dataIndex: 'format',
 	    },
-	    'size': {
+	    {
 		header: gettext('Size'),
 		width: 100,
 		renderer: Proxmox.Utils.format_size,
 		dataIndex: 'size',
 	    },
-	};
-
-	let showColumns = me.showColumns || ['name', 'date', 'format', 'size'];
-
-	Object.keys(availableColumns).forEach(function(key) {
-	    if (!showColumns.includes(key)) {
-		delete availableColumns[key];
-	    }
-	});
-
-	if (me.extraColumns && typeof me.extraColumns === 'object') {
-	    Object.assign(availableColumns, me.extraColumns);
-	}
-	const columns = Object.values(availableColumns);
+	];
 
 	Ext.apply(me, {
 	    store: store,
@@ -216,8 +189,8 @@ Ext.define('PVE.storage.ContentView', {
     Ext.define('pve-storage-content', {
 	extend: 'Ext.data.Model',
 	fields: [
-	    'volid', 'content', 'format', 'size', 'used', 'vmid',
-	    'channel', 'id', 'lun', 'notes', 'verification',
+	    'volid', 'content', 'format', 'size', 'used',
+	    'channel', 'id', 'lun',
 	    {
 		name: 'text',
 		convert: function(value, record) {
-- 
2.30.2






More information about the pve-devel mailing list