From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <o.bektas@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits))
 (No client certificate requested)
 by lists.proxmox.com (Postfix) with ESMTPS id BEC3160E62
 for <pbs-devel@lists.proxmox.com>; Mon,  7 Feb 2022 15:51:50 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id ACBC326909
 for <pbs-devel@lists.proxmox.com>; Mon,  7 Feb 2022 15:51:20 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
 [94.136.29.106])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits))
 (No client certificate requested)
 by firstgate.proxmox.com (Proxmox) with ESMTPS id 066C2268FE
 for <pbs-devel@lists.proxmox.com>; Mon,  7 Feb 2022 15:51:19 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
 by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 91DF041AF4
 for <pbs-devel@lists.proxmox.com>; Mon,  7 Feb 2022 15:41:46 +0100 (CET)
Date: Mon, 7 Feb 2022 15:41:44 +0100
From: Oguz Bektas <o.bektas@proxmox.com>
To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>
Message-ID: <YgEvqByj5WwIVEqE@gaia>
References: <20220126153851.2059993-1-d.whyte@proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220126153851.2059993-1-d.whyte@proxmox.com>
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.673 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
 T_SCC_BODY_TEXT_LINE    -0.01 -
Subject: Re: [pbs-devel] [PATCH proxmox-backup] Add option in GUI for
 destroying data
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
 <pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 07 Feb 2022 14:51:50 -0000


works as expected, with one small issue that it doesn't immediately
reload the navtree for the datastores (a.k.a. the handler function
'removeDatastore' at www/datastore/OptionView.js does that).

the effect is that the deleted datastore is still visible in the
left navigation tree until the store is reloaded manually or
automatically (in about ~10-15 seconds).

otherwise looks good to me :)

Tested-by: Oguz Bektas <o.bektas@proxmox.com>

On Wed, Jan 26, 2022 at 04:38:51PM +0100, Dylan Whyte wrote:
> Adds a checkbox to the remove datastore window in the GUI, to destroy a
> datastore's underlying contents
> 
> related to (Fix 3335)
> 
> Signed-off-by: Dylan Whyte <d.whyte@proxmox.com>
> ---
>  www/Makefile                       |  1 +
>  www/datastore/OptionView.js        |  4 ++--
>  www/window/SafeDestroyDatastore.js | 34 ++++++++++++++++++++++++++++++
>  3 files changed, 37 insertions(+), 2 deletions(-)
>  create mode 100644 www/window/SafeDestroyDatastore.js
> 
> diff --git a/www/Makefile b/www/Makefile
> index 455fbeec..86af7767 100644
> --- a/www/Makefile
> +++ b/www/Makefile
> @@ -66,6 +66,7 @@ JSSRC=							\
>  	window/TrafficControlEdit.js			\
>  	window/NotifyOptions.js				\
>  	window/SyncJobEdit.js				\
> +	window/SafeDestroyDatastore.js 			\
>  	window/UserEdit.js				\
>  	window/UserPassword.js				\
>  	window/Settings.js				\
> diff --git a/www/datastore/OptionView.js b/www/datastore/OptionView.js
> index 5a5e85be..5a15e1d4 100644
> --- a/www/datastore/OptionView.js
> +++ b/www/datastore/OptionView.js
> @@ -25,12 +25,12 @@ Ext.define('PBS.Datastore.Options', {
>  	removeDatastore: function() {
>  	    let me = this;
>  	    let datastore = me.getView().datastore;
> -	    Ext.create('Proxmox.window.SafeDestroy', {
> +	    Ext.create('PBS.window.SafeDestroyDatastore', {
>  		url: `/config/datastore/${datastore}`,
>  		item: {
>  		    id: datastore,
>  		},
> -		note: gettext('Configuration change only, no data will be deleted.'),
> +		note: gettext('If "Destroy data" is not enabled, only the configuration is changed.'),
>  		autoShow: true,
>  		taskName: 'delete-datastore',
>  		apiCallDone: (success) => {
> diff --git a/www/window/SafeDestroyDatastore.js b/www/window/SafeDestroyDatastore.js
> new file mode 100644
> index 00000000..20ee4154
> --- /dev/null
> +++ b/www/window/SafeDestroyDatastore.js
> @@ -0,0 +1,34 @@
> +/*
> + * SafeDestroy window with additional checkbox for removing datastore contents
> + */
> +Ext.define('PBS.window.SafeDestroyDatastore', {
> +    extend: 'Proxmox.window.SafeDestroy',
> +    alias: 'widget.pbsSafeDestroyDatastore',
> +
> +    showProgress: true,
> +
> +    additionalItems: [
> +        {
> +            xtype: 'proxmoxcheckbox',
> +            name: 'destroy-data',
> +            reference: 'destroyDataCheckbox',
> +            boxLabel: gettext('Destroy data'),
> +            checked: false,
> +            autoEl: {
> +                tag: 'div',
> +                'data-qtip': gettext("Delete datastore's underlying contents"),
> +            },
> +        },
> +    ],
> +
> +    getParams: function() {
> +        let me = this;
> +
> +        const destroyDataCheckbox = me.lookupReference('destroyDataCheckbox');
> +        me.params["destroy-data"] = destroyDataCheckbox.checked ? 1 : 0;
> +
> +        return me.callParent();
> +    },
> +
> +
> +});
> -- 
> 2.30.2
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
>