[pve-devel] [PATCH manager] ui: PBSEdit: cleanup iframe for paperkey

[Thomas Lamprecht]

Am 10/03/2023 um 15:36 schrieb Aaron Lauterer:
> Otherwise the iframe used to print the paperkey will remain even after
> the encryption key window is closed.

thanks for noticing!

> Additionally clean before creating a new one as otherwise we might end
> up with multiple iframes.

having to do both seems wrong. Why not add a on close or on destroy listener
on the window which handles that always correctly in a single place?

> 
> Signed-off-by: Aaron Lauterer <a.lauterer at proxmox.com>
> ---
>  www/manager6/storage/PBSEdit.js | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/www/manager6/storage/PBSEdit.js b/www/manager6/storage/PBSEdit.js
> index 5b6b6bb8..dbc88668 100644
> --- a/www/manager6/storage/PBSEdit.js
> +++ b/www/manager6/storage/PBSEdit.js
> @@ -112,7 +112,10 @@ Ext.define('PVE.Storage.PBSKeyShow', {
>  			    width: 110,
>  			    handler: function(b) {
>  				let win = this.up('window');
> -				win.paperkey(win.key);
> +				if (win.printFrame) {
> +				    document.body.removeChild(win.printFrame);
> +				}
> +				win.printFrame = win.paperkey(win.key, win.printFrame);
>  			    },
>  			},
>  		    ],
> @@ -132,6 +135,9 @@ Ext.define('PVE.Storage.PBSKeyShow', {
>  	    text: gettext('Close'),
>  	    handler: function(b) {
>  		let win = this.up('window');
> +		if (win.printFrame) {
> +		    document.body.removeChild(win.printFrame);
> +		}
>  		win.close();
>  	    },
>  	},
> @@ -181,6 +187,7 @@ ${prettifiedKey}
>  
>  	printFrame.src = "data:text/html;base64," + btoa(html);
>  	document.body.appendChild(printFrame);
> +	return printFrame;

You could replace the whole patch with adding the following line here:

me.on('destroy', () => document.body.removeChild(printFrame));

can also apply directly with a Reported-by tag if you see nothing off with this,
whatever you prefer?

>      },
>  });
>