From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: "Dominic Jäger" <d.jaeger@proxmox.com>
Subject: [pve-devel] [PATCH manager v2 1/1] ui: close #3504: Add datacenter notes
Date: Wed, 22 Sep 2021 12:42:18 +0200 [thread overview]
Message-ID: <20210922104218.3398996-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210922104218.3398996-1-d.csapak@proxmox.com>
From: Dominic Jäger <d.jaeger@proxmox.com>
Like notes for nodes.
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/dc/Config.js | 6 +++++
www/manager6/panel/NotesView.js | 48 +++++++++++++++++----------------
2 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js
index 934952d9..eb4c7805 100644
--- a/www/manager6/dc/Config.js
+++ b/www/manager6/dc/Config.js
@@ -27,6 +27,12 @@ Ext.define('PVE.dc.Config', {
iconCls: 'fa fa-book',
itemId: 'summary',
},
+ {
+ xtype: 'pveNotesView',
+ title: gettext('Notes'),
+ iconCls: 'fa fa-sticky-note-o',
+ itemId: 'notes',
+ },
{
title: gettext('Cluster'),
xtype: 'pveClusterAdministration',
diff --git a/www/manager6/panel/NotesView.js b/www/manager6/panel/NotesView.js
index b281f892..7c8299d0 100644
--- a/www/manager6/panel/NotesView.js
+++ b/www/manager6/panel/NotesView.js
@@ -6,6 +6,7 @@ Ext.define('PVE.panel.NotesView', {
bodyPadding: 10,
scrollable: true,
animCollapse: false,
+ maxLength: 64 * 1024,
tbar: {
itemId: 'tbar',
@@ -79,37 +80,38 @@ Ext.define('PVE.panel.NotesView', {
}],
initComponent: function() {
- var me = this;
+ const me = this;
+ const type = me.pveSelNode.data.type;
- var nodename = me.pveSelNode.data.node;
- if (!nodename) {
- throw "no node name specified";
- }
+ if (me.pveSelNode.data.id === 'root') {
+ me.url = '/api2/extjs/cluster/options';
+ } else {
+ const nodename = me.pveSelNode.data.node;
+ if (!nodename) {
+ throw "no node name specified";
+ }
- let type = me.pveSelNode.data.type;
- if (!Ext.Array.contains(['node', 'qemu', 'lxc'], type)) {
- throw 'invalid type specified';
- }
+ if (!Ext.Array.contains(['node', 'qemu', 'lxc'], type)) {
+ throw 'invalid type specified';
+ }
- var vmid = me.pveSelNode.data.vmid;
- if (!vmid && type !== 'node') {
- throw "no VM ID specified";
- }
+ const vmid = me.pveSelNode.data.vmid;
+ if (!vmid && type !== 'node') {
+ throw "no VM ID specified";
+ }
- me.url = `/api2/extjs/nodes/${nodename}/`;
+ me.url = `/api2/extjs/nodes/${nodename}/`;
- // add the type specific path if qemu/lxc and set the backend's maxLen
- if (type === 'qemu' || type === 'lxc') {
- me.url += `${type}/${vmid}/`;
- me.maxLength = 8 * 1024;
- } else {
- me.maxLength = 64 * 1024;
+ // add the type specific path if qemu/lxc and set the backend's maxLen
+ if (type === 'qemu' || type === 'lxc') {
+ me.url += `${type}/${vmid}/`;
+ me.maxLength = 8 * 1024;
+ }
+ me.url += 'config';
}
- me.url += 'config';
-
me.callParent();
- if (type === 'node') {
+ if (type === 'node' || type === '') { // '' is for datacenter
me.down('#tbar').setVisible(true);
} else if (me.pveSelNode.data.template !== 1) {
me.setCollapsible(true);
--
2.30.2
next prev parent reply other threads:[~2021-09-22 10:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 10:42 [pve-devel] [PATCH cluster/manager v2] add dc notes Dominik Csapak
2021-09-22 10:42 ` [pve-devel] [PATCH cluster v2 1/1] dc.cfg: Add notes to datacenter config Dominik Csapak
2021-10-04 7:37 ` [pve-devel] applied: " Thomas Lamprecht
2021-09-22 10:42 ` Dominik Csapak [this message]
2021-11-09 17:42 ` [pve-devel] applied: [PATCH manager v2 1/1] ui: close #3504: Add datacenter notes Thomas Lamprecht
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=20210922104218.3398996-3-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=d.jaeger@proxmox.com \
--cc=pve-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox