From: Dietmar Maurer <dietmar@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: [pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: add RunningTasksStore
Date: Thu, 9 Jul 2020 14:30:02 +0200 (CEST) [thread overview]
Message-ID: <3550210.377.1594297803141@webmail.proxmox.com> (raw)
In-Reply-To: <20200709113821.9152-1-d.csapak@proxmox.com>
applied both patches
> On 07/09/2020 1:38 PM Dominik Csapak <d.csapak@proxmox.com> wrote:
>
>
> so that we have a global store for running tasks
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> www/MainView.js | 1 +
> www/Makefile | 1 +
> www/dashboard/RunningTasks.js | 14 +-------------
> www/data/RunningTasksStore.js | 21 +++++++++++++++++++++
> 4 files changed, 24 insertions(+), 13 deletions(-)
> create mode 100644 www/data/RunningTasksStore.js
>
> diff --git a/www/MainView.js b/www/MainView.js
> index 062d78e..cb7a81d 100644
> --- a/www/MainView.js
> +++ b/www/MainView.js
> @@ -133,6 +133,7 @@ Ext.define('PBS.MainView', {
> init: function(view) {
> var me = this;
>
> + PBS.data.RunningTasksStore.startUpdate();
> me.lookupReference('usernameinfo').update({username:Proxmox.UserName});
>
> // show login on requestexception
> diff --git a/www/Makefile b/www/Makefile
> index 29a3561..b205f67 100644
> --- a/www/Makefile
> +++ b/www/Makefile
> @@ -8,6 +8,7 @@ JSSRC= \
> form/UserSelector.js \
> form/RemoteSelector.js \
> form/DataStoreSelector.js \
> + data/RunningTasksStore.js \
> config/UserView.js \
> config/RemoteView.js \
> config/ACLView.js \
> diff --git a/www/dashboard/RunningTasks.js b/www/dashboard/RunningTasks.js
> index 9b53d1b..e31218e 100644
> --- a/www/dashboard/RunningTasks.js
> +++ b/www/dashboard/RunningTasks.js
> @@ -54,20 +54,8 @@ Ext.define('PBS.RunningTasks', {
> store: {
> type: 'diff',
> autoDestroy: true,
> - autoDestroyRstore: true,
> sorters: 'starttime',
> - rstore: {
> - type: 'update',
> - autoStart: true,
> - interval: 3000,
> - storeid: 'pbs-running-tasks-dash',
> - model: 'proxmox-tasks',
> - proxy: {
> - type: 'proxmox',
> - // maybe separate api call?
> - url: '/api2/json/nodes/localhost/tasks?running=1'
> - },
> - },
> + rstore: PBS.data.RunningTasksStore,
> },
>
> columns: [
> diff --git a/www/data/RunningTasksStore.js b/www/data/RunningTasksStore.js
> new file mode 100644
> index 0000000..d78c44e
> --- /dev/null
> +++ b/www/data/RunningTasksStore.js
> @@ -0,0 +1,21 @@
> +Ext.define('PBS.data.RunningTasksStore', {
> + extend: 'Proxmox.data.UpdateStore',
> +
> + singleton: true,
> +
> + constructor: function(config) {
> + let me = this;
> + config = config || {};
> + Ext.apply(config, {
> + interval: 3000,
> + storeid: 'pbs-running-tasks-dash',
> + model: 'proxmox-tasks',
> + proxy: {
> + type: 'proxmox',
> + // maybe separate api call?
> + url: '/api2/json/nodes/localhost/tasks?running=1',
> + },
> + });
> + me.callParent([config]);
> + },
> +});
> --
> 2.20.1
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
prev parent reply other threads:[~2020-07-09 12:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 11:38 [pbs-devel] " Dominik Csapak
2020-07-09 11:38 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: add TaskButton in header Dominik Csapak
2020-07-09 12:30 ` Dietmar Maurer [this message]
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=3550210.377.1594297803141@webmail.proxmox.com \
--to=dietmar@proxmox.com \
--cc=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