From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-widget-toolkit 18/21] notification: matcher: move match-severity fields to panel
Date: Mon, 11 Dec 2023 13:49:52 +0100 [thread overview]
Message-ID: <20231211124955.211219-19-l.wagner@proxmox.com> (raw)
In-Reply-To: <20231211124955.211219-1-l.wagner@proxmox.com>
Also introduce a local viewModel that is linked to a parent viewModel,
allowing us to move the formulas to the panel.
This should make the code more cohesive and easier to follow.
No functional changes.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
src/window/NotificationMatcherEdit.js | 129 ++++++++++++++++----------
1 file changed, 80 insertions(+), 49 deletions(-)
diff --git a/src/window/NotificationMatcherEdit.js b/src/window/NotificationMatcherEdit.js
index 47f6e18..3e2449f 100644
--- a/src/window/NotificationMatcherEdit.js
+++ b/src/window/NotificationMatcherEdit.js
@@ -380,34 +380,7 @@ Ext.define('Proxmox.panel.NotificationRulesEditPanel', {
}
return !record.isRoot();
},
- typeIsMatchSeverity: {
- bind: {
- bindTo: '{selectedRecord}',
- deep: true,
- },
- get: function(record) {
- return record?.get('type') === 'match-severity';
- },
- },
- matchSeverityValue: {
- 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;
- },
- },
+
rootMode: {
bind: {
bindTo: '{selectedRecord}',
@@ -944,27 +917,7 @@ Ext.define('Proxmox.panel.NotificationMatchRuleSettings', {
},
},
{
- xtype: 'proxmoxKVComboBox',
- fieldLabel: gettext('Severities to match'),
- isFormField: false,
- allowBlank: true,
- multiSelect: true,
- field: 'value',
- // Hide initially to avoid glitches when opening the window
- hidden: true,
- bind: {
- value: '{matchSeverityValue}',
- hidden: '{!typeIsMatchSeverity}',
- disabled: '{!typeIsMatchSeverity}',
- },
-
- comboItems: [
- ['info', gettext('Info')],
- ['notice', gettext('Notice')],
- ['warning', gettext('Warning')],
- ['error', gettext('Error')],
- ['unknown', gettext('Unknown')],
- ],
+ xtype: 'pmxNotificationMatchSeveritySettings',
},
{
xtype: 'pmxNotificationMatchCalendarSettings',
@@ -1047,6 +1000,84 @@ Ext.define('Proxmox.panel.MatchCalendarSettings', {
},
});
+Ext.define('Proxmox.panel.MatchSeveritySettings', {
+ extend: 'Ext.panel.Panel',
+ xtype: 'pmxNotificationMatchSeveritySettings',
+ border: false,
+ layout: 'anchor',
+ // Hide initially to avoid glitches when opening the window
+ hidden: true,
+ bind: {
+ hidden: '{!typeIsMatchSeverity}',
+ },
+ viewModel: {
+ // parent is set in `initComponents`
+ formulas: {
+ typeIsMatchSeverity: {
+ bind: {
+ bindTo: '{selectedRecord}',
+ deep: true,
+ },
+ get: function(record) {
+ return record?.get('type') === 'match-severity';
+ },
+ },
+ matchSeverityValue: {
+ 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;
+ },
+ },
+ },
+ },
+ items: [
+ {
+ xtype: 'proxmoxKVComboBox',
+ fieldLabel: gettext('Severities to match'),
+ isFormField: false,
+ allowBlank: true,
+ multiSelect: true,
+ field: 'value',
+ // Hide initially to avoid glitches when opening the window
+ hidden: true,
+ bind: {
+ value: '{matchSeverityValue}',
+ hidden: '{!typeIsMatchSeverity}',
+ disabled: '{!typeIsMatchSeverity}',
+ },
+
+ comboItems: [
+ ['info', gettext('Info')],
+ ['notice', gettext('Notice')],
+ ['warning', gettext('Warning')],
+ ['error', gettext('Error')],
+ ['unknown', gettext('Unknown')],
+ ],
+ },
+ ],
+
+ initComponent: function() {
+ let me = this;
+ Ext.apply(me.viewModel, {
+ parent: me.up('pmxNotificationMatchRulesEditPanel').getViewModel(),
+ });
+ me.callParent();
+ },
+});
+
Ext.define('Proxmox.panel.MatchFieldSettings', {
extend: 'Ext.panel.Panel',
xtype: 'pmxNotificationMatchFieldSettings',
--
2.39.2
next prev parent reply other threads:[~2023-12-11 12:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-11 12:49 [pve-devel] [PATCH many 00/21] notifications: notification metadata matching improvements Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH proxmox 01/21] notify: include 'hostname' metadata field for forwarded mails Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH proxmox 02/21] notify: matcher: support lists of values for 'exact' match-field mode Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 03/21] api: notifications: add 'smtp' to target index Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 04/21] api: jobs: vzdump: pass job 'id' parameter Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 05/21] ui: dc: backup: send 'id' property when starting a backup job manually Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 06/21] ui: dc: backup: show 'Job ID' column Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 07/21] ui: dc: backup: allow to set custom job id in advanced settings Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 08/21] api: replication: add 'replication-job' to notification metadata Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 09/21] ui: replication: show 'Job ID' column Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 10/21] vzdump: apt: notification: do not include domain in 'hostname' field Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 11/21] api: replication: include 'hostname' field for notifications Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 12/21] api: notification: add API for getting known metadata fields/values Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-manager 13/21] ui: utils: add overrides for translatable notification fields/values Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH proxmox-widget-toolkit 14/21] combogrid: add 'showClearTrigger' config Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH proxmox-widget-toolkit 15/21] notification: matcher: match-field: show known fields/values Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH proxmox-widget-toolkit 16/21] notification: matcher: move match-field formulas to local viewModel Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH proxmox-widget-toolkit 17/21] notification: matcher: move match-calendar fields to panel Lukas Wagner
2023-12-11 12:49 ` Lukas Wagner [this message]
2023-12-11 12:49 ` [pve-devel] [PATCH pve-docs 19/21] notification: clarify that 'hostname' does not include the domain Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-docs 20/21] notifications: describe new notification metadata fields Lukas Wagner
2023-12-11 12:49 ` [pve-devel] [PATCH pve-docs 21/21] notifications: match-field 'exact'-mode can now match multiple values Lukas Wagner
2023-12-11 13:50 ` [pve-devel] [PATCH many 00/21] notifications: notification metadata matching improvements Maximiliano Sandoval
2023-12-13 16:36 ` 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=20231211124955.211219-19-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