[pve-devel] [PATCH cluster/guest-common/qemu-server/ct/manager v11] add tags to ui

Dominik Csapak d.csapak at proxmox.com
Wed Nov 16 16:47:54 CET 2022


this series brings the already existing 'tags' for ct/vms to the gui:
* tags can be edited in the status toolbar of the guest
* existing tags will be shown in the tree/global search/resource grids
* when editing a tag, a list of tags will be shown
* by default, the color is (consistently) autogenerated based on the
  text
* that color can be overridden in datacenter -> options (cluster wide)
  (edit window for browser local storage is TBD)
* by default, the text color is either white or black, depending which
  provides the greater contrast (according to SAPC)
* this text color can also be overridden
* there are multiple shapes available for the tree
* implements some permission control in datacenter.cfg with
  'user-tag-access' and 'registered-tags' with that it's possible to have
  better control over what tags a user can actually add to its guests
  i intentionally left out the gui for those for now, but they shouldn't
  be that hard to add, should we go this way

changes from v10:
* adapted c code to wolfgangs requests
  - make the config \n terminated if it's not already
  - comment that lines must be null terminated
  - better types
* renamed 'privileged-tags' to 'registered-tags' (also in the ui)
* moved 'get_allowed_tags' into pve-guest-common
* internal improvements in assert_tag_permissions
* made alphabetical ordering the default (@thomas request)
* removed /ui-options, reused /cluster/options for that
* show warning in gui when tag is in allow list and registered
* reworded the descriptions in DataCenterConfig
* some minor gui changes
  - gettext fixes
  - renaming pmxTag to pveTag
  - refactored the dc edit windows out into their own files
* omitted already applied widget-toolkit patches

changes from v9:
* implemented changes required by wolfgang
  - fixed some c code behaviour
  - refactored the permission check into guest-common
* changed a bit how the permission check worked:
  - get_allowed_tags now takes a bool (privileged_user) and a closure
    for checking the vm access. with this we can avoid a
    cluster <-> access-control cyclic dependency
  - refactored some of the internal code of the permission check
    (see patch for details)
  - the forbidden tags are now in quotes in the error
* added an optional 'ordering' option into the 'tag-style' property
  with this the tags will be sorted in the gui (ui only)
  i left the patches separately

(omitted older changelog)

pve-cluster:

Dominik Csapak (5):
  add CFS_IPC_GET_GUEST_CONFIG_PROPERTIES method
  Cluster: add get_guest_config_properties
  datacenter.cfg: add option for tag-style
  datacenter.cfg: add tag rights control to the datacenter config
  datacenter.cfg: add 'ordering' to 'tag-style' config

 data/PVE/Cluster.pm          |  27 +++++
 data/PVE/DataCenterConfig.pm | 109 ++++++++++++++++++
 data/src/cfs-ipc-ops.h       |   2 +
 data/src/server.c            |  63 +++++++++++
 data/src/status.c            | 207 +++++++++++++++++++++++++----------
 data/src/status.h            |   3 +
 6 files changed, 353 insertions(+), 58 deletions(-)

pve-guest-common:

Dominik Csapak (1):
  GuestHelpers: add tag related helpers

 debian/control          |  3 +-
 src/PVE/GuestHelpers.pm | 99 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 100 insertions(+), 2 deletions(-)

qemu-server:

Dominik Csapak (1):
  api: update: check for tags permissions with 'assert_tag_permissions'

 PVE/API2/Qemu.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

pve-container:

Dominik Csapak (1):
  check_ct_modify_config_perm: check for tags permissions with
    'assert_tag_permissions'

 src/PVE/LXC.pm | 4 ++++
 1 file changed, 4 insertions(+)

pve-manager:

Dominik Csapak (13):
  api: /cluster/resources: add tags to returned properties
  api: allow all users to (partially) read datacenter.cfg
  ui: save ui options from /cluster/options instead of version
  ui: parse and save tag infos from /cluster/options
  ui: add form/TagColorGrid
  ui: add PVE.form.ListField
  ui: dc/OptionView: add editors for tag settings
  ui: add form/Tag
  ui: add form/TagEdit.js
  ui: {lxc,qemu}/Config: show Tags and make them editable
  ui: tree/ResourceTree: show Tags in tree
  ui: add tags to ResourceGrid and GlobalSearchField
  ui: implement tag ordering from datacenter.cfg

 PVE/API2.pm                            |   3 +-
 PVE/API2/Cluster.pm                    |  33 ++-
 www/css/ext6-pve.css                   |  57 ++++
 www/manager6/Makefile                  |   6 +
 www/manager6/Utils.js                  | 104 ++++++-
 www/manager6/Workspace.js              |   2 +
 www/manager6/data/ResourceStore.js     |   7 +
 www/manager6/dc/OptionView.js          | 139 +++++++++-
 www/manager6/dc/RegisteredTagsEdit.js  |  70 +++++
 www/manager6/dc/UserTagAccessEdit.js   |  90 +++++++
 www/manager6/form/GlobalSearchField.js |  20 +-
 www/manager6/form/ListField.js         | 165 ++++++++++++
 www/manager6/form/Tag.js               | 232 ++++++++++++++++
 www/manager6/form/TagColorGrid.js      | 357 +++++++++++++++++++++++++
 www/manager6/form/TagEdit.js           | 336 +++++++++++++++++++++++
 www/manager6/grid/ResourceGrid.js      |   1 +
 www/manager6/lxc/Config.js             |  36 ++-
 www/manager6/qemu/Config.js            |  35 ++-
 www/manager6/tree/ResourceTree.js      |  10 +-
 19 files changed, 1682 insertions(+), 21 deletions(-)
 create mode 100644 www/manager6/dc/RegisteredTagsEdit.js
 create mode 100644 www/manager6/dc/UserTagAccessEdit.js
 create mode 100644 www/manager6/form/ListField.js
 create mode 100644 www/manager6/form/Tag.js
 create mode 100644 www/manager6/form/TagColorGrid.js
 create mode 100644 www/manager6/form/TagEdit.js

-- 
2.30.2






More information about the pve-devel mailing list