[pbs-devel] [PATCH proxmox-backup v2] ui: fix #4260: add dynamic notes in backup group comment

[pbs-devel] [PATCH proxmox-backup v2] ui: fix #4260: add dynamic notes in backup group comment

[Philipp Hufnagl]

When there is no comment for a backup group, the comment of the last
snapshot in this group will be shown slightly grayed out as long as
the group is collapsed.

Changes since v1:
* fixed typo at "additonal classes"
* renamed css class to "faded" so it can be used more generic
* guarded snapshot comment for not being a string guarded snapshot

Signed-off-by: Philipp Hufnagl <p.hufnagl@proxmox.com>
---
 www/css/ext6-pbs.css     |  3 +++
 www/datastore/Content.js | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/www/css/ext6-pbs.css b/www/css/ext6-pbs.css
index 5fd65d25..fce3f4cd 100644
--- a/www/css/ext6-pbs.css
+++ b/www/css/ext6-pbs.css
@@ -226,6 +226,9 @@ span.snapshot-comment-column {
     display: inline-block;
     width: calc(100% - 18px);
 }
+span.pmx-faded {
+    opacity: 0.7;
+}
 
 .x-action-col-icon.good:before {
     color: #21BF4B;
diff --git a/www/datastore/Content.js b/www/datastore/Content.js
index 9fc07d49..8b8c114b 100644
--- a/www/datastore/Content.js
+++ b/www/datastore/Content.js
@@ -146,6 +146,7 @@ Ext.define('PBS.DataStoreContent', {
 		    leaf: false,
 		    iconCls: "fa " + cls,
 		    expanded: false,
+		    comment: item.data.comment,
 		    backup_type: item.data["backup-type"],
 		    backup_id: item.data["backup-id"],
 		    children: [],
@@ -287,6 +288,7 @@ Ext.define('PBS.DataStoreContent', {
 		    if (item["backup-time"] > last_backup && item.size !== null) {
 			last_backup = item["backup-time"];
 			group["backup-time"] = last_backup;
+			group["last-comment"] = item.comment;
 			group.files = item.files;
 			group.size = item.size;
 			group.owner = item.owner;
@@ -903,13 +905,22 @@ Ext.define('PBS.DataStoreContent', {
 		if (!data || data.leaf || data.root) {
 		    return '';
 		}
-		if (v === undefined || v === null) {
-		    v = '';
+
+		let additional_classes = "";
+		// when there is no group comment and the section is collapsed,
+		// display the most recent snapshot comment
+		if (v === undefined || v === null|| v === '') {
+		    if (data.expanded === false) {
+		    v = data['last-comment'] ?? '';
+		    additional_classes = "pmx-faded";
+		    } else {
+			v = '';
+		    }
 		}
 		v = Ext.String.htmlEncode(v);
 		let icon = 'x-action-col-icon fa fa-fw fa-pencil pointer';
 
-		return `<span class="snapshot-comment-column">${v}</span>
+		return `<span class="snapshot-comment-column ${additional_classes}">${v}</span>
 		    <i data-qtip="${gettext('Edit')}" style="float: right; margin: 0px;" class="${icon}"></i>`;
 	    },
 	    listeners: {
-- 
2.39.2

Re: [pbs-devel] [PATCH proxmox-backup v2] ui: fix #4260: add dynamic notes in backup group comment

[Lukas Wagner]

On Mon Oct 2, 2023 at 10:38 AM CEST, Philipp Hufnagl wrote:
> -		if (v === undefined || v === null) {
> -		    v = '';
> +
> +		let additional_classes = "";

Note: I know the codebase is in some parts inconsistent in that regard, but
for new code please use camelCase for variables and functions [1].

[1] https://pve.proxmox.com/wiki/Javascript_Style_Guide

Apart from that, the changes look fine and work as advertised.

Tested-by: Lukas Wagner <l.wagner@proxmox.com>

Re: [pbs-devel] [PATCH proxmox-backup v2] ui: fix #4260: add dynamic notes in backup group comment

[Philipp Hufnagl]

On 10/2/23 13:13, Lukas Wagner wrote:
> On Mon Oct 2, 2023 at 10:38 AM CEST, Philipp Hufnagl wrote:
>> -		if (v === undefined || v === null) {
>> -		    v = '';
>> +
>> +		let additional_classes = "";
> 
> Note: I know the codebase is in some parts inconsistent in that regard, but
> for new code please use camelCase for variables and functions [1].
> 
> [1] https://pve.proxmox.com/wiki/Javascript_Style_Guide
> 
> Apart from that, the changes look fine and work as advertised.
> 
> Tested-by: Lukas Wagner <l.wagner@proxmox.com>
> 

Thank you for spotting! I made a v3