From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 5/8] ui: move sync/verify jobs to the datastores
Date: Tue, 27 Oct 2020 16:20:08 +0100 [thread overview]
Message-ID: <20201027152011.7373-6-d.csapak@proxmox.com> (raw)
In-Reply-To: <20201027152011.7373-1-d.csapak@proxmox.com>
add the datastore as parameter for the store, remove
the datastore selector for the edit windows and give the datastore
to it instead
also remove the autostart from the rstore, since we only want to start
it when we change to the relevant tab
and add icons for all other datastore tabs
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/DataStorePanel.js | 20 ++++++++++++++++++++
www/NavigationTree.js | 12 ------------
www/config/SyncView.js | 14 ++++++++++++--
www/config/VerifyView.js | 20 ++++++++++++--------
www/window/SyncJobEdit.js | 6 ++++--
www/window/VerifyJobEdit.js | 6 ++++--
6 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/www/DataStorePanel.js b/www/DataStorePanel.js
index a00ccd47..059fd3b2 100644
--- a/www/DataStorePanel.js
+++ b/www/DataStorePanel.js
@@ -20,6 +20,7 @@ Ext.define('PBS.DataStorePanel', {
xtype: 'pbsDataStoreSummary',
title: gettext('Summary'),
itemId: 'summary',
+ iconCls: 'fa fa-book',
cbind: {
datastore: '{datastore}',
},
@@ -27,6 +28,7 @@ Ext.define('PBS.DataStorePanel', {
{
xtype: 'pbsDataStoreContent',
itemId: 'content',
+ iconCls: 'fa fa-th',
cbind: {
datastore: '{datastore}',
},
@@ -35,6 +37,23 @@ Ext.define('PBS.DataStorePanel', {
title: gettext('Prune & Garbage collection'),
xtype: 'pbsDataStorePruneAndGC',
itemId: 'prunegc',
+ iconCls: 'fa fa-trash-o',
+ cbind: {
+ datastore: '{datastore}',
+ },
+ },
+ {
+ iconCls: 'fa fa-refresh',
+ itemId: 'syncjobs',
+ xtype: 'pbsSyncJobView',
+ cbind: {
+ datastore: '{datastore}',
+ },
+ },
+ {
+ iconCls: 'fa fa-check-circle',
+ itemId: 'verifyjobs',
+ xtype: 'pbsVerifyJobView',
cbind: {
datastore: '{datastore}',
},
@@ -42,6 +61,7 @@ Ext.define('PBS.DataStorePanel', {
{
itemId: 'acl',
xtype: 'pbsACLView',
+ iconCls: 'fa fa-unlock',
aclExact: true,
cbind: {
aclPath: '{aclPath}',
diff --git a/www/NavigationTree.js b/www/NavigationTree.js
index a2835cd2..c37e2613 100644
--- a/www/NavigationTree.js
+++ b/www/NavigationTree.js
@@ -36,18 +36,6 @@ Ext.define('PBS.store.NavigationStore', {
path: 'pbsRemoteView',
leaf: true,
},
- {
- text: gettext('Sync Jobs'),
- iconCls: 'fa fa-refresh',
- path: 'pbsSyncJobView',
- leaf: true,
- },
- {
- text: gettext('Verify Jobs'),
- iconCls: 'fa fa-check-circle',
- path: 'pbsVerifyJobView',
- leaf: true,
- },
{
text: gettext('Subscription'),
iconCls: 'fa fa-support',
diff --git a/www/config/SyncView.js b/www/config/SyncView.js
index 679624a8..513ddd9b 100644
--- a/www/config/SyncView.js
+++ b/www/config/SyncView.js
@@ -12,6 +12,7 @@ Ext.define('pbs-sync-jobs-status', {
return endtime - task.starttime;
},
},
+ 'comment',
],
idProperty: 'id',
proxy: {
@@ -34,7 +35,9 @@ Ext.define('PBS.config.SyncJobView', {
addSyncJob: function() {
let me = this;
+ let view = me.getView();
Ext.create('PBS.window.SyncJobEdit', {
+ datastore: view.datastore,
listeners: {
destroy: function() {
me.reload();
@@ -50,6 +53,7 @@ Ext.define('PBS.config.SyncJobView', {
if (selection.length < 1) return;
Ext.create('PBS.window.SyncJobEdit', {
+ datastore: view.datastore,
id: selection[0].data.id,
listeners: {
destroy: function() {
@@ -147,15 +151,22 @@ Ext.define('PBS.config.SyncJobView', {
return Proxmox.Utils.render_timestamp(value);
},
+ startStore: function() { this.getView().getStore().rstore.startUpdate(); },
+ stopStore: function() { this.getView().getStore().rstore.stopUpdate(); },
+
reload: function() { this.getView().getStore().rstore.load(); },
init: function(view) {
+ view.getStore().rstore.getProxy().setExtraParams({
+ store: view.datastore,
+ });
Proxmox.Utils.monStoreErrors(view, view.getStore().rstore);
},
},
listeners: {
- activate: 'reload',
+ activate: 'startStore',
+ deactivate: 'stopStore',
itemdblclick: 'editSyncJob',
},
@@ -168,7 +179,6 @@ Ext.define('PBS.config.SyncJobView', {
type: 'update',
storeid: 'pbs-sync-jobs-status',
model: 'pbs-sync-jobs-status',
- autoStart: true,
interval: 5000,
},
},
diff --git a/www/config/VerifyView.js b/www/config/VerifyView.js
index db541cf4..7e391226 100644
--- a/www/config/VerifyView.js
+++ b/www/config/VerifyView.js
@@ -12,6 +12,7 @@ Ext.define('pbs-verify-jobs-status', {
return endtime - task.starttime;
},
},
+ 'comment',
],
idProperty: 'id',
proxy: {
@@ -34,7 +35,9 @@ Ext.define('PBS.config.VerifyJobView', {
addVerifyJob: function() {
let me = this;
+ let view = me.getView();
Ext.create('PBS.window.VerifyJobEdit', {
+ datastore: view.datastore,
listeners: {
destroy: function() {
me.reload();
@@ -50,6 +53,7 @@ Ext.define('PBS.config.VerifyJobView', {
if (selection.length < 1) return;
Ext.create('PBS.window.VerifyJobEdit', {
+ datastore: view.datastore,
id: selection[0].data.id,
listeners: {
destroy: function() {
@@ -147,15 +151,22 @@ Ext.define('PBS.config.VerifyJobView', {
return Proxmox.Utils.render_timestamp(value);
},
+ startStore: function() { this.getView().getStore().rstore.startUpdate(); },
+ stopStore: function() { this.getView().getStore().rstore.stopUpdate(); },
+
reload: function() { this.getView().getStore().rstore.load(); },
init: function(view) {
+ view.getStore().rstore.getProxy().setExtraParams({
+ store: view.datastore,
+ });
Proxmox.Utils.monStoreErrors(view, view.getStore().rstore);
},
},
listeners: {
- activate: 'reload',
+ activate: 'startStore',
+ deactivate: 'stopStore',
itemdblclick: 'editVerifyJob',
},
@@ -168,7 +179,6 @@ Ext.define('PBS.config.VerifyJobView', {
type: 'update',
storeid: 'pbs-verify-jobs-status',
model: 'pbs-verify-jobs-status',
- autoStart: true,
interval: 5000,
},
},
@@ -219,12 +229,6 @@ Ext.define('PBS.config.VerifyJobView', {
renderer: Ext.String.htmlEncode,
dataIndex: 'id',
},
- {
- header: gettext('Datastore'),
- width: 100,
- sortable: true,
- dataIndex: 'store',
- },
{
header: gettext('Days valid'),
width: 125,
diff --git a/www/window/SyncJobEdit.js b/www/window/SyncJobEdit.js
index 08209e64..2002c2fa 100644
--- a/www/window/SyncJobEdit.js
+++ b/www/window/SyncJobEdit.js
@@ -53,10 +53,12 @@ Ext.define('PBS.window.SyncJobEdit', {
name: 'remote-store',
},
{
- fieldLabel: gettext('Local Datastore'),
- xtype: 'pbsDataStoreSelector',
+ xtype: 'hiddenfield',
allowBlank: false,
name: 'store',
+ cbind: {
+ value: '{datastore}',
+ },
},
],
diff --git a/www/window/VerifyJobEdit.js b/www/window/VerifyJobEdit.js
index 9d29eba7..ddcf355b 100644
--- a/www/window/VerifyJobEdit.js
+++ b/www/window/VerifyJobEdit.js
@@ -41,10 +41,12 @@ Ext.define('PBS.window.VerifyJobEdit', {
},
},
{
- fieldLabel: gettext('Datastore'),
- xtype: 'pbsDataStoreSelector',
+ xtype: 'hiddenfield',
allowBlank: false,
name: 'store',
+ cbind: {
+ value: '{datastore}',
+ },
},
{
xtype: 'proxmoxintegerfield',
--
2.20.1
next prev parent reply other threads:[~2020-10-27 15:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-27 15:20 [pbs-devel] [PATCH proxmox-backup 0/8] improve datstore ux Dominik Csapak
2020-10-27 15:20 ` [pbs-devel] [PATCH proxmox-backup 1/8] api/{verify, syncjobs}: add optional datastore parameter Dominik Csapak
2020-10-27 15:20 ` [pbs-devel] [PATCH proxmox-backup 2/8] ui: DataStoreContent: add 'Verify All' button Dominik Csapak
2020-10-27 15:20 ` [pbs-devel] [PATCH proxmox-backup 3/8] ui: add DataStorePruneAndGC panel and add it to datastore panel Dominik Csapak
2020-10-27 15:20 ` [pbs-devel] [PATCH proxmox-backup 4/8] ui: add DataStoreSummary and move Statistics into it Dominik Csapak
2020-10-27 15:20 ` Dominik Csapak [this message]
2020-10-27 15:20 ` [pbs-devel] [PATCH proxmox-backup 6/8] ui: NavigationTree: add 'Add Datastore' button below datastore list Dominik Csapak
2020-10-27 15:20 ` [pbs-devel] [PATCH proxmox-backup 7/8] ui: MainView/NavigationTree: improve tree selection handling Dominik Csapak
2020-10-27 15:20 ` [pbs-devel] [PATCH proxmox-backup 8/8] ui: DataStorePanel: save active tab statefully Dominik Csapak
2020-10-27 16:55 ` [pbs-devel] applied-series: [PATCH proxmox-backup 0/8] improve datstore ux Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201027152011.7373-6-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox