Proxmox/proxmox-widget-toolkit
5
0
Fork 0
Code Pull Requests Releases Activity

notification ui: rename filter to matcher

Browse Source 
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
This commit is contained in:
Lukas Wagner 2023-11-14 13:59:47 +01:00 committed by Thomas Lamprecht
parent feacab72ca
commit e8f1954c55
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -88,7 +88,7 @@ JSSRC= \
window/ACMEPluginEdit.js \
window/ACMEDomains.js \
window/EndpointEditBase.js \
window/NotificationFilterEdit.js \
window/NotificationMatcherEdit.js \
window/FileBrowser.js \
window/AuthEditBase.js \
window/AuthEditOpenId.js \

2
src/data/model/NotificationConfig.js
View File

@ -7,7 +7,7 @@ Ext.define('proxmox-notification-endpoints', {
idProperty: 'name',
});
Ext.define('proxmox-notification-filters', {
Ext.define('proxmox-notification-matchers', {
extend: 'Ext.data.Model',
fields: ['name', 'comment'],
proxy: {

26
src/panel/NotificationConfigView.js
View File

@ -21,7 +21,7 @@ Ext.define('Proxmox.panel.NotificationConfigView', {
border: false,
collapsible: true,
animCollapse: false,
xtype: 'pmxNotificationFilterView',
xtype: 'pmxNotificationMatcherView',
cbind: {
baseUrl: '{baseUrl}',
},
@ -209,21 +209,21 @@ Ext.define('Proxmox.panel.NotificationEndpointView', {
},
});
Ext.define('Proxmox.panel.NotificationFilterView', {
Ext.define('Proxmox.panel.NotificationMatcherView', {
extend: 'Ext.grid.Panel',
alias: 'widget.pmxNotificationFilterView',
alias: 'widget.pmxNotificationMatcherView',
title: gettext('Notification Filters'),
title: gettext('Notification Matchers'),
controller: {
xclass: 'Ext.app.ViewController',
openEditWindow: function(filter) {
openEditWindow: function(matcher) {
let me = this;
Ext.create('Proxmox.window.NotificationFilterEdit', {
Ext.create('Proxmox.window.NotificationMatcherEdit', {
baseUrl: me.getView().baseUrl,
name: filter,
name: matcher,
autoShow: true,
listeners: {
destroy: () => me.reload(),
@ -253,12 +253,12 @@ Ext.define('Proxmox.panel.NotificationFilterView', {
activate: 'reload',
},
emptyText: gettext('No notification filters configured'),
emptyText: gettext('No notification matchers configured'),
columns: [
{
dataIndex: 'name',
text: gettext('Filter Name'),
text: gettext('Matcher Name'),
renderer: Ext.String.htmlEncode,
flex: 1,
},
@ -276,8 +276,8 @@ Ext.define('Proxmox.panel.NotificationFilterView', {
autoDestroyRstore: true,
rstore: {
type: 'update',
storeid: 'proxmox-notification-filters',
model: 'proxmox-notification-filters',
storeid: 'proxmox-notification-matchers',
model: 'proxmox-notification-matchers',
autoStart: true,
},
sorters: 'name',
@ -307,12 +307,12 @@ Ext.define('Proxmox.panel.NotificationFilterView', {
{
xtype: 'proxmoxStdRemoveButton',
callback: 'reload',
baseurl: `${me.baseUrl}/filters`,
baseurl: `${me.baseUrl}/matchers`,
},
],
});
me.callParent();
me.store.rstore.proxy.setUrl(`/api2/json/${me.baseUrl}/filters`);
me.store.rstore.proxy.setUrl(`/api2/json/${me.baseUrl}/matchers`);
},
});

14
src/window/NotificationFilterEdit.js → src/window/NotificationMatcherEdit.js
View File

@ -1,6 +1,6 @@
Ext.define('Proxmox.panel.NotificationFilterEditPanel', {
Ext.define('Proxmox.panel.NotificationMatcherEditPanel', {
extend: 'Proxmox.panel.InputPanel',
xtype: 'pmxNotificationFilterEditPanel',
xtype: 'pmxNotificationMatcherEditPanel',
mixins: ['Proxmox.Mixin.CBind'],
items: [
@ -11,7 +11,7 @@ Ext.define('Proxmox.panel.NotificationFilterEditPanel', {
value: '{name}',
editable: '{isCreate}',
},
fieldLabel: gettext('Filter Name'),
fieldLabel: gettext('Matcher Name'),
allowBlank: false,
},
{
@ -65,7 +65,7 @@ Ext.define('Proxmox.panel.NotificationFilterEditPanel', {
],
});
Ext.define('Proxmox.window.NotificationFilterEdit', {
Ext.define('Proxmox.window.NotificationMatcherEdit', {
extend: 'Proxmox.window.Edit',
isAdd: true,
@ -85,7 +85,7 @@ Ext.define('Proxmox.window.NotificationFilterEdit', {
throw "baseUrl not set";
}
me.url = `/api2/extjs${me.baseUrl}/filters`;
me.url = `/api2/extjs${me.baseUrl}/matchers`;
if (me.isCreate) {
me.method = 'POST';
@ -94,12 +94,12 @@ Ext.define('Proxmox.window.NotificationFilterEdit', {
me.method = 'PUT';
}
me.subject = gettext('Notification Filter');
me.subject = gettext('Notification Matcher');
Ext.apply(me, {
items: [{
name: me.name,
xtype: 'pmxNotificationFilterEditPanel',
xtype: 'pmxNotificationMatcherEditPanel',
isCreate: me.isCreate,
baseUrl: me.baseUrl,
}],