From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 931FC74320 for ; Tue, 1 Jun 2021 14:14:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 88DDA29471 for ; Tue, 1 Jun 2021 14:13:53 +0200 (CEST) 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 AB5F52944B for ; Tue, 1 Jun 2021 14:13:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7E9CD42B23 for ; Tue, 1 Jun 2021 14:13:51 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 1 Jun 2021 14:13:50 +0200 Message-Id: <20210601121350.19919-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210601121350.19919-1-d.csapak@proxmox.com> References: <20210601121350.19919-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.041 Adjusted score from AWL reputation of From: address 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [data.store] Subject: [pbs-devel] [PATCH proxmox-backup 4/4] ui: DataStoreList: add remove button X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2021 12:14:23 -0000 so that a user can remove a datastore from the gui, though no data is deleted, this has to be done elsewhere (for now) Signed-off-by: Dominik Csapak --- www/Utils.js | 1 + www/datastore/DataStoreList.js | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/www/Utils.js b/www/Utils.js index f614d77e..6b378355 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -380,6 +380,7 @@ Ext.define('PBS.Utils', { backup: (type, id) => PBS.Utils.render_datastore_worker_id(id, gettext('Backup')), 'barcode-label-media': [gettext('Drive'), gettext('Barcode-Label Media')], 'catalog-media': [gettext('Drive'), gettext('Catalog Media')], + 'delete-datastore': [gettext('Datastore'), gettext('Remove Datastore')], dircreate: [gettext('Directory Storage'), gettext('Create')], dirremove: [gettext('Directory'), gettext('Remove')], 'eject-media': [gettext('Drive'), gettext('Eject Media')], diff --git a/www/datastore/DataStoreList.js b/www/datastore/DataStoreList.js index 353709d3..f81b25b7 100644 --- a/www/datastore/DataStoreList.js +++ b/www/datastore/DataStoreList.js @@ -113,11 +113,50 @@ Ext.define('PBS.datastore.DataStoreList', { me.datastores[data.store] = me.insert(i, { datastore: data.store, + header: { + padding: '6 6 7 9', + }, + tools: [ + { + xtype: 'button', + text: gettext('Remove'), + iconCls: 'fa fa-trash-o', + handler: () => me.removeDatastore(data.store), + padding: 2, + }, + ], }); me.datastores[data.store].setStatus(data); me.datastores[data.store].setTasks(me.tasks[data.store], me.since); }, + removeDatastore: function(datastore) { + let me = this; + Ext.create('Proxmox.window.SafeDestroy', { + url: `/config/datastore/${datastore}`, + item: { + id: datastore, + }, + note: gettext('Configuration change only, no data will be deleted.'), + autoShow: true, + taskName: 'delete-datastore', + listeners: { + destroy: () => { + me.reload(); + let navtree = Ext.ComponentQuery.query('navigationtree')[0]; + navtree.rstore.load(); + }, + }, + }); + }, + + reload: function() { + let me = this; + me.mask(); + me.usageStore.load(); + me.taskStore.load(); + }, + initComponent: function() { let me = this; me.items = [ -- 2.20.1