From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v7 14/14] ui: form/Tag(Edit): add drag & drop when editing tags
Date: Tue, 21 Jun 2022 11:20:12 +0200 [thread overview]
Message-ID: <20220621092012.1776825-25-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220621092012.1776825-1-d.csapak@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/form/Tag.js | 22 +++++++--
www/manager6/form/TagEdit.js | 96 +++++++++++++++++++++++++++++++++++-
2 files changed, 114 insertions(+), 4 deletions(-)
diff --git a/www/manager6/form/Tag.js b/www/manager6/form/Tag.js
index 91190051..dcbd9597 100644
--- a/www/manager6/form/Tag.js
+++ b/www/manager6/form/Tag.js
@@ -31,6 +31,9 @@ Ext.define('Proxmox.Tag', {
if (event.target.tagName !== 'I') {
return;
}
+ if (event.target.classList.contains('handle')) {
+ return;
+ }
switch (me.mode) {
case 'editable':
if (me.addTag) {
@@ -156,12 +159,14 @@ Ext.define('Proxmox.Tag', {
let text = me.tag;
let cursor = 'pointer';
let padding = '0px';
+ let dragHandleStyle = 'none';
switch (mode) {
case 'normal':
iconStyle += 'display: none;';
padding = undefined;
break;
case 'editable':
+ dragHandleStyle = '';
break;
case 'edit':
me.tagEl().contentEditable = true;
@@ -174,12 +179,14 @@ Ext.define('Proxmox.Tag', {
if (me.addTag) {
me.setText(text);
me.setStyle('cursor', cursor);
+ dragHandleStyle = 'none';
}
me.setStyle('padding-right', padding);
me.iconEl().classList = `fa fa-${icon}${me.faIconStyle}`;
me.iconEl().style = iconStyle;
+ me.dragEl().style.display = dragHandleStyle;
me.mode = mode;
},
@@ -233,14 +240,18 @@ Ext.define('Proxmox.Tag', {
}
},
- tagEl: function() {
+ dragEl: function() {
return this.el?.dom?.children?.[0];
},
- iconEl: function() {
+ tagEl: function() {
return this.el?.dom?.children?.[1];
},
+ iconEl: function() {
+ return this.el?.dom?.children?.[2];
+ },
+
initComponent: function() {
let me = this;
if (me.tag === undefined && !me.addTag) {
@@ -256,10 +267,15 @@ Ext.define('Proxmox.Tag', {
let iconStyle = me.mode !== 'editable' ? 'display: none' : 'padding-right: 6px;';
let iconCls = me.icons[me.addTag ? 'addTag' : me.mode];
+ let dragHandleStyle = 'cursor: grab; font-size: 14px;';
+ if (me.addTag || me.mode !== 'editable') {
+ dragHandleStyle += 'display: none';
+ }
let adminCls = me.tag[0] === '+' ? 'admin-tag' : '';
+ let dragHandle = `<i class="handle fa fa-bars" style="${dragHandleStyle}"></i> `;
let icon = ` <i style="cursor: pointer; ${iconStyle}" class="fa fa-${iconCls}${me.faIconStyle}"></i>`;
- me.html = `<span style="padding-right: 1px" class="${adminCls}">${me.tag}</span>${icon}`;
+ me.html = `${dragHandle}<span style="padding-right: 1px" class="${adminCls}">${me.tag}</span>${icon}`;
me.callParent();
if (me.addTag) {
diff --git a/www/manager6/form/TagEdit.js b/www/manager6/form/TagEdit.js
index 5a267169..85f9f63e 100644
--- a/www/manager6/form/TagEdit.js
+++ b/www/manager6/form/TagEdit.js
@@ -18,7 +18,7 @@ Ext.define('PVE.panel.TagEditContainer', {
let tags = tagstring.split(/[;, ]/).filter((t) => !!t) || [];
me.suspendLayout = true;
- me.tags = {};
+ me.tagList = [];
me.removeAllTags();
tags.forEach((tag) => {
me.addTag(tag, inEdit);
@@ -87,6 +87,7 @@ Ext.define('PVE.panel.TagEditContainer', {
me.remove(tag);
});
me.tagFields = [];
+ me.tagList = [];
me.noTagsField.setVisible(true);
},
@@ -94,11 +95,13 @@ Ext.define('PVE.panel.TagEditContainer', {
let me = this;
let tagField = me.insert(me.tagFields.length + 1, {
xtype: 'pmxTag',
+ tagIndex: me.tagList.length,
tag,
mode: inEdit ? 'editable' : 'normal',
layoutCallback: () => me.updateLayout(),
});
me.tagFields.push(tagField);
+ me.tagList.push(tag);
me.noTagsField.setVisible(false);
},
@@ -147,5 +150,96 @@ Ext.define('PVE.panel.TagEditContainer', {
if (me.tags) {
me.loadTags(me.tags);
}
+
+ me.on('render', function(v) {
+ me.dragzone = Ext.create('Ext.dd.DragZone', v.getEl(), {
+ getDragData: function(e) {
+ let source = e.getTarget('.handle');
+ if (source) {
+ let sourceId = source.parentNode.id;
+ let cmp = Ext.getCmp(sourceId);
+ let tag = cmp.getTag();
+ let ddel = document.createElement('div');
+ ddel.classList.add('proxmox-tags-full');
+ ddel.innerHTML = Proxmox.Utils.getTagElement(tag, PVE.Utils.tagOverrides);
+ let repairXY = Ext.fly(source).getXY();
+ cmp.setDisabled(true);
+ ddel.id = Ext.id();
+ return {
+ ddel,
+ repairXY,
+ tagIndex: cmp.tagIndex,
+ tag: cmp.getTag(),
+ sourceId,
+ };
+ }
+ return undefined;
+ },
+ onMouseUp: function(target, e, id) {
+ let cmp = Ext.getCmp(this.dragData.sourceId);
+ if (cmp && !cmp.isDestroyed) {
+ cmp.setDisabled(false);
+ }
+ },
+ getRepairXY: function() {
+ return this.dragData.repairXY;
+ },
+ beforeInvalidDrop: function(target, e, id) {
+ let cmp = Ext.getCmp(this.dragData.sourceId);
+ if (cmp && !cmp.isDestroyed) {
+ cmp.setDisabled(false);
+ }
+ },
+ });
+ me.dropzone = Ext.create('Ext.dd.DropZone', v.getEl(), {
+ getTargetFromEvent: function(e) {
+ return e.getTarget('.proxmox-tag-dark,.proxmox-tag-light');
+ },
+ getIndicator: function() {
+ if (!me.indicator) {
+ me.indicator = Ext.create('Ext.Component', {
+ floating: true,
+ html: '<i class="fa fa-long-arrow-up"></i>',
+ hidden: true,
+ shadow: false,
+ });
+ }
+ return me.indicator;
+ },
+ onContainerOver: function() {
+ this.getIndicator().setVisible(false);
+ },
+ notifyOut: function() {
+ this.getIndicator().setVisible(false);
+ },
+ onNodeOver: function(target, dd, e, data) {
+ let indicator = this.getIndicator();
+ indicator.setVisible(true);
+ indicator.alignTo(Ext.getCmp(target.id), 't50-bl', [-1, -2]);
+ return this.dropAllowed;
+ },
+ onNodeDrop: function(target, dd, e, data) {
+ this.getIndicator().setVisible(false);
+ let tagIdx = data.tagIndex;
+ let tag = data.tag;
+ me.tagList.splice(tagIdx, 1);
+ let targetCmp = Ext.getCmp(target.id);
+ let targetIdx = targetCmp.tagIndex ?? Infinity;
+ if (targetIdx > tagIdx) {
+ targetIdx--;
+ }
+ me.tagList.splice(targetIdx, 0, tag);
+ me.loadTags(me.tagList.join(','), true, true);
+ },
+ });
+ });
+ },
+
+ destroy: function() {
+ let me = this;
+ Ext.destroy(me.dragzone);
+ Ext.destroy(me.dropzone);
+ Ext.destroy(me.indicator);
+ me.callParent();
},
});
--
2.30.2
next prev parent reply other threads:[~2022-06-21 9:20 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 9:19 [pve-devel] [PATCH common/cluster/qemu/container/wt/manager v7] add tags to ui Dominik Csapak
2022-06-21 9:19 ` [pve-devel] [PATCH common v7 1/2] JSONSchema: refactor tag regex Dominik Csapak
2022-09-20 11:37 ` [pve-devel] applied: " Thomas Lamprecht
2022-06-21 9:19 ` [pve-devel] [PATCH common v7 2/2] JSONSchema: pve-tag: add syntax for 'admin' tags Dominik Csapak
2022-06-21 9:19 ` [pve-devel] [PATCH cluster v7 1/3] add CFS_IPC_GET_GUEST_CONFIG_PROPERTIES method Dominik Csapak
2022-06-21 9:19 ` [pve-devel] [PATCH cluster v7 2/3] Cluster: add get_guest_config_properties Dominik Csapak
2022-06-21 9:19 ` [pve-devel] [PATCH cluster v7 3/3] datacenter.cfg: add option for tag-style Dominik Csapak
2022-06-21 9:19 ` [pve-devel] [PATCH widget-toolkit v7 1/3] add tag related helpers Dominik Csapak
2022-09-14 14:15 ` Aaron Lauterer
2022-06-21 9:19 ` [pve-devel] [PATCH widget-toolkit v7 2/3] add class for 'admin' tags Dominik Csapak
2022-06-21 9:19 ` [pve-devel] [PATCH widget-toolkit v7 3/3] Toolkit: add override for Ext.dd.DragDropManager Dominik Csapak
2022-06-21 9:19 ` [pve-devel] [PATCH qemu-server v7 1/1] api: update: check 'admin' tags privileges Dominik Csapak
2022-09-14 14:15 ` Aaron Lauterer
2022-09-15 11:46 ` Dominik Csapak
2022-06-21 9:19 ` [pve-devel] [PATCH container v7 1/1] check_ct_modify_config_perm: " Dominik Csapak
2022-06-21 9:19 ` [pve-devel] [PATCH manager v7 01/14] api: /cluster/resources: add tags to returned properties Dominik Csapak
2022-09-14 14:15 ` Aaron Lauterer
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 02/14] api: /version: add 'tag-style' Dominik Csapak
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 03/14] ui: parse and save tag color overrides from /version Dominik Csapak
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 04/14] ui: tree/ResourceTree: collect tags on update Dominik Csapak
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 05/14] ui: add form/TagColorGrid Dominik Csapak
2022-09-14 14:15 ` Aaron Lauterer
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 06/14] ui: dc/OptionView: add editors for tag settings Dominik Csapak
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 07/14] ui: add form/Tag Dominik Csapak
2022-09-14 14:15 ` Aaron Lauterer
2022-09-14 14:36 ` Aaron Lauterer
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 08/14] ui: add form/TagEdit.js Dominik Csapak
2022-09-14 14:15 ` Aaron Lauterer
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 09/14] ui: {lxc, qemu}/Config: show Tags and make them editable Dominik Csapak
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 10/14] ui: tree/ResourceTree: show Tags in tree Dominik Csapak
2022-09-14 14:15 ` Aaron Lauterer
2022-09-15 11:54 ` Dominik Csapak
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 11/14] ui: form/GlobalSearchField: display tags and allow to search for them Dominik Csapak
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 12/14] ui: form/Tag: add 'admin-tag' class to admin tags Dominik Csapak
2022-06-21 9:20 ` [pve-devel] [PATCH manager v7 13/14] ui: ResourceGrid: render tags Dominik Csapak
2022-06-21 9:20 ` Dominik Csapak [this message]
2022-09-14 14:15 ` [pve-devel] [PATCH manager v7 14/14] ui: form/Tag(Edit): add drag & drop when editing tags Aaron Lauterer
2022-09-15 11:56 ` Dominik Csapak
2022-09-14 14:34 ` [pve-devel] [PATCH common/cluster/qemu/container/wt/manager v7] add tags to ui Aaron Lauterer
2022-09-16 7:19 ` Thomas Lamprecht
2022-09-16 7:50 ` 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=20220621092012.1776825-25-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