From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id DCD728401
for <pve-devel@lists.proxmox.com>; Tue, 15 Nov 2022 14:03:21 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 562A92ED7
for <pve-devel@lists.proxmox.com>; Tue, 15 Nov 2022 14:03:02 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Tue, 15 Nov 2022 14:02:55 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5A3E344C4E
for <pve-devel@lists.proxmox.com>; Tue, 15 Nov 2022 14:02:52 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 15 Nov 2022 14:02:48 +0100
Message-Id: <20221115130248.1007325-24-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20221115130248.1007325-1-d.csapak@proxmox.com>
References: <20221115130248.1007325-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.065 Adjusted
score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=BAYES_00 -1.9
Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict
=?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an
SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH manager v10 13/13] ui: implement tag ordering
from datacenter.cfg
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 15 Nov 2022 13:03:21 -0000
ui-options/datacenter.cfg return an 'ordering' option. parse that and
use it to order the tags when viewing.
when having that enabled, drag & drop when editing is disabled and the
tags will be inserted at the right place. when saving, the sorted
order will be written into the config
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
new in v10
www/css/ext6-pve.css | 5 +++++
www/manager6/Utils.js | 7 +++++++
www/manager6/dc/OptionView.js | 17 +++++++++++++++++
www/manager6/form/TagEdit.js | 13 ++++++++++++-
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/www/css/ext6-pve.css b/www/css/ext6-pve.css
index 4fc83a878..b8c713c48 100644
--- a/www/css/ext6-pve.css
+++ b/www/css/ext6-pve.css
@@ -668,6 +668,11 @@ table.osds td:first-of-type {
cursor: grab;
}
+.hide-handles .pve-edit-tag > i.handle {
+ display: none;
+ padding-right: 0px;
+}
+
.pve-edit-tag > i.action,
.pve-add-tag > i.action {
padding-left: 5px;
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 2e819ce84..d34ac53ac 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1931,6 +1931,9 @@ Ext.define('PVE.Utils', {
let text = '';
if (tagstext) {
let tags = (tagstext.split(/[,; ]/) || []).filter(t => !!t);
+ if (PVE.Utils.shouldSortTags()) {
+ tags = tags.sort();
+ }
text += ' ';
tags.forEach((tag) => {
text += Proxmox.Utils.getTagElement(tag, overrides);
@@ -1939,6 +1942,10 @@ Ext.define('PVE.Utils', {
return text;
},
+ shouldSortTags: function() {
+ return PVE.UIOptions?.['tag-style']?.ordering === 'alphabetical';
+ },
+
tagCharRegex: /^[a-z0-9+_.-]$/i,
},
diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js
index ef2989d6c..65d057036 100644
--- a/www/manager6/dc/OptionView.js
+++ b/www/manager6/dc/OptionView.js
@@ -323,6 +323,7 @@ Ext.define('PVE.dc.OptionView', {
let shape = value.shape;
let shapeText = PVE.Utils.tagTreeStyles[shape] ?? Proxmox.Utils.defaultText;
let txt = Ext.String.format(gettext("Tree Shape: {0}"), shapeText);
+ txt += `, ${Ext.String.format(gettext("Ordering: {0}"), value.ordering ?? 'config')}`;
if (Object.keys(colors).length > 0) {
txt += ', ';
}
@@ -361,6 +362,9 @@ Ext.define('PVE.dc.OptionView', {
if (values.shape) {
style.shape = values.shape;
}
+ if (values.ordering) {
+ style.ordering = values.ordering;
+ }
let value = PVE.Parser.printPropertyString(style);
if (value === '') {
return {
@@ -380,6 +384,19 @@ Ext.define('PVE.dc.OptionView', {
defaultValue: '__default__',
deleteEmpty: true,
},
+ {
+ name: 'ordering',
+ xtype: 'proxmoxKVComboBox',
+ fieldLabel: gettext('Ordering'),
+ comboItems: [
+ ['__default__', `${Proxmox.Utils.defaultText} (config)`],
+ ['config', 'config'],
+ ['alphabetical', 'alphabetical'],
+ ],
+ defaultValue: '__default__',
+ value: '__default__',
+ deleteEmpty: true,
+ },
{
xtype: 'displayfield',
fieldLabel: gettext('Color Overrides'),
diff --git a/www/manager6/form/TagEdit.js b/www/manager6/form/TagEdit.js
index 7200e3c09..7219845ae 100644
--- a/www/manager6/form/TagEdit.js
+++ b/www/manager6/form/TagEdit.js
@@ -37,6 +37,8 @@ Ext.define('PVE.panel.TagEditContainer', {
onRender: function(v) {
let me = this;
let view = me.getView();
+ view.toggleCls('hide-handles', PVE.Utils.shouldSortTags());
+
view.dragzone = Ext.create('Ext.dd.DragZone', v.getEl(), {
getDragData: function(e) {
let source = e.getTarget('.handle');
@@ -168,6 +170,14 @@ Ext.define('PVE.panel.TagEditContainer', {
let view = me.getView();
let vm = me.getViewModel();
let index = view.items.indexOf(me.lookup('addTagBtn'));
+ if (PVE.Utils.shouldSortTags()) {
+ index = view.items.findIndexBy(tagField => {
+ if (tagField.reference === 'addTagBtn') {
+ return true;
+ }
+ return tagField.tag >= tag;
+ }, 1);
+ }
view.insert(index, {
xtype: 'pmxTag',
tag,
@@ -226,7 +236,8 @@ Ext.define('PVE.panel.TagEditContainer', {
}
me.mon(Ext.GlobalEvents, 'loadedUiOptions', () => {
- me.loadTags(me.oldTags, true); // refresh tag colors
+ view.toggleCls('hide-handles', PVE.Utils.shouldSortTags());
+ me.loadTags(me.oldTags, true); // refresh tag colors and order
});
},
},
--
2.30.2