[pbs-devel] [PATCH proxmox-backup 1/2] ui: datastore/Content: reload in activate listener

[pbs-devel] [PATCH proxmox-backup 1/2] ui: datastore/Content: reload in activate listener

[Dominik Csapak]

when we trigger the first load before the panel was fully created,
there was no load mask for it (but the snapshots would "pop in" on load)

move the first reload into the 'activate' listener. this will be called
the every time a user opens the content tab of a datastore, so guard
it by a 'firstLoad' bool.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/datastore/Content.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/www/datastore/Content.js b/www/datastore/Content.js
index 57693785..ddc923fd 100644
--- a/www/datastore/Content.js
+++ b/www/datastore/Content.js
@@ -73,7 +73,6 @@ Ext.define('PBS.DataStoreContent', {
 		'backup-time',
 	    ]);
 	    Proxmox.Utils.monStoreErrors(view, this.store);
-	    this.reload(); // initial load
 	},
 
 	reload: function() {
@@ -625,6 +624,17 @@ Ext.define('PBS.DataStoreContent', {
 	},
     },
 
+    listeners: {
+	activate: function() {
+	    let me = this;
+	    // only load on first activate to not load every tab switch
+	    if (!me.firstLoad) {
+		me.getController().reload();
+		me.firstLoad = true;
+	    }
+	},
+    },
+
     viewConfig: {
 	getRowClass: function(record, index) {
 	    let verify = record.get('verification');
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 2/2] ui: datastore/Content: add empty text for no snapshots

[Dominik Csapak]

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/datastore/Content.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/datastore/Content.js b/www/datastore/Content.js
index ddc923fd..87a9079d 100644
--- a/www/datastore/Content.js
+++ b/www/datastore/Content.js
@@ -261,6 +261,10 @@ Ext.define('PBS.DataStoreContent', {
 		children: children,
 	    });
 
+	    if (!children.length) {
+		view.setEmptyText(gettext('No Snapshots found'));
+	    }
+
 	    this.updateGroupNotes(view);
 
 	    if (selected !== undefined) {
-- 
2.30.2

[pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: datastore/Content: reload in activate listener

[Dietmar Maurer]

applied both patches

On 10/1/21 11:56 AM, Dominik Csapak wrote:
> when we trigger the first load before the panel was fully created,
> there was no load mask for it (but the snapshots would "pop in" on load)
>
> move the first reload into the 'activate' listener. this will be called
> the every time a user opens the content tab of a datastore, so guard
> it by a 'firstLoad' bool.
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>   www/datastore/Content.js | 12 +++++++++++-
>   1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/www/datastore/Content.js b/www/datastore/Content.js
> index 57693785..ddc923fd 100644
> --- a/www/datastore/Content.js
> +++ b/www/datastore/Content.js
> @@ -73,7 +73,6 @@ Ext.define('PBS.DataStoreContent', {
>   		'backup-time',
>   	    ]);
>   	    Proxmox.Utils.monStoreErrors(view, this.store);
> -	    this.reload(); // initial load
>   	},
>   
>   	reload: function() {
> @@ -625,6 +624,17 @@ Ext.define('PBS.DataStoreContent', {
>   	},
>       },
>   
> +    listeners: {
> +	activate: function() {
> +	    let me = this;
> +	    // only load on first activate to not load every tab switch
> +	    if (!me.firstLoad) {
> +		me.getController().reload();
> +		me.firstLoad = true;
> +	    }
> +	},
> +    },
> +
>       viewConfig: {
>   	getRowClass: function(record, index) {
>   	    let verify = record.get('verification');