[pve-devel] applied: [PATCH manager 1/1] ui: add comment/verification columns to backup/content grid

Thomas Lamprecht t.lamprecht at proxmox.com
Thu Nov 12 18:38:51 CET 2020


On 12.11.20 16:26, Dominik Csapak wrote:
> verification column only shows in the backup grid and for
> pbs storages
> 
> (renderer is mostly copied from proxmox-backup)

missing some crucial parts (see below)

> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  www/manager6/grid/BackupView.js     | 39 +++++++++++++++++++++++++++++
>  www/manager6/storage/ContentView.js |  8 +++++-
>  2 files changed, 46 insertions(+), 1 deletion(-)
> 
> diff --git a/www/manager6/grid/BackupView.js b/www/manager6/grid/BackupView.js
> index ff8d69ec..a9c6be5e 100644
> --- a/www/manager6/grid/BackupView.js
> +++ b/www/manager6/grid/BackupView.js
> @@ -99,6 +99,15 @@ Ext.define('PVE.grid.BackupView', {
>  	    allowBlank: false,
>  	    listeners: {
>  		change: function(f, value) {
> +		    let storage = f.getStore().findRecord('storage', value);
> +		    if (storage) {
> +			let isPbs = storage.data.type === 'pbs';
> +			me.getColumns().forEach((column) => {
> +			    if (column.dataIndex === 'verification') {
> +				column.setHidden(!isPbs);
> +			    }
> +			});
> +		    }
>  		    setStorage(value);
>  		}
>  	    }
> @@ -251,6 +260,36 @@ Ext.define('PVE.grid.BackupView', {
>  		    dataIndex: 'vmid',
>  		    hidden: true,
>  		},
> +		{
> +		    header: gettext('Comment'),
> +		    dataIndex: 'comment',
> +		    width: 100,
> +		    renderer: Ext.htmlEncode,
> +		},

re-ordered that column as second, like PBS does it.

> +		{
> +		    header: gettext('Verify State'),
> +		    dataIndex: 'verification',
> +		    renderer: function(v) {
> +			let i = (cls, txt) => `<i class="fa fa-fw fa-${cls}"></i> ${txt}`;
> +			if (v === undefined || v === null) {
> +			    return i('question-circle-o warning', gettext('None'));
> +			}
> +			let tip = ""
> +			let txt = gettext('Failed');
> +			let iconCls = 'times critical';
> +			if (v.state === 'ok') {
> +			    txt = gettext('OK');
> +			    iconCls = 'check good';
> +			    let now = Date.now() / 1000;
> +			    let task = Proxmox.Utils.parse_task_upid(v.upid);

.                           ^^^~ ununsed

> +			    if (now - v.starttime > 30 * 24 * 60 * 60) {
> +				tip = `Last verify task over 30 days ago: ${verify_time}`;

.                                                                     ^^^^^^^^^^~ undefined

fixed up in followup, adding also the missing tip in the non outdated case.

We really need to get pve-manager also eslint ready, as then such mistakes
can get caught easily.






More information about the pve-devel mailing list