diff --git a/@restart.cmd b/@restart.cmd
index 290ffd8..7c65b10 100644
--- a/@restart.cmd
+++ b/@restart.cmd
@@ -1,5 +1,10 @@
@echo off
+scp pve.tsanie.org:/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js usr\share\javascript\proxmox-widget-toolkit\proxmoxlib.js
+scp pve.tsanie.org:/usr/share/perl5/PVE/API2/Nodes.pm usr\share\perl5\PVE\API2\Nodes.pm
+scp pve.tsanie.org:/usr/share/pve-manager/js/pvemanagerlib.js usr\share\pve-manager\js\pvemanagerlib.js
+pause
+
scp usr\share\javascript\proxmox-widget-toolkit\proxmoxlib.js pve.tsanie.org:/usr/share/javascript/proxmox-widget-toolkit/
scp usr\share\perl5\PVE\API2\Nodes.pm pve.tsanie.org:/usr/share/perl5/PVE/API2/
scp usr\share\pve-manager\js\pvemanagerlib.js pve.tsanie.org:/usr/share/pve-manager/js/
diff --git a/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js b/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
index 84abcb0..996f638 100644
--- a/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
+++ b/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
@@ -1,4 +1,4 @@
-// v4.2.3-t1714038312
+// v4.3.6-t1740503330
Ext.ns('Proxmox');
Ext.ns('Proxmox.Setup');
@@ -65,6 +65,7 @@ utilities: {
language_map: { //language map is sorted alphabetically by iso 639-1
ar: `العربية - ${gettext("Arabic")}`,
+ bg: `Български - ${gettext("Bulgarian")}`,
ca: `Català - ${gettext("Catalan")}`,
da: `Dansk - ${gettext("Danish")}`,
de: `Deutsch - ${gettext("German")}`,
@@ -318,7 +319,7 @@ utilities: {
// that way the cookie gets deleted after the browser window is closed
if (data.ticket) {
Proxmox.CSRFPreventionToken = data.CSRFPreventionToken;
- Ext.util.Cookies.set(Proxmox.Setup.auth_cookie_name, data.ticket, null, '/', null, true, "strict");
+ Ext.util.Cookies.set(Proxmox.Setup.auth_cookie_name, data.ticket, null, '/', null, true, "lax");
}
if (data.token) {
@@ -344,7 +345,7 @@ utilities: {
return;
}
// ExtJS clear is basically the same, but browser may complain if any cookie isn't "secure"
- Ext.util.Cookies.set(Proxmox.Setup.auth_cookie_name, "", new Date(0), null, null, true, "strict");
+ Ext.util.Cookies.set(Proxmox.Setup.auth_cookie_name, "", new Date(0), null, null, true, "lax");
window.localStorage.removeItem("ProxmoxUser");
},
@@ -562,7 +563,7 @@ utilities: {
let res = response.result;
if (res === null || res === undefined || !res || res
.data.status.toLowerCase() !== 'active') {
- void({ //Ext.Msg.show({
+ Ext.Msg.show({
title: gettext('No valid subscription'),
icon: Ext.Msg.WARNING,
message: Proxmox.Utils.getNoSubKeyHtml(res.data.url),
@@ -928,7 +929,7 @@ utilities: {
let parsed = Proxmox.Utils.parse_task_status(status);
switch (parsed) {
case 'unknown': return Proxmox.Utils.unknownText;
- case 'error': return Proxmox.Utils.errorText + ': ' + status;
+ case 'error': return Proxmox.Utils.errorText + ': ' + Ext.htmlEncode(status);
case 'warning': return status.replace('WARNINGS', Proxmox.Utils.warningsText);
case 'ok': // fall-through
default: return status;
@@ -1357,6 +1358,24 @@ utilities: {
);
},
+ // Convert utf-8 string to base64.
+ // This also escapes unicode characters such as emojis.
+ utf8ToBase64: function(string) {
+ let bytes = new TextEncoder().encode(string);
+ const escapedString = Array.from(bytes, (byte) =>
+ String.fromCodePoint(byte),
+ ).join("");
+ return btoa(escapedString);
+ },
+
+ // Converts a base64 string into a utf8 string.
+ // Decodes escaped unicode characters correctly.
+ base64ToUtf8: function(b64_string) {
+ let string = atob(b64_string);
+ let bytes = Uint8Array.from(string, (m) => m.codePointAt(0));
+ return new TextDecoder().decode(bytes);
+ },
+
stringToRGB: function(string) {
let hash = 0;
if (!string) {
@@ -1507,6 +1526,26 @@ utilities: {
me.IP6_dotnotation_match = new RegExp("^(" + IPV6_REGEXP + ")(?:\\.(\\d+))?$");
me.Vlan_match = /^vlan(\d+)/;
me.VlanInterface_match = /(\w+)\.(\d+)/;
+
+
+ // Taken from proxmox-schema and ported to JS
+ let PORT_REGEX_STR = "(?:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])";
+ let IPRE_BRACKET_STR = "(?:" + IPV4_REGEXP + "|\\[(?:" + IPV6_REGEXP + ")\\])";
+ let DNS_NAME_STR = "(?:(?:" + DnsName_REGEXP + "\\.)*" + DnsName_REGEXP + ")";
+ let HTTP_URL_REGEX = "^https?://(?:(?:(?:"
+ + DNS_NAME_STR
+ + "|"
+ + IPRE_BRACKET_STR
+ + ")(?::"
+ + PORT_REGEX_STR
+ + ")?)|"
+ + IPV6_REGEXP
+ + ")(?:/[^\x00-\x1F\x7F]*)?$";
+
+ me.httpUrlRegex = new RegExp(HTTP_URL_REGEX);
+
+ // Same as SAFE_ID_REGEX in proxmox-schema
+ me.safeIdRegex = /^(?:[A-Za-z0-9_][A-Za-z0-9._\\-]*)$/;
},
});
@@ -1551,10 +1590,13 @@ Ext.define('Proxmox.Schema', { // a singleton
authDomains: {
pam: {
name: 'Linux PAM',
+ ipanel: 'pmxAuthSimplePanel',
+ onlineHelp: 'user-realms-pam',
add: false,
- edit: false,
+ edit: true,
pwchange: true,
sync: false,
+ useTypeInUrl: false,
},
openid: {
name: gettext('OpenID Connect Server'),
@@ -1565,6 +1607,7 @@ Ext.define('Proxmox.Schema', { // a singleton
pwchange: false,
sync: false,
iconCls: 'pmx-itype-icon-openid-logo',
+ useTypeInUrl: true,
},
ldap: {
name: gettext('LDAP Server'),
@@ -1575,6 +1618,7 @@ Ext.define('Proxmox.Schema', { // a singleton
tfa: true,
pwchange: false,
sync: true,
+ useTypeInUrl: true,
},
ad: {
name: gettext('Active Directory Server'),
@@ -1585,6 +1629,7 @@ Ext.define('Proxmox.Schema', { // a singleton
tfa: true,
pwchange: false,
sync: true,
+ useTypeInUrl: true,
},
},
// to add or change existing for product specific ones
@@ -1612,6 +1657,11 @@ Ext.define('Proxmox.Schema', { // a singleton
ipanel: 'pmxGotifyEditPanel',
iconCls: 'fa-bell-o',
},
+ webhook: {
+ name: 'Webhook',
+ ipanel: 'pmxWebhookEditPanel',
+ iconCls: 'fa-bell-o',
+ },
},
// to add or change existing for product specific ones
@@ -3819,6 +3869,18 @@ Ext.define('proxmox-notification-matchers', {
},
idProperty: 'name',
});
+
+Ext.define('proxmox-notification-fields', {
+ extend: 'Ext.data.Model',
+ fields: ['name', 'description'],
+ idProperty: 'name',
+});
+
+Ext.define('proxmox-notification-field-values', {
+ extend: 'Ext.data.Model',
+ fields: ['value', 'comment', 'field'],
+ idProperty: 'value',
+});
Ext.define('pmx-domains', {
extend: "Ext.data.Model",
fields: [
@@ -4075,6 +4137,15 @@ Ext.define('Proxmox.form.field.DisplayEdit', {
vm.get('value');
},
+ setEmptyText: function(emptyText) {
+ let me = this;
+ me.editField.setEmptyText(emptyText);
+ },
+ getEmptyText: function() {
+ let me = this;
+ return me.editField.getEmptyText();
+ },
+
layout: 'fit',
defaults: {
hideLabel: true,
@@ -4133,6 +4204,11 @@ Ext.define('Proxmox.form.field.DisplayEdit', {
me.callParent();
+ // save a reference to make it easier when one needs to operate on the underlying fields,
+ // like when creating a passthrough getter/setter to allow easy data-binding.
+ me.editField = me.down(editConfig.xtype);
+ me.displayField = me.down(displayConfig.xtype);
+
me.getViewModel().set('editable', me.editable);
},
@@ -4248,6 +4324,67 @@ Ext.define('Proxmox.form.field.Textfield', {
this.validate();
},
});
+Ext.define('Proxmox.form.field.Base64TextArea', {
+ extend: 'Ext.form.field.TextArea',
+ alias: ['widget.proxmoxBase64TextArea'],
+
+ config: {
+ skipEmptyText: false,
+ deleteEmpty: false,
+ trimValue: false,
+ editable: true,
+ width: 600,
+ height: 400,
+ scrollable: 'y',
+ emptyText: gettext('You can use Markdown for rich text formatting.'),
+ },
+
+ setValue: function(value) {
+ // We want to edit the decoded version of the text
+ this.callParent([Proxmox.Utils.base64ToUtf8(value)]);
+ },
+
+ processRawValue: function(value) {
+ // The field could contain multi-line values
+ return Proxmox.Utils.utf8ToBase64(value);
+ },
+
+ getSubmitData: function() {
+ let me = this,
+ data = null,
+ val;
+ if (!me.disabled && me.submitValue && !me.isFileUpload()) {
+ val = me.getSubmitValue();
+ if (val !== null) {
+ data = {};
+ data[me.getName()] = val;
+ } else if (me.getDeleteEmpty()) {
+ data = {};
+ data.delete = me.getName();
+ }
+ }
+ return data;
+ },
+
+ getSubmitValue: function() {
+ let me = this;
+
+ let value = this.processRawValue(this.getRawValue());
+ if (me.getTrimValue() && typeof value === 'string') {
+ value = value.trim();
+ }
+ if (value !== '') {
+ return value;
+ }
+
+ return me.getSkipEmptyText() ? null: value;
+ },
+
+ setAllowBlank: function(allowBlank) {
+ this.allowBlank = allowBlank;
+ this.validate();
+ },
+});
Ext.define('Proxmox.form.field.VlanField', {
extend: 'Ext.form.field.Number',
alias: ['widget.proxmoxvlanfield'],
@@ -5907,6 +6044,20 @@ Ext.define('Proxmox.form.ThemeSelector', {
comboItems: Proxmox.Utils.theme_array(),
});
+Ext.define('Proxmox.form.field.FingerprintField', {
+ extend: 'Proxmox.form.field.Textfield',
+ alias: ['widget.pmxFingerprintField'],
+
+ config: {
+ fieldLabel: gettext('Fingerprint'),
+ emptyText: gettext('Server certificate SHA-256 fingerprint, required for self-signed certificates'),
+
+ regex: /[A-Fa-f0-9]{2}(:[A-Fa-f0-9]{2}){31}/,
+ regexText: gettext('Example') + ': AB:CD:EF:...',
+
+ allowBlank: true,
+ },
+});
/* Button features:
* - observe selection changes to enable/disable the button using enableFn()
* - pop up confirmation dialog using confirmMsg()
@@ -6050,7 +6201,7 @@ Ext.define('Proxmox.button.StdRemoveButton', {
} else {
text = gettext('Are you sure you want to remove entry {0}');
}
- return Ext.String.format(text, `'${name}'`);
+ return Ext.String.format(text, Ext.htmlEncode(`'${name}'`));
},
handler: function(btn, event, rec) {
@@ -6261,7 +6412,6 @@ Ext.define('Proxmox.grid.ObjectGrid', {
editor: {
xtype: 'proxmoxWindowEdit',
subject: text,
- onlineHelp: opts.onlineHelp,
fieldDefaults: {
labelWidth: opts.labelWidth || 100,
},
@@ -6278,6 +6428,9 @@ Ext.define('Proxmox.grid.ObjectGrid', {
},
},
};
+ if (opts.onlineHelp) {
+ me.rows[name].editor.onlineHelp = opts.onlineHelp;
+ }
},
add_text_row: function(name, text, opts) {
@@ -6294,7 +6447,6 @@ Ext.define('Proxmox.grid.ObjectGrid', {
editor: {
xtype: 'proxmoxWindowEdit',
subject: text,
- onlineHelp: opts.onlineHelp,
fieldDefaults: {
labelWidth: opts.labelWidth || 100,
},
@@ -6309,6 +6461,9 @@ Ext.define('Proxmox.grid.ObjectGrid', {
},
},
};
+ if (opts.onlineHelp) {
+ me.rows[name].editor.onlineHelp = opts.onlineHelp;
+ }
},
add_boolean_row: function(name, text, opts) {
@@ -6325,7 +6480,6 @@ Ext.define('Proxmox.grid.ObjectGrid', {
editor: {
xtype: 'proxmoxWindowEdit',
subject: text,
- onlineHelp: opts.onlineHelp,
fieldDefaults: {
labelWidth: opts.labelWidth || 100,
},
@@ -6341,6 +6495,9 @@ Ext.define('Proxmox.grid.ObjectGrid', {
},
},
};
+ if (opts.onlineHelp) {
+ me.rows[name].editor.onlineHelp = opts.onlineHelp;
+ }
},
add_integer_row: function(name, text, opts) {
@@ -6357,7 +6514,6 @@ Ext.define('Proxmox.grid.ObjectGrid', {
editor: {
xtype: 'proxmoxWindowEdit',
subject: text,
- onlineHelp: opts.onlineHelp,
fieldDefaults: {
labelWidth: opts.labelWidth || 100,
},
@@ -6374,6 +6530,40 @@ Ext.define('Proxmox.grid.ObjectGrid', {
},
},
};
+ if (opts.onlineHelp) {
+ me.rows[name].editor.onlineHelp = opts.onlineHelp;
+ }
+ },
+
+ // adds a row that allows editing in a full TextArea that transparently de/encodes as Base64
+ add_textareafield_row: function(name, text, opts) {
+ let me = this;
+
+ opts = opts || {};
+ me.rows = me.rows || {};
+ let fieldOpts = opts.fieldOpts || {};
+
+ me.rows[name] = {
+ required: true,
+ defaultValue: "",
+ header: text,
+ renderer: value => Ext.htmlEncode(Proxmox.Utils.base64ToUtf8(value)),
+ editor: {
+ xtype: 'proxmoxWindowEdit',
+ subject: text,
+ fieldDefaults: {
+ labelWidth: opts.labelWidth || 600,
+ },
+ items: {
+ xtype: 'proxmoxBase64TextArea',
+ ...fieldOpts,
+ name,
+ },
+ },
+ };
+ if (opts.onlineHelp) {
+ me.rows[name].editor.onlineHelp = opts.onlineHelp;
+ }
},
editorConfig: {}, // default config passed to editor
@@ -6672,8 +6862,10 @@ Ext.define('Proxmox.grid.PendingObjectGrid', {
});
Ext.define('Proxmox.panel.AuthView', {
extend: 'Ext.grid.GridPanel',
-
alias: 'widget.pmxAuthView',
+ mixins: ['Proxmox.Mixin.CBind'],
+
+ showDefaultRealm: false,
stateful: true,
stateId: 'grid-authrealms',
@@ -6683,7 +6875,6 @@ Ext.define('Proxmox.panel.AuthView', {
},
baseUrl: '/access/domains',
- useTypeInUrl: false,
columns: [
{
@@ -6698,6 +6889,17 @@ Ext.define('Proxmox.panel.AuthView', {
sortable: true,
dataIndex: 'type',
},
+ {
+ header: gettext('Default'),
+ width: 80,
+ sortable: true,
+ dataIndex: 'default',
+ renderer: isDefault => isDefault ? Proxmox.Utils.renderEnabledIcon(true) : '',
+ align: 'center',
+ cbind: {
+ hidden: '{!showDefaultRealm}',
+ },
+ },
{
header: gettext('Comment'),
sortable: false,
@@ -6717,11 +6919,15 @@ Ext.define('Proxmox.panel.AuthView', {
openEditWindow: function(authType, realm) {
let me = this;
+ const { useTypeInUrl, onlineHelp } = Proxmox.Schema.authDomains[authType];
+
Ext.create('Proxmox.window.AuthEditBase', {
baseUrl: me.baseUrl,
- useTypeInUrl: me.useTypeInUrl,
+ useTypeInUrl,
+ onlineHelp,
authType,
realm,
+ showDefaultRealm: me.showDefaultRealm,
listeners: {
destroy: () => me.reload(),
},
@@ -6795,7 +7001,7 @@ Ext.define('Proxmox.panel.AuthView', {
xtype: 'proxmoxStdRemoveButton',
getUrl: (rec) => {
let url = me.baseUrl;
- if (me.useTypeInUrl) {
+ if (Proxmox.Schema.authDomains[rec.data.type].useTypeInUrl) {
url += `/${rec.get('type')}`;
}
url += `/${rec.getId()}`;
@@ -11698,6 +11904,429 @@ Ext.define('Proxmox.panel.NotesView', {
}
},
});
+Ext.define('Proxmox.panel.WebhookEditPanel', {
+ extend: 'Proxmox.panel.InputPanel',
+ xtype: 'pmxWebhookEditPanel',
+ mixins: ['Proxmox.Mixin.CBind'],
+ onlineHelp: 'notification_targets_webhook',
+
+ type: 'webhook',
+
+ columnT: [
+
+ ],
+
+ column1: [
+ {
+ xtype: 'pmxDisplayEditField',
+ name: 'name',
+ cbind: {
+ value: '{name}',
+ editable: '{isCreate}',
+ },
+ fieldLabel: gettext('Endpoint Name'),
+ regex: Proxmox.Utils.safeIdRegex,
+ allowBlank: false,
+ },
+ ],
+
+ column2: [
+ {
+ xtype: 'proxmoxcheckbox',
+ name: 'enable',
+ fieldLabel: gettext('Enable'),
+ allowBlank: false,
+ checked: true,
+ },
+ ],
+
+ columnB: [
+ {
+ xtype: 'fieldcontainer',
+ fieldLabel: gettext('Method/URL'),
+ layout: 'hbox',
+ border: false,
+ margin: '0 0 5 0',
+ items: [
+ {
+ xtype: 'proxmoxKVComboBox',
+ name: 'method',
+ editable: false,
+ value: 'post',
+ comboItems: [
+ ['post', 'POST'],
+ ['put', 'PUT'],
+ ['get', 'GET'],
+ ],
+ width: 80,
+ margin: '0 5 0 0',
+ },
+ {
+ xtype: 'proxmoxtextfield',
+ name: 'url',
+ allowBlank: false,
+ emptyText: "https://example.com/hook",
+ regex: Proxmox.Utils.httpUrlRegex,
+ regexText: gettext('Must be a valid URL'),
+ flex: 4,
+ },
+ ],
+ },
+ {
+ xtype: 'pmxWebhookKeyValueList',
+ name: 'header',
+ fieldLabel: gettext('Headers'),
+ addLabel: gettext('Add Header'),
+ maskValues: false,
+ cbind: {
+ isCreate: '{isCreate}',
+ },
+ margin: '0 0 10 0',
+ },
+ {
+ xtype: 'textarea',
+ fieldLabel: gettext('Body'),
+ name: 'body',
+ allowBlank: true,
+ minHeight: '150',
+ fieldStyle: {
+ 'font-family': 'monospace',
+ },
+ margin: '0 0 5 0',
+ },
+ {
+ xtype: 'pmxWebhookKeyValueList',
+ name: 'secret',
+ fieldLabel: gettext('Secrets'),
+ addLabel: gettext('Add Secret'),
+ maskValues: true,
+ cbind: {
+ isCreate: '{isCreate}',
+ },
+ margin: '0 0 10 0',
+ },
+ {
+ xtype: 'proxmoxtextfield',
+ name: 'comment',
+ fieldLabel: gettext('Comment'),
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ },
+ ],
+
+ onSetValues: (values) => {
+ values.enable = !values.disable;
+
+ if (values.body) {
+ values.body = Proxmox.Utils.base64ToUtf8(values.body);
+ }
+
+ delete values.disable;
+ return values;
+ },
+
+ onGetValues: function(values) {
+ let me = this;
+
+ if (values.enable) {
+ if (!me.isCreate) {
+ Proxmox.Utils.assemble_field_data(values, { 'delete': 'disable' });
+ }
+ } else {
+ values.disable = 1;
+ }
+
+ if (values.body) {
+ values.body = Proxmox.Utils.utf8ToBase64(values.body);
+ } else {
+ delete values.body;
+ if (!me.isCreate) {
+ Proxmox.Utils.assemble_field_data(values, { 'delete': 'body' });
+ }
+ }
+
+ if (Ext.isArray(values.header) && !values.header.length) {
+ delete values.header;
+ if (!me.isCreate) {
+ Proxmox.Utils.assemble_field_data(values, { 'delete': 'header' });
+ }
+ }
+
+ if (Ext.isArray(values.secret) && !values.secret.length) {
+ delete values.secret;
+ if (!me.isCreate) {
+ Proxmox.Utils.assemble_field_data(values, { 'delete': 'secret' });
+ }
+ }
+ delete values.enable;
+
+ return values;
+ },
+});
+
+Ext.define('Proxmox.form.WebhookKeyValueList', {
+ extend: 'Ext.form.FieldContainer',
+ alias: 'widget.pmxWebhookKeyValueList',
+
+ mixins: [
+ 'Ext.form.field.Field',
+ ],
+
+ // override for column header
+ fieldTitle: gettext('Item'),
+
+ // label displayed in the "Add" button
+ addLabel: undefined,
+
+ // will be applied to the textfields
+ maskRe: undefined,
+
+ allowBlank: true,
+ selectAll: false,
+ isFormField: true,
+ deleteEmpty: false,
+ config: {
+ deleteEmpty: false,
+ maskValues: false,
+ },
+
+ setValue: function(list) {
+ let me = this;
+
+ list = Ext.isArray(list) ? list : (list ?? '').split(';').filter(t => t !== '');
+
+ let store = me.lookup('grid').getStore();
+ if (list.length > 0) {
+ store.setData(list.map(item => {
+ let properties = Proxmox.Utils.parsePropertyString(item);
+
+ // decode base64
+ let value = me.maskValues ? '' : Proxmox.Utils.base64ToUtf8(properties.value);
+
+ let obj = {
+ headerName: properties.name,
+ headerValue: value,
+ };
+
+ if (!me.isCreate && me.maskValues) {
+ obj.emptyText = gettext('Unchanged');
+ }
+
+ return obj;
+ }));
+ } else {
+ store.removeAll();
+ }
+ me.checkChange();
+ return me;
+ },
+
+ getValue: function() {
+ let me = this;
+ let values = [];
+ me.lookup('grid').getStore().each((rec) => {
+ if (rec.data.headerName) {
+ let obj = {
+ name: rec.data.headerName,
+ value: Proxmox.Utils.utf8ToBase64(rec.data.headerValue),
+ };
+
+ values.push(Proxmox.Utils.printPropertyString(obj));
+ }
+ });
+
+ return values;
+ },
+
+ getErrors: function(value) {
+ let me = this;
+ let empty = false;
+
+ me.lookup('grid').getStore().each((rec) => {
+ if (!rec.data.headerName) {
+ empty = true;
+ }
+
+ if (!rec.data.headerValue && rec.data.newValue) {
+ empty = true;
+ }
+
+ if (!rec.data.headerValue && !me.maskValues) {
+ empty = true;
+ }
+ });
+ if (empty) {
+ return [gettext('Name/value must not be empty.')];
+ }
+ return [];
+ },
+
+ // override framework function to implement deleteEmpty behaviour
+ getSubmitData: function() {
+ let me = this,
+ data = null,
+ val;
+ if (!me.disabled && me.submitValue) {
+ val = me.getValue();
+ if (val !== null && val !== '') {
+ data = {};
+ data[me.getName()] = val;
+ } else if (me.getDeleteEmpty()) {
+ data = {};
+ data.delete = me.getName();
+ }
+ }
+ return data;
+ },
+
+ controller: {
+ xclass: 'Ext.app.ViewController',
+
+ addLine: function() {
+ let me = this;
+ me.lookup('grid').getStore().add({
+ headerName: '',
+ headerValue: '',
+ emptyText: gettext('Value'),
+ newValue: true,
+ });
+ },
+
+ removeSelection: function(field) {
+ let me = this;
+ let view = me.getView();
+ let grid = me.lookup('grid');
+
+ let record = field.getWidgetRecord();
+ if (record === undefined) {
+ // this is sometimes called before a record/column is initialized
+ return;
+ }
+
+ grid.getStore().remove(record);
+ view.checkChange();
+ view.validate();
+ },
+
+ itemChange: function(field, newValue) {
+ let rec = field.getWidgetRecord();
+ if (!rec) {
+ return;
+ }
+
+ let column = field.getWidgetColumn();
+ rec.set(column.dataIndex, newValue);
+ let list = field.up('pmxWebhookKeyValueList');
+ list.checkChange();
+ list.validate();
+ },
+
+ control: {
+ 'grid button': {
+ click: 'removeSelection',
+ },
+ },
+ },
+
+ initComponent: function() {
+ let me = this;
+
+ let items = [
+ {
+ xtype: 'grid',
+ reference: 'grid',
+ minHeight: 100,
+ maxHeight: 100,
+ scrollable: 'vertical',
+
+ viewConfig: {
+ deferEmptyText: false,
+ },
+
+ store: {
+ listeners: {
+ update: function() {
+ this.commitChanges();
+ },
+ },
+ },
+ margin: '5 0 5 0',
+ columns: [
+ {
+ header: me.fieldTtitle,
+ dataIndex: 'headerName',
+ xtype: 'widgetcolumn',
+ widget: {
+ xtype: 'textfield',
+ isFormField: false,
+ maskRe: me.maskRe,
+ allowBlank: false,
+ queryMode: 'local',
+ emptyText: gettext('Key'),
+ listeners: {
+ change: 'itemChange',
+ },
+ },
+ onWidgetAttach: function(_col, widget) {
+ widget.isValid();
+ },
+ flex: 1,
+ },
+ {
+ header: me.fieldTtitle,
+ dataIndex: 'headerValue',
+ xtype: 'widgetcolumn',
+ widget: {
+ xtype: 'proxmoxtextfield',
+ inputType: me.maskValues ? 'password' : 'text',
+ isFormField: false,
+ maskRe: me.maskRe,
+ queryMode: 'local',
+ listeners: {
+ change: 'itemChange',
+ },
+ allowBlank: !me.isCreate && me.maskValues,
+
+ bind: {
+ emptyText: '{record.emptyText}',
+ },
+ },
+ onWidgetAttach: function(_col, widget) {
+ widget.isValid();
+ },
+ flex: 1,
+ },
+ {
+ xtype: 'widgetcolumn',
+ width: 40,
+ widget: {
+ xtype: 'button',
+ iconCls: 'fa fa-trash-o',
+ },
+ },
+ ],
+ },
+ {
+ xtype: 'button',
+ text: me.addLabel ? me.addLabel : gettext('Add'),
+ iconCls: 'fa fa-plus-circle',
+ handler: 'addLine',
+ },
+ ];
+
+ for (const [key, value] of Object.entries(me.gridConfig ?? {})) {
+ items[0][key] = value;
+ }
+
+ Ext.apply(me, {
+ items,
+ });
+
+ me.callParent();
+ me.initField();
+ },
+});
Ext.define('Proxmox.window.Edit', {
extend: 'Ext.window.Window',
alias: 'widget.proxmoxWindowEdit',
@@ -12138,6 +12767,10 @@ Ext.define('Proxmox.window.PasswordEdit', {
labelWidth: 150,
},
+ // specifies the minimum length of *new* passwords so this can be
+ // adapted by each product as limits are changed there.
+ minLength: 5,
+
// allow products to opt-in as their API gains support for this.
confirmCurrentPassword: false,
@@ -12159,13 +12792,15 @@ Ext.define('Proxmox.window.PasswordEdit', {
xtype: 'textfield',
inputType: 'password',
fieldLabel: gettext('New Password'),
- minLength: 5,
allowBlank: false,
name: 'password',
listeners: {
change: (field) => field.next().validate(),
blur: (field) => field.next().validate(),
},
+ cbind: {
+ minLength: '{minLength}',
+ },
},
{
xtype: 'textfield',
@@ -12582,11 +13217,11 @@ Ext.define('Proxmox.window.TaskViewer', {
defaultValue: 'unknown',
renderer: function(value) {
if (value !== 'stopped') {
- return value;
+ return Ext.htmlEncode(value);
}
let es = statgrid.getObjectValue('exitstatus');
if (es) {
- return value + ': ' + es;
+ return Ext.htmlEncode(`${value}: ${es}`);
}
return 'unknown';
},
@@ -12838,6 +13473,7 @@ Ext.define('Proxmox.window.DiskSmart', {
text: 'ID',
dataIndex: 'id',
width: 50,
+ align: 'right',
},
{
text: gettext('Attribute'),
@@ -12854,16 +13490,19 @@ Ext.define('Proxmox.window.DiskSmart', {
text: gettext('Normalized'),
dataIndex: 'real-normalized',
width: 60,
+ align: 'right',
},
{
text: gettext('Threshold'),
dataIndex: 'threshold',
width: 60,
+ align: 'right',
},
{
text: gettext('Worst'),
dataIndex: 'worst',
width: 60,
+ align: 'right',
},
{
text: gettext('Flags'),
@@ -13348,6 +13987,42 @@ Ext.define('Proxmox.window.CertificateUpload', {
me.callParent();
},
});
+Ext.define('Proxmox.window.ConsentModal', {
+ extend: 'Ext.window.Window',
+ alias: ['widget.pmxConsentModal'],
+ mixins: ['Proxmox.Mixin.CBind'],
+
+ maxWidth: 1000,
+ maxHeight: 1000,
+ minWidth: 600,
+ minHeight: 400,
+ scrollable: true,
+ modal: true,
+ closable: false,
+ resizable: false,
+ alwaysOnTop: true,
+ title: gettext('Consent'),
+
+ items: [
+ {
+ xtype: 'displayfield',
+ padding: 10,
+ scrollable: true,
+ cbind: {
+ value: '{consent}',
+ },
+ },
+ ],
+ buttons: [
+ {
+ handler: function() {
+ this.up('window').close();
+ },
+ text: gettext('OK'),
+ },
+ ],
+});
+
Ext.define('Proxmox.window.ACMEAccountCreate', {
extend: 'Proxmox.window.Edit',
mixins: ['Proxmox.Mixin.CBind'],
@@ -13649,14 +14324,14 @@ Ext.define('Proxmox.window.ACMEPluginEdit', {
let field = Ext.create({
xtype,
name: `custom_${name}`,
- fieldLabel: label,
+ fieldLabel: Ext.htmlEncode(label),
width: '100%',
labelWidth: 150,
labelSeparator: '=',
emptyText: definition.default || '',
autoEl: definition.description ? {
tag: 'div',
- 'data-qtip': definition.description,
+ 'data-qtip': Ext.htmlEncode(Ext.htmlEncode(definition.description)),
} : undefined,
});
@@ -14150,7 +14825,7 @@ Ext.define('Proxmox.window.NotificationMatcherEdit', {
labelWidth: 120,
},
- width: 700,
+ width: 800,
initComponent: function() {
let me = this;
@@ -14451,134 +15126,7 @@ 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}',
- deep: true,
- },
- get: function(record) {
- return record?.get('type') === 'match-severity';
- },
- },
- typeIsMatchCalendar: {
- bind: {
- bindTo: '{selectedRecord}',
- deep: true,
- },
- get: function(record) {
- 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');
- record.set({
- data: {
- ...currentData,
- type: value,
- },
- });
- },
- 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,
- },
- });
- },
- 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 currentData = record.get('data');
- record.set({
- data: {
- ...currentData,
- value: value,
- },
- });
- },
- get: function(record) {
- return record?.get('data')?.value;
- },
- },
- matchCalendarValue: {
- 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;
- },
- },
rootMode: {
bind: {
bindTo: '{selectedRecord}',
@@ -14620,6 +15168,9 @@ Ext.define('Proxmox.panel.NotificationRulesEditPanel', {
column2: [
{
xtype: 'pmxNotificationMatchRuleSettings',
+ cbind: {
+ baseUrl: '{baseUrl}',
+ },
},
],
@@ -14672,7 +15223,7 @@ Ext.define('Proxmox.panel.NotificationMatchRuleTree', {
let value = data.value;
text = Ext.String.format(gettext("Match field: {0}={1}"), field, value);
iconCls = 'fa fa-square-o';
- if (!field || !value) {
+ if (!field || !value || (Ext.isArray(value) && !value.length)) {
iconCls += ' internal-error';
}
} break;
@@ -14686,12 +15237,17 @@ Ext.define('Proxmox.panel.NotificationMatchRuleTree', {
} break;
case 'mode':
if (data.value === 'all') {
- text = gettext("All");
+ if (data.invert) {
+ text = gettext('At least one rule does not match');
+ } else {
+ text = gettext('All rules match');
+ }
} else if (data.value === 'any') {
- text = gettext("Any");
- }
- if (data.invert) {
- text = `!${text}`;
+ if (data.invert) {
+ text = gettext('No rule matches');
+ } else {
+ text = gettext('Any rule matches');
+ }
}
iconCls = 'fa fa-filter';
@@ -14892,6 +15448,11 @@ Ext.define('Proxmox.panel.NotificationMatchRuleTree', {
if (type === undefined) {
type = "exact";
}
+
+ if (type === 'exact') {
+ matchedValue = matchedValue.split(',');
+ }
+
return {
type: 'match-field',
data: {
@@ -15053,7 +15614,9 @@ Ext.define('Proxmox.panel.NotificationMatchRuleTree', {
Ext.define('Proxmox.panel.NotificationMatchRuleSettings', {
extend: 'Ext.panel.Panel',
xtype: 'pmxNotificationMatchRuleSettings',
+ mixins: ['Proxmox.Mixin.CBind'],
border: false,
+ layout: 'anchor',
items: [
{
@@ -15071,6 +15634,8 @@ Ext.define('Proxmox.panel.NotificationMatchRuleSettings', {
['notall', gettext('At least one rule does not match')],
['notany', gettext('No rule matches')],
],
+ // Hide initially to avoid glitches when opening the window
+ hidden: true,
bind: {
hidden: '{!showMatchingMode}',
disabled: '{!showMatchingMode}',
@@ -15082,7 +15647,8 @@ Ext.define('Proxmox.panel.NotificationMatchRuleSettings', {
fieldLabel: gettext('Node type'),
isFormField: false,
allowBlank: false,
-
+ // Hide initially to avoid glitches when opening the window
+ hidden: true,
bind: {
value: '{nodeType}',
hidden: '{!showMatcherType}',
@@ -15096,59 +15662,139 @@ Ext.define('Proxmox.panel.NotificationMatchRuleSettings', {
],
},
{
- fieldLabel: gettext('Match Type'),
- xtype: 'proxmoxKVComboBox',
- reference: 'type',
- isFormField: false,
- allowBlank: false,
- submitValue: false,
- field: 'type',
-
- bind: {
- hidden: '{!typeIsMatchField}',
- disabled: '{!typeIsMatchField}',
- value: '{matchFieldType}',
+ xtype: 'pmxNotificationMatchFieldSettings',
+ cbind: {
+ baseUrl: '{baseUrl}',
},
-
- comboItems: [
- ['exact', gettext('Exact')],
- ['regex', gettext('Regex')],
- ],
},
{
- fieldLabel: gettext('Field'),
+ xtype: 'pmxNotificationMatchSeveritySettings',
+ },
+ {
+ xtype: 'pmxNotificationMatchCalendarSettings',
+ },
+ ],
+});
+
+Ext.define('Proxmox.panel.MatchCalendarSettings', {
+ extend: 'Ext.panel.Panel',
+ xtype: 'pmxNotificationMatchCalendarSettings',
+ border: false,
+ layout: 'anchor',
+ // Hide initially to avoid glitches when opening the window
+ hidden: true,
+ bind: {
+ hidden: '{!typeIsMatchCalendar}',
+ },
+ viewModel: {
+ // parent is set in `initComponents`
+ formulas: {
+ typeIsMatchCalendar: {
+ bind: {
+ bindTo: '{selectedRecord}',
+ deep: true,
+ },
+ get: function(record) {
+ return record?.get('type') === 'match-calendar';
+ },
+ },
+
+ matchCalendarValue: {
+ 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;
+ },
+ },
+ },
+ },
+ items: [
+ {
xtype: 'proxmoxKVComboBox',
+ fieldLabel: gettext('Timespan to match'),
isFormField: false,
- submitValue: false,
allowBlank: false,
editable: true,
displayField: 'key',
- field: 'field',
- bind: {
- hidden: '{!typeIsMatchField}',
- disabled: '{!typeIsMatchField}',
- value: '{matchFieldField}',
- },
- // TODO: Once we have a 'notification registry', we should
- // retrive those via an API call.
- comboItems: [
- ['type', ''],
- ['hostname', ''],
- ],
- },
- {
- fieldLabel: gettext('Value'),
- xtype: 'textfield',
- isFormField: false,
- submitValue: false,
- allowBlank: false,
field: 'value',
bind: {
- hidden: '{!typeIsMatchField}',
- disabled: '{!typeIsMatchField}',
- value: '{matchFieldValue}',
+ value: '{matchCalendarValue}',
+ disabled: '{!typeIsMatchCalender}',
+ },
+
+ comboItems: [
+ ['mon 8-12', ''],
+ ['tue..fri,sun 0:00-23:59', ''],
+ ],
+ },
+ ],
+
+ initComponent: function() {
+ let me = this;
+ Ext.apply(me.viewModel, {
+ parent: me.up('pmxNotificationMatchRulesEditPanel').getViewModel(),
+ });
+ me.callParent();
+ },
+});
+
+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'),
@@ -15156,7 +15802,8 @@ Ext.define('Proxmox.panel.NotificationMatchRuleSettings', {
allowBlank: true,
multiSelect: true,
field: 'value',
-
+ // Hide initially to avoid glitches when opening the window
+ hidden: true,
bind: {
value: '{matchSeverityValue}',
hidden: '{!typeIsMatchSeverity}',
@@ -15171,27 +15818,305 @@ Ext.define('Proxmox.panel.NotificationMatchRuleSettings', {
['unknown', gettext('Unknown')],
],
},
- {
- xtype: 'proxmoxKVComboBox',
- fieldLabel: gettext('Timespan to match'),
- isFormField: false,
- allowBlank: false,
- editable: true,
- displayField: 'key',
- field: 'value',
-
- bind: {
- value: '{matchCalendarValue}',
- hidden: '{!typeIsMatchCalendar}',
- disabled: '{!typeIsMatchCalender}',
- },
-
- comboItems: [
- ['mon 8-12', ''],
- ['tue..fri,sun 0:00-23:59', ''],
- ],
- },
],
+
+ 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',
+ border: false,
+ layout: 'anchor',
+ // Hide initially to avoid glitches when opening the window
+ hidden: true,
+ bind: {
+ hidden: '{!typeIsMatchField}',
+ },
+ controller: {
+ xclass: 'Ext.app.ViewController',
+
+ control: {
+ 'field[reference=fieldSelector]': {
+ change: function(field) {
+ let view = this.getView();
+ let valueField = view.down('field[reference=valueSelector]');
+ let store = valueField.getStore();
+ let val = field.getValue();
+
+ if (val) {
+ store.setFilters([
+ {
+ property: 'field',
+ value: val,
+ },
+ ]);
+ }
+ },
+ },
+ },
+ },
+ 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 = "^";
+ if (currentData.value && currentData.value.length) {
+ regexVal += `(${currentData.value.join('|')})`;
+ }
+ regexVal += "$";
+ 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;
+
+ let store = Ext.create('Ext.data.Store', {
+ model: 'proxmox-notification-fields',
+ autoLoad: true,
+ proxy: {
+ type: 'proxmox',
+ url: `/api2/json/${me.baseUrl}/matcher-fields`,
+ },
+ listeners: {
+ 'load': function() {
+ this.each(function(record) {
+ record.set({
+ description:
+ Proxmox.Utils.formatNotificationFieldName(
+ record.get('name'),
+ ),
+ });
+ });
+
+ // Commit changes so that the description field is not marked
+ // as dirty
+ this.commitChanges();
+ },
+ },
+ });
+
+ let valueStore = Ext.create('Ext.data.Store', {
+ model: 'proxmox-notification-field-values',
+ autoLoad: true,
+ proxy: {
+ type: 'proxmox',
+
+ url: `/api2/json/${me.baseUrl}/matcher-field-values`,
+ },
+ listeners: {
+ 'load': function() {
+ this.each(function(record) {
+ if (record.get('field') === 'type') {
+ record.set({
+ comment:
+ Proxmox.Utils.formatNotificationFieldValue(
+ record.get('value'),
+ ),
+ });
+ }
+ }, this, true);
+
+ // Commit changes so that the description field is not marked
+ // as dirty
+ this.commitChanges();
+ },
+ },
+ });
+
+ Ext.apply(me.viewModel, {
+ parent: me.up('pmxNotificationMatchRulesEditPanel').getViewModel(),
+ });
+ Ext.apply(me, {
+ items: [
+ {
+ fieldLabel: gettext('Match Type'),
+ xtype: 'proxmoxKVComboBox',
+ reference: 'type',
+ isFormField: false,
+ allowBlank: false,
+ submitValue: false,
+ field: 'type',
+
+ bind: {
+ value: '{matchFieldType}',
+ },
+
+ comboItems: [
+ ['exact', gettext('Exact')],
+ ['regex', gettext('Regex')],
+ ],
+ },
+ {
+ fieldLabel: gettext('Field'),
+ reference: 'fieldSelector',
+ xtype: 'proxmoxComboGrid',
+ isFormField: false,
+ submitValue: false,
+ allowBlank: false,
+ editable: false,
+ store: store,
+ queryMode: 'local',
+ valueField: 'name',
+ displayField: 'description',
+ field: 'field',
+ bind: {
+ value: '{matchFieldField}',
+ },
+ listConfig: {
+ columns: [
+ {
+ header: gettext('Description'),
+ dataIndex: 'description',
+ flex: 2,
+ },
+ {
+ header: gettext('Field Name'),
+ dataIndex: 'name',
+ flex: 1,
+ },
+ ],
+ },
+ },
+ {
+ fieldLabel: gettext('Value'),
+ reference: 'valueSelector',
+ xtype: 'proxmoxComboGrid',
+ autoSelect: false,
+ editable: false,
+ isFormField: false,
+ submitValue: false,
+ allowBlank: false,
+ showClearTrigger: true,
+ field: 'value',
+ store: valueStore,
+ valueField: 'value',
+ displayField: 'value',
+ notFoundIsValid: false,
+ multiSelect: true,
+ bind: {
+ value: '{matchFieldValue}',
+ hidden: '{isRegex}',
+ },
+ listConfig: {
+ columns: [
+ {
+ header: gettext('Value'),
+ dataIndex: 'value',
+ flex: 1,
+ },
+ {
+ header: gettext('Comment'),
+ dataIndex: 'comment',
+ flex: 2,
+ },
+ ],
+ },
+ },
+ {
+ fieldLabel: gettext('Regex'),
+ xtype: 'proxmoxtextfield',
+ editable: true,
+ isFormField: false,
+ submitValue: false,
+ allowBlank: false,
+ field: 'value',
+ bind: {
+ value: '{matchFieldValue}',
+ hidden: '{!isRegex}',
+ },
+ },
+ ],
+ });
+ me.callParent();
+ },
});
Ext.define('proxmox-file-tree', {
extend: 'Ext.data.Model',
@@ -15525,6 +16450,9 @@ Ext.define("Proxmox.window.FileBrowser", {
});
Ext.define('Proxmox.window.AuthEditBase', {
extend: 'Proxmox.window.Edit',
+ mixins: ['Proxmox.Mixin.CBind'],
+
+ showDefaultRealm: false,
isAdd: true,
@@ -15554,9 +16482,9 @@ Ext.define('Proxmox.window.AuthEditBase', {
let authConfig = Proxmox.Schema.authDomains[me.authType];
if (!authConfig) {
- throw 'unknown auth type';
+ throw `unknown auth type ${me.authType}`;
} else if (!authConfig.add && me.isCreate) {
- throw 'trying to add non addable realm';
+ throw `trying to add non addable realm of type ${me.authType}`;
}
me.subject = authConfig.name;
@@ -15578,6 +16506,7 @@ Ext.define('Proxmox.window.AuthEditBase', {
isCreate: me.isCreate,
useTypeInUrl: me.useTypeInUrl,
type: me.authType,
+ showDefaultRealm: me.showDefaultRealm,
},
{
title: gettext('Sync Options'),
@@ -15595,6 +16524,7 @@ Ext.define('Proxmox.window.AuthEditBase', {
isCreate: me.isCreate,
useTypeInUrl: me.useTypeInUrl,
type: me.authType,
+ showDefaultRealm: me.showDefaultRealm,
}];
}
@@ -15611,9 +16541,9 @@ Ext.define('Proxmox.window.AuthEditBase', {
var data = response.result.data || {};
// just to be sure (should not happen)
// only check this when the type is not in the api path
- if (!me.useTypeInUrl && data.type !== me.authType) {
+ if (!me.useTypeInUrl && data.realm !== me.authType) {
me.close();
- throw "got wrong auth type";
+ throw `got wrong auth type '${me.authType}' for realm '${data.realm}'`;
}
me.setValues(data);
},
@@ -15626,6 +16556,8 @@ Ext.define('Proxmox.panel.OpenIDInputPanel', {
xtype: 'pmxAuthOpenIDPanel',
mixins: ['Proxmox.Mixin.CBind'],
+ showDefaultRealm: false,
+
type: 'openid',
onGetValues: function(values) {
@@ -15658,6 +16590,21 @@ Ext.define('Proxmox.panel.OpenIDInputPanel', {
fieldLabel: gettext('Realm'),
allowBlank: false,
},
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Default realm'),
+ name: 'default',
+ value: 0,
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ hidden: '{!showDefaultRealm}',
+ disabled: '{!showDefaultRealm}',
+ },
+ autoEl: {
+ tag: 'div',
+ 'data-qtip': gettext('Set realm as default for login'),
+ },
+ },
{
xtype: 'proxmoxtextfield',
fieldLabel: gettext('Client ID'),
@@ -15757,10 +16704,8 @@ Ext.define('Proxmox.panel.OpenIDInputPanel', {
],
});
-
Ext.define('Proxmox.panel.LDAPInputPanelViewModel', {
extend: 'Ext.app.ViewModel',
-
alias: 'viewmodel.pmxAuthLDAPPanel',
data: {
@@ -15782,6 +16727,8 @@ Ext.define('Proxmox.panel.LDAPInputPanel', {
xtype: 'pmxAuthLDAPPanel',
mixins: ['Proxmox.Mixin.CBind'],
+ showDefaultRealm: false,
+
viewModel: {
type: 'pmxAuthLDAPPanel',
},
@@ -15841,6 +16788,21 @@ Ext.define('Proxmox.panel.LDAPInputPanel', {
fieldLabel: gettext('Realm'),
allowBlank: false,
},
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Default realm'),
+ name: 'default',
+ value: 0,
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ hidden: '{!showDefaultRealm}',
+ disabled: '{!showDefaultRealm}',
+ },
+ autoEl: {
+ tag: 'div',
+ 'data-qtip': gettext('Set realm as default for login'),
+ },
+ },
{
xtype: 'proxmoxtextfield',
fieldLabel: gettext('Base Domain Name'),
@@ -15975,7 +16937,6 @@ Ext.define('Proxmox.panel.LDAPInputPanel', {
},
},
],
-
});
@@ -16190,6 +17151,51 @@ Ext.define('Proxmox.panel.ADSyncInputPanel', {
type: 'ad',
});
+Ext.define('Proxmox.panel.SimpleRealmInputPanel', {
+ extend: 'Proxmox.panel.InputPanel',
+ xtype: 'pmxAuthSimplePanel',
+ mixins: ['Proxmox.Mixin.CBind'],
+
+ showDefaultRealm: false,
+
+ column1: [
+ {
+ xtype: 'pmxDisplayEditField',
+ name: 'realm',
+ cbind: {
+ value: '{realm}',
+ },
+ fieldLabel: gettext('Realm'),
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Default realm'),
+ name: 'default',
+ value: 0,
+ deleteEmpty: true,
+ autoEl: {
+ tag: 'div',
+ 'data-qtip': gettext('Set realm as default for login'),
+ },
+ cbind: {
+ hidden: '{!showDefaultRealm}',
+ disabled: '{!showDefaultRealm}',
+ },
+ },
+ ],
+
+ column2: [],
+
+ columnB: [
+ {
+ xtype: 'proxmoxtextfield',
+ name: 'comment',
+ fieldLabel: gettext('Comment'),
+ allowBlank: true,
+ deleteEmpty: true,
+ },
+ ],
+});
/*global u2f*/
Ext.define('Proxmox.window.TfaLoginWindow', {
extend: 'Ext.window.Window',
@@ -18588,7 +19594,7 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', {
let txt = [gettext('Warning')];
record.data.warnings.forEach((warning) => {
if (warning.property === 'Suites') {
- txt.push(warning.message);
+ txt.push(Ext.htmlEncode(warning.message));
}
});
metaData.tdAttr = `data-qtip="${Ext.htmlEncode(txt.join('
'))}"`;
@@ -18623,7 +19629,7 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', {
? gettext('The no-subscription repository is NOT production-ready')
: gettext('The test repository may contain unstable updates')
;
- metaData.tdAttr = `data-qtip="${Ext.htmlEncode(qtip)}"`;
+ metaData.tdAttr = `data-qtip="${Ext.htmlEncode(Ext.htmlEncode(qtip))}"`;
}
}
return components.join(' ') + err;
@@ -19121,6 +20127,9 @@ Ext.define('Proxmox.node.NetworkEdit', {
extend: 'Proxmox.window.Edit',
alias: ['widget.proxmoxNodeNetworkEdit'],
+ // Enable to show the VLAN ID field
+ enableBridgeVlanIds: false,
+
initComponent: function() {
let me = this;
@@ -19176,11 +20185,53 @@ Ext.define('Proxmox.node.NetworkEdit', {
}
if (me.iftype === 'bridge') {
+ let vlanIdsField = !me.enableBridgeVlanIds ? undefined : Ext.create('Ext.form.field.Text', {
+ fieldLabel: gettext('VLAN IDs'),
+ name: 'bridge_vids',
+ emptyText: '2-4094',
+ disabled: true,
+ autoEl: {
+ tag: 'div',
+ 'data-qtip': gettext("List of VLAN IDs and ranges, useful for NICs with restricted VLAN offloading support. For example: '2 4 100-200'"),
+ },
+ validator: function(value) {
+ if (!value) { // empty
+ return true;
+ }
+
+ for (const vid of value.split(/\s+[,;]?/)) {
+ if (!vid) {
+ continue;
+ }
+ let res = vid.match(/^(\d+)(?:-(\d+))?$/);
+ if (!res) {
+ return Ext.String.format(gettext("not a valid bridge VLAN ID entry: {0}"), vid);
+ }
+ let start = Number(res[1]), end = Number(res[2] ?? res[1]); // end=start for single IDs
+
+ if (Number.isNaN(start) || Number.isNaN(end)) {
+ return Ext.String.format(gettext('VID range includes not-a-number: {0}'), vid);
+ } else if (start > end) {
+ return Ext.String.format(gettext('VID range must go from lower to higher tag: {0}'), vid);
+ } else if (start < 2 || end > 4094) { // check just one each, we already ensured start < end
+ return Ext.String.format(gettext('VID range outside of allowed 2 and 4094 limit: {0}'), vid);
+ }
+ }
+ return true;
+ },
+ });
column2.push({
xtype: 'proxmoxcheckbox',
fieldLabel: gettext('VLAN aware'),
name: 'bridge_vlan_aware',
deleteEmpty: !me.isCreate,
+ listeners: {
+ change: function(f, newVal) {
+ if (vlanIdsField) {
+ vlanIdsField.setDisabled(!newVal);
+ }
+ },
+ },
});
column2.push({
xtype: 'textfield',
@@ -19191,6 +20242,9 @@ Ext.define('Proxmox.node.NetworkEdit', {
'data-qtip': gettext('Space-separated list of interfaces, for example: enp0s0 enp1s0'),
},
});
+ if (vlanIdsField) {
+ advancedColumn2.push(vlanIdsField);
+ }
} else if (me.iftype === 'OVSBridge') {
column2.push({
xtype: 'textfield',
@@ -19542,6 +20596,9 @@ Ext.define('Proxmox.node.NetworkView', {
showApplyBtn: false,
+ // for options passed down to the network edit window
+ editOptions: {},
+
initComponent: function() {
let me = this;
@@ -19609,6 +20666,7 @@ Ext.define('Proxmox.node.NetworkView', {
nodename: me.nodename,
iface: rec.data.iface,
iftype: rec.data.type,
+ ...me.editOptions,
listeners: {
destroy: () => reload(),
},
@@ -19679,6 +20737,7 @@ Ext.define('Proxmox.node.NetworkView', {
nodename: me.nodename,
iftype: iType,
iface_default: findNextFreeInterfaceId(iDefault ?? iType),
+ ...me.editOptions,
onlineHelp: 'sysadmin_network_configuration',
listeners: {
destroy: () => reload(),
@@ -20689,6 +21748,8 @@ Ext.define('Proxmox.node.ServiceView', {
},
});
+ let filterInstalledOnly = record => record.get('unit-state') !== 'not-found';
+
let store = Ext.create('Proxmox.data.DiffStore', {
rstore: rstore,
sortAfterUpdate: true,
@@ -20698,6 +21759,24 @@ Ext.define('Proxmox.node.ServiceView', {
direction: 'ASC',
},
],
+ filters: [
+ filterInstalledOnly,
+ ],
+ });
+
+ let unHideCB = Ext.create('Ext.form.field.Checkbox', {
+ boxLabel: gettext('Show only installed services'),
+ value: true,
+ boxLabelAlign: 'before',
+ listeners: {
+ change: function(_cb, value) {
+ if (value) {
+ store.addFilter([filterInstalledOnly]);
+ } else {
+ store.clearFilter();
+ }
+ },
+ },
});
let view_service_log = function() {
@@ -20826,6 +21905,8 @@ Ext.define('Proxmox.node.ServiceView', {
restart_btn,
'-',
syslog_btn,
+ '->',
+ unHideCB,
],
columns: [
{
diff --git a/usr/share/perl5/PVE/API2/Nodes.pm b/usr/share/perl5/PVE/API2/Nodes.pm
index 67e249e..c6b0e5e 100644
--- a/usr/share/perl5/PVE/API2/Nodes.pm
+++ b/usr/share/perl5/PVE/API2/Nodes.pm
@@ -399,7 +399,7 @@ __PACKAGE__->register_method({
type => "object",
additionalProperties => 1,
properties => {
- # TODO: document remaing ones
+ # TODO: document remaining ones
'boot-info' => {
description => "Meta-information about the boot mode.",
type => 'object',
@@ -417,7 +417,7 @@ __PACKAGE__->register_method({
},
},
'current-kernel' => {
- description => "The uptime of the system in seconds.",
+ description => "Meta-information about the currently booted kernel of this node.",
type => 'object',
properties => {
sysname => {
@@ -438,6 +438,81 @@ __PACKAGE__->register_method({
},
},
},
+ cpu => {
+ description => "The current cpu usage.",
+ type => "number",
+ },
+ cpuinfo => {
+ type => "object",
+ properties => {
+ cores => {
+ description => "The number of physical cores of the CPU.",
+ type => "integer",
+ },
+ cpus => {
+ description => "The number of logical threads of the CPU.",
+ type => "integer",
+ },
+ model => {
+ description => "The CPU model",
+ type => "string",
+ },
+ sockets => {
+ description => "The number of logical threads of the CPU.",
+ type => "integer",
+ },
+ },
+ },
+ loadavg => {
+ type => 'array',
+ description => "An array of load avg for 1, 5 and 15 minutes respectively.",
+ items => {
+ type => 'string',
+ description => "The value of the load.",
+ }
+ },
+ memory => {
+ type => "object",
+ properties => {
+ free => {
+ type => "integer",
+ description => "The free memory in bytes.",
+ },
+ total => {
+ type => "integer",
+ description => "The total memory in bytes.",
+ },
+ used => {
+ type => "integer",
+ description => "The used memory in bytes.",
+ },
+ },
+ },
+ pveversion => {
+ type => 'string',
+ description => "The PVE version string.",
+ },
+ rootfs => {
+ type => "object",
+ properties => {
+ free => {
+ type => "integer",
+ description => "The free bytes on the root filesystem.",
+ },
+ total => {
+ type => "integer",
+ description => "The total size of the root filesystem in bytes.",
+ },
+ used => {
+ type => "integer",
+ description => "The used bytes in the root filesystem.",
+ },
+ avail => {
+ type => "integer",
+ description => "The available bytes in the root filesystem.",
+ },
+ },
+ }
},
},
code => sub {
@@ -486,15 +561,6 @@ __PACKAGE__->register_method({
$res->{pveversion} = PVE::pvecfg::package() . "/" .
PVE::pvecfg::version_text();
- my $net_eno1 = `ethtool eno1 | grep Speed`;
- my $net_enp4s0 = `ethtool enp4s0 | grep Speed`;
- my $net_enp5s0 = `ethtool enp5s0 | grep Speed`;
- my $net_enp7s0 = `ethtool enp7s0 | grep Speed`;
- my $net_enp8s0 = `ethtool enp8s0 | grep Speed`;
- $res->{networksp} = [ $net_eno1, $net_enp4s0, $net_enp5s0, $net_enp7s0, $net_enp8s0 ];
-
- $res->{thermal} = `sensors -j`; # add temps
-
my $dinfo = df('/', 1); # output is bytes
$res->{rootfs} = {
@@ -915,6 +981,7 @@ __PACKAGE__->register_method({
check => ['perm', '/nodes/{node}', [ 'Sys.Syslog' ]],
},
protected => 1,
+ download_allowed => 1,
parameters => {
additionalProperties => 0,
properties => {
diff --git a/usr/share/pve-manager/js/pvemanagerlib.js b/usr/share/pve-manager/js/pvemanagerlib.js
index 1d090d3..f8a1f5c 100644
--- a/usr/share/pve-manager/js/pvemanagerlib.js
+++ b/usr/share/pve-manager/js/pvemanagerlib.js
@@ -3,6 +3,10 @@ const pveOnlineHelpInfo = {
"link" : "/pve-docs/chapter-pvesm.html#ceph_rados_block_devices",
"title" : "Ceph RADOS Block Devices (RBD)"
},
+ "chapter_gui" : {
+ "link" : "/pve-docs/chapter-pve-gui.html#chapter_gui",
+ "title" : "Graphical User Interface"
+ },
"chapter_ha_manager" : {
"link" : "/pve-docs/chapter-ha-manager.html#chapter_ha_manager",
"title" : "High Availability"
@@ -144,6 +148,11 @@ const pveOnlineHelpInfo = {
"subtitle" : "SMTP",
"title" : "Notifications"
},
+ "notification_targets_webhook" : {
+ "link" : "/pve-docs/chapter-notifications.html#notification_targets_webhook",
+ "subtitle" : "Webhook",
+ "title" : "Notifications"
+ },
"pct_configuration" : {
"link" : "/pve-docs/chapter-pct.html#pct_configuration",
"subtitle" : "Configuration",
@@ -300,6 +309,11 @@ const pveOnlineHelpInfo = {
"subtitle" : "PowerDNS Plugin",
"title" : "Software-Defined Network"
},
+ "pvesdn_firewall_integration" : {
+ "link" : "/pve-docs/chapter-pvesdn.html#pvesdn_firewall_integration",
+ "subtitle" : "Firewall Integration",
+ "title" : "Software-Defined Network"
+ },
"pvesdn_ipam_plugin_netbox" : {
"link" : "/pve-docs/chapter-pvesdn.html#pvesdn_ipam_plugin_netbox",
"subtitle" : "NetBox IPAM Plugin",
@@ -434,6 +448,11 @@ const pveOnlineHelpInfo = {
"subtitle" : "Hard Disk",
"title" : "QEMU/KVM Virtual Machines"
},
+ "qm_import_virtual_machines" : {
+ "link" : "/pve-docs/chapter-qm.html#qm_import_virtual_machines",
+ "subtitle" : "Importing Virtual Machines",
+ "title" : "QEMU/KVM Virtual Machines"
+ },
"qm_machine_type" : {
"link" : "/pve-docs/chapter-qm.html#qm_machine_type",
"title" : "QEMU/KVM Virtual Machines"
@@ -566,11 +585,6 @@ const pveOnlineHelpInfo = {
"subtitle" : "ACME Account",
"title" : "Certificate Management"
},
- "sysadmin_certs_acme_plugins" : {
- "link" : "/pve-docs/chapter-sysadmin.html#sysadmin_certs_acme_plugins",
- "subtitle" : "ACME Plugins",
- "title" : "Certificate Management"
- },
"sysadmin_network_configuration" : {
"link" : "/pve-docs/chapter-sysadmin.html#sysadmin_network_configuration",
"title" : "Network Configuration"
@@ -589,6 +603,11 @@ const pveOnlineHelpInfo = {
"subtitle" : "LDAP",
"title" : "User Management"
},
+ "user-realms-pam" : {
+ "link" : "/pve-docs/chapter-pveum.html#user-realms-pam",
+ "subtitle" : "Linux PAM Standard Authentication",
+ "title" : "User Management"
+ },
"user_mgmt" : {
"link" : "/pve-docs/chapter-pveum.html#user_mgmt",
"title" : "User Management"
@@ -666,7 +685,7 @@ Ext.define('PVE.Parser', {
if (Ext.isDefined(res[defaultKey])) {
throw 'defaultKey may be only defined once in propertyString';
}
- res[defaultKey] = k; // k ist the value in this case
+ res[defaultKey] = k; // k is the value in this case
} else {
throw `Failed to parse key-value pair: ${property}`;
}
@@ -1571,7 +1590,8 @@ Ext.define('PVE.Utils', {
}
if (service.ceph_version) {
- var match = service.ceph_version.match(/version (\d+(\.\d+)*)/);
+ // See PVE/Ceph/Tools.pm - get_local_version
+ const match = service.ceph_version.match(/^ceph.*\sv?(\d+(?:\.\d+)+)/);
if (match) {
return match[1];
}
@@ -1637,23 +1657,23 @@ Ext.define('PVE.Utils', {
render_sdn_pending: function(rec, value, key, index) {
if (rec.data.state === undefined || rec.data.state === null) {
- return value;
+ return Ext.htmlEncode(value);
}
if (rec.data.state === 'deleted') {
if (value === undefined) {
return ' ';
} else {
- return ''+ value +'
';
+ return `${Ext.htmlEncode(value)}
`;
}
} else if (rec.data.pending[key] !== undefined && rec.data.pending[key] !== null) {
if (rec.data.pending[key] === 'deleted') {
return ' ';
} else {
- return rec.data.pending[key];
+ return Ext.htmlEncode(rec.data.pending[key]);
}
}
- return value;
+ return Ext.htmlEncode(value);
},
render_sdn_pending_state: function(rec, value) {
@@ -1664,7 +1684,7 @@ Ext.define('PVE.Utils', {
let icon = ``;
if (value === 'deleted') {
- return '' + icon + value + '';
+ return `${icon}${Ext.htmlEncode(value)}`;
}
let tip = gettext('Pending Changes') + ':
';
@@ -1673,10 +1693,10 @@ Ext.define('PVE.Utils', {
if ((rec.data[key] !== undefined && rec.data.pending[key] !== rec.data[key]) ||
rec.data[key] === undefined
) {
- tip += `${key}: ${keyvalue}
`;
+ tip += `${Ext.htmlEncode(key)}: ${Ext.htmlEncode(keyvalue)}
`;
}
}
- return ''+ icon + value + '';
+ return `${icon}${Ext.htmlEncode(value)}`;
},
render_ceph_health: function(healthObj) {
@@ -2143,6 +2163,7 @@ Ext.define('PVE.Utils', {
'iso': gettext('ISO image'),
'rootdir': gettext('Container'),
'snippets': gettext('Snippets'),
+ 'import': gettext('Import'),
},
volume_is_qemu_backup: function(volid, format) {
@@ -2476,7 +2497,13 @@ Ext.define('PVE.Utils', {
Ext.String.leftPad(data.channel, 2, '0') +
" ID " + data.id + " LUN " + data.lun;
} else if (data.content === 'import') {
- result = data.volid.replace(/^.*?:/, '');
+ if (data.volid.match(/^.*?:import\//)) {
+ // dir-based storages
+ result = data.volid.replace(/^.*?:import\//, '');
+ } else {
+ // esxi storage
+ result = data.volid.replace(/^.*?:/, '');
+ }
} else {
result = data.volid.replace(/^.*?:(.*?\/)?/, '');
}
@@ -2526,13 +2553,14 @@ Ext.define('PVE.Utils', {
}
var maxcpu = node.data.maxcpu || 1;
- if (!Ext.isNumeric(maxcpu) && (maxcpu >= 1)) {
+ if (!Ext.isNumeric(maxcpu) || maxcpu < 1) {
return '';
}
var per = (record.data.cpu/maxcpu) * record.data.maxcpu * 100;
+ const cpu_label = maxcpu > 1 ? 'CPUs' : 'CPU';
- return per.toFixed(1) + '% of ' + maxcpu.toString() + (maxcpu > 1 ? 'CPUs' : 'CPU');
+ return `${per.toFixed(1)}% of ${maxcpu} ${cpu_label}`;
},
render_bandwidth: function(value) {
@@ -2697,7 +2725,7 @@ Ext.define('PVE.Utils', {
// templates
objType = 'template';
status = type;
- } else if (type === 'storage' && record.content.indexOf('import') !== -1) {
+ } else if (type === 'storage' && record.content === 'import') {
return 'fa fa-cloud-download';
} else {
// everything else
@@ -3411,6 +3439,10 @@ Ext.define('PVE.Utils', {
}
return languageCookie || Proxmox.defaultLang || 'en';
},
+
+ formatGuestTaskConfirmation: function(taskType, vmid, guestName) {
+ return Proxmox.Utils.format_task_description(taskType, `${vmid} (${guestName})`);
+ },
},
singleton: true,
@@ -3512,6 +3544,17 @@ Ext.define('PVE.Utils', {
zfscreate: [gettext('ZFS Storage'), gettext('Create')],
zfsremove: ['ZFS Pool', gettext('Remove')],
});
+
+ Proxmox.Utils.overrideNotificationFieldName({
+ 'job-id': gettext('Job ID'),
+ });
+
+ Proxmox.Utils.overrideNotificationFieldValue({
+ 'package-updates': gettext('Package updates are available'),
+ 'vzdump': gettext('Backup notifications'),
+ 'replication': gettext('Replication job notifications'),
+ 'fencing': gettext('Node fencing notifications'),
+ });
},
});
@@ -4491,7 +4534,7 @@ Ext.define('PVE.container.TwoColumnContainer', {
layout: {
type: 'hbox',
- align: 'stretch',
+ align: 'begin',
},
// The default ratio of the start widget. It an be an integer or a floating point number
@@ -4764,7 +4807,7 @@ Ext.define('PVE.form.SizeField', {
unit: 'MiB',
unitPostfix: '',
- // use this if the backend saves values in another unit tha bytes, e.g.,
+ // use this if the backend saves values in a unit other than bytes, e.g.,
// for KiB set it to 'KiB'
backendUnit: undefined,
@@ -5333,7 +5376,7 @@ Ext.define('PVE.form.ContentTypeSelector', {
me.comboItems = [];
if (me.cts === undefined) {
- me.cts = ['images', 'iso', 'vztmpl', 'backup', 'rootdir', 'snippets'];
+ me.cts = ['images', 'iso', 'vztmpl', 'backup', 'rootdir', 'snippets', 'import'];
}
Ext.Array.each(me.cts, function(ct) {
@@ -6417,6 +6460,12 @@ Ext.define('PVE.form.IPRefSelector', {
});
}
+ let scopes = {
+ 'dc': gettext("Datacenter"),
+ 'guest': gettext("Guest"),
+ 'sdn': gettext("SDN"),
+ };
+
columns.push(
{
header: gettext('Name'),
@@ -6430,7 +6479,7 @@ Ext.define('PVE.form.IPRefSelector', {
hideable: false,
width: 140,
renderer: function(value) {
- return value === 'dc' ? gettext("Datacenter") : gettext("Guest");
+ return scopes[value] ?? "unknown scope";
},
},
{
@@ -6510,14 +6559,14 @@ Ext.define('PVE.form.MDevSelector', {
],
},
- setPciID: function(pciid, force) {
+ setPciIdOrMapping: function(pciIdOrMapping, force) {
var me = this;
- if (!force && (!pciid || me.pciid === pciid)) {
+ if (!force && (!pciIdOrMapping || me.pciIdOrMapping === pciIdOrMapping)) {
return;
}
- me.pciid = pciid;
+ me.pciIdOrMapping = pciIdOrMapping;
me.updateProxy();
},
@@ -6537,7 +6586,7 @@ Ext.define('PVE.form.MDevSelector', {
var me = this;
me.store.setProxy({
type: 'proxmox',
- url: '/api2/json/nodes/' + me.nodename + '/hardware/pci/' + me.pciid + '/mdev',
+ url: `/api2/json/nodes/${me.nodename}/hardware/pci/${me.pciIdOrMapping}/mdev`,
});
me.store.load();
},
@@ -6551,8 +6600,8 @@ Ext.define('PVE.form.MDevSelector', {
me.callParent();
- if (me.pciid) {
- me.setPciID(me.pciid, true);
+ if (me.pciIdOrMapping) {
+ me.setPciIdOrMapping(me.pciIdOrMapping, true);
}
},
});
@@ -7549,7 +7598,7 @@ Ext.define('PVE.form.SDNZoneSelector', {
}, function() {
Ext.define('pve-sdn-zone', {
extend: 'Ext.data.Model',
- fields: ['zone'],
+ fields: ['zone', 'type'],
proxy: {
type: 'proxmox',
url: "/api2/json/cluster/sdn/zones",
@@ -7772,7 +7821,14 @@ Ext.define('PVE.form.SecurityGroupsSelector', {
{
header: gettext('Comment'),
dataIndex: 'comment',
- renderer: Ext.String.htmlEncode,
+ renderer: function(value, metaData) {
+ let comment = Ext.String.htmlEncode(value) || '';
+ if (comment.length * 12 > metaData.column.cellWidth) {
+ let qtip = Ext.htmlEncode(comment);
+ comment = `${comment}`;
+ }
+ return comment;
+ },
flex: 1,
},
],
@@ -9273,7 +9329,35 @@ Ext.define('PVE.form.ViewSelector', {
text: gettext('Pool View'),
groups: ['pool'],
// Pool View only lists VMs and Containers
- filterfn: ({ data }) => data.type === 'qemu' || data.type === 'lxc' || data.type === 'pool',
+ getFilterFn: () => ({ data }) => data.type === 'qemu' || data.type === 'lxc' || data.type === 'pool',
+ },
+ tags: {
+ text: gettext('Tag View'),
+ groups: ['tag'],
+ getFilterFn: () => ({ data }) => ['qemu', 'lxc', 'node', 'storage'].indexOf(data.type) !== -1,
+ groupRenderer: function(info) {
+ let tag = PVE.Utils.renderTags(info.tag, PVE.UIOptions.tagOverrides);
+ return `${tag}`;
+ },
+ itemMap: function(item) {
+ let tags = (item.data.tags ?? '').split(/[;, ]/);
+ if (tags.length === 1 && tags[0] === '') {
+ return item;
+ }
+ let items = [];
+ for (const tag of tags) {
+ let id = `${item.data.id}-${tag}`;
+ let info = Ext.apply({ leaf: true }, item.data);
+ info.tag = tag;
+ info.realId = info.id;
+ info.id = id;
+ items.push(Ext.create('Ext.data.TreeModel', info));
+ }
+ return items;
+ },
+ attrMoveChecks: {
+ tag: (newitem, olditem) => newitem.data.tags !== olditem.data.tags,
+ },
},
};
let groupdef = Object.entries(default_views).map(([name, config]) => [name, config.text]);
@@ -11329,23 +11413,19 @@ Ext.define('PVE.FirewallOptions', {
extend: 'Proxmox.grid.ObjectGrid',
alias: ['widget.pveFirewallOptions'],
- fwtype: undefined, // 'dc', 'node' or 'vm'
+ fwtype: undefined, // 'dc', 'node', 'vm' or 'vnet'
base_url: undefined,
initComponent: function() {
var me = this;
- if (!me.base_url) {
- throw "missing base_url configuration";
+ if (!['dc', 'node', 'vm', 'vnet'].includes(me.fwtype)) {
+ throw "unknown firewall option type";
}
- if (me.fwtype === 'dc' || me.fwtype === 'node' || me.fwtype === 'vm') {
- if (me.fwtype === 'node') {
- me.cwidth1 = 250;
- }
- } else {
- throw "unknown firewall option type";
+ if (me.fwtype === 'node') {
+ me.cwidth1 = 250;
}
let caps = Ext.state.Manager.get('GuiCap');
@@ -11408,6 +11488,7 @@ Ext.define('PVE.FirewallOptions', {
'nf_conntrack_tcp_timeout_established', 7875, 250);
add_log_row('log_level_in');
add_log_row('log_level_out');
+ add_log_row('log_level_forward');
add_log_row('tcp_flags_log_level', 120);
add_log_row('smurf_log_level');
add_boolean_row('nftables', gettext('nftables (tech preview)'), 0);
@@ -11441,6 +11522,9 @@ Ext.define('PVE.FirewallOptions', {
defaultValue: 'enable=1',
},
};
+ } else if (me.fwtype === 'vnet') {
+ add_boolean_row('enable', gettext('Firewall'), 0);
+ add_log_row('log_level_forward');
}
if (me.fwtype === 'dc' || me.fwtype === 'vm') {
@@ -11477,6 +11561,28 @@ Ext.define('PVE.FirewallOptions', {
};
}
+ if (me.fwtype === 'vnet' || me.fwtype === 'dc') {
+ me.rows.policy_forward = {
+ header: gettext('Forward Policy'),
+ required: true,
+ defaultValue: 'ACCEPT',
+ editor: {
+ xtype: 'proxmoxWindowEdit',
+ subject: gettext('Forward Policy'),
+ items: {
+ xtype: 'pveFirewallPolicySelector',
+ name: 'policy_forward',
+ value: 'ACCEPT',
+ fieldLabel: gettext('Forward Policy'),
+ comboItems: [
+ ['ACCEPT', 'ACCEPT'],
+ ['DROP', 'DROP'],
+ ],
+ },
+ },
+ };
+ }
+
var edit_btn = new Ext.Button({
text: gettext('Edit'),
disabled: true,
@@ -11498,23 +11604,49 @@ Ext.define('PVE.FirewallOptions', {
};
Ext.apply(me, {
- url: "/api2/json" + me.base_url,
tbar: [edit_btn],
- editorConfig: {
- url: '/api2/extjs/' + me.base_url,
- },
listeners: {
itemdblclick: () => { if (canEdit) { me.run_editor(); } },
selectionchange: set_button_status,
},
});
+ if (me.base_url) {
+ me.applyUrl(me.base_url);
+ } else {
+ me.rstore = Ext.create('Proxmox.data.ObjectStore', {
+ interval: me.interval,
+ extraParams: me.extraParams,
+ rows: me.rows,
+ });
+ }
+
me.callParent();
me.on('activate', me.rstore.startUpdate);
me.on('destroy', me.rstore.stopUpdate);
me.on('deactivate', me.rstore.stopUpdate);
},
+ applyUrl: function(url) {
+ let me = this;
+
+ Ext.apply(me, {
+ url: "/api2/json" + url,
+ editorConfig: {
+ url: '/api2/extjs/' + url,
+ },
+ });
+ },
+ setBaseUrl: function(url) {
+ let me = this;
+
+ me.base_url = url;
+
+ me.applyUrl(url);
+
+ me.rstore.getProxy().setConfig('url', `/api2/extjs/${url}`);
+ me.rstore.reload();
+ },
});
@@ -11532,10 +11664,12 @@ Ext.define('PVE.FirewallLogLevels', {
Ext.define('PVE.form.FWMacroSelector', {
extend: 'Proxmox.form.ComboGrid',
alias: 'widget.pveFWMacroSelector',
+
allowBlank: true,
autoSelect: false,
valueField: 'macro',
displayField: 'macro',
+
listConfig: {
columns: [
{
@@ -11580,10 +11714,12 @@ Ext.define('PVE.form.FWMacroSelector', {
Ext.define('PVE.form.ICMPTypeSelector', {
extend: 'Proxmox.form.ComboGrid',
alias: 'widget.pveICMPTypeSelector',
+
allowBlank: true,
autoSelect: false,
valueField: 'name',
displayField: 'name',
+
listConfig: {
columns: [
{
@@ -11678,6 +11814,24 @@ let ICMPV6_TYPE_NAMES_STORE = Ext.create('Ext.data.Store', {
],
});
+let DEFAULT_ALLOWED_DIRECTIONS = ['in', 'out'];
+
+let ALLOWED_DIRECTIONS = {
+ 'dc': ['in', 'out', 'forward'],
+ 'node': ['in', 'out', 'forward'],
+ 'group': ['in', 'out', 'forward'],
+ 'vm': ['in', 'out'],
+ 'vnet': ['forward'],
+};
+
+let DEFAULT_ALLOWED_ACTIONS = ['ACCEPT', 'REJECT', 'DROP'];
+
+let ALLOWED_ACTIONS = {
+ 'in': ['ACCEPT', 'REJECT', 'DROP'],
+ 'out': ['ACCEPT', 'REJECT', 'DROP'],
+ 'forward': ['ACCEPT', 'DROP'],
+};
+
Ext.define('PVE.FirewallRulePanel', {
extend: 'Proxmox.panel.InputPanel',
@@ -11685,6 +11839,10 @@ Ext.define('PVE.FirewallRulePanel', {
list_refs_url: undefined,
+ firewall_type: undefined,
+ action_selector: undefined,
+ forward_warning: undefined,
+
onGetValues: function(values) {
var me = this;
@@ -11702,6 +11860,29 @@ Ext.define('PVE.FirewallRulePanel', {
return values;
},
+ setValidActions: function(type) {
+ let me = this;
+
+ let allowed_actions = ALLOWED_ACTIONS[type] ?? DEFAULT_ALLOWED_ACTIONS;
+ me.action_selector.setComboItems(allowed_actions.map((action) => [action, action]));
+ },
+
+ setForwardWarning: function(type) {
+ let me = this;
+ me.forward_warning.setHidden(type !== 'forward');
+ },
+
+ onSetValues: function(values) {
+ let me = this;
+
+ if (values.type) {
+ me.setValidActions(values.type);
+ me.setForwardWarning(values.type);
+ }
+
+ return values;
+ },
+
initComponent: function() {
var me = this;
@@ -11709,6 +11890,23 @@ Ext.define('PVE.FirewallRulePanel', {
throw "no list_refs_url specified";
}
+ let allowed_directions = ALLOWED_DIRECTIONS[me.firewall_type] ?? DEFAULT_ALLOWED_DIRECTIONS;
+
+ me.action_selector = Ext.create('Proxmox.form.KVComboBox', {
+ xtype: 'proxmoxKVComboBox',
+ name: 'action',
+ value: 'ACCEPT',
+ comboItems: DEFAULT_ALLOWED_ACTIONS.map((action) => [action, action]),
+ fieldLabel: gettext('Action'),
+ allowBlank: false,
+ });
+
+ me.forward_warning = Ext.create('Proxmox.form.field.DisplayEdit', {
+ userCls: 'pmx-hint',
+ value: gettext('Forward rules only take effect when the nftables firewall is activated in the host options'),
+ hidden: true,
+ });
+
me.column1 = [
{
// hack: we use this field to mark the form 'dirty' when the
@@ -11721,19 +11919,18 @@ Ext.define('PVE.FirewallRulePanel', {
{
xtype: 'proxmoxKVComboBox',
name: 'type',
- value: 'in',
- comboItems: [['in', 'in'], ['out', 'out']],
+ value: allowed_directions[0],
+ comboItems: allowed_directions.map((dir) => [dir, dir]),
fieldLabel: gettext('Direction'),
allowBlank: false,
+ listeners: {
+ change: function(f, value) {
+ me.setValidActions(value);
+ me.setForwardWarning(value);
+ },
+ },
},
- {
- xtype: 'proxmoxKVComboBox',
- name: 'action',
- value: 'ACCEPT',
- comboItems: [['ACCEPT', 'ACCEPT'], ['DROP', 'DROP'], ['REJECT', 'REJECT']],
- fieldLabel: gettext('Action'),
- allowBlank: false,
- },
+ me.action_selector,
];
if (me.allow_iface) {
@@ -11904,9 +12101,17 @@ Ext.define('PVE.FirewallRulePanel', {
value: '',
fieldLabel: gettext('Comment'),
},
+ me.forward_warning,
];
me.callParent();
+
+ if (me.isCreate) {
+ // on create we never change the values, so we need to trigger this
+ // manually
+ me.setValidActions(me.getValues().type);
+ me.setForwardWarning(me.getValues().type);
+ }
},
});
@@ -11918,6 +12123,8 @@ Ext.define('PVE.FirewallRuleEdit', {
allow_iface: false,
+ firewall_type: undefined,
+
initComponent: function() {
var me = this;
@@ -11943,6 +12150,7 @@ Ext.define('PVE.FirewallRuleEdit', {
list_refs_url: me.list_refs_url,
allow_iface: me.allow_iface,
rule_pos: me.rule_pos,
+ firewall_type: me.firewall_type,
});
Ext.apply(me, {
@@ -12069,6 +12277,7 @@ Ext.define('PVE.FirewallRules', {
alias: 'widget.pveFirewallRules',
onlineHelp: 'chapter_pve_firewall',
+ emptyText: gettext('No firewall rule configured here.'),
stateful: true,
stateId: 'grid-firewall-rules',
@@ -12086,6 +12295,8 @@ Ext.define('PVE.FirewallRules', {
allow_groups: true,
allow_iface: false,
+ firewall_type: undefined,
+
setBaseUrl: function(url) {
var me = this;
@@ -12192,7 +12403,7 @@ Ext.define('PVE.FirewallRules', {
var type = rec.data.type;
var editor;
- if (type === 'in' || type === 'out') {
+ if (type === 'in' || type === 'out' || type === 'forward') {
editor = 'PVE.FirewallRuleEdit';
} else if (type === 'group') {
editor = 'PVE.FirewallGroupRuleEdit';
@@ -12201,6 +12412,7 @@ Ext.define('PVE.FirewallRules', {
}
var win = Ext.create(editor, {
+ firewall_type: me.firewall_type,
digest: rec.data.digest,
allow_iface: me.allow_iface,
base_url: me.base_url,
@@ -12225,6 +12437,7 @@ Ext.define('PVE.FirewallRules', {
disabled: true,
handler: function() {
var win = Ext.create('PVE.FirewallRuleEdit', {
+ firewall_type: me.firewall_type,
allow_iface: me.allow_iface,
base_url: me.base_url,
list_refs_url: me.list_refs_url,
@@ -12240,11 +12453,12 @@ Ext.define('PVE.FirewallRules', {
return;
}
let type = rec.data.type;
- if (!(type === 'in' || type === 'out')) {
+ if (!(type === 'in' || type === 'out' || type === 'forward')) {
return;
}
let win = Ext.create('PVE.FirewallRuleEdit', {
+ firewall_type: me.firewall_type,
allow_iface: me.allow_iface,
base_url: me.base_url,
list_refs_url: me.list_refs_url,
@@ -12257,7 +12471,7 @@ Ext.define('PVE.FirewallRules', {
me.copyBtn = Ext.create('Proxmox.button.Button', {
text: gettext('Copy'),
selModel: sm,
- enableFn: ({ data }) => (data.type === 'in' || data.type === 'out') && me.canEdit,
+ enableFn: ({ data }) => (data.type === 'in' || data.type === 'out' || data.type === 'forward') && me.canEdit,
disabled: true,
handler: run_copy_editor,
});
@@ -12304,10 +12518,10 @@ Ext.define('PVE.FirewallRules', {
let errors = record.data.errors;
if (errors && errors[name]) {
metaData.tdCls = 'proxmox-invalid-row';
- let html = '' + Ext.htmlEncode(errors[name]) + '
';
+ let html = Ext.htmlEncode(`${Ext.htmlEncode(errors[name])}`);
metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + html + '"';
}
- return value;
+ return Ext.htmlEncode(value);
};
let columns = [
@@ -12450,9 +12664,9 @@ Ext.define('PVE.FirewallRules', {
flex: 10,
minWidth: 75,
renderer: function(value, metaData, record) {
- let comment = render_errors('comment', Ext.util.Format.htmlEncode(value), metaData, record) || '';
+ let comment = render_errors('comment', value, metaData, record) || '';
if (comment.length * 12 > metaData.column.cellWidth) {
- comment = `${comment}`;
+ comment = `${comment}`;
}
return comment;
},
@@ -12669,8 +12883,6 @@ Ext.define('PVE.grid.PoolMembers', {
extend: 'Ext.grid.GridPanel',
alias: ['widget.pvePoolMembers'],
- // fixme: dynamic status update ?
-
stateful: true,
stateId: 'grid-pool-members',
@@ -12681,19 +12893,25 @@ Ext.define('PVE.grid.PoolMembers', {
throw "no pool specified";
}
- var store = Ext.create('Ext.data.Store', {
+ me.rstore = Ext.create('Proxmox.data.UpdateStore', {
+ interval: 10000,
model: 'PVEResources',
+ proxy: {
+ type: 'proxmox',
+ root: 'data[0].members',
+ url: `/api2/json/pools/?poolid=${me.pool}`,
+ },
+ autoStart: true,
+ });
+
+ let store = Ext.create('Proxmox.data.DiffStore', {
+ rstore: me.rstore,
sorters: [
{
property: 'type',
direction: 'ASC',
},
],
- proxy: {
- type: 'proxmox',
- root: 'data[0].members',
- url: "/api2/json/pools/?poolid=" + me.pool,
- },
});
var coldef = PVE.data.ResourceStore.defaultColumns().filter((c) =>
@@ -12781,6 +12999,7 @@ Ext.define('PVE.grid.PoolMembers', {
ws.selectById(record.data.id);
},
activate: reload,
+ destroy: () => me.rstore.stopUpdate(),
},
});
@@ -13315,7 +13534,7 @@ Ext.define('PVE.grid.ResourceGrid', {
return;
}
for (let child of node.childNodes) {
- let orgNode = rstore.data.get(child.data.id);
+ let orgNode = rstore.data.get(child.data.realId ?? child.data.id);
if (orgNode) {
if ((!filterfn || filterfn(child)) && (!textfilter || textfilterMatch(child))) {
nodeidx[child.data.id] = orgNode;
@@ -13770,6 +13989,10 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
return {};
}
+ if (!formValues.id && me.isCreate) {
+ formValues.id = 'backup-' + Ext.data.identifier.Uuid.Global.generate().slice(0, 13);
+ }
+
let options = {};
if (!me.isCreate) {
@@ -13841,6 +14064,25 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
},
items: [
+ {
+ xtype: 'pveTwoColumnContainer',
+ startColumn: {
+ xtype: 'pmxDisplayEditField',
+ vtype: 'ConfigId',
+ fieldLabel: gettext('Job ID'),
+ emptyText: gettext('Autogenerate'),
+ name: 'id',
+ allowBlank: true,
+ cbind: {
+ editable: '{isCreate}',
+ },
+ },
+ endFlex: 2,
+ endColumn: {
+ xtype: 'displayfield',
+ value: gettext('Can be used in notification matchers to match this job.'),
+ },
+ },
{
xtype: 'pveTwoColumnContainer',
startColumn: {
@@ -13989,7 +14231,7 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
endFlex: 2,
endColumn: {
xtype: 'displayfield',
- value: gettext("EXPERIMENTAL: Mode to detect file changes and archive encoding format for container backups."),
+ value: gettext("Mode to detect file changes and switch archive encoding format for container backups."),
},
},
{
@@ -14539,12 +14781,11 @@ Ext.define('PVE.IPSetGrid', {
var msg = errors.cidr || errors.nomatch;
if (msg) {
metaData.tdCls = 'proxmox-invalid-row';
- var html = '
' + Ext.htmlEncode(msg) + '
';
- metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' +
- html.replace(/"/g, '"') + '"';
+ var html = Ext.htmlEncode(`${Ext.htmlEncode(msg)}
`);
+ metaData.tdAttr = `data-qwidth=600 data-qtitle="ERROR" data-qtip="${html}"`;
}
}
- return value;
+ return Ext.htmlEncode(value);
};
Ext.apply(me, {
@@ -15589,6 +15830,13 @@ Ext.define('PVE.panel.MultiDiskPanel', {
},
],
});
+Ext.define('PVE.panel.TagConfig', {
+ extend: 'PVE.panel.Config',
+ alias: 'widget.pveTagConfig',
+
+ //onlineHelp: 'gui_tags', // TODO: use this one once available
+ onlineHelp: 'chapter_gui',
+});
/*
* Left Treepanel, containing all the resources we manage in this datacenter: server nodes, server storages, VMs and Containers
*/
@@ -15628,11 +15876,26 @@ Ext.define('PVE.tree.ResourceTree', {
template: {
iconCls: 'fa fa-file-o',
},
+ tag: {
+ iconCls: 'fa fa-tag',
+ },
},
},
useArrows: true,
+ // private
+ getTypeOrder: function(type) {
+ switch (type) {
+ case 'lxc': return 0;
+ case 'qemu': return 1;
+ case 'node': return 2;
+ case 'sdn': return 3;
+ case 'storage': return 4;
+ default: return 9;
+ }
+ },
+
// private
nodeSortFn: function(node1, node2) {
let me = this;
@@ -15643,10 +15906,9 @@ Ext.define('PVE.tree.ResourceTree', {
let n2IsGuest = n2.type === 'qemu' || n2.type === 'lxc';
if (me['group-guest-types'] || !n1IsGuest || !n2IsGuest) {
// first sort (group) by type
- if (n1.type > n2.type) {
- return 1;
- } else if (n1.type < n2.type) {
- return -1;
+ let res = me.getTypeOrder(n1.type) - me.getTypeOrder(n2.type);
+ if (res !== 0) {
+ return res;
}
}
@@ -15725,16 +15987,15 @@ Ext.define('PVE.tree.ResourceTree', {
},
getToolTip: function(info) {
- if (info.type === 'pool' || info.groupbyid !== undefined) {
- return undefined;
+ let qtips = [];
+ if (info.qmpstatus || info.status) {
+ qtips.push(Ext.String.format(gettext('Status: {0}'), info.qmpstatus || info.status));
}
-
- let qtips = [gettext('Status') + ': ' + (info.qmpstatus || info.status)];
if (info.lock) {
qtips.push(Ext.String.format(gettext('Config locked ({0})'), info.lock));
}
if (info.hastate !== 'unmanaged') {
- qtips.push(gettext('HA State') + ": " + info.hastate);
+ qtips.push(Ext.String.format(gettext('HA State: {0}'), info.hastate));
}
if (info.type === 'storage') {
let usage = info.disk / info.maxdisk;
@@ -15743,6 +16004,10 @@ Ext.define('PVE.tree.ResourceTree', {
}
}
+ if (qtips.length === 0) {
+ return undefined;
+ }
+
let tip = qtips.join(', ');
info.tip = tip;
return tip;
@@ -15756,12 +16021,15 @@ Ext.define('PVE.tree.ResourceTree', {
me.setText(info);
if (info.groupbyid) {
- info.text = info.groupbyid;
- if (info.type === 'type') {
+ if (me.viewFilter.groupRenderer) {
+ info.text = me.viewFilter.groupRenderer(info);
+ } else if (info.type === 'type') {
let defaults = PVE.tree.ResourceTree.typeDefaults[info.groupbyid];
if (defaults && defaults.text) {
info.text = defaults.text;
}
+ } else {
+ info.text = info.groupbyid;
}
}
let child = Ext.create('PVETree', info);
@@ -15858,6 +16126,30 @@ Ext.define('PVE.tree.ResourceTree', {
'text', 'running', 'template', 'status', 'qmpstatus', 'hastate', 'lock', 'tags',
];
+ // special case ids from the tag view, since they change the id in the state
+ let idMapFn = function(id) {
+ if (!id) {
+ return undefined;
+ }
+ if (id.startsWith('qemu') || id.startsWith('lxc')) {
+ let [realId, _tag] = id.split('-');
+ return realId;
+ }
+ return id;
+ };
+
+ let findNode = function(rootNode, id) {
+ if (!id) {
+ return undefined;
+ }
+ let node = rootNode.findChild('id', id, true);
+ if (!node) {
+ node = rootNode.findChildBy((r) => idMapFn(r.data.id) === idMapFn(id), undefined, true);
+ }
+ return node;
+ };
+
+
let updateTree = function() {
store.suspendEvents();
@@ -15873,22 +16165,31 @@ Ext.define('PVE.tree.ResourceTree', {
let groups = me.viewFilter.groups || [];
// explicitly check for node/template, as those are not always grouping attributes
+ let attrMoveChecks = me.viewFilter.attrMoveChecks ?? {};
+
// also check for name for when the tree is sorted by name
let moveCheckAttrs = groups.concat(['node', 'template', 'name']);
- let filterfn = me.viewFilter.filterfn;
+ let filterFn = me.viewFilter.getFilterFn ? me.viewFilter.getFilterFn() : Ext.identityFn;
let reselect = false; // for disappeared nodes
let index = pdata.dataIndex;
// remove vanished or moved items and update changed items in-place
for (const [key, olditem] of Object.entries(index)) {
// getById() use find(), which is slow (ExtJS4 DP5)
- let item = rstore.data.get(olditem.data.id);
+ let oldid = olditem.data.id;
+ let id = idMapFn(olditem.data.id);
+ let item = rstore.data.get(id);
let changed = sorting_changed, moved = sorting_changed;
if (item) {
// test if any grouping attributes changed, catches migrated tree-nodes in server view too
for (const attr of moveCheckAttrs) {
- if (item.data[attr] !== olditem.data[attr]) {
+ if (attrMoveChecks[attr]) {
+ if (attrMoveChecks[attr](olditem, item)) {
+ moved = true;
+ break;
+ }
+ } else if (item.data[attr] !== olditem.data[attr]) {
moved = true;
break;
}
@@ -15908,6 +16209,9 @@ Ext.define('PVE.tree.ResourceTree', {
olditem.beginEdit();
let info = olditem.data;
Ext.apply(info, item.data);
+ if (info.id !== oldid) {
+ info.id = oldid;
+ }
me.setIconCls(info);
me.setText(info);
olditem.commit();
@@ -15924,15 +16228,20 @@ Ext.define('PVE.tree.ResourceTree', {
// store events are suspended, so remove the item manually
store.remove(olditem);
parentNode.removeChild(olditem, true);
+ if (parentNode.childNodes.length < 1 && parentNode.parentNode) {
+ let grandParent = parentNode.parentNode;
+ grandParent.removeChild(parentNode, true);
+ }
}
}
- rstore.each(function(item) { // add new items
+ let items = rstore.getData().items.flatMap(me.viewFilter.itemMap ?? Ext.identityFn);
+ items.forEach(function(item) { // add new items
let olditem = index[item.data.id];
if (olditem) {
return;
}
- if (filterfn && !filterfn(item)) {
+ if (filterFn && !filterFn(item)) {
return;
}
let info = Ext.apply({ leaf: true }, item.data);
@@ -15946,8 +16255,10 @@ Ext.define('PVE.tree.ResourceTree', {
store.resumeEvents();
store.fireEvent('refresh', store);
+ let foundChild = findNode(rootnode, lastsel?.data.id);
+
// select parent node if original selected node vanished
- if (lastsel && !rootnode.findChild('id', lastsel.data.id, true)) {
+ if (lastsel && !foundChild) {
lastsel = rootnode;
for (const node of parents) {
if (rootnode.findChild('id', node.data.id, true)) {
@@ -16067,7 +16378,7 @@ Ext.define('PVE.tree.ResourceTree', {
if (nodeid === 'root') {
node = rootnode;
} else {
- node = rootnode.findChild('id', nodeid, true);
+ node = findNode(rootnode, nodeid);
}
if (node) {
me.selectExpand(node);
@@ -16089,6 +16400,24 @@ Ext.define('PVE.tree.ResourceTree', {
rstore.on("load", updateTree);
rstore.startUpdate();
+
+ me.mon(Ext.GlobalEvents, 'loadedUiOptions', () => {
+ me.store.getRootNode().cascadeBy({
+ before: function(node) {
+ if (node.data.groupbyid) {
+ node.beginEdit();
+ let info = node.data;
+ me.setIconCls(info);
+ me.setText(info);
+ if (me.viewFilter.groupRenderer) {
+ info.text = me.viewFilter.groupRenderer(info);
+ }
+ node.commit();
+ }
+ return true;
+ },
+ });
+ });
},
});
@@ -16984,15 +17313,20 @@ Ext.define('PVE.sdn.DhcpTree', {
openEditWindow: function(data) {
let me = this;
+ let extraRequestParams = {
+ mac: data.mac,
+ zone: data.zone,
+ vnet: data.vnet,
+ };
+
+ if (data.vmid) {
+ extraRequestParams.vmid = data.vmid;
+ }
+
Ext.create('PVE.sdn.IpamEdit', {
autoShow: true,
mapping: data,
- extraRequestParams: {
- vmid: data.vmid,
- mac: data.mac,
- zone: data.zone,
- vnet: data.vnet,
- },
+ extraRequestParams,
listeners: {
destroy: () => me.reload(),
},
@@ -18063,12 +18397,12 @@ Ext.define('PVE.ceph.Install', {
},
handler: function() {
let view = this.up('pveCephInstallWindow');
- let wizzard = Ext.create('PVE.ceph.CephInstallWizard', {
+ let wizard = Ext.create('PVE.ceph.CephInstallWizard', {
nodename: view.nodename,
});
- wizzard.getViewModel().set('isInstalled', this.getViewModel().get('isInstalled'));
- wizzard.show();
- view.mon(wizzard, 'beforeClose', function() {
+ wizard.getViewModel().set('isInstalled', this.getViewModel().get('isInstalled'));
+ wizard.show();
+ view.mon(wizard, 'beforeClose', function() {
view.fireEvent("cephInstallWindowClosed");
view.close();
});
@@ -19042,7 +19376,7 @@ Ext.define('PVE.window.Migrate', {
},
onTargetChange: function(nodeSelector) {
- // Always display the storages of the currently seleceted migration target
+ // Always display the storages of the currently selected migration target
this.lookup('pveDiskStorageSelector').setNodename(nodeSelector.value);
this.checkMigratePreconditions();
},
@@ -19786,7 +20120,7 @@ Ext.define('PVE.window.Restore', {
if (key === '#qmdump#map') {
let match = value.match(/^(\S+):(\S+):(\S*):(\S*):$/) ?? [];
- // if a /dev/XYZ disk was backed up, ther is no storage hint
+ // if a /dev/XYZ disk was backed up, there is no storage hint
allStoragesAvailable &&= !!match[3] && !!PVE.data.ResourceStore.getById(
`storage/${view.nodename}/${match[3]}`);
} else if (key === 'name' || key === 'hostname') {
@@ -20899,7 +21233,7 @@ Ext.define('PVE.window.DownloadUrlToStorage', {
let filename = data.filename || "";
let compression = '__default__';
if (view.content === 'iso') {
- const matches = filename.match(/^(.+)\.(gz|lzo|zst)$/i);
+ const matches = filename.match(/^(.+)\.(gz|lzo|zst|bz2)$/i);
if (matches) {
filename = matches[1];
compression = matches[2].toLowerCase();
@@ -21043,6 +21377,7 @@ Ext.define('PVE.window.DownloadUrlToStorage', {
['lzo', 'LZO'],
['gz', 'GZIP'],
['zst', 'ZSTD'],
+ ['bz2', 'BZIP2'],
],
cbind: {
hidden: get => get('content') !== 'iso',
@@ -21083,6 +21418,7 @@ Ext.define('PVE.window.UploadToStorage', {
title: gettext('Upload'),
acceptedExtensions: {
+ 'import': ['.ova'],
iso: ['.img', '.iso'],
vztmpl: ['.tar.gz', '.tar.xz', '.tar.zst'],
},
@@ -22094,7 +22430,7 @@ Ext.define('PVE.GuestStop', {
let cfg = {
title: gettext('Confirm'),
icon: Ext.Msg.WARNING,
- msg: Proxmox.Utils.format_task_description(me.taskType, me.vm.vmid),
+ msg: PVE.Utils.formatGuestTaskConfirmation(me.taskType, me.vm.vmid, me.vm.name),
buttons: Ext.Msg.YESNO,
callback: btn => me.handler(btn),
};
@@ -22108,7 +22444,7 @@ Ext.define('PVE.window.TreeSettingsEdit', {
title: gettext('Tree Settings'),
isCreate: false,
- url: '#', // ignored as submit() gets overriden here, but the parent class requires it
+ url: '#', // ignored as submit() gets overridden here, but the parent class requires it
width: 450,
fieldDefaults: {
@@ -22315,8 +22651,10 @@ Ext.define('PVE.window.PCIMapEditWindow', {
this.lookup('pciselector').setMdev(value);
},
- nodeChange: function(_field, value) {
- this.lookup('pciselector').setNodename(value);
+ nodeChange: function(field, value) {
+ if (!field.isDisabled()) {
+ this.lookup('pciselector').setNodename(value);
+ }
},
pciChange: function(_field, value) {
@@ -22569,9 +22907,11 @@ Ext.define('PVE.window.USBMapEditWindow', {
usbsel.setDisabled(!value);
},
- nodeChange: function(_field, value) {
- this.lookup('id').setNodename(value);
- this.lookup('path').setNodename(value);
+ nodeChange: function(field, value) {
+ if (!field.isDisabled()) {
+ this.lookup('id').setNodename(value);
+ this.lookup('path').setNodename(value);
+ }
},
@@ -22718,6 +23058,8 @@ Ext.define('PVE.window.GuestImport', {
title: gettext('Import Guest'),
+ onlineHelp: 'qm_import_virtual_machines',
+
width: 720,
bodyPadding: 0,
@@ -23017,6 +23359,7 @@ Ext.define('PVE.window.GuestImport', {
os: 'l26',
maxCdDrives: false,
uniqueMACAdresses: false,
+ isOva: false,
warnings: [],
},
@@ -23028,6 +23371,8 @@ Ext.define('PVE.window.GuestImport', {
liveImportNote: get => !get('liveImport') ? ''
: gettext('Note: If anything goes wrong during the live-import, new data written by the VM may be lost.'),
isWindows: get => (get('os') ?? '').startsWith('w'),
+ liveImportText: get => get('isOva') ? gettext('Starts a VM and imports the disks in the background')
+ : gettext('Starts a previously stopped VM on Proxmox VE and imports the disks in the background.'),
},
},
@@ -23146,6 +23491,10 @@ Ext.define('PVE.window.GuestImport', {
}
}
+ if (config['import-working-storage'] === '') {
+ delete config['import-working-storage'];
+ }
+
return config;
},
@@ -23267,6 +23616,22 @@ Ext.define('PVE.window.GuestImport', {
allowBlank: false,
fieldLabel: gettext('Default Bridge'),
},
+ {
+ xtype: 'pveStorageSelector',
+ reference: 'extractionStorage',
+ fieldLabel: gettext('Import Working Storage'),
+ storageContent: 'images',
+ emptyText: gettext('Source Storage'),
+ autoSelect: false,
+ name: 'import-working-storage',
+ disabled: true,
+ hidden: true,
+ allowBlank: true,
+ bind: {
+ disabled: '{!isOva}',
+ hidden: '{!isOva}',
+ },
+ },
],
columnB: [
@@ -23275,9 +23640,9 @@ Ext.define('PVE.window.GuestImport', {
fieldLabel: gettext('Live Import'),
reference: 'liveimport',
isFormField: false,
- boxLabel: gettext('Starts a previously stopped VM on Proxmox VE and imports the disks in the background.'),
bind: {
value: '{liveImport}',
+ boxLabel: '{liveImportText}',
},
},
{
@@ -23639,11 +24004,12 @@ Ext.define('PVE.window.GuestImport', {
me.lookup('defaultStorage').setNodename(me.nodename);
me.lookup('defaultBridge').setNodename(me.nodename);
+ me.lookup('extractionStorage').setNodename(me.nodename);
let renderWarning = w => {
const warningsCatalogue = {
'cdrom-image-ignored': gettext("CD-ROM images cannot get imported, if required you can reconfigure the '{0}' drive in the 'Advanced' tab."),
- 'nvme-unsupported': gettext("NVMe disks are currently not supported, '{0}' will get attaced as SCSI"),
+ 'nvme-unsupported': gettext("NVMe disks are currently not supported, '{0}' will get attached as SCSI"),
'ovmf-with-lsi-unsupported': gettext("OVMF is built without LSI drivers, scsi hardware was set to '{1}'"),
'serial-port-socket-only': gettext("Serial socket '{0}' will be mapped to a socket"),
'guest-is-running': gettext('Virtual guest seems to be running on source host. Import might fail or have inconsistent state!'),
@@ -23651,6 +24017,7 @@ Ext.define('PVE.window.GuestImport', {
gettext('EFI state cannot be imported, you may need to reconfigure the boot order (see {0})'),
'OVMF/UEFI Boot Entries',
),
+ 'ova-needs-extracting': gettext('Importing an OVA temporarily requires extra space on the working storage while extracting the contained disks for further processing.'),
};
let message = warningsCatalogue[w.type];
if (!w.type || !message) {
@@ -23719,6 +24086,7 @@ Ext.define('PVE.window.GuestImport', {
}
me.getViewModel().set('warnings', data.warnings.map(w => renderWarning(w)));
+ me.getViewModel().set('isOva', data.warnings.map(w => w.type).indexOf('ova-needs-extracting') !== -1);
let osinfo = PVE.Utils.get_kvm_osinfo(me.vmConfig.ostype ?? '');
let prepareForVirtIO = (me.vmConfig.ostype ?? '').startsWith('w') && (me.vmConfig.bios ?? '').indexOf('ovmf') !== -1;
@@ -24531,7 +24899,7 @@ Ext.define('PVE.ha.ResourcesView', {
renderer: function(value, metaData, { data }) {
if (data.errors && data.errors.group) {
metaData.tdCls = 'proxmox-invalid-row';
- let html = `${Ext.htmlEncode(data.errors.group)}
`;
+ let html = Ext.htmlEncode(`${Ext.htmlEncode(data.errors.group)}
`);
metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + html + '"';
}
return value;
@@ -24970,204 +25338,6 @@ Ext.define('pve-acme-plugins', {
idProperty: 'plugin',
});
-Ext.define('PVE.dc.ACMEAccountView', {
- extend: 'Ext.grid.Panel',
- alias: 'widget.pveACMEAccountView',
-
- title: gettext('Accounts'),
-
- controller: {
- xclass: 'Ext.app.ViewController',
-
- addAccount: function() {
- let me = this;
- let view = me.getView();
- let defaultExists = view.getStore().findExact('name', 'default') !== -1;
- Ext.create('PVE.node.ACMEAccountCreate', {
- defaultExists,
- taskDone: function() {
- me.reload();
- },
- }).show();
- },
-
- viewAccount: function() {
- let me = this;
- let view = me.getView();
- let selection = view.getSelection();
- if (selection.length < 1) return;
- Ext.create('PVE.node.ACMEAccountView', {
- accountname: selection[0].data.name,
- }).show();
- },
-
- reload: function() {
- let me = this;
- let view = me.getView();
- view.getStore().rstore.load();
- },
-
- showTaskAndReload: function(options, success, response) {
- let me = this;
- if (!success) return;
-
- let upid = response.result.data;
- Ext.create('Proxmox.window.TaskProgress', {
- upid,
- taskDone: function() {
- me.reload();
- },
- }).show();
- },
- },
-
- minHeight: 150,
- emptyText: gettext('No Accounts configured'),
-
- columns: [
- {
- dataIndex: 'name',
- text: gettext('Name'),
- renderer: Ext.String.htmlEncode,
- flex: 1,
- },
- ],
-
- tbar: [
- {
- xtype: 'proxmoxButton',
- text: gettext('Add'),
- selModel: false,
- handler: 'addAccount',
- },
- {
- xtype: 'proxmoxButton',
- text: gettext('View'),
- handler: 'viewAccount',
- disabled: true,
- },
- {
- xtype: 'proxmoxStdRemoveButton',
- baseurl: '/cluster/acme/account',
- callback: 'showTaskAndReload',
- },
- ],
-
- listeners: {
- itemdblclick: 'viewAccount',
- },
-
- store: {
- type: 'diff',
- autoDestroy: true,
- autoDestroyRstore: true,
- rstore: {
- type: 'update',
- storeid: 'pve-acme-accounts',
- model: 'pve-acme-accounts',
- autoStart: true,
- },
- sorters: 'name',
- },
-});
-
-Ext.define('PVE.dc.ACMEPluginView', {
- extend: 'Ext.grid.Panel',
- alias: 'widget.pveACMEPluginView',
-
- title: gettext('Challenge Plugins'),
-
- controller: {
- xclass: 'Ext.app.ViewController',
-
- addPlugin: function() {
- let me = this;
- Ext.create('PVE.dc.ACMEPluginEditor', {
- isCreate: true,
- apiCallDone: function() {
- me.reload();
- },
- }).show();
- },
-
- editPlugin: function() {
- let me = this;
- let view = me.getView();
- let selection = view.getSelection();
- if (selection.length < 1) return;
- let plugin = selection[0].data.plugin;
- Ext.create('PVE.dc.ACMEPluginEditor', {
- url: `/cluster/acme/plugins/${plugin}`,
- apiCallDone: function() {
- me.reload();
- },
- }).show();
- },
-
- reload: function() {
- let me = this;
- let view = me.getView();
- view.getStore().rstore.load();
- },
- },
-
- minHeight: 150,
- emptyText: gettext('No Plugins configured'),
-
- columns: [
- {
- dataIndex: 'plugin',
- text: gettext('Plugin'),
- renderer: Ext.String.htmlEncode,
- flex: 1,
- },
- {
- dataIndex: 'api',
- text: 'API',
- renderer: Ext.String.htmlEncode,
- flex: 1,
- },
- ],
-
- tbar: [
- {
- xtype: 'proxmoxButton',
- text: gettext('Add'),
- handler: 'addPlugin',
- selModel: false,
- },
- {
- xtype: 'proxmoxButton',
- text: gettext('Edit'),
- handler: 'editPlugin',
- disabled: true,
- },
- {
- xtype: 'proxmoxStdRemoveButton',
- baseurl: '/cluster/acme/plugins',
- callback: 'reload',
- },
- ],
-
- listeners: {
- itemdblclick: 'editPlugin',
- },
-
- store: {
- type: 'diff',
- autoDestroy: true,
- autoDestroyRstore: true,
- rstore: {
- type: 'update',
- storeid: 'pve-acme-plugins',
- model: 'pve-acme-plugins',
- autoStart: true,
- filters: item => !!item.data.api,
- },
- sorters: 'plugin',
- },
-});
-
Ext.define('PVE.dc.ACMEClusterView', {
extend: 'Ext.panel.Panel',
alias: 'widget.pveACMEClusterView',
@@ -25178,238 +25348,17 @@ Ext.define('PVE.dc.ACMEClusterView', {
{
region: 'north',
border: false,
- xtype: 'pveACMEAccountView',
+ xtype: 'pmxACMEAccounts',
+ acmeUrl: '/cluster/acme',
},
{
region: 'center',
border: false,
- xtype: 'pveACMEPluginView',
+ xtype: 'pmxACMEPluginView',
+ acmeUrl: '/cluster/acme',
},
],
});
-Ext.define('PVE.dc.ACMEPluginEditor', {
- extend: 'Proxmox.window.Edit',
- xtype: 'pveACMEPluginEditor',
- mixins: ['Proxmox.Mixin.CBind'],
-
- onlineHelp: 'sysadmin_certs_acme_plugins',
-
- isAdd: true,
- isCreate: false,
-
- width: 550,
- url: '/cluster/acme/plugins/',
-
- subject: 'ACME DNS Plugin',
-
- items: [
- {
- xtype: 'inputpanel',
- // we dynamically create fields from the given schema
- // things we have to do here:
- // * save which fields we created to remove them again
- // * split the data from the generic 'data' field into the boxes
- // * on deletion collect those values again
- // * save the original values of the data field
- createdFields: {},
- createdInitially: false,
- originalValues: {},
- createSchemaFields: function(schema) {
- let me = this;
- // we know where to add because we define it right below
- let container = me.down('container');
- let datafield = me.down('field[name=data]');
- let hintfield = me.down('field[name=hint]');
- if (!me.createdInitially) {
- [me.originalValues] = PVE.Parser.parseACMEPluginData(datafield.getValue());
- }
-
- // collect values from custom fields and add it to 'data'',
- // then remove the custom fields
- let data = [];
- for (const [name, field] of Object.entries(me.createdFields)) {
- let value = field.getValue();
- if (value !== undefined && value !== null && value !== '') {
- data.push(`${name}=${value}`);
- }
- container.remove(field);
- }
- let datavalue = datafield.getValue();
- if (datavalue !== undefined && datavalue !== null && datavalue !== '') {
- data.push(datavalue);
- }
- datafield.setValue(data.join('\n'));
-
- me.createdFields = {};
-
- if (typeof schema.fields !== 'object') {
- schema.fields = {};
- }
- // create custom fields according to schema
- let gotSchemaField = false;
- let cmp = (a, b) => a[0].localeCompare(b[0]);
- for (const [name, definition] of Object.entries(schema.fields).sort(cmp)) {
- let xtype;
- switch (definition.type) {
- case 'string':
- xtype = 'proxmoxtextfield';
- break;
- case 'integer':
- xtype = 'proxmoxintegerfield';
- break;
- case 'number':
- xtype = 'numberfield';
- break;
- default:
- console.warn(`unknown type '${definition.type}'`);
- xtype = 'proxmoxtextfield';
- break;
- }
-
- let label = name;
- if (typeof definition.name === "string") {
- label = definition.name;
- }
-
- let field = Ext.create({
- xtype,
- name: `custom_${name}`,
- fieldLabel: label,
- width: '100%',
- labelWidth: 150,
- labelSeparator: '=',
- emptyText: definition.default || '',
- autoEl: definition.description ? {
- tag: 'div',
- 'data-qtip': definition.description,
- } : undefined,
- });
-
- me.createdFields[name] = field;
- container.add(field);
- gotSchemaField = true;
- }
- datafield.setHidden(gotSchemaField); // prefer schema-fields
-
- if (schema.description) {
- hintfield.setValue(schema.description);
- hintfield.setHidden(false);
- } else {
- hintfield.setValue('');
- hintfield.setHidden(true);
- }
-
- // parse data from field and set it to the custom ones
- let extradata = [];
- [data, extradata] = PVE.Parser.parseACMEPluginData(datafield.getValue());
- for (const [key, value] of Object.entries(data)) {
- if (me.createdFields[key]) {
- me.createdFields[key].setValue(value);
- me.createdFields[key].originalValue = me.originalValues[key];
- } else {
- extradata.push(`${key}=${value}`);
- }
- }
- datafield.setValue(extradata.join('\n'));
- if (!me.createdInitially) {
- datafield.resetOriginalValue();
- me.createdInitially = true; // save that we initally set that
- }
- },
- onGetValues: function(values) {
- let me = this;
- let win = me.up('pveACMEPluginEditor');
- if (win.isCreate) {
- values.id = values.plugin;
- values.type = 'dns'; // the only one for now
- }
- delete values.plugin;
-
- PVE.Utils.delete_if_default(values, 'validation-delay', '30', win.isCreate);
-
- let data = '';
- for (const [name, field] of Object.entries(me.createdFields)) {
- let value = field.getValue();
- if (value !== null && value !== undefined && value !== '') {
- data += `${name}=${value}\n`;
- }
- delete values[`custom_${name}`];
- }
- values.data = Ext.util.Base64.encode(data + values.data);
- return values;
- },
- items: [
- {
- xtype: 'pmxDisplayEditField',
- cbind: {
- editable: (get) => get('isCreate'),
- submitValue: (get) => get('isCreate'),
- },
- editConfig: {
- flex: 1,
- xtype: 'proxmoxtextfield',
- allowBlank: false,
- },
- name: 'plugin',
- labelWidth: 150,
- fieldLabel: gettext('Plugin ID'),
- },
- {
- xtype: 'proxmoxintegerfield',
- name: 'validation-delay',
- labelWidth: 150,
- fieldLabel: gettext('Validation Delay'),
- emptyText: 30,
- cbind: {
- deleteEmpty: '{!isCreate}',
- },
- minValue: 0,
- maxValue: 48*60*60,
- },
- {
- xtype: 'pveACMEApiSelector',
- name: 'api',
- labelWidth: 150,
- listeners: {
- change: function(selector) {
- let schema = selector.getSchema();
- selector.up('inputpanel').createSchemaFields(schema);
- },
- },
- },
- {
- xtype: 'textarea',
- fieldLabel: gettext('API Data'),
- labelWidth: 150,
- name: 'data',
- },
- {
- xtype: 'displayfield',
- fieldLabel: gettext('Hint'),
- labelWidth: 150,
- name: 'hint',
- hidden: true,
- },
- ],
- },
- ],
-
- initComponent: function() {
- var me = this;
-
- me.callParent();
-
- if (!me.isCreate) {
- me.load({
- success: function(response, opts) {
- me.setValues(response.result.data);
- },
- });
- } else {
- me.method = 'POST';
- }
- },
-});
Ext.define('PVE.panel.AuthBase', {
extend: 'Proxmox.panel.InputPanel',
xtype: 'pveAuthBasePanel',
@@ -26565,7 +26514,7 @@ Ext.define('PVE.dc.BackupInfo', {
const modeToDisplay = {
snapshot: gettext('Snapshot'),
stop: gettext('Stop'),
- suspend: gettext('Snapshot'),
+ suspend: gettext('Suspend'),
};
return modeToDisplay[value] ?? gettext('Unknown');
},
@@ -26868,10 +26817,6 @@ Ext.define('PVE.dc.BackupEdit', {
Proxmox.Utils.assemble_field_data(values, { 'delete': 'notification-target' });
}
- if (!values.id && isCreate) {
- values.id = 'backup-' + Ext.data.identifier.Uuid.Global.generate().slice(0, 13);
- }
-
let selMode = values.selMode;
delete values.selMode;
@@ -28188,6 +28133,7 @@ Ext.define('PVE.ClusterInfoWindow', {
document.execCommand("copy");
},
text: gettext('Copy Information'),
+ iconCls: 'fa fa-clipboard',
}],
}],
});
@@ -28673,6 +28619,14 @@ Ext.define('PVE.dc.Config', {
hidden: true,
iconCls: 'fa fa-map-signs',
itemId: 'sdnmappings',
+ },
+ {
+ xtype: 'pveSDNFirewall',
+ groups: ['sdn'],
+ title: gettext('VNet Firewall'),
+ hidden: true,
+ iconCls: 'fa fa-shield',
+ itemId: 'sdnfirewall',
});
}
@@ -28693,6 +28647,7 @@ Ext.define('PVE.dc.Config', {
list_refs_url: '/cluster/firewall/refs',
iconCls: 'fa fa-shield',
itemId: 'firewall',
+ firewall_type: 'dc',
},
{
xtype: 'pveFirewallOptions',
@@ -30022,6 +29977,9 @@ Ext.define('PVE.dc.OptionView', {
emptyText: Proxmox.Utils.defaultText,
autoSelect: false,
skipEmptyText: true,
+ editable: true,
+ notFoundIsValid: true,
+ vtype: 'IP64CIDRAddress',
}],
});
me.add_inputpanel_row('ha', gettext('HA Settings'), {
@@ -31170,6 +31128,7 @@ Ext.define('PVE.SecurityGroups', {
list_refs_url: '/cluster/firewall/refs',
tbar_prefix: '' + gettext('Rules') + ':',
border: false,
+ firewall_type: 'group',
},
{
xtype: 'pveSecurityGroupList',
@@ -31530,6 +31489,11 @@ Ext.define('PVE.dc.Summary', {
} else if (countedStorage[sid]) {
break;
}
+
+ if (data.status === "unknown") {
+ break;
+ }
+
used += data.disk;
total += data.maxdisk;
countedStorage[sid] = true;
@@ -31984,11 +31948,11 @@ Ext.define('PVE.dc.Tasks', {
return;
}
- var win = Ext.create('Proxmox.window.TaskViewer', {
+ Ext.create('Proxmox.window.TaskViewer', {
+ autoShow: true,
upid: rec.data.upid,
endtime: rec.data.endtime,
});
- win.show();
};
Ext.apply(me, {
@@ -32090,7 +32054,6 @@ Ext.define('PVE.dc.TokenEdit', {
isAdd: true,
isCreate: false,
- fixedUser: false,
method: 'POST',
url: '/api2/extjs/access/users/',
@@ -32115,7 +32078,7 @@ Ext.define('PVE.dc.TokenEdit', {
{
xtype: 'pmxDisplayEditField',
cbind: {
- editable: (get) => get('isCreate') && !get('fixedUser'),
+ editable: '{isCreate}',
},
submitValue: true,
editConfig: {
@@ -32257,9 +32220,6 @@ Ext.define('PVE.dc.TokenView', {
stateful: true,
stateId: 'grid-tokens',
- // use fixed user
- fixedUser: undefined,
-
initComponent: function() {
let me = this;
@@ -32272,34 +32232,6 @@ Ext.define('PVE.dc.TokenView', {
});
let reload = function() {
- if (me.fixedUser) {
- Proxmox.Utils.API2Request({
- url: `/access/users/${encodeURIComponent(me.fixedUser)}/token`,
- method: 'GET',
- failure: function(response, opts) {
- Proxmox.Utils.setErrorMask(me, response.htmlStatus);
- me.load_task.delay(me.load_delay);
- },
- success: function(response, opts) {
- Proxmox.Utils.setErrorMask(me, false);
- let result = Ext.decode(response.responseText);
- let data = result.data || [];
- let records = [];
- Ext.Array.each(data, function(token) {
- let r = {};
- r.id = me.fixedUser + '!' + token.tokenid;
- r.userid = me.fixedUser;
- r.tokenid = token.tokenid;
- r.comment = token.comment;
- r.expire = token.expire;
- r.privsep = token.privsep === 1;
- records.push(r);
- });
- store.loadData(records);
- },
- });
- return;
- }
Proxmox.Utils.API2Request({
url: '/access/users/?full=1',
method: 'GET',
@@ -32338,8 +32270,12 @@ Ext.define('PVE.dc.TokenView', {
return `/access/users/${uid}/token/${tid}`;
};
+ let hasTokenCRUDPermissions = function(userid) {
+ return userid === Proxmox.UserName || !!caps.access['User.Modify'];
+ };
+
let run_editor = function(rec) {
- if (!caps.access['User.Modify']) {
+ if (!hasTokenCRUDPermissions(rec.data.userid)) {
return;
}
@@ -32355,18 +32291,10 @@ Ext.define('PVE.dc.TokenView', {
let tbar = [
{
text: gettext('Add'),
- disabled: !caps.access['User.Modify'],
- handler: function(btn, e, rec) {
+ handler: function(btn, e) {
let data = {};
- if (me.fixedUser) {
- data.userid = me.fixedUser;
- data.fixedUser = true;
- } else if (rec && rec.data) {
- data.userid = rec.data.userid;
- }
let win = Ext.create('PVE.dc.TokenEdit', {
isCreate: true,
- fixedUser: me.fixedUser,
});
win.setValues(data);
win.on('destroy', reload);
@@ -32377,14 +32305,14 @@ Ext.define('PVE.dc.TokenView', {
xtype: 'proxmoxButton',
text: gettext('Edit'),
disabled: true,
- enableFn: (rec) => !!caps.access['User.Modify'],
+ enableFn: (rec) => hasTokenCRUDPermissions(rec.data.userid),
selModel: sm,
handler: (btn, e, rec) => run_editor(rec),
},
{
xtype: 'proxmoxStdRemoveButton',
selModel: sm,
- enableFn: (rec) => !!caps.access['User.Modify'],
+ enableFn: (rec) => hasTokenCRUDPermissions(rec.data.userid),
callback: reload,
getUrl: urlFromRecord,
},
@@ -32420,7 +32348,6 @@ Ext.define('PVE.dc.TokenView', {
let realm = Ext.String.htmlEncode(uid.substr(realmIndex));
return `${user} ${realm}`;
},
- hidden: !!me.fixedUser,
flex: 2,
},
{
@@ -32456,34 +32383,9 @@ Ext.define('PVE.dc.TokenView', {
},
});
- if (me.fixedUser) {
- reload();
- }
-
me.callParent();
},
});
-
-Ext.define('PVE.window.TokenView', {
- extend: 'Ext.window.Window',
- mixins: ['Proxmox.Mixin.CBind'],
-
- modal: true,
- subject: gettext('API Tokens'),
- scrollable: true,
- layout: 'fit',
- width: 800,
- height: 400,
- cbind: {
- title: gettext('API Tokens') + ' - {userid}',
- },
- items: [{
- xtype: 'pveTokenView',
- cbind: {
- fixedUser: '{userid}',
- },
- }],
-});
Ext.define('PVE.dc.UserEdit', {
extend: 'Proxmox.window.Edit',
alias: ['widget.pveDcUserEdit'],
@@ -32522,7 +32424,7 @@ Ext.define('PVE.dc.UserEdit', {
pwfield = Ext.createWidget('textfield', {
inputType: 'password',
fieldLabel: gettext('Password'),
- minLength: 5,
+ minLength: 8,
name: 'password',
disabled: true,
hidden: true,
@@ -32734,6 +32636,7 @@ Ext.define('PVE.dc.UserView', {
userid: rec.data.userid,
confirmCurrentPassword: Proxmox.UserName !== 'root@pam',
autoShow: true,
+ minLength: 8,
listeners: {
destroy: () => reload(),
},
@@ -34211,7 +34114,7 @@ Ext.define('PVE.lxc.CmdMenu', {
});
};
let confirmedVMCommand = (cmd, params) => {
- let msg = Proxmox.Utils.format_task_description(`vz${cmd}`, info.vmid);
+ let msg = PVE.Utils.formatGuestTaskConfirmation(`vz${cmd}`, info.vmid, info.name);
Ext.Msg.confirm(gettext('Confirm'), msg, btn => {
if (btn === 'yes') {
vm_command(cmd, params);
@@ -34297,7 +34200,7 @@ Ext.define('PVE.lxc.CmdMenu', {
text: gettext('Convert to template'),
iconCls: 'fa fa-fw fa-file-o',
handler: function() {
- let msg = Proxmox.Utils.format_task_description('vztemplate', info.vmid);
+ let msg = PVE.Utils.formatGuestTaskConfirmation('vztemplate', info.vmid, info.name);
Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) {
if (btn === 'yes') {
Proxmox.Utils.API2Request({
@@ -34382,7 +34285,7 @@ Ext.define('PVE.lxc.Config', {
text: gettext('Shutdown'),
disabled: !caps.vms['VM.PowerMgmt'] || !running,
hidden: template,
- confirmMsg: Proxmox.Utils.format_task_description('vzshutdown', vmid),
+ confirmMsg: PVE.Utils.formatGuestTaskConfirmation('vzshutdown', vmid, vm.name),
handler: function() {
vm_command('shutdown');
},
@@ -34390,7 +34293,7 @@ Ext.define('PVE.lxc.Config', {
items: [{
text: gettext('Reboot'),
disabled: !caps.vms['VM.PowerMgmt'],
- confirmMsg: Proxmox.Utils.format_task_description('vzreboot', vmid),
+ confirmMsg: PVE.Utils.formatGuestTaskConfirmation('vzreboot', vmid, vm.name),
tooltip: Ext.String.format(gettext('Reboot {0}'), 'CT'),
handler: function() {
vm_command("reboot");
@@ -34447,7 +34350,7 @@ Ext.define('PVE.lxc.Config', {
xtype: 'pveMenuItem',
iconCls: 'fa fa-fw fa-file-o',
hidden: !caps.vms['VM.Allocate'],
- confirmMsg: Proxmox.Utils.format_task_description('vztemplate', vmid),
+ confirmMsg: PVE.Utils.formatGuestTaskConfirmation('vztemplate', vmid, vm.name),
handler: function() {
Proxmox.Utils.API2Request({
url: base_url + '/template',
@@ -34639,6 +34542,7 @@ Ext.define('PVE.lxc.Config', {
base_url: base_url + '/firewall/rules',
list_refs_url: base_url + '/firewall/refs',
itemId: 'firewall',
+ firewall_type: 'vm',
},
{
xtype: 'pveFirewallOptions',
@@ -35009,7 +34913,7 @@ Ext.define('PVE.lxc.CreateWizard', {
},
columns: [
{ header: 'Key', width: 150, dataIndex: 'key' },
- { header: 'Value', flex: 1, dataIndex: 'value' },
+ { header: 'Value', flex: 1, dataIndex: 'value', renderer: Ext.htmlEncode },
],
},
],
@@ -35177,6 +35081,13 @@ Ext.define('PVE.lxc.DeviceInputPanel', {
return gettext("Access mode has to be an octal number");
},
},
+ {
+ xtype: 'checkbox',
+ name: 'deny-write',
+ fieldLabel: gettext('Read only'),
+ labelWidth: 120,
+ checked: false,
+ },
],
});
@@ -35227,6 +35138,7 @@ Ext.define('PVE.lxc.DeviceEdit', {
mode: data.mode,
uid: data.uid,
gid: data.gid,
+ 'deny-write': data['deny-write'],
};
ipanel.setValues(values);
@@ -35927,6 +35839,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
fieldLabel: gettext('Mount options'),
deleteEmpty: false,
comboItems: [
+ ['discard', 'discard'],
['lazytime', 'lazytime'],
['noatime', 'noatime'],
['nodev', 'nodev'],
@@ -36965,7 +36878,7 @@ Ext.define('PVE.lxc.CPUEdit', {
},
});
-// The view model of the parent shoul contain a 'cgroupMode' variable (or params for v2 are used).
+// The view model of the parent should contain a 'cgroupMode' variable (or params for v2 are used).
Ext.define('PVE.lxc.CPUInputPanel', {
extend: 'Proxmox.panel.InputPanel',
alias: 'widget.pveLxcCPUInputPanel',
@@ -37192,6 +37105,7 @@ Ext.define('PVE.lxc.RessourceView', {
editor: mpeditor,
iconCls: 'hdd-o',
group: 4,
+ renderer: Ext.htmlEncode,
},
cpulimit: {
visible: false,
@@ -37219,6 +37133,7 @@ Ext.define('PVE.lxc.RessourceView', {
tdCls: 'pve-itype-icon-storage',
editor: mpeditor,
header: header,
+ renderer: Ext.htmlEncode,
};
}, true);
@@ -37231,6 +37146,7 @@ Ext.define('PVE.lxc.RessourceView', {
tdCls: 'pve-itype-icon-pci',
editor: deveditor,
header: gettext('Device') + ' (' + confid + ')',
+ renderer: Ext.htmlEncode,
};
});
@@ -37761,6 +37677,7 @@ Ext.define('PVE.ceph.CephVersionSelector', {
data: [
{ release: "quincy", version: "17.2" },
{ release: "reef", version: "18.2" },
+ { release: "squid", version: "19.2" },
],
},
});
@@ -37857,12 +37774,13 @@ Ext.define('PVE.ceph.CephInstallWizard', {
viewModel: {
data: {
nodename: '',
- cephRelease: 'reef',
+ cephRelease: 'reef', // default
cephRepo: 'enterprise',
configuration: true,
isInstalled: false,
nodeHasSubscription: true, // avoid warning hint until fully loaded
allHaveSubscription: true, // avoid warning hint until fully loaded
+ selectedReleaseIsTechPreview: false, // avoid warning hint until fully loaded
},
formulas: {
repoHintHidden: get => get('allHaveSubscription') && get('cephRepo') === 'enterprise',
@@ -37879,7 +37797,7 @@ Ext.define('PVE.ceph.CephInstallWizard', {
return ''; // should be hidden
} else if (repo === 'no-subscription') {
return allSub
- ? gettext("Cluster has active subscriptions and would be elligible for using the enterprise repository.")
+ ? gettext("Cluster has active subscriptions and would be eligible for using the enterprise repository.")
: gettext("The no-subscription repository is not the best choice for production setups.");
} else {
return gettext('The test repository should only be used for test setups or after consulting the official Proxmox support!');
@@ -37959,6 +37877,17 @@ Ext.define('PVE.ceph.CephInstallWizard', {
hidden: '{repoHintHidden}',
},
},
+ {
+ xtype: 'displayfield',
+ fieldLabel: gettext('Note'),
+ labelClsExtra: 'pmx-hint',
+ submitValue: false,
+ labelWidth: 50,
+ value: gettext('The selected release is currently considered a Technology Preview. Although we are not aware of any major issues, there may be some bugs and the Enterprise Repository is not yet available.'),
+ bind: {
+ hidden: '{!selectedReleaseIsTechPreview}',
+ },
+ },
{
xtype: 'pveCephHighestVersionDisplay',
labelWidth: 150,
@@ -37991,15 +37920,28 @@ Ext.define('PVE.ceph.CephInstallWizard', {
},
listeners: {
change: function(field, release) {
+ let me = this;
let wizard = this.up('pveCephInstallWizard');
wizard.down('#next').setText(
Ext.String.format(gettext('Start {0} installation'), release),
);
+
+ let record = me.store.findRecord('release', release, 0, false, true, true);
+ let releaseIsTechPreview = !!record.data.preview;
+ wizard.getViewModel().set('selectedReleaseIsTechPreview', releaseIsTechPreview);
+
+ let repoSelector = wizard.down('#repoSelector');
+ if (releaseIsTechPreview) {
+ repoSelector.store.filterBy(entry => entry.get('key') !== 'enterprise');
+ } else {
+ repoSelector.store.clearFilter();
+ }
},
},
},
{
xtype: 'proxmoxKVComboBox',
+ id: 'repoSelector', // TODO: use name or reference (how to lookup that here?)
fieldLabel: gettext('Repository'),
padding: '0 0 0 10',
comboItems: [
@@ -40085,8 +40027,10 @@ Ext.define('PVE.CephPoolInputPanel', {
init: function(view) {
let vm = this.getViewModel();
- vm.set('size', Number(view.defaultSize));
- vm.set('minSize', Number(view.defaultMinSize));
+ if (view.isCreate) {
+ vm.set('size', Number(view.defaultSize));
+ vm.set('minSize', Number(view.defaultMinSize));
+ }
},
sizeChange: function(field, val) {
let vm = this.getViewModel();
@@ -40157,7 +40101,7 @@ Ext.define('PVE.CephPoolInputPanel', {
column2: [
{
xtype: 'proxmoxKVComboBox',
- fieldLabel: 'PG Autoscale Mode',
+ fieldLabel: gettext('PG Autoscaler Mode'),
name: 'pg_autoscale_mode',
comboItems: [
['warn', 'warn'],
@@ -40376,6 +40320,14 @@ Ext.define('PVE.node.Ceph.PoolList', {
dataIndex: 'type',
hidden: true,
},
+ {
+ text: gettext('Application'),
+ minWidth: 100,
+ flex: 1,
+ dataIndex: 'application_metadata',
+ hidden: true,
+ renderer: (v, _meta, _rec) => Object.keys(v).toString(),
+ },
{
text: gettext('Size') + '/min',
minWidth: 100,
@@ -40439,7 +40391,7 @@ Ext.define('PVE.node.Ceph.PoolList', {
},
},
{
- text: gettext('Autoscale Mode'),
+ text: gettext('Autoscaler Mode'),
flex: 1,
minWidth: 100,
align: 'right',
@@ -40601,21 +40553,22 @@ Ext.define('PVE.node.Ceph.PoolList', {
}, function() {
Ext.define('ceph-pool-list', {
extend: 'Ext.data.Model',
- fields: ['pool_name',
- { name: 'pool', type: 'integer' },
- { name: 'size', type: 'integer' },
- { name: 'min_size', type: 'integer' },
- { name: 'pg_num', type: 'integer' },
- { name: 'pg_num_min', type: 'integer' },
- { name: 'bytes_used', type: 'integer' },
- { name: 'percent_used', type: 'number' },
- { name: 'crush_rule', type: 'integer' },
- { name: 'crush_rule_name', type: 'string' },
- { name: 'pg_autoscale_mode', type: 'string' },
- { name: 'pg_num_final', type: 'integer' },
- { name: 'target_size_ratio', type: 'number' },
- { name: 'target_size', type: 'integer' },
- ],
+ fields: [
+ 'pool_name',
+ { name: 'pool', type: 'integer' },
+ { name: 'size', type: 'integer' },
+ { name: 'min_size', type: 'integer' },
+ { name: 'pg_num', type: 'integer' },
+ { name: 'pg_num_min', type: 'integer' },
+ { name: 'bytes_used', type: 'integer' },
+ { name: 'percent_used', type: 'number' },
+ { name: 'crush_rule', type: 'integer' },
+ { name: 'crush_rule_name', type: 'string' },
+ { name: 'pg_autoscale_mode', type: 'string' },
+ { name: 'pg_num_final', type: 'integer' },
+ { name: 'target_size_ratio', type: 'number' },
+ { name: 'target_size', type: 'integer' },
+ ],
idProperty: 'pool_name',
});
});
@@ -40681,18 +40634,17 @@ Ext.define('PVE.CephCreateService', {
me.nodename = node;
me.updateUrl();
},
- setExtraID: function(extraID) {
+ setServiceID: function(value) {
let me = this;
- me.extraID = me.type === 'mds' ? `-${extraID}` : '';
+ me.serviceID = value;
me.updateUrl();
},
updateUrl: function() {
let me = this;
-
- let extraID = me.extraID ?? '';
let node = me.nodename;
+ let serviceID = me.serviceID ?? me.nodename;
- me.url = `/nodes/${node}/ceph/${me.type}/${node}${extraID}`;
+ me.url = `/nodes/${node}/ceph/${me.type}/${serviceID}`;
},
defaults: {
@@ -40708,17 +40660,19 @@ Ext.define('PVE.CephCreateService', {
listeners: {
change: function(f, value) {
let view = this.up('pveCephCreateService');
+ view.lookup('mds-id').setValue(value);
view.setNode(value);
},
},
},
{
xtype: 'textfield',
- fieldLabel: gettext('Extra ID'),
- regex: /[a-zA-Z0-9]+/,
- regexText: gettext('ID may only consist of alphanumeric characters'),
+ reference: 'mds-id',
+ fieldLabel: gettext('MDS ID'),
+ regex: /^([a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?)$/,
+ regexText: gettext('ID may consist of alphanumeric characters and hyphen. It cannot start with a number or end in a hyphen.'),
submitValue: false,
- emptyText: Proxmox.Utils.NoneText,
+ allowBlank: false,
cbind: {
disabled: get => get('type') !== 'mds',
hidden: get => get('type') !== 'mds',
@@ -40726,7 +40680,7 @@ Ext.define('PVE.CephCreateService', {
listeners: {
change: function(f, value) {
let view = this.up('pveCephCreateService');
- view.setExtraID(value);
+ view.setServiceID(value);
},
},
},
@@ -40741,7 +40695,7 @@ Ext.define('PVE.CephCreateService', {
cbind: {
hidden: get => get('type') !== 'mds',
},
- html: gettext('The Extra ID allows creating multiple MDS per node, which increases redundancy with more than one CephFS.'),
+ html: gettext('By using different IDs, you can have multiple MDS per node, which increases redundancy with more than one CephFS.'),
},
],
@@ -41437,7 +41391,7 @@ Ext.define('PVE.ceph.ServiceList', {
});
me.ids.push(list[i].id);
} else {
- delete pendingRemoval[list[i].id]; // drop exisiting from for-removal
+ delete pendingRemoval[list[i].id]; // drop existing from for-removal
}
service.updateService(list[i].title, list[i].text, list[i].health);
}
@@ -42570,72 +42524,6 @@ Ext.define('PVE.node.ACMEAccountCreate', {
});
-Ext.define('PVE.node.ACMEAccountView', {
- extend: 'Proxmox.window.Edit',
-
- width: 600,
- fieldDefaults: {
- labelWidth: 140,
- },
-
- title: gettext('Account'),
-
- items: [
- {
- xtype: 'displayfield',
- fieldLabel: gettext('E-Mail'),
- name: 'email',
- },
- {
- xtype: 'displayfield',
- fieldLabel: gettext('Created'),
- name: 'createdAt',
- },
- {
- xtype: 'displayfield',
- fieldLabel: gettext('Status'),
- name: 'status',
- },
- {
- xtype: 'displayfield',
- fieldLabel: gettext('Directory'),
- renderer: PVE.Utils.render_optional_url,
- name: 'directory',
- },
- {
- xtype: 'displayfield',
- fieldLabel: gettext('Terms of Services'),
- renderer: PVE.Utils.render_optional_url,
- name: 'tos',
- },
- ],
-
- initComponent: function() {
- var me = this;
-
- if (!me.accountname) {
- throw "no account name defined";
- }
-
- me.url = '/cluster/acme/account/' + me.accountname;
-
- me.callParent();
-
- // hide OK/Reset button, because we just want to show data
- me.down('toolbar[dock=bottom]').setVisible(false);
-
- me.load({
- success: function(response) {
- var data = response.result.data;
- data.email = data.account.contact[0];
- data.createdAt = data.account.createdAt;
- data.status = data.account.status;
- me.setValues(data);
- },
- });
- },
-});
-
Ext.define('PVE.node.ACMEDomainEdit', {
extend: 'Proxmox.window.Edit',
alias: 'widget.pveACMEDomainEdit',
@@ -43497,7 +43385,7 @@ Ext.define('PVE.node.Certificates', {
dataIndex: 'subject',
},
{
- header: gettext('Public Key Alogrithm'),
+ header: gettext('Public Key Algorithm'),
flex: 1,
dataIndex: 'public-key-type',
hidden: true,
@@ -43945,6 +43833,9 @@ Ext.define('PVE.node.Config', {
showApplyBtn: true,
groups: ['services'],
nodename: nodename,
+ editOptions: {
+ enableBridgeVlanIds: true,
+ },
onlineHelp: 'sysadmin_network_configuration',
},
{
@@ -44044,6 +43935,7 @@ Ext.define('PVE.node.Config', {
base_url: '/nodes/' + nodename + '/firewall/rules',
list_refs_url: '/cluster/firewall/refs',
itemId: 'firewall',
+ firewall_type: 'node',
},
{
xtype: 'pveFirewallOptions',
@@ -45021,7 +44913,7 @@ Ext.define('PVE.node.StatusView', {
extend: 'Proxmox.panel.StatusView',
alias: 'widget.pveNodeStatus',
- height: 390,
+ height: 350,
bodyPadding: '15 5 15 5',
layout: {
@@ -45156,34 +45048,6 @@ Ext.define('PVE.node.StatusView', {
textField: 'pveversion',
value: '',
},
- {
- itemId: 'thermal',
- colspan: 2,
- printBar: false,
- title: gettext('Thermal'),
- textField: 'thermal',
- renderer: function (value) {
- value = JSON.parse(value);
- const cpu0 = value['coretemp-isa-0000']['Package id 0']['temp1_input'].toFixed(1);
- const board = value['acpitz-acpi-0']['temp1']['temp1_input'].toFixed(1);
- const nvme = value['nvme-pci-0c00']['Composite']['temp1_input'].toFixed(1);
- return `CPU: ${cpu0}\xb0C | Board: ${board}\xb0C | NVME: ${nvme}\xb0C`;
- },
- },
- {
- itemId: 'networksp',
- colspan: 2,
- printBar: false,
- title: gettext('Network Speed'),
- textField: 'networksp',
- renderer: function (sp) {
- if (!Array.isArray(sp)) {
- return '';
- }
- const sps = sp.map(function (s) { return String(s).match(/(?<=:\s+)(.+)/g)?.[0] });
- return sps.join(' | ');
- },
- },
],
updateTitle: function() {
@@ -45562,7 +45426,7 @@ Ext.define('PVE.node.Summary', {
layout: 'column',
minWidth: 700,
defaults: {
- minHeight: 390,
+ minHeight: 350,
padding: 5,
columnWidth: 1,
},
@@ -46236,11 +46100,13 @@ Ext.define('PVE.window.IPInfo', {
{
dataIndex: 'name',
text: gettext('Name'),
+ renderer: Ext.htmlEncode,
flex: 3,
},
{
dataIndex: 'hardware-address',
text: gettext('MAC address'),
+ renderer: Ext.htmlEncode,
width: 140,
},
{
@@ -46257,7 +46123,7 @@ Ext.define('PVE.window.IPInfo', {
var addr = ip['ip-address'];
var pref = ip.prefix;
if (addr && pref) {
- ips.push(addr + '/' + pref);
+ ips.push(Ext.htmlEncode(addr + '/' + pref));
}
});
return ips.join('
');
@@ -46331,7 +46197,7 @@ Ext.define('PVE.qemu.AgentIPView', {
var p = ip['ip-address'];
// show 2 ips at maximum
if (ips.length < 2) {
- ips.push(p);
+ ips.push(Ext.htmlEncode(p));
}
});
}
@@ -46377,7 +46243,8 @@ Ext.define('PVE.qemu.AgentIPView', {
text = ips.join('
');
}
} else if (me.nics && me.nics.error) {
- text = Ext.String.format(text, me.nics.error.desc);
+ let msg = gettext('Cannot get info from Guest Agent
Error: {0}');
+ text = Ext.String.format(msg, Ext.htmlEncode(me.nics.error.desc));
}
} else if (me.agent) {
text = gettext('Guest Agent not running');
@@ -47087,9 +46954,7 @@ Ext.define('PVE.qemu.CloudInit', {
waitMsgTarget: view,
method: 'PUT',
params: params,
- failure: function(response, opts) {
- Ext.Msg.alert('Error', response.htmlStatus);
- },
+ failure: response => Ext.Msg.alert('Error', response.htmlStatus),
callback: function() {
view.reload();
},
@@ -47117,38 +46982,14 @@ Ext.define('PVE.qemu.CloudInit', {
text: gettext('Regenerate Image'),
handler: function() {
let view = this.up('grid');
- var eject_params = {};
- var insert_params = {};
- let disk = PVE.Parser.parseQemuDrive(view.ciDriveId, view.ciDrive);
- var storage = '';
- var stormatch = disk.file.match(/^([^:]+):/);
- if (stormatch) {
- storage = stormatch[1];
- }
- eject_params[view.ciDriveId] = 'none,media=cdrom';
- insert_params[view.ciDriveId] = storage + ':cloudinit';
-
- var failure = function(response, opts) {
- Ext.Msg.alert('Error', response.htmlStatus);
- };
Proxmox.Utils.API2Request({
- url: view.baseurl + '/config',
+ url: view.baseurl + '/cloudinit',
waitMsgTarget: view,
method: 'PUT',
- params: eject_params,
- failure: failure,
+ failure: response => Ext.Msg.alert('Error', response.htmlStatus),
callback: function() {
- Proxmox.Utils.API2Request({
- url: view.baseurl + '/config',
- waitMsgTarget: view,
- method: 'PUT',
- params: insert_params,
- failure: failure,
- callback: function() {
- view.reload();
- },
- });
+ view.reload();
},
});
},
@@ -47177,7 +47018,10 @@ Ext.define('PVE.qemu.CloudInit', {
}
});
- me.down('#savebtn').setDisabled(!found);
+ let caps = Ext.state.Manager.get('GuiCap');
+ let canRegenerateImage = !!caps.vms['VM.Config.Cloudinit'];
+ me.down('#savebtn').setDisabled(!found || !canRegenerateImage);
+
me.setDisabled(!found);
if (!found) {
me.getView().mask(gettext('No CloudInit Drive found'), ['pve-static-mask']);
@@ -47399,7 +47243,7 @@ Ext.define('PVE.qemu.CmdMenu', {
};
let confirmedVMCommand = (cmd, params, confirmTask) => {
let task = confirmTask || `qm${cmd}`;
- let msg = Proxmox.Utils.format_task_description(task, info.vmid);
+ let msg = PVE.Utils.formatGuestTaskConfirmation(task, info.vmid, info.name);
Ext.Msg.confirm(gettext('Confirm'), msg, btn => {
if (btn === 'yes') {
vm_command(cmd, params);
@@ -47512,7 +47356,7 @@ Ext.define('PVE.qemu.CmdMenu', {
iconCls: 'fa fa-fw fa-file-o',
hidden: !caps.vms['VM.Allocate'],
handler: function() {
- let msg = Proxmox.Utils.format_task_description('qmtemplate', info.vmid);
+ let msg = PVE.Utils.formatGuestTaskConfirmation('qmtemplate', info.vmid, info.name);
Ext.Msg.confirm(gettext('Confirm'), msg, btn => {
if (btn === 'yes') {
Proxmox.Utils.API2Request({
@@ -47651,7 +47495,7 @@ Ext.define('PVE.qemu.Config', {
xtype: 'pveMenuItem',
iconCls: 'fa fa-fw fa-file-o',
hidden: !caps.vms['VM.Allocate'],
- confirmMsg: Proxmox.Utils.format_task_description('qmtemplate', vmid),
+ confirmMsg: PVE.Utils.formatGuestTaskConfirmation('qmtemplate', vmid, vm.name),
handler: function() {
Proxmox.Utils.API2Request({
url: base_url + '/template',
@@ -47696,7 +47540,7 @@ Ext.define('PVE.qemu.Config', {
text: gettext('Shutdown'),
disabled: !caps.vms['VM.PowerMgmt'] || !running,
hidden: template,
- confirmMsg: Proxmox.Utils.format_task_description('qmshutdown', vmid),
+ confirmMsg: PVE.Utils.formatGuestTaskConfirmation('qmshutdown', vmid, vm.name),
handler: function() {
vm_command('shutdown');
},
@@ -47705,7 +47549,7 @@ Ext.define('PVE.qemu.Config', {
text: gettext('Reboot'),
disabled: !caps.vms['VM.PowerMgmt'],
tooltip: Ext.String.format(gettext('Shutdown, apply pending changes and reboot {0}'), 'VM'),
- confirmMsg: Proxmox.Utils.format_task_description('qmreboot', vmid),
+ confirmMsg: PVE.Utils.formatGuestTaskConfirmation('qmreboot', vmid, vm.name),
handler: function() {
vm_command("reboot");
},
@@ -47713,7 +47557,7 @@ Ext.define('PVE.qemu.Config', {
}, {
text: gettext('Pause'),
disabled: !caps.vms['VM.PowerMgmt'],
- confirmMsg: Proxmox.Utils.format_task_description('qmpause', vmid),
+ confirmMsg: PVE.Utils.formatGuestTaskConfirmation('qmpause', vmid, vm.name),
handler: function() {
vm_command("suspend");
},
@@ -47721,7 +47565,7 @@ Ext.define('PVE.qemu.Config', {
}, {
text: gettext('Hibernate'),
disabled: !caps.vms['VM.PowerMgmt'],
- confirmMsg: Proxmox.Utils.format_task_description('qmsuspend', vmid),
+ confirmMsg: PVE.Utils.formatGuestTaskConfirmation('qmsuspend', vmid, vm.name),
tooltip: gettext('Suspend to disk'),
handler: function() {
vm_command("suspend", { todisk: 1 });
@@ -47743,7 +47587,7 @@ Ext.define('PVE.qemu.Config', {
text: gettext('Reset'),
disabled: !caps.vms['VM.PowerMgmt'],
tooltip: Ext.String.format(gettext('Reset {0} immediately'), 'VM'),
- confirmMsg: Proxmox.Utils.format_task_description('qmreset', vmid),
+ confirmMsg: PVE.Utils.formatGuestTaskConfirmation('qmreset', vmid, vm.name),
handler: function() {
vm_command("reset");
},
@@ -47905,6 +47749,7 @@ Ext.define('PVE.qemu.Config', {
base_url: base_url + '/firewall/rules',
list_refs_url: base_url + '/firewall/refs',
itemId: 'firewall',
+ firewall_type: 'vm',
},
{
xtype: 'pveFirewallOptions',
@@ -48289,7 +48134,7 @@ Ext.define('PVE.qemu.CreateWizard', {
},
columns: [
{ header: 'Key', width: 150, dataIndex: 'key' },
- { header: 'Value', flex: 1, dataIndex: 'value' },
+ { header: 'Value', flex: 1, dataIndex: 'value', renderer: Ext.htmlEncode },
],
},
],
@@ -48457,8 +48302,17 @@ Ext.define('PVE.qemu.DisplayInputPanel', {
xtype: 'displayfield',
name: 'vncHint',
userCls: 'pmx-hint',
- value: gettext('You cannot use the default SPICE clipboard if the VNC Clipboard is selected.') + ' ' +
- gettext('VNC Clipboard requires spice-tools installed in the Guest-VM.'),
+ value: gettext('You cannot use the default SPICE clipboard if the VNC clipboard is selected.') + ' ' +
+ gettext('VNC clipboard requires spice-tools installed in the Guest-VM.'),
+ bind: {
+ hidden: '{hideVNCHint}',
+ },
+ },
+ {
+ xtype: 'displayfield',
+ name: 'vncMigration',
+ userCls: 'pmx-hint',
+ value: gettext('You cannot live-migrate while using the VNC clipboard.'),
bind: {
hidden: '{hideVNCHint}',
},
@@ -48468,7 +48322,7 @@ Ext.define('PVE.qemu.DisplayInputPanel', {
name: 'defaultHint',
userCls: 'pmx-hint',
value: gettext('This option depends on your display type.') + ' ' +
- gettext('If the display type uses SPICE you are able to use the default SPICE Clipboard.'),
+ gettext('If the display type uses SPICE you are able to use the default SPICE clipboard.'),
bind: {
hidden: '{hideDefaultHint}',
},
@@ -49539,7 +49393,7 @@ Ext.define('PVE.qemu.HardwareView', {
tdCls: 'pve-itype-icon-cpu',
group: 3,
defaultValue: '1',
- multiKey: ['sockets', 'cpu', 'cores', 'numa', 'vcpus', 'cpulimit', 'cpuunits'],
+ multiKey: ['sockets', 'cpu', 'cores', 'numa', 'vcpus', 'cpulimit', 'cpuunits', 'affinity'],
renderer: function(value, metaData, record, rowIndex, colIndex, store, pending) {
var sockets = me.getObjectValue('sockets', 1, pending);
var model = me.getObjectValue('cpu', undefined, pending);
@@ -49548,6 +49402,7 @@ Ext.define('PVE.qemu.HardwareView', {
var vcpus = me.getObjectValue('vcpus', undefined, pending);
var cpulimit = me.getObjectValue('cpulimit', undefined, pending);
var cpuunits = me.getObjectValue('cpuunits', undefined, pending);
+ var cpuaffinity = me.getObjectValue('affinity', undefined, pending);
let res = Ext.String.format(
'{0} ({1} sockets, {2} cores)', sockets * cores, sockets, cores);
@@ -49567,6 +49422,9 @@ Ext.define('PVE.qemu.HardwareView', {
if (cpuunits) {
res += ' [cpuunits=' + cpuunits +']';
}
+ if (cpuaffinity) {
+ res += ' [cpuaffinity=' + cpuaffinity + ']';
+ }
return res;
},
@@ -49650,6 +49508,9 @@ Ext.define('PVE.qemu.HardwareView', {
ostype: {
visible: false,
},
+ affinity: {
+ visible: false,
+ },
};
PVE.Utils.forEachBus(undefined, function(type, id) {
@@ -49662,6 +49523,7 @@ Ext.define('PVE.qemu.HardwareView', {
header: gettext('Hard Disk') + ' (' + confid +')',
cdheader: gettext('CD/DVD Drive') + ' (' + confid +')',
cloudheader: gettext('CloudInit Drive') + ' (' + confid + ')',
+ renderer: Ext.htmlEncode,
};
});
for (let i = 0; i < PVE.Utils.hardware_counts.net; i++) {
@@ -49681,6 +49543,7 @@ Ext.define('PVE.qemu.HardwareView', {
editor: null,
never_delete: !caps.vms['VM.Config.Disk'],
header: gettext('EFI Disk'),
+ renderer: Ext.htmlEncode,
};
rows.tpmstate0 = {
group: 22,
@@ -49688,6 +49551,7 @@ Ext.define('PVE.qemu.HardwareView', {
editor: null,
never_delete: !caps.vms['VM.Config.Disk'],
header: gettext('TPM State'),
+ renderer: Ext.htmlEncode,
};
for (let i = 0; i < PVE.Utils.hardware_counts.usb; i++) {
let confid = "usb" + i.toString();
@@ -49922,17 +49786,19 @@ Ext.define('PVE.qemu.HardwareView', {
return msg;
},
handler: function(btn, e, rec) {
+ let params = { 'delete': rec.data.key };
+ if (btn.RESTMethod === 'POST') {
+ params.background_delay = 5;
+ }
Proxmox.Utils.API2Request({
url: '/api2/extjs/' + baseurl,
waitMsgTarget: me,
method: btn.RESTMethod,
- params: {
- 'delete': rec.data.key,
- },
+ params: params,
callback: () => me.reload(),
failure: response => Ext.Msg.alert('Error', response.htmlStatus),
success: function(response, options) {
- if (btn.RESTMethod === 'POST') {
+ if (btn.RESTMethod === 'POST' && response.result.data !== null) {
Ext.create('Proxmox.window.TaskProgress', {
autoShow: true,
upid: response.result.data,
@@ -50027,7 +49893,7 @@ Ext.define('PVE.qemu.HardwareView', {
me.down('#addNet').setDisabled(noVMConfigNetPerm || isAtLimit('net'));
me.down('#addRng').setDisabled(noSysConsolePerm || isAtLimit('rng'));
efidisk_menuitem.setDisabled(noVMConfigDiskPerm || isAtLimit('efidisk'));
- me.down('#addTpmState').setDisabled(noSysConsolePerm || isAtLimit('tpmstate'));
+ me.down('#addTpmState').setDisabled(noVMConfigDiskPerm || isAtLimit('tpmstate'));
me.down('#addCloudinitDrive').setDisabled(noVMConfigCDROMPerm || noVMConfigCloudinitPerm || hasCloudInit);
if (!rec) {
@@ -50042,6 +49908,7 @@ Ext.define('PVE.qemu.HardwareView', {
const deleted = !!rec.data.delete;
const pending = deleted || me.hasPendingChanges(key);
+ const isRunning = me.pveSelNode.data.running;
const isCloudInit = isCloudInitKey(value);
const isCDRom = value && !!value.toString().match(/media=cdrom/);
@@ -50050,7 +49917,7 @@ Ext.define('PVE.qemu.HardwareView', {
const isUsedDisk = !isUnusedDisk && row.isOnStorageBus && !isCDRom;
const isDisk = isUnusedDisk || isUsedDisk;
const isEfi = key === 'efidisk0';
- const tpmMoveable = key === 'tpmstate0' && !me.pveSelNode.data.running;
+ const tpmMoveable = key === 'tpmstate0' && !isRunning;
let cannotDelete = deleted || row.never_delete;
cannotDelete ||= isCDRom && !cdromCap;
@@ -50059,7 +49926,7 @@ Ext.define('PVE.qemu.HardwareView', {
remove_btn.setDisabled(cannotDelete);
remove_btn.setText(isUsedDisk && !isCloudInit ? remove_btn.altText : remove_btn.defaultText);
- remove_btn.RESTMethod = isUnusedDisk ? 'POST':'PUT';
+ remove_btn.RESTMethod = isUnusedDisk || (isDisk && isRunning) ? 'POST' : 'PUT';
edit_btn.setDisabled(
deleted || !row.editor || isCloudInit || (isCDRom && !cdromCap) || (isDisk && !diskCap));
@@ -51420,7 +51287,7 @@ Ext.define('PVE.qemu.OSDefaults', {
networkCard: 'virtio',
});
- // recommandation from http://wiki.qemu.org/Windows2000
+ // recommendation from http://wiki.qemu.org/Windows2000
addOS({
pveOS: 'w2k',
parent: 'generic',
@@ -51983,6 +51850,17 @@ Ext.define('PVE.qemu.Options', {
},
} : undefined,
},
+ 'amd-sev': {
+ header: gettext('AMD SEV'),
+ editor: caps.vms['VM.Config.HWType'] ? 'PVE.qemu.SevEdit' : undefined,
+ defaultValue: Proxmox.Utils.defaultText + ' (' + Proxmox.Utils.disabledText + ')',
+ renderer: function(value, metaData, record, ri, ci, store, pending) {
+ let amd_sev = PVE.Parser.parsePropertyString(value, "type");
+ if (amd_sev.type === 'std') return 'AMD SEV (' + value + ')';
+ if (amd_sev.type === 'es') return 'AMD SEV-ES (' + value + ')';
+ return value;
+ },
+ },
hookscript: {
header: gettext('Hookscript'),
},
@@ -52111,21 +51989,11 @@ Ext.define('PVE.qemu.PCIInputPanel', {
let path = value;
if (pciDev.data.map) {
- // find local mapping
- for (const entry of pciDev.data.map) {
- let mapping = PVE.Parser.parsePropertyString(entry);
- if (mapping.node === pcisel.up('inputpanel').nodename) {
- path = mapping.path.split(';')[0];
- break;
- }
- }
- if (path.indexOf('.') === -1) {
- path += '.0';
- }
+ path = pciDev.data.id;
}
if (pciDev.data.mdev) {
- mdevfield.setPciID(path);
+ mdevfield.setPciIdOrMapping(path);
}
if (pcisel.reference === 'selector') {
let iommu = pciDev.data.iommugroup;
@@ -52224,7 +52092,7 @@ Ext.define('PVE.qemu.PCIInputPanel', {
columnWidth: 1,
padding: '0 0 10 0',
itemId: 'iommuwarning',
- value: 'The selected Device is not in a seperate IOMMU group, make sure this is intended.',
+ value: 'The selected Device is not in a separate IOMMU group, make sure this is intended.',
userCls: 'pmx-hint',
},
];
@@ -52419,7 +52287,7 @@ Ext.define('PVE.qemu.PCIEdit', {
});
},
});
-// The view model of the parent shoul contain a 'cgroupMode' variable (or params for v2 are used).
+// The view model of the parent should contain a 'cgroupMode' variable (or params for v2 are used).
Ext.define('PVE.qemu.ProcessorInputPanel', {
extend: 'Proxmox.panel.InputPanel',
alias: 'widget.pveQemuProcessorPanel',
@@ -53070,6 +52938,128 @@ Ext.define('PVE.qemu.SerialEdit', {
});
},
});
+Ext.define('PVE.qemu.SevInputPanel', {
+ extend: 'Proxmox.panel.InputPanel',
+ xtype: 'pveSevInputPanel',
+
+ onlineHelp: 'qm_memory', // TODO: change to 'qm_memory_encryption' one available
+
+ viewModel: {
+ data: {
+ type: '__default__',
+ },
+ formulas: {
+ sevEnabled: get => get('type') !== '__default__',
+ },
+ },
+
+ onGetValues: function(values) {
+ if (values.delete === 'type') {
+ values.delete = 'amd-sev';
+ return values;
+ }
+ if (!values.debug) {
+ values["no-debug"] = 1;
+ }
+ if (!values["key-sharing"]) {
+ values["no-key-sharing"] = 1;
+ }
+ delete values.debug;
+ delete values["key-sharing"];
+ let ret = {};
+ ret['amd-sev'] = PVE.Parser.printPropertyString(values, 'type');
+ return ret;
+ },
+
+
+ setValues: function(values) {
+ if (PVE.Parser.parseBoolean(values["no-debug"])) {
+ values.debug = 0;
+ }
+ if (PVE.Parser.parseBoolean(values["no-key-sharing"])) {
+ values["key-sharing"] = 0;
+ }
+ this.callParent(arguments);
+ },
+
+ items: {
+ xtype: 'proxmoxKVComboBox',
+ fieldLabel: gettext('AMD SEV Type'),
+ labelWidth: 150,
+ name: 'type',
+ value: '__default__',
+ comboItems: [
+ ['__default__', Proxmox.Utils.defaultText + ' (' + Proxmox.Utils.disabledText + ')'],
+ ['std', 'AMD SEV'],
+ ['es', 'AMD SEV-ES (highly experimental)'],
+ ],
+ bind: {
+ value: '{type}',
+ },
+ },
+
+ advancedItems: [
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Allow Debugging'),
+ labelWidth: 150,
+ name: 'debug',
+ value: 1,
+ bind: {
+ hidden: '{!sevEnabled}',
+ disabled: '{!sevEnabled}',
+ },
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Allow Key-Sharing'),
+ labelWidth: 150,
+ name: 'key-sharing',
+ value: 1,
+ bind: {
+ hidden: '{!sevEnabled}',
+ disabled: '{!sevEnabled}',
+ },
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Enable Kernel Hashes'),
+ labelWidth: 150,
+ name: 'kernel-hashes',
+ deleteDefaultValue: false,
+ bind: {
+ hidden: '{!sevEnabled}',
+ disabled: '{!sevEnabled}',
+ },
+ },
+ ],
+});
+
+Ext.define('PVE.qemu.SevEdit', {
+ extend: 'Proxmox.window.Edit',
+
+ subject: 'AMD Secure Encrypted Virtualization (SEV)',
+
+ items: {
+ xtype: 'pveSevInputPanel',
+ },
+
+ width: 400,
+
+ initComponent: function() {
+ let me = this;
+
+ me.callParent();
+
+ me.load({
+ success: function(response) {
+ let conf = response.result.data;
+ let amd_sev = conf['amd-sev'] || '__default__';
+ me.setValues(PVE.Parser.parsePropertyString(amd_sev, 'type'));
+ },
+ });
+ },
+});
Ext.define('PVE.qemu.Smbios1InputPanel', {
extend: 'Proxmox.panel.InputPanel',
alias: 'widget.PVE.qemu.Smbios1InputPanel',
@@ -53864,12 +53854,20 @@ Ext.define('PVE.sdn.StatusView', {
{
text: gettext('Apply'),
handler: function() {
- Proxmox.Utils.API2Request({
- url: '/cluster/sdn/',
- method: 'PUT',
- waitMsgTarget: me,
- failure: function(response, opts) {
- Ext.Msg.alert(gettext('Error'), response.htmlStatus);
+ Ext.Msg.show({
+ title: gettext('Confirm'),
+ icon: Ext.Msg.QUESTION,
+ msg: gettext('Applying pending SDN changes will also apply any pending local node network changes. Proceed?'),
+ buttons: Ext.Msg.YESNO,
+ callback: function(btn) {
+ if (btn === 'yes') {
+ Proxmox.Utils.API2Request({
+ url: '/cluster/sdn/',
+ method: 'PUT',
+ waitMsgTarget: me,
+ failure: response => Ext.Msg.alert(gettext('Error'), response.htmlStatus),
+ });
+ }
},
});
},
@@ -53926,6 +53924,13 @@ Ext.define('PVE.sdn.VnetInputPanel', {
return values;
},
+ initComponent: function() {
+ let me = this;
+
+ me.callParent();
+ me.setZoneType(undefined);
+ },
+
items: [
{
xtype: 'pmxDisplayEditField',
@@ -53954,9 +53959,21 @@ Ext.define('PVE.sdn.VnetInputPanel', {
name: 'zone',
value: '',
allowBlank: false,
+ listeners: {
+ change: function() {
+ let me = this;
+
+ let record = me.findRecordByValue(me.value);
+ let zoneType = record?.data?.type;
+
+ let panel = me.up('panel');
+ panel.setZoneType(zoneType);
+ },
+ },
},
{
xtype: 'proxmoxintegerfield',
+ itemId: 'sdnVnetTagField',
name: 'tag',
minValue: 1,
maxValue: 16777216,
@@ -53966,8 +53983,21 @@ Ext.define('PVE.sdn.VnetInputPanel', {
deleteEmpty: "{!isCreate}",
},
},
+ ],
+ advancedItems: [
{
xtype: 'proxmoxcheckbox',
+ name: 'isolate-ports',
+ uncheckedValue: null,
+ checked: false,
+ fieldLabel: gettext('Isolate Ports'),
+ cbind: {
+ deleteEmpty: "{!isCreate}",
+ },
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ itemId: 'sdnVnetVlanAwareField',
name: 'vlanaware',
uncheckedValue: null,
checked: false,
@@ -53977,6 +54007,26 @@ Ext.define('PVE.sdn.VnetInputPanel', {
},
},
],
+
+ setZoneType: function(zoneType) {
+ let me = this;
+
+ let tagField = me.down('#sdnVnetTagField');
+ if (!zoneType || zoneType === 'simple') {
+ tagField.setVisible(false);
+ tagField.setValue('');
+ } else {
+ tagField.setVisible(true);
+ }
+
+ let vlanField = me.down('#sdnVnetVlanAwareField');
+ if (!zoneType || zoneType === 'evpn') {
+ vlanField.setVisible(false);
+ vlanField.setValue('');
+ } else {
+ vlanField.setVisible(true);
+ }
+ },
});
Ext.define('PVE.sdn.VnetEdit', {
@@ -54028,6 +54078,7 @@ Ext.define('PVE.sdn.VnetView', {
alias: 'widget.pveSDNVnetView',
onlineHelp: 'pvesdn_config_vnet',
+ emptyText: gettext('No VNet configured.'),
stateful: true,
stateId: 'grid-sdn-vnet',
@@ -55143,11 +55194,144 @@ Ext.define('PVE.sdn.ZoneContentPanel', {
me.callParent();
},
});
+Ext.define('PVE.sdn.FirewallPanel', {
+ extend: 'Ext.panel.Panel',
+ alias: 'widget.pveSDNFirewall',
+
+ title: 'VNet',
+
+ onlineHelp: 'pvesdn_firewall_integration',
+
+ initComponent: function() {
+ let me = this;
+
+ let tabPanel = Ext.create('Ext.TabPanel', {
+ fullscreen: true,
+ region: 'center',
+ border: false,
+ split: true,
+ disabled: true,
+ flex: 2,
+ items: [
+ {
+ xtype: 'pveFirewallRules',
+ title: gettext('Rules'),
+ list_refs_url: '/cluster/firewall/refs',
+ firewall_type: 'vnet',
+ },
+ {
+ xtype: 'pveFirewallOptions',
+ title: gettext('Options'),
+ fwtype: 'vnet',
+ },
+ ],
+ });
+
+ let vnetPanel = Ext.createWidget('pveSDNFirewallVnetView', {
+ title: 'VNets',
+ region: 'west',
+ border: false,
+ split: true,
+ forceFit: true,
+ flex: 1,
+ tabPanel,
+ });
+
+ Ext.apply(me, {
+ layout: 'border',
+ items: [vnetPanel, tabPanel],
+ });
+
+ me.callParent();
+ },
+});
+Ext.define('PVE.sdn.FirewallVnetView', {
+ extend: 'Ext.grid.GridPanel',
+ alias: 'widget.pveSDNFirewallVnetView',
+
+ stateful: true,
+ stateId: 'grid-sdn-vnet-firewall',
+
+ tabPanel: undefined,
+
+ emptyText: gettext('No VNet configured.'),
+
+ getRulesPanel: function() {
+ let me = this;
+ return me.tabPanel.items.getAt(0);
+ },
+
+ getOptionsPanel: function() {
+ let me = this;
+ return me.tabPanel.items.getAt(1);
+ },
+
+ initComponent: function() {
+ let me = this;
+
+ let store = new Ext.data.Store({
+ model: 'pve-sdn-vnet',
+ proxy: {
+ type: 'proxmox',
+ url: "/api2/json/cluster/sdn/vnets",
+ },
+ sorters: {
+ property: ['zone', 'vnet'],
+ direction: 'ASC',
+ },
+ });
+
+ let reload = () => store.load();
+
+ let sm = Ext.create('Ext.selection.RowModel', {});
+
+ Ext.apply(me, {
+ store: store,
+ reloadStore: reload,
+ selModel: sm,
+ viewConfig: {
+ trackOver: false,
+ },
+ columns: [
+ {
+ header: 'ID',
+ flex: 1,
+ dataIndex: 'vnet',
+ },
+ {
+ header: gettext('Zone'),
+ flex: 1,
+ dataIndex: 'zone',
+ renderer: Ext.htmlEncode,
+ },
+ {
+ header: gettext('Alias'),
+ flex: 1,
+ dataIndex: 'alias',
+ renderer: Ext.htmlEncode,
+ },
+ ],
+ listeners: {
+ activate: reload,
+ show: reload,
+ select: function(_sm, rec) {
+ me.tabPanel.setDisabled(false);
+
+ me.getRulesPanel().setBaseUrl(`/cluster/sdn/vnets/${rec.id}/firewall/rules`);
+ me.getOptionsPanel().setBaseUrl(`/cluster/sdn/vnets/${rec.id}/firewall/options`);
+ },
+ },
+ });
+ store.load();
+ me.callParent();
+ },
+});
Ext.define('PVE.sdn.ZoneView', {
extend: 'Ext.grid.GridPanel',
alias: ['widget.pveSDNZoneView'],
onlineHelp: 'pvesdn_config_zone',
+ emptyText: gettext('No zone configured.'),
stateful: true,
stateId: 'grid-sdn-zone',
@@ -55803,6 +55987,7 @@ Ext.define('PVE.sdn.IpamView', {
header: 'ID',
flex: 2,
dataIndex: 'ipam',
+ renderer: Ext.htmlEncode,
},
{
header: gettext('Type'),
@@ -55814,6 +55999,7 @@ Ext.define('PVE.sdn.IpamView', {
header: 'url',
flex: 1,
dataIndex: 'url',
+ renderer: Ext.htmlEncode,
},
],
listeners: {
@@ -55919,7 +56105,7 @@ Ext.define('PVE.sdn.ipams.NetboxInputPanel', {
initComponent: function() {
var me = this;
- me.items = [
+ me.column1 = [
{
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'ipam',
@@ -55928,17 +56114,29 @@ Ext.define('PVE.sdn.ipams.NetboxInputPanel', {
fieldLabel: 'ID',
allowBlank: false,
},
+ {
+ xtype: 'textfield',
+ name: 'token',
+ fieldLabel: gettext('Token'),
+ allowBlank: false,
+ },
+ ];
+
+ me.column2 = [
{
xtype: 'textfield',
name: 'url',
fieldLabel: gettext('URL'),
allowBlank: false,
},
+ ];
+
+ me.columnB = [
{
- xtype: 'textfield',
- name: 'token',
- fieldLabel: gettext('Token'),
- allowBlank: false,
+ xtype: 'pmxFingerprintField',
+ name: 'fingerprint',
+ value: me.isCreate ? null : undefined,
+ deleteEmpty: !me.isCreate,
},
];
@@ -55999,7 +56197,7 @@ Ext.define('PVE.sdn.ipams.PhpIpamInputPanel', {
initComponent: function() {
var me = this;
- me.items = [
+ me.column1 = [
{
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'ipam',
@@ -56008,18 +56206,20 @@ Ext.define('PVE.sdn.ipams.PhpIpamInputPanel', {
fieldLabel: 'ID',
allowBlank: false,
},
- {
- xtype: 'textfield',
- name: 'url',
- fieldLabel: gettext('URL'),
- allowBlank: false,
- },
{
xtype: 'textfield',
name: 'token',
fieldLabel: gettext('Token'),
allowBlank: false,
},
+ ];
+ me.column2 = [
+ {
+ xtype: 'textfield',
+ name: 'url',
+ fieldLabel: gettext('URL'),
+ allowBlank: false,
+ },
{
xtype: 'textfield',
name: 'section',
@@ -56028,6 +56228,15 @@ Ext.define('PVE.sdn.ipams.PhpIpamInputPanel', {
},
];
+ me.columnB = [
+ {
+ xtype: 'pmxFingerprintField',
+ name: 'fingerprint',
+ value: me.isCreate ? null : undefined,
+ deleteEmpty: !me.isCreate,
+ },
+ ];
+
me.callParent();
},
});
@@ -56134,6 +56343,7 @@ Ext.define('PVE.sdn.DnsView', {
header: 'ID',
flex: 2,
dataIndex: 'dns',
+ renderer: Ext.htmlEncode,
},
{
header: gettext('Type'),
@@ -56145,6 +56355,7 @@ Ext.define('PVE.sdn.DnsView', {
header: 'url',
flex: 1,
dataIndex: 'url',
+ renderer: Ext.htmlEncode,
},
],
listeners: {
@@ -56250,7 +56461,7 @@ Ext.define('PVE.sdn.dns.PowerdnsInputPanel', {
initComponent: function() {
var me = this;
- me.items = [
+ me.column1 = [
{
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'dns',
@@ -56259,18 +56470,20 @@ Ext.define('PVE.sdn.dns.PowerdnsInputPanel', {
fieldLabel: 'ID',
allowBlank: false,
},
- {
- xtype: 'textfield',
- name: 'url',
- fieldLabel: 'URL',
- allowBlank: false,
- },
{
xtype: 'textfield',
name: 'key',
fieldLabel: gettext('API Key'),
allowBlank: false,
},
+ ];
+ me.column2 = [
+ {
+ xtype: 'textfield',
+ name: 'url',
+ fieldLabel: 'URL',
+ allowBlank: false,
+ },
{
xtype: 'proxmoxintegerfield',
name: 'ttl',
@@ -56278,6 +56491,14 @@ Ext.define('PVE.sdn.dns.PowerdnsInputPanel', {
allowBlank: true,
},
];
+ me.columnB = [
+ {
+ xtype: 'pmxFingerprintField',
+ name: 'fingerprint',
+ value: me.isCreate ? null : undefined,
+ deleteEmpty: !me.isCreate,
+ },
+ ];
me.callParent();
},
@@ -56725,10 +56946,10 @@ Ext.define('PVE.storage.ContentView', {
content: content,
},
},
- sorters: {
- property: 'volid',
- direction: 'ASC',
- },
+ sorters: [
+ (a, b) => a.data.text.toString().localeCompare(
+ b.data.text.toString(), undefined, { numeric: true }),
+ ],
});
if (!me.sm) {
@@ -56835,6 +57056,8 @@ Ext.define('PVE.storage.ContentView', {
flex: 2,
sortable: true,
renderer: PVE.Utils.render_storage_content,
+ sorter: (a, b) => a.data.text.toString().localeCompare(
+ b.data.text.toString(), undefined, { numeric: true }),
dataIndex: 'text',
},
'notes': {
@@ -56944,6 +57167,8 @@ Ext.define('PVE.storage.ContentView', {
Ext.define('PVE.storage.BackupView', {
extend: 'PVE.storage.ContentView',
+ onlineHelp: 'chapter_vzdump',
+
alias: 'widget.pveStorageBackupView',
showColumns: ['name', 'notes', 'protected', 'date', 'format', 'size'],
@@ -57391,7 +57616,9 @@ Ext.define('PVE.storage.Browser', {
let res = storageInfo.data;
let plugin = res.plugintype;
- me.items = plugin !== 'esxi' ? [
+ let isEsxi = plugin === 'esxi';
+
+ me.items = !isEsxi ? [
{
title: gettext('Summary'),
xtype: 'pveStorageSummary',
@@ -57485,6 +57712,7 @@ Ext.define('PVE.storage.Browser', {
});
}
if (contents.includes('import')) {
+ let isImportable = format => ['ova', 'ovf', 'vmx'].indexOf(format) !== -1;
let createGuestImportWindow = (selection) => {
if (!selection) {
return;
@@ -57501,19 +57729,29 @@ Ext.define('PVE.storage.Browser', {
};
me.items.push({
xtype: 'pveStorageContentView',
- title: gettext('Virtual Guests'),
- iconCls: 'fa fa-desktop',
+ // each gettext needs to be in a separate line
+ title: isEsxi ? gettext('Virtual Guests')
+ : gettext('Import'),
+ iconCls: isEsxi ? 'fa fa-desktop' : 'fa fa-cloud-download',
itemId: 'contentImport',
content: 'import',
- useCustomRemoveButton: true, // hide default remove button
- showColumns: ['name', 'format'],
- itemdblclick: (view, record) => createGuestImportWindow(record),
+ useCustomRemoveButton: isEsxi, // hide default remove button for esxi
+ showColumns: isEsxi ? ['name', 'format'] : ['name', 'size', 'format'],
+ enableUploadButton: enableUpload && !isEsxi,
+ enableDownloadUrlButton: enableDownloadUrl && !isEsxi,
+ useUploadButton: !isEsxi,
+ itemdblclick: (view, record) => {
+ if (isImportable(record.data.format)) {
+ createGuestImportWindow(record);
+ }
+ },
tbar: [
{
xtype: 'proxmoxButton',
disabled: true,
text: gettext('Import'),
iconCls: 'fa fa-cloud-download',
+ enableFn: rec => isImportable(rec.data.format),
handler: function() {
let grid = this.up('pveStorageContentView');
let selection = grid.getSelection()?.[0];
@@ -57868,7 +58106,7 @@ Ext.define('PVE.storage.CephFSInputPanel', {
me.column2 = [
{
xtype: 'pveContentTypeSelector',
- cts: ['backup', 'iso', 'vztmpl', 'snippets'],
+ cts: ['backup', 'iso', 'vztmpl', 'snippets', 'import'],
fieldLabel: gettext('Content'),
name: 'content',
value: 'backup',
@@ -58051,7 +58289,7 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
},
{
xtype: 'pveContentTypeSelector',
- cts: ['images', 'iso', 'backup', 'vztmpl', 'snippets'],
+ cts: ['images', 'iso', 'backup', 'vztmpl', 'snippets', 'import'],
name: 'content',
value: 'images',
multiSelect: true,
@@ -59138,11 +59376,14 @@ Ext.define('PVE.panel.PBSEncryptionKeyTab', {
// old key without FP
values['crypt-key-fp'] = icon + gettext('Active');
}
+ values.cryptMode = 'keep';
+ values['crypt-allow-edit'] = false;
} else {
values['crypt-key-fp'] = gettext('None');
let cryptModeNone = me.down('radiofield[inputValue=none]');
cryptModeNone.setBoxLabel(gettext('Do not encrypt backups'));
- cryptModeNone.setValue(true);
+ values.cryptMode = 'none';
+ values['crypt-allow-edit'] = true;
}
vm.set('keepCryptVisible', !!cryptKeyInfo);
vm.set('allowEdit', !cryptKeyInfo);
@@ -59190,7 +59431,6 @@ Ext.define('PVE.panel.PBSEncryptionKeyTab', {
padding: '0 0 0 25',
cbind: {
hidden: '{isCreate}',
- checked: '{!isCreate}',
},
bind: {
hidden: '{!keepCryptVisible}',
@@ -59483,15 +59723,10 @@ Ext.define('PVE.storage.PBSInputPanel', {
me.columnB = [
{
- xtype: 'proxmoxtextfield',
+ xtype: 'pmxFingerprintField',
name: 'fingerprint',
value: me.isCreate ? null : undefined,
- fieldLabel: gettext('Fingerprint'),
- emptyText: gettext('Server certificate SHA-256 fingerprint, required for self-signed certificates'),
- regex: /[A-Fa-f0-9]{2}(:[A-Fa-f0-9]{2}){31}/,
- regexText: gettext('Example') + ': AB:CD:EF:...',
deleteEmpty: !me.isCreate,
- allowBlank: true,
},
];
@@ -60680,6 +60915,7 @@ Ext.define('PVE.StdWorkspace', {
storage: 'PVE.storage.Browser',
sdn: 'PVE.sdn.Browser',
pool: 'pvePoolConfig',
+ tag: 'pveTagConfig',
};
PVE.curSelectedNode = treeNode;
me.setContent({
@@ -60816,6 +61052,7 @@ Ext.define('PVE.StdWorkspace', {
var win = Ext.create('Proxmox.window.PasswordEdit', {
userid: Proxmox.UserName,
confirmCurrentPassword: Proxmox.UserName !== 'root@pam',
+ minLength: 8,
});
win.show();
},
@@ -60964,7 +61201,8 @@ Ext.define('PVE.StdWorkspace', {
let tagSelectors = [];
['circle', 'dense'].forEach((style) => {
['dark', 'light'].forEach((variant) => {
- tagSelectors.push(`.proxmox-tags-${style} .proxmox-tag-${variant}`);
+ let selector = `.proxmox-tags-${style} :not(.proxmox-tags-full) > .proxmox-tag-${variant}`;
+ tagSelectors.push(selector);
});
});