From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9C80D91670 for ; Tue, 3 Oct 2023 14:35:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 777F11DC2 for ; Tue, 3 Oct 2023 14:34:32 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 3 Oct 2023 14:34:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 27B2C447C1 for ; Tue, 3 Oct 2023 14:34:31 +0200 (CEST) From: Philipp Hufnagl To: pbs-devel@lists.proxmox.com Date: Tue, 3 Oct 2023 14:34:25 +0200 Message-Id: <20231003123425.991560-1-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.085 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [item.data] Subject: [pbs-devel] [PATCH proxmox-backup v5] ui: fix #4260: add dynamic notes in backup group comment X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Oct 2023 12:35:02 -0000 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 --- 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 Changes since v3: * fixed intentation * removed span prefix from faded class Changes since v4: * fixed css class www/css/ext6-pbs.css | 4 ++++ www/datastore/Content.js | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/www/css/ext6-pbs.css b/www/css/ext6-pbs.css index 5fd65d25..95a655cf 100644 --- a/www/css/ext6-pbs.css +++ b/www/css/ext6-pbs.css @@ -227,6 +227,10 @@ span.snapshot-comment-column { width: calc(100% - 18px); } +.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..740d10bf 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 `${v} + return `${v} `; }, listeners: { -- 2.39.2