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 v6 06/11] ui: dc/OptionView: add editors for tag settings
Date: Tue, 12 Apr 2022 15:34:18 +0200	[thread overview]
Message-ID: <20220412133423.1021857-11-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220412133423.1021857-1-d.csapak@proxmox.com>

namely for 'tag-tree-style' and 'tag-colors'.
display the tag overrides directly as they will appear as tags

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Utils.js         | 20 ++++++++++++++++
 www/manager6/dc/OptionView.js | 43 ++++++++++++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 63687d08..2fe823ff 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1862,6 +1862,26 @@ Ext.define('PVE.Utils', {
 	Ext.ComponentQuery.query('pveResourceTree')[0].setUserCls(`proxmox-tags-${style}`);
     },
 
+    tagTreeStyles: {
+	'__default__': Proxmox.Utils.defaultText,
+	'full': gettext('Full'),
+	'circle': gettext('Circle'),
+	'dense': gettext('Dense'),
+	'none': Proxmox.Utils.NoneText,
+    },
+
+    renderTags: function(tagstext, overrides) {
+	let text = '';
+	if (tagstext) {
+	    let tags = (tagstext.split(/[,; ]/) || []).filter(t => !!t);
+	    text += ' ';
+	    tags.forEach((tag) => {
+		text += Proxmox.Utils.getTagElement(tag, overrides);
+	    });
+	}
+	return text;
+    },
+
     tagCharRegex: /^[a-z0-9+_.-]$/i,
 },
 
diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js
index 6b30ede9..aef77964 100644
--- a/www/manager6/dc/OptionView.js
+++ b/www/manager6/dc/OptionView.js
@@ -5,6 +5,7 @@ Ext.define('PVE.dc.OptionView', {
     onlineHelp: 'datacenter_configuration_file',
 
     monStoreErrors: true,
+    userCls: 'proxmox-tags-full',
 
     add_inputpanel_row: function(name, text, opts) {
 	var me = this;
@@ -284,7 +285,43 @@ Ext.define('PVE.dc.OptionView', {
 	    minValue: 1,
 	    maxValue: 64, // arbitrary but generous limit as limits are good
 	});
-
+	me.add_combobox_row('tag-tree-style', gettext('Tag Tree Style'), {
+	    renderer: (value) => PVE.Utils.tagTreeStyles[value] ?? value,
+	    comboItems: Object.entries(PVE.Utils.tagTreeStyles),
+	    defaultValue: '__default__',
+	    deleteEmpty: true,
+	});
+	me.rows['tag-colors'] = {
+	    required: true,
+	    renderer: (value) => {
+		if (value === undefined) {
+		    return gettext('No Overrides');
+		}
+		let overrides = PVE.Utils.parseTagOverrides(value);
+		let txt = '';
+		for (const tag of Object.keys(overrides)) {
+		    txt += Proxmox.Utils.getTagElement(tag, overrides);
+		}
+		return txt;
+	    },
+	    header: gettext('Tag Color Override'),
+	    editor: {
+		xtype: 'proxmoxWindowEdit',
+		width: 800,
+		bodyPadding: 0,
+		subject: gettext('Tag Color Override'),
+		fieldDefaults: {
+		    labelWidth: 100,
+		},
+		url: '/api2/extjs/cluster/options',
+		items: [{
+		    name: 'tag-colors',
+		    xtype: 'pveTagColorGrid',
+		    deleteEmpty: true,
+		    height: 300,
+		}],
+	    },
+	};
 	me.selModel = Ext.create('Ext.selection.RowModel', {});
 
 	Ext.apply(me, {
@@ -319,6 +356,10 @@ Ext.define('PVE.dc.OptionView', {
 	    if (rec.data.value === '__default__') {
 		delete PVE.VersionInfo.console;
 	    }
+
+	    let colors = store.getById('tag-colors')?.data?.value;
+	    let style = store.getById('tag-tree-style')?.data?.value;
+	    PVE.Utils.updateTagSettings(colors, style);
 	});
 
 	me.on('activate', me.rstore.startUpdate);
-- 
2.30.2





  parent reply	other threads:[~2022-04-12 13:34 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-12 13:34 [pve-devel] [PATCH cluster/widget-toolkit/manager v6] add tags to ui Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH cluster v6 1/3] add CFS_IPC_GET_GUEST_CONFIG_PROPERTIES method Dominik Csapak
2022-04-27  7:17   ` Thomas Lamprecht
2022-04-12 13:34 ` [pve-devel] [PATCH cluster v6 2/3] Cluster: add get_guest_config_properties Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH cluster v6 3/3] datacenter.cfg: add option for tag-tree-style and tag-colors Dominik Csapak
2022-04-27  5:55   ` Thomas Lamprecht
2022-04-12 13:34 ` [pve-devel] [PATCH widget-toolkit v6 1/1] add tag related helpers Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 01/11] api: /cluster/resources: add tags to returned properties Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 02/11] api: /version: add 'tag-colors' and 'tag-tree-style' Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 03/11] ui: parse and save tag color overrides from /version Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 04/11] ui: tree/ResourceTree: collect tags on update Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 05/11] ui: add form/TagColorGrid Dominik Csapak
2022-04-12 13:34 ` Dominik Csapak [this message]
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 07/11] ui: add form/Tag Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 08/11] ui: add form/TagEdit.js Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 09/11] ui: {lxc, qemu}/Config: show Tags and make them editable Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 10/11] ui: tree/ResourceTree: show Tags in tree Dominik Csapak
2022-04-12 13:34 ` [pve-devel] [PATCH manager v6 11/11] 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=20220412133423.1021857-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