public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v4 08/10] ui: {lxc, qemu}/Config: show Tags and make them editable
Date: Wed, 23 Mar 2022 11:34:43 +0100	[thread overview]
Message-ID: <20220323103445.2075649-11-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220323103445.2075649-1-d.csapak@proxmox.com>

add the tags in the status line, and add a button for adding new ones

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/lxc/Config.js  | 68 +++++++++++++++++++++++++++++++++++--
 www/manager6/qemu/Config.js | 66 +++++++++++++++++++++++++++++++++--
 2 files changed, 130 insertions(+), 4 deletions(-)

diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js
index 89b59c9b..4e2b4bb8 100644
--- a/www/manager6/lxc/Config.js
+++ b/www/manager6/lxc/Config.js
@@ -4,6 +4,8 @@ Ext.define('PVE.lxc.Config', {
 
     onlineHelp: 'chapter_pct',
 
+    userCls: 'proxmox-tags-full',
+
     initComponent: function() {
         var me = this;
 	var vm = me.pveSelNode.data;
@@ -182,12 +184,43 @@ Ext.define('PVE.lxc.Config', {
 	    ],
 	});
 
+	let tagsContainer = Ext.create('Ext.container.Container', {
+	    userCls: 'proxmox-tags-full',
+	    layout: {
+		type: 'hbox',
+		align: 'stretch',
+	    },
+	});
+
+	let tagAddBtn = Ext.create('Proxmox.Tag', {
+	    xtype: 'pmxTag',
+	    addTag: true,
+	    layoutCallback: () => me.query('>toolbar[dock=top]')?.[0].updateLayout(),
+	    updateCallback: function(newTag) {
+		let rec = me.statusStore.data.get('tags');
+		let tags = rec?.data?.value?.split(/[;, ]/) || [];
+		tags.push(newTag);
+		Proxmox.Utils.API2Request({
+		    url: base_url + '/config',
+		    method: 'PUT',
+		    params: {
+			tags: tags.filter(t => !!t).join(','),
+		    },
+		    success: function() {
+			me.statusStore.load();
+		    },
+		    failure: function(response) {
+			Ext.Msg.alert('Error', response.htmlStatus);
+		    },
+		});
+	    },
+	});
 
 	Ext.apply(me, {
 	    title: Ext.String.format(gettext("Container {0} on node '{1}'"), vm.text, nodename),
 	    hstateid: 'lxctab',
 	    tbarSpacing: false,
-	    tbar: [statusTxt, '->', startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn],
+	    tbar: [statusTxt, tagsContainer, '-', tagAddBtn, '->', startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn],
 	    defaults: { statusStore: me.statusStore },
 	    items: [
 		{
@@ -344,10 +377,12 @@ Ext.define('PVE.lxc.Config', {
 	me.mon(me.statusStore, 'load', function(s, records, success) {
 	    var status;
 	    var lock;
+	    var rec;
+
 	    if (!success) {
 		status = 'unknown';
 	    } else {
-		var rec = s.data.get('status');
+		rec = s.data.get('status');
 		status = rec ? rec.data.value : 'unknown';
 		rec = s.data.get('template');
 		template = rec ? rec.data.value : false;
@@ -357,6 +392,35 @@ Ext.define('PVE.lxc.Config', {
 
 	    statusTxt.update({ lock: lock });
 
+	    rec = s.data.get('tags');
+	    if (me.oldtags === undefined || me.oldtags !== rec?.data?.value) {
+		let tags = rec?.data?.value.split(/[,; ]/).filter(t => !!t) ?? [];
+		me.oldtags = rec?.data?.value;
+		tagsContainer.removeAll();
+		for (let i = 0; i < tags.length; i++) {
+		    let tag = tags[i];
+		    tagsContainer.add({
+			xtype: 'pmxTag',
+			tag,
+			layoutCallback: () => tagsContainer.updateLayout(),
+			updateCallback: function(newTag) {
+			    tags[i] = newTag;
+			    Proxmox.Utils.API2Request({
+				url: base_url + '/config',
+				method: 'PUT',
+				params: {
+				    tags: tags.filter(t => !!t).join(','),
+				},
+				failure: function(response) {
+				    Ext.Msg.alert('Error', response.htmlStatus);
+				},
+			    });
+			    me.oldtags = tags.join(',');
+			},
+		    });
+		}
+	    }
+
 	    startBtn.setDisabled(!caps.vms['VM.PowerMgmt'] || status === 'running' || template);
 	    shutdownBtn.setDisabled(!caps.vms['VM.PowerMgmt'] || status !== 'running');
 	    me.down('#removeBtn').setDisabled(!caps.vms['VM.Allocate'] || status !== 'stopped');
diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js
index 9fe933df..df5f688f 100644
--- a/www/manager6/qemu/Config.js
+++ b/www/manager6/qemu/Config.js
@@ -3,6 +3,7 @@ Ext.define('PVE.qemu.Config', {
     alias: 'widget.PVE.qemu.Config',
 
     onlineHelp: 'chapter_virtual_machines',
+    userCls: 'proxmox-tags-full',
 
     initComponent: function() {
         var me = this;
@@ -219,11 +220,42 @@ Ext.define('PVE.qemu.Config', {
 	    ],
 	});
 
+	let tagsContainer = Ext.create('Ext.container.Container', {
+	    layout: {
+		type: 'hbox',
+		align: 'stretch',
+	    },
+	});
+
+	let tagAddBtn = Ext.create('Proxmox.Tag', {
+	    xtype: 'pmxTag',
+	    addTag: true,
+	    layoutCallback: () => me.query('>toolbar[dock=top]')?.[0].updateLayout(),
+	    updateCallback: function(newTag) {
+		let rec = me.statusStore.data.get('tags');
+		let tags = rec?.data?.value?.split(/[;, ]/) || [];
+		tags.push(newTag);
+		Proxmox.Utils.API2Request({
+		    url: base_url + '/config',
+		    method: 'PUT',
+		    params: {
+			tags: tags.filter(t => !!t).join(','),
+		    },
+		    success: function() {
+			me.statusStore.load();
+		    },
+		    failure: function(response) {
+			Ext.Msg.alert('Error', response.htmlStatus);
+		    },
+		});
+	    },
+	});
+
 	Ext.apply(me, {
 	    title: Ext.String.format(gettext("Virtual Machine {0} on node '{1}'"), vm.text, nodename),
 	    hstateid: 'kvmtab',
 	    tbarSpacing: false,
-	    tbar: [statusTxt, '->', resumeBtn, startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn],
+	    tbar: [statusTxt, tagsContainer, '-', tagAddBtn, '->', resumeBtn, startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn],
 	    defaults: { statusStore: me.statusStore },
 	    items: [
 		{
@@ -382,11 +414,12 @@ Ext.define('PVE.qemu.Config', {
 	    var spice = false;
 	    var xtermjs = false;
 	    var lock;
+	    var rec;
 
 	    if (!success) {
 		status = qmpstatus = 'unknown';
 	    } else {
-		var rec = s.data.get('status');
+		rec = s.data.get('status');
 		status = rec ? rec.data.value : 'unknown';
 		rec = s.data.get('qmpstatus');
 		qmpstatus = rec ? rec.data.value : 'unknown';
@@ -399,6 +432,35 @@ Ext.define('PVE.qemu.Config', {
 		xtermjs = !!s.data.get('serial');
 	    }
 
+	    rec = s.data.get('tags');
+	    if (me.oldtags === undefined || me.oldtags !== rec?.data?.value) {
+		let tags = rec?.data?.value.split(/[,; ]/).filter(t => !!t) ?? [];
+		me.oldtags = rec?.data?.value;
+		tagsContainer.removeAll();
+		for (let i = 0; i < tags.length; i++) {
+		    let tag = tags[i];
+		    tagsContainer.add({
+			xtype: 'pmxTag',
+			tag,
+			layoutCallback: () => tagsContainer.updateLayout(),
+			updateCallback: function(newTag) {
+			    tags[i] = newTag;
+			    Proxmox.Utils.API2Request({
+				url: base_url + '/config',
+				method: 'PUT',
+				params: {
+				    tags: tags.filter(t => !!t).join(','),
+				},
+				failure: function(response) {
+				    Ext.Msg.alert('Error', response.htmlStatus);
+				},
+			    });
+			    me.oldtags = tags.join(',');
+			},
+		    });
+		}
+	    }
+
 	    if (template) {
 		return;
 	    }
-- 
2.30.2





  parent reply	other threads:[~2022-03-23 10:35 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-23 10:34 [pve-devel] [PATCH cluster/widget-toolkit/manager v4] add tags to ui Dominik Csapak
2022-03-23 10:34 ` [pve-devel] [PATCH cluster v4 1/1] datacenter.cfg: add option for tag-tree-style and tag-colors Dominik Csapak
2022-03-23 10:34 ` [pve-devel] [PATCH widget-toolkit v4 1/1] add tag related helpers Dominik Csapak
2022-03-23 10:34 ` [pve-devel] [PATCH manager v4 01/10] api: /cluster/resources: add tags to returned properties Dominik Csapak
2022-03-23 10:34 ` [pve-devel] [PATCH manager v4 02/10] api: /version: add 'tag-colors' and 'tag-tree-style' Dominik Csapak
2022-03-23 10:34 ` [pve-devel] [PATCH manager v4 03/10] ui: parse and save tag color overrides from /version Dominik Csapak
2022-03-23 10:34 ` [pve-devel] [PATCH manager v4 04/10] ui: tree/ResourceTree: collect tags on update Dominik Csapak
2022-03-23 10:34 ` [pve-devel] [PATCH manager v4 05/10] ui: add form/TagColorGrid Dominik Csapak
2022-03-23 10:34 ` [pve-devel] [PATCH manager v4 06/10] ui: dc/OptionView: add editors for tag settings Dominik Csapak
2022-03-23 10:34 ` [pve-devel] [PATCH manager v4 07/10] ui: add form/Tag Dominik Csapak
2022-03-23 10:34 ` Dominik Csapak [this message]
2022-03-23 10:34 ` [pve-devel] [PATCH manager v4 09/10] ui: tree/ResourceTree: show Tags in tree Dominik Csapak
2022-03-23 10:34 ` [pve-devel] [PATCH manager v4 10/10] ui: form/GlobalSearchField: display tags and allow to search for them Dominik Csapak

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=20220323103445.2075649-11-d.csapak@proxmox.com \
    --to=d.csapak@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal