From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 proxmox-widget-toolkit 17/22] notification: matcher: move match-field formulas to local viewModel
Date: Wed, 13 Dec 2023 17:37:56 +0100 [thread overview]
Message-ID: <20231213163801.392492-18-l.wagner@proxmox.com> (raw)
In-Reply-To: <20231213163801.392492-1-l.wagner@proxmox.com>
This should make the code more cohesive and easier to follow.
No functional changes.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Tested-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
src/window/NotificationMatcherEdit.js | 186 +++++++++++++-------------
1 file changed, 92 insertions(+), 94 deletions(-)
diff --git a/src/window/NotificationMatcherEdit.js b/src/window/NotificationMatcherEdit.js
index fa42e1e..9d0a6bd 100644
--- a/src/window/NotificationMatcherEdit.js
+++ b/src/window/NotificationMatcherEdit.js
@@ -380,15 +380,6 @@ Ext.define('Proxmox.panel.NotificationRulesEditPanel', {
}
return !record.isRoot();
},
- typeIsMatchField: {
- bind: {
- bindTo: '{selectedRecord}',
- deep: true,
- },
- get: function(record) {
- return record?.get('type') === 'match-field';
- },
- },
typeIsMatchSeverity: {
bind: {
bindTo: '{selectedRecord}',
@@ -407,89 +398,13 @@ Ext.define('Proxmox.panel.NotificationRulesEditPanel', {
return record?.get('type') === 'match-calendar';
},
},
- matchFieldType: {
- bind: {
- bindTo: '{selectedRecord}',
- deep: true,
- },
- set: function(value) {
- let me = this;
- let record = me.get('selectedRecord');
- let currentData = record.get('data');
-
- let newValue = [];
-
- // Build equivalent regular expression if switching
- // to 'regex' mode
- if (value === 'regex') {
- let regexVal = "^(";
- regexVal += currentData.value.join('|') + ")$";
- newValue.push(regexVal);
- }
-
- record.set({
- data: {
- ...currentData,
- type: value,
- value: newValue,
- },
- });
- },
- get: function(record) {
- return record?.get('data')?.type;
- },
- },
- matchFieldField: {
- bind: {
- bindTo: '{selectedRecord}',
- deep: true,
- },
- set: function(value) {
- let me = this;
- let record = me.get('selectedRecord');
- let currentData = record.get('data');
-
- record.set({
- data: {
- ...currentData,
- field: value,
- // Reset value if field changes
- value: [],
- },
- });
- },
- get: function(record) {
- return record?.get('data')?.field;
- },
- },
- matchFieldValue: {
- bind: {
- bindTo: '{selectedRecord}',
- deep: true,
- },
- set: function(value) {
- let me = this;
- let record = me.get('selectedRecord');
- let currentData = record.get('data');
- record.set({
- data: {
- ...currentData,
- value: value,
- },
- });
- },
- get: function(record) {
- return record?.get('data')?.value;
- },
- },
matchSeverityValue: {
bind: {
bindTo: '{selectedRecord}',
deep: true,
},
set: function(value) {
- let me = this;
- let record = me.get('selectedRecord');
+ let record = this.get('selectedRecord');
let currentData = record.get('data');
record.set({
data: {
@@ -1137,7 +1052,95 @@ Ext.define('Proxmox.panel.MatchFieldSettings', {
},
},
},
+ viewModel: {
+ // parent is set in `initComponents`
+ formulas: {
+ typeIsMatchField: {
+ bind: {
+ bindTo: '{selectedRecord}',
+ deep: true,
+ },
+ get: function(record) {
+ return record?.get('type') === 'match-field';
+ },
+ },
+ isRegex: function(get) {
+ return get('matchFieldType') === 'regex';
+ },
+ matchFieldType: {
+ bind: {
+ bindTo: '{selectedRecord}',
+ deep: true,
+ },
+ set: function(value) {
+ let record = this.get('selectedRecord');
+ let currentData = record.get('data');
+ let newValue = [];
+
+ // Build equivalent regular expression if switching
+ // to 'regex' mode
+ if (value === 'regex') {
+ let regexVal = "^(";
+ regexVal += currentData.value.join('|') + ")$";
+ newValue.push(regexVal);
+ }
+
+ record.set({
+ data: {
+ ...currentData,
+ type: value,
+ value: newValue,
+ },
+ });
+ },
+ get: function(record) {
+ return record?.get('data')?.type;
+ },
+ },
+ matchFieldField: {
+ bind: {
+ bindTo: '{selectedRecord}',
+ deep: true,
+ },
+ set: function(value) {
+ let record = this.get('selectedRecord');
+ let currentData = record.get('data');
+
+ record.set({
+ data: {
+ ...currentData,
+ field: value,
+ // Reset value if field changes
+ value: [],
+ },
+ });
+ },
+ get: function(record) {
+ return record?.get('data')?.field;
+ },
+ },
+ matchFieldValue: {
+ bind: {
+ bindTo: '{selectedRecord}',
+ deep: true,
+ },
+ set: function(value) {
+ let record = this.get('selectedRecord');
+ let currentData = record.get('data');
+ record.set({
+ data: {
+ ...currentData,
+ value: value,
+ },
+ });
+ },
+ get: function(record) {
+ return record?.get('data')?.value;
+ },
+ },
+ },
+ },
initComponent: function() {
let me = this;
@@ -1198,15 +1201,10 @@ Ext.define('Proxmox.panel.MatchFieldSettings', {
},
});
+ Ext.apply(me.viewModel, {
+ parent: me.up('pmxNotificationMatchRulesEditPanel').getViewModel(),
+ });
Ext.apply(me, {
- viewModel: Ext.create('Ext.app.ViewModel', {
- parent: me.up('pmxNotificationMatchRulesEditPanel').getViewModel(),
- formulas: {
- isRegex: function(get) {
- return get('matchFieldType') === 'regex';
- },
- },
- }),
items: [
{
fieldLabel: 'Match Type',
--
2.39.2
next prev parent reply other threads:[~2023-12-13 16:38 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-13 16:37 [pve-devel] [PATCH v2 many 00/22] notifications: notification metadata matching improvements Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox 01/22] notify: include 'hostname' metadata field for forwarded mails Lukas Wagner
2024-01-10 11:40 ` [pve-devel] applied: " Wolfgang Bumiller
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox 02/22] notify: include 'type' " Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox 03/22] notify: matcher: support lists of values for 'exact' match-field mode Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 04/22] api: notifications: add 'smtp' to target index Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 05/22] api: jobs: vzdump: pass job 'id' parameter Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 06/22] ui: dc: backup: send 'id' property when starting a backup job manually Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 07/22] ui: dc: backup: show 'Job ID' column Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 08/22] ui: dc: backup: allow to set custom job id in advanced settings Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 09/22] api: replication: add 'replication-job' to notification metadata Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 10/22] ui: replication: show 'Job ID' column Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 11/22] vzdump: apt: notification: do not include domain in 'hostname' field Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 12/22] api: replication: include 'hostname' field for notifications Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 13/22] api: notification: add API for getting known metadata fields/values Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-manager 14/22] ui: utils: add overrides for translatable notification fields/values Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox-widget-toolkit 15/22] combogrid: add 'showClearTrigger' config Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox-widget-toolkit 16/22] notification: matcher: match-field: show known fields/values Lukas Wagner
2023-12-13 16:37 ` Lukas Wagner [this message]
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox-widget-toolkit 18/22] notification: matcher: move match-calendar fields to panel Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 proxmox-widget-toolkit 19/22] notification: matcher: move match-severity " Lukas Wagner
2023-12-13 16:37 ` [pve-devel] [PATCH v2 pve-docs 20/22] notification: clarify that 'hostname' does not include the domain Lukas Wagner
2023-12-13 16:38 ` [pve-devel] [PATCH v2 pve-docs 21/22] notifications: describe new notification metadata fields Lukas Wagner
2023-12-13 16:38 ` [pve-devel] [PATCH v2 pve-docs 22/22] notifications: match-field 'exact'-mode can now match multiple values Lukas Wagner
2024-01-08 10:43 ` [pve-devel] [PATCH v2 many 00/22] notifications: notification metadata matching improvements Lukas Wagner
2024-02-16 9:19 ` Lukas Wagner
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=20231213163801.392492-18-l.wagner@proxmox.com \
--to=l.wagner@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