[pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: add RunningTasksStore

Dietmar Maurer dietmar at proxmox.com
Thu Jul 9 14:30:02 CEST 2020


applied both patches

> On 07/09/2020 1:38 PM Dominik Csapak <d.csapak at proxmox.com> wrote:
> 
>  
> so that we have a global store for running tasks
> 
> Signed-off-by: Dominik Csapak <d.csapak at 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 at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel





More information about the pbs-devel mailing list