* [pbs-devel] [PATCH proxmox-backup v3] ui: fix #4260: add dynamic notes in backup group comment
@ 2023-10-02 11:53 Philipp Hufnagl
2023-10-02 12:59 ` Dominik Csapak
0 siblings, 1 reply; 2+ messages in thread
From: Philipp Hufnagl @ 2023-10-02 11:53 UTC (permalink / raw)
To: pbs-devel
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
Changes since v2:
* fixed variable name in violation of coding guidelines
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.
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..1529bea7 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 additionalClasses = "";
+ // 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'] ?? '';
+ additionalClasses = "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 ${additionalClasses}">${v}</span>
<i data-qtip="${gettext('Edit')}" style="float: right; margin: 0px;" class="${icon}"></i>`;
},
listeners: {
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [pbs-devel] [PATCH proxmox-backup v3] ui: fix #4260: add dynamic notes in backup group comment
2023-10-02 11:53 [pbs-devel] [PATCH proxmox-backup v3] ui: fix #4260: add dynamic notes in backup group comment Philipp Hufnagl
@ 2023-10-02 12:59 ` Dominik Csapak
0 siblings, 0 replies; 2+ messages in thread
From: Dominik Csapak @ 2023-10-02 12:59 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Philipp Hufnagl
two comments inline
otherwise LGTM
On 10/2/23 13:53, Philipp Hufnagl wrote:
>
> 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
>
> Changes since v2:
> * fixed variable name in violation of coding guidelines
>
> 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.
>
> 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;
> +}
please leave out the span, otherwise we can't use it on non-spans
the classname is 'namespaced' anyway, so no need to restrict it to
spans
>
> .x-action-col-icon.good:before {
> color: #21BF4B;
> diff --git a/www/datastore/Content.js b/www/datastore/Content.js
> index 9fc07d49..1529bea7 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 additionalClasses = "";
> + // 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'] ?? '';
> + additionalClasses = "pmx-faded";
the indentation here is off, i previously blamed my mail client, but there is a level of indentation
missing in the if block here
> + } 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 ${additionalClasses}">${v}</span>
> <i data-qtip="${gettext('Edit')}" style="float: right; margin: 0px;" class="${icon}"></i>`;
> },
> listeners: {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-02 12:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-02 11:53 [pbs-devel] [PATCH proxmox-backup v3] ui: fix #4260: add dynamic notes in backup group comment Philipp Hufnagl
2023-10-02 12:59 ` Dominik Csapak
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal