From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A5E251FF185 for ; Mon, 21 Jul 2025 13:41:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7DBCBC0A5; Mon, 21 Jul 2025 13:42:14 +0200 (CEST) Message-ID: <0655c8e4-9402-45ae-9821-696f7322faae@proxmox.com> Date: Mon, 21 Jul 2025 13:42:00 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox VE development discussion , Aaron Lauterer References: <20250715143218.1548306-1-a.lauterer@proxmox.com> <20250715143218.1548306-13-a.lauterer@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20250715143218.1548306-13-a.lauterer@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753098124154 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH widget-toolkit v3 1/2] rrdchart: allow to override the series object X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" One nit inline, but aside from that: Reviewed-by: Dominik Csapak On 7/15/25 16:31, Aaron Lauterer wrote: > this way we can keep the current behavior, but also make it possible to > finely control a series if needed. For example, if we want a stacked > graph, or just a line without fill. > > Additionally we need to adjust the tooltip renderer to also gather the > titles from these directly configured series. > > Signed-off-by: Aaron Lauterer > --- > src/panel/RRDChart.js | 53 +++++++++++++++++++++++++++++++++---------- > 1 file changed, 41 insertions(+), 12 deletions(-) > > diff --git a/src/panel/RRDChart.js b/src/panel/RRDChart.js > index 86cf4e2..3b41ae6 100644 > --- a/src/panel/RRDChart.js > +++ b/src/panel/RRDChart.js > @@ -118,13 +118,33 @@ Ext.define('Proxmox.widget.RRDChart', { > suffix = 'B/s'; > } > > - let prefix = item.field; > - if (view.fieldTitles && view.fieldTitles[view.fields.indexOf(item.field)]) { > - prefix = view.fieldTitles[view.fields.indexOf(item.field)]; > + let value = record.get(item.field); > + if (value === null) { > + tooltip.setHtml('No Data'); nit: this change seems a bit unrelated? we did just put it in convertToUnits previously, and did not check the value before... also, we could use the 'value' later, namely... > + } else { > + let prefix = item.field; > + if (view.fieldTitles && view.fieldTitles[view.fields.indexOf(item.field)]) { > + prefix = view.fieldTitles[view.fields.indexOf(item.field)]; > + } else { > + // If series is passed in directly, we don't have fieldTitles set. The title property can be a > + // single string for a line series, or an array for an area/stacked series. > + for (const field of view.fields) { > + if (Array.isArray(field.yField)) { > + if (field.title && field.title[field.yField.indexOf(item.field)]) { > + prefix = field.title[field.yField.indexOf(item.field)]; > + break; > + } > + } else if (field.title) { > + prefix = field.title; > + break; > + } > + } > + } > + > + let v = this.convertToUnits(record.get(item.field)); here > + let t = new Date(record.get('time')); > + tooltip.setHtml(`${prefix}: ${v}${suffix}
${t}`); > } > - let v = this.convertToUnits(record.get(item.field)); > - let t = new Date(record.get('time')); > - tooltip.setHtml(`${prefix}: ${v}${suffix}
${t}`); > }, > > onAfterAnimation: function (chart, eopts) { > @@ -261,17 +281,26 @@ Ext.define('Proxmox.widget.RRDChart', { > > // add a series for each field we get > me.fields.forEach(function (item, index) { > - let title = item; > - if (me.fieldTitles && me.fieldTitles[index]) { > - title = me.fieldTitles[index]; > + let yField; > + let title; > + let object; > + > + if (typeof item === 'object') { > + object = item; > + } else { > + yField = item; > + title = item; > + if (me.fieldTitles && me.fieldTitles[index]) { > + title = me.fieldTitles[index]; > + } > } > me.addSeries( > Ext.apply( > { > type: 'line', > xField: 'time', > - yField: item, > - title: title, > + yField, > + title, > fill: true, > style: { > lineWidth: 1.5, > @@ -290,7 +319,7 @@ Ext.define('Proxmox.widget.RRDChart', { > renderer: 'onSeriesTooltipRender', > }, > }, > - me.seriesConfig, > + object ?? me.seriesConfig, > ), > ); > }); _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel