all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Philipp Hufnagl <p.hufnagl@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>,
	Proxmox Backup Server development discussion
	<pbs-devel@lists.proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup] ui: fix #4260: add dynamic notes in backup group comment
Date: Mon, 2 Oct 2023 10:10:38 +0200	[thread overview]
Message-ID: <58e15fa1-841e-ee16-c6e0-692a1b955ddb@proxmox.com> (raw)
In-Reply-To: <ddee2393-7232-4b85-aa7a-9fa81c915519@proxmox.com>



On 10/2/23 09:30, Dominik Csapak wrote:
> a few comments inline
> 
> On 9/29/23 14:30, Philipp Hufnagl wrote:
>> 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..324f73b8 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.snapshot-comment-derived {
>> +    opacity: 0.7;
>> +}
> 
> for such generic properties, i'd like to have more generic names,
> e.g 'pmx-disabled'  or 'pmx-faded' ?

That is a very good name. Ill make a V2
> 
>>     .x-action-col-icon.good:before {
>>       color: #21BF4B;
>> diff --git a/www/datastore/Content.js b/www/datastore/Content.js
>> index 9fc07d49..926aab89 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;
>> @@ -900,16 +902,25 @@ Ext.define('PBS.DataStoreContent', {
>>           flex: 1,
>>           renderer: (v, meta, record) => {
>>           let data = record.data;
>> +        let additional_classes = "";
> 
> i'd like for variables to be defined closer to where they are used,
> namely
> 
>>           if (!data || data.leaf || data.root) {
>>               return '';
>>           }
>> -        if (v === undefined || v === null) {
>> -            v = '';
>> +
> 
> here

Will do
> 
>> +        // 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'];
> 
> is it guaranteed to be a stringe here? else i'd do :
> 
> v = data['last-comment'] ?? '';
> 
> (or do it at the assignment level above)

I think it is garanteed since it comes from the backend. But I will
apply your suggestion to be sure
> 
>> +            additional_classes = "snapshot-comment-derived";
>> +            } 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
>> ${additinal_classes}">${v}</span>
> 
> please test your patches. i did not, but i can see clearly here that
> the additional classes
> could not have worked, since you have a typo in them
> 'additinal_classes' vs 'additional_classes'

I actually tested it and I do not understand how that actually worked
at my side. Regardless sorry for this misstake. Ill fix it in the v2
> 
> 
>>               <i data-qtip="${gettext('Edit')}" style="float: right;
>> margin: 0px;" class="${icon}"></i>`;
>>           },
>>           listeners: {
> 
> 




      reply	other threads:[~2023-10-02  8:11 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-29 12:30 Philipp Hufnagl
2023-10-02  7:30 ` Dominik Csapak
2023-10-02  8:10   ` Philipp Hufnagl [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=58e15fa1-841e-ee16-c6e0-692a1b955ddb@proxmox.com \
    --to=p.hufnagl@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 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