From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-widget-toolkit 23/27] notification ui: remove notification groups
Date: Tue, 7 Nov 2023 11:18:23 +0100 [thread overview]
Message-ID: <20231107101827.340100-24-l.wagner@proxmox.com> (raw)
In-Reply-To: <20231107101827.340100-1-l.wagner@proxmox.com>
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
src/Makefile | 1 -
src/Schema.js | 5 -
src/panel/NotificationConfigView.js | 4 -
src/panel/NotificationGroupEditPanel.js | 174 ------------------------
4 files changed, 184 deletions(-)
delete mode 100644 src/panel/NotificationGroupEditPanel.js
diff --git a/src/Makefile b/src/Makefile
index 85ecea4..e07f17c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -61,7 +61,6 @@ JSSRC= \
panel/LogView.js \
panel/NodeInfoRepoStatus.js \
panel/NotificationConfigView.js \
- panel/NotificationGroupEditPanel.js \
panel/JournalView.js \
panel/PermissionView.js \
panel/PruneKeepPanel.js \
diff --git a/src/Schema.js b/src/Schema.js
index a7ffdf8..37ecd88 100644
--- a/src/Schema.js
+++ b/src/Schema.js
@@ -48,11 +48,6 @@ Ext.define('Proxmox.Schema', { // a singleton
ipanel: 'pmxGotifyEditPanel',
iconCls: 'fa-bell-o',
},
- group: {
- name: gettext('Notification Group'),
- ipanel: 'pmxNotificationGroupEditPanel',
- iconCls: 'fa-bell-o',
- },
},
pxarFileTypes: {
diff --git a/src/panel/NotificationConfigView.js b/src/panel/NotificationConfigView.js
index ff9c512..ba98395 100644
--- a/src/panel/NotificationConfigView.js
+++ b/src/panel/NotificationConfigView.js
@@ -191,10 +191,6 @@ Ext.define('Proxmox.panel.NotificationEndpointView', {
callback: 'reload',
enableFn: rec => rec.data.name !== 'mail-to-root',
getUrl: function(rec) {
- if (rec.data.type === 'group') {
- return `${me.baseUrl}/groups/${rec.getId()}`;
- }
-
return `${me.baseUrl}/endpoints/${rec.data.type}/${rec.getId()}`;
},
},
diff --git a/src/panel/NotificationGroupEditPanel.js b/src/panel/NotificationGroupEditPanel.js
deleted file mode 100644
index 910d15a..0000000
--- a/src/panel/NotificationGroupEditPanel.js
+++ /dev/null
@@ -1,174 +0,0 @@
-Ext.define('Proxmox.panel.NotificationGroupEditPanel', {
- extend: 'Proxmox.panel.InputPanel',
- xtype: 'pmxNotificationGroupEditPanel',
- mixins: ['Proxmox.Mixin.CBind'],
-
- type: 'group',
-
- items: [
- {
- xtype: 'pmxDisplayEditField',
- name: 'name',
- cbind: {
- value: '{name}',
- editable: '{isCreate}',
- },
- fieldLabel: gettext('Group Name'),
- allowBlank: false,
- },
- {
- xtype: 'pmxNotificationEndpointSelector',
- name: 'endpoint',
- allowBlank: false,
- },
- {
- xtype: 'proxmoxtextfield',
- name: 'comment',
- fieldLabel: gettext('Comment'),
- cbind: {
- deleteEmpty: '{!isCreate}',
- },
- },
- ],
-});
-
-Ext.define('Proxmox.form.NotificationEndpointSelector', {
- extend: 'Ext.grid.Panel',
- alias: 'widget.pmxNotificationEndpointSelector',
-
- mixins: {
- field: 'Ext.form.field.Field',
- },
-
- padding: '0 0 10 0',
-
- allowBlank: true,
- selectAll: false,
- isFormField: true,
-
- store: {
- autoLoad: true,
- model: 'proxmox-notification-endpoints',
- sorters: 'name',
- filters: item => item.data.type !== 'group',
- },
-
- columns: [
- {
- header: gettext('Endpoint Name'),
- dataIndex: 'name',
- flex: 1,
- },
- {
- header: gettext('Type'),
- dataIndex: 'type',
- flex: 1,
- },
- {
- header: gettext('Comment'),
- dataIndex: 'comment',
- flex: 3,
- },
- ],
-
- selModel: {
- selType: 'checkboxmodel',
- mode: 'SIMPLE',
- },
-
- checkChangeEvents: [
- 'selectionchange',
- 'change',
- ],
-
- listeners: {
- selectionchange: function() {
- // to trigger validity and error checks
- this.checkChange();
- },
- },
-
- getSubmitData: function() {
- let me = this;
- let res = {};
- res[me.name] = me.getValue();
- return res;
- },
-
- getValue: function() {
- let me = this;
- if (me.savedValue !== undefined) {
- return me.savedValue;
- }
- let sm = me.getSelectionModel();
- return (sm.getSelection() ?? []).map(item => item.data.name);
- },
-
- setValueSelection: function(value) {
- let me = this;
-
- let store = me.getStore();
-
- let notFound = [];
- let selection = value.map(item => {
- let found = store.findRecord('name', item, 0, false, true, true);
- if (!found) {
- notFound.push(item);
- }
- return found;
- }).filter(r => r);
-
- for (const name of notFound) {
- let rec = store.add({
- name,
- type: '-',
- comment: gettext('Included endpoint does not exist!'),
- });
- selection.push(rec[0]);
- }
-
- let sm = me.getSelectionModel();
- if (selection.length) {
- sm.select(selection);
- } else {
- sm.deselectAll();
- }
- // to correctly trigger invalid class
- me.getErrors();
- },
-
- setValue: function(value) {
- let me = this;
-
- let store = me.getStore();
- if (!store.isLoaded()) {
- me.savedValue = value;
- store.on('load', function() {
- me.setValueSelection(value);
- delete me.savedValue;
- }, { single: true });
- } else {
- me.setValueSelection(value);
- }
- return me.mixins.field.setValue.call(me, value);
- },
-
- getErrors: function(value) {
- let me = this;
- if (!me.isDisabled() && me.allowBlank === false &&
- me.getSelectionModel().getCount() === 0) {
- me.addBodyCls(['x-form-trigger-wrap-default', 'x-form-trigger-wrap-invalid']);
- return [gettext('No endpoint selected')];
- }
-
- me.removeBodyCls(['x-form-trigger-wrap-default', 'x-form-trigger-wrap-invalid']);
- return [];
- },
-
- initComponent: function() {
- let me = this;
- me.callParent();
- me.initField();
- },
-
-});
--
2.39.2
next prev parent reply other threads:[~2023-11-07 10:19 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 10:18 [pve-devel] [PATCH many 00/27] overhaul notification system, use matchers instead of filters Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox 01/27] notify: introduce Error::Generic Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox 02/27] notify: factor out notification content into its own type Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox 03/27] notify: replace filters and groups with matcher-based system Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox 04/27] notify: add calendar matcher Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox 05/27] notify: matcher: introduce common trait for match directives Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox 06/27] notify: let a matcher always match if it has no matching directives Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox-perl-rs 07/27] notify: adapt to new matcher-based notification routing Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-cluster 08/27] notify: adapt to matcher based notification system Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-guest-common 09/27] vzdump: deprecate mailto/mailnotification/notification-{target, policy} Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-ha-manager 10/27] env: switch to matcher-based notification system Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-manager 11/27] api: notification: remove notification groups Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-manager 12/27] api: notification: add new matcher-based notification API Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-manager 13/27] ui: dc: remove unneeded notification events panel Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-manager 14/27] vzdump: adapt to new matcher based notification system Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-manager 15/27] api: apt: adapt to matcher-based notifications Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-manager 16/27] api: replication: adapt to matcher-based notification system Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-manager 17/27] debian: postinst: create notifications.cfg if it does not exist Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-manager 18/27] test: fix vzdump notification test Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-manager 19/27] ui: vzdump: remove left-overs from target/policy based notifications Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH pve-manager 20/27] ui: dc: config: show notification panel again Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox-widget-toolkit 21/27] notification ui: add target selector for matcher Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox-widget-toolkit 22/27] notification ui: remove filter setting for targets Lukas Wagner
2023-11-07 10:18 ` Lukas Wagner [this message]
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox-widget-toolkit 24/27] notification ui: rename filter to matcher Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox-widget-toolkit 25/27] notification: matcher: add UI for matcher editing Lukas Wagner
2023-11-13 15:13 ` Dominik Csapak
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox-widget-toolkit 26/27] notification ui: unprotected mailto-root target Lukas Wagner
2023-11-07 10:18 ` [pve-devel] [PATCH proxmox-widget-toolkit 27/27] noficiation: matcher edit: make 'field' an editable combobox Lukas Wagner
2023-11-13 14:34 ` [pve-devel] [PATCH many 00/27] overhaul notification system, use matchers instead of filters Dominik Csapak
2023-11-13 14:54 ` Thomas Lamprecht
2023-11-13 14:58 ` 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=20231107101827.340100-24-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