[pve-devel] [PATCH manager v2 1/1] ui: close #3504: Add datacenter notes

Dominik Csapak d.csapak at proxmox.com
Wed Sep 22 12:42:18 CEST 2021


From: Dominic Jäger <d.jaeger at proxmox.com>

Like notes for nodes.

Signed-off-by: Dominic Jäger <d.jaeger at proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak at 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





More information about the pve-devel mailing list