[pmg-devel] [PATCH pmg-api/gui/docs, proxmox-widget-toolkit] Extend rule system

Leo Nunner l.nunner at proxmox.com
Fri Apr 7 15:42:46 CEST 2023


This series introduces two new features for the PMG rule system: object
negation, and match groups. Negation allows the user to negate objects
inside a rule, meaning that they will evaluate to true if their
condition is NOT fulfilled.

The second feature, match groups, allows objects to be chained together.
A match group functions as a container for multiple other objects; it
will only evaluate to true if all its members evaluate to true. Match groups
are connected via logical 'or' to all other objects inside the rule;
take the following rule system:

- Rule
    - Match Group
	- Object 1
	- Object 2
    - Object 3

It will match if either (Object 1 && Object 2), or if Object 3
evaluate to true.

To properly achieve match groups inside the GUI, the rule overview was
reworked as a tree, instead of a simple list. It can now be
collapsed/expanded, and each object type (except actions) has a single
subfolder called 'Match Group'.

In combination, these features should cover quite a few use cases, and
make it possible to model more complex rule systems.

pmg-api:

Leo Nunner (8):
  feature: negation: add field to database
  feature: negation: parse negation value into objects
  feature: negation: expand/implement API endpoints
  feature: negation: implement matching logic
  feature: match groups: add field to database
  feature: match groups: parse field into objects
  feature: match groups: update API endpoints
  feature: match groups: implement matching logic

 src/PMG/API2/ObjectGroupHelpers.pm     |   6 +-
 src/PMG/API2/Rules.pm                  | 119 +++++++++++++++++++++++++
 src/PMG/DBTools.pm                     |  28 ++++++
 src/PMG/RuleCache.pm                   |  61 +++++++++++--
 src/PMG/RuleDB.pm                      |  65 +++++++++++++-
 src/PMG/RuleDB/ArchiveFilter.pm        |   6 +-
 src/PMG/RuleDB/ContentTypeFilter.pm    |   6 +-
 src/PMG/RuleDB/MatchArchiveFilename.pm |   4 +-
 src/PMG/RuleDB/MatchField.pm           |   2 +-
 src/PMG/RuleDB/MatchFilename.pm        |   2 +-
 10 files changed, 280 insertions(+), 19 deletions(-)

pmg-gui:

Leo Nunner (2):
  feature: negate objects inside rules
  feature: introduce logical 'and' for rules

 css/ext6-pmg.css |  10 ++
 js/RuleInfo.js   | 321 +++++++++++++++++++++++++++++++++++++----------
 js/Utils.js      |  14 +--
 3 files changed, 271 insertions(+), 74 deletions(-)

pmg-docs:

Leo Nunner (1):
  docs: document negation and match groups

 pmg-mail-filter.adoc | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

proxmox-widget-toolkit:

Leo Nunner (1):
  dark-mode: fix colour of default tree icons

 src/proxmox-dark/scss/other/_icons.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.30.2





More information about the pmg-devel mailing list