Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

ui: storage content: avoid redundant options hasNotesColumn and hideColumns

Browse Source 
Replace both by a showColumns option instead. As the current use of
hasNotesColumn already indicates, when new content-specific columns
are added, it is more natural for each derived class to specify the
columns it wants, rather than those it doesn't.

For hideColumns, there was no user. For hasNotesColumn, the only user
was the backup view.

Set the column information in the storage.BackupView class itself
rather than the instance (like hasNotesColumn was).

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-09-30 13:42:12 +02:00 committed by Fabian Grünbichler
parent 4a4bbd5b54
commit 093dd35887
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/manager6/storage/BackupView.js
View File

@ -3,6 +3,8 @@ Ext.define('PVE.storage.BackupView', {
alias: 'widget.pveStorageBackupView',
showColumns: ['name', 'notes', 'date', 'format', 'size'],
initComponent: function() {
var me = this;

1
www/manager6/storage/Browser.js
View File

@ -63,7 +63,6 @@ Ext.define('PVE.storage.Browser', {
iconCls: 'fa fa-floppy-o',
itemId: 'contentBackup',
pluginType: plugin,
hasNotesColumn: true,
});
}
if (contents.includes('images')) {

14
www/manager6/storage/ContentView.js
View File

@ -371,12 +371,14 @@ Ext.define('PVE.storage.ContentView', {
},
};
if (me.hideColumns) {
me.hideColumns.forEach(key => delete availableColumns[key]);
}
if (!me.hasNotesColumn) {
delete availableColumns.notes;
}
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);
}