onlineHelp: 'datacenter_configuration_file',
monStoreErrors: true,
+ userCls: 'proxmox-tags-full',
add_inputpanel_row: function(name, text, opts) {
var me = this;
me.add_text_row('mac_prefix', gettext('MAC address prefix'), {
deleteEmpty: true,
vtype: 'MacPrefix',
- defaultValue: Proxmox.Utils.noneText,
+ defaultValue: 'BC:24:11',
});
me.add_inputpanel_row('migration', gettext('Migration Settings'), {
renderer: PVE.Utils.render_as_property_string,
defaultValue: '__default__',
}],
});
+ me.add_inputpanel_row('crs', gettext('Cluster Resource Scheduling'), {
+ renderer: PVE.Utils.render_as_property_string,
+ width: 450,
+ labelWidth: 120,
+ url: "/api2/extjs/cluster/options",
+ onlineHelp: 'ha_manager_crs',
+ items: [{
+ xtype: 'proxmoxKVComboBox',
+ name: 'ha',
+ fieldLabel: gettext('HA Scheduling'),
+ deleteEmpty: false,
+ value: '__default__',
+ comboItems: [
+ ['__default__', Proxmox.Utils.defaultText + ' (basic)'],
+ ['basic', 'Basic (Resource Count)'],
+ ['static', 'Static Load'],
+ ],
+ defaultValue: '__default__',
+ }, {
+ xtype: 'proxmoxcheckbox',
+ name: 'ha-rebalance-on-start',
+ fieldLabel: gettext('Rebalance on Start'),
+ boxLabel: gettext('Use CRS to select the least loaded node when starting an HA service'),
+ value: 0,
+ }],
+ });
me.add_inputpanel_row('u2f', gettext('U2F Settings'), {
renderer: v => !v ? Proxmox.Utils.NoneText : PVE.Parser.printPropertyString(v),
width: 450,
renderer: v => !v ? Proxmox.Utils.NoneText : PVE.Parser.printPropertyString(v),
width: 450,
url: "/api2/extjs/cluster/options",
- //onlineHelp: 'pveum_configure_webauthn',
+ onlineHelp: 'pveum_configure_webauthn',
items: [{
xtype: 'textfield',
- fieldLabel: gettext('Relying Party'),
- name: 'rp',
+ fieldLabel: gettext('Name'),
+ name: 'rp', // NOTE: relying party consists of name and id, this is the name
allowBlank: false,
- listeners: {
- dirtychange: (f, isDirty) =>
- f.up('panel').down('box[id=rpChangeWarning]').setHidden(!f.originalValue || !isDirty),
- },
},
{
xtype: 'textfield',
fieldLabel: gettext('Origin'),
+ emptyText: Ext.String.format(gettext("Domain Lockdown (e.g., {0})"), document.location.origin),
name: 'origin',
- allowBlank: false,
+ allowBlank: true,
},
{
xtype: 'textfield',
fieldLabel: 'ID',
name: 'id',
allowBlank: false,
+ listeners: {
+ dirtychange: (f, isDirty) =>
+ f.up('panel').down('box[id=idChangeWarning]').setHidden(!f.originalValue || !isDirty),
+ },
},
{
xtype: 'container',
iconCls: 'fa fa-fw fa-pencil-square-o',
handler: function(button, ev) {
let panel = this.up('panel');
- panel.down('field[name=rp]').setValue(document.location.hostname);
- panel.down('field[name=origin]').setValue(document.location.origin);
- panel.down('field[name=id]').setValue(document.location.hostname);
+ let fqdn = document.location.hostname;
+
+ panel.down('field[name=rp]').setValue(fqdn);
+
+ let idField = panel.down('field[name=id]');
+ let currentID = idField.getValue();
+ if (!currentID || currentID.length === 0) {
+ idField.setValue(fqdn);
+ }
},
},
],
},
{
xtype: 'box',
- id: 'rpChangeWarning',
+ id: 'idChangeWarning',
hidden: true,
padding: '5 0 0 0',
html: '<i class="fa fa-exclamation-triangle warning"></i> '
- + gettext('Changing the Relying Party may break existing webAuthn TFA entries.'),
+ + gettext('Changing the ID breaks existing WebAuthn TFA entries.'),
}],
});
me.add_inputpanel_row('bwlimit', gettext('Bandwidth Limits'), {
submitValue: true,
}],
});
+ me.rows['tag-style'] = {
+ required: true,
+ renderer: (value) => {
+ if (value === undefined) {
+ return gettext('No Overrides');
+ }
+ let colors = PVE.UIOptions.parseTagOverrides(value?.['color-map']);
+ let shape = value.shape;
+ let shapeText = PVE.UIOptions.tagTreeStyles[shape ?? '__default__'];
+ let txt = Ext.String.format(gettext("Tree Shape: {0}"), shapeText);
+ let orderText = PVE.UIOptions.tagOrderOptions[value.ordering ?? '__default__'];
+ txt += `, ${Ext.String.format(gettext("Ordering: {0}"), orderText)}`;
+ if (value['case-sensitive']) {
+ txt += `, ${gettext('Case-Sensitive')}`;
+ }
+ if (Object.keys(colors).length > 0) {
+ txt += `, ${gettext('Color Overrides')}: `;
+ for (const tag of Object.keys(colors)) {
+ txt += Proxmox.Utils.getTagElement(tag, colors);
+ }
+ }
+ return txt;
+ },
+ header: gettext('Tag Style Override'),
+ editor: {
+ xtype: 'proxmoxWindowEdit',
+ width: 800,
+ subject: gettext('Tag Color Override'),
+ onlineHelp: 'datacenter_configuration_file',
+ fieldDefaults: {
+ labelWidth: 100,
+ },
+ url: '/api2/extjs/cluster/options',
+ items: [
+ {
+ xtype: 'inputpanel',
+ setValues: function(values) {
+ if (values === undefined) {
+ return undefined;
+ }
+ values = values?.['tag-style'] ?? {};
+ values.shape = values.shape || '__default__';
+ values.colors = values['color-map'];
+ return Proxmox.panel.InputPanel.prototype.setValues.call(this, values);
+ },
+ onGetValues: function(values) {
+ let style = {};
+ if (values.colors) {
+ style['color-map'] = values.colors;
+ }
+ if (values.shape && values.shape !== '__default__') {
+ style.shape = values.shape;
+ }
+ if (values.ordering) {
+ style.ordering = values.ordering;
+ }
+ if (values['case-sensitive']) {
+ style['case-sensitive'] = 1;
+ }
+ let value = PVE.Parser.printPropertyString(style);
+ if (value === '') {
+ return {
+ 'delete': 'tag-style',
+ };
+ }
+ return {
+ 'tag-style': value,
+ };
+ },
+ items: [
+ {
+
+ name: 'shape',
+ xtype: 'proxmoxComboGrid',
+ fieldLabel: gettext('Tree Shape'),
+ valueField: 'value',
+ displayField: 'display',
+ allowBlank: false,
+ listConfig: {
+ columns: [
+ {
+ header: gettext('Option'),
+ dataIndex: 'display',
+ flex: 1,
+ },
+ {
+ header: gettext('Preview'),
+ dataIndex: 'value',
+ renderer: function(value) {
+ let cls = value ?? '__default__';
+ if (value === '__default__') {
+ cls = 'circle';
+ }
+ let tags = PVE.Utils.renderTags('preview');
+ return `<div class="proxmox-tags-${cls}">${tags}</div>`;
+ },
+ flex: 1,
+ },
+ ],
+ },
+ store: {
+ data: Object.entries(PVE.UIOptions.tagTreeStyles).map(v => ({
+ value: v[0],
+ display: v[1],
+ })),
+ },
+ deleteDefault: true,
+ defaultValue: '__default__',
+ deleteEmpty: true,
+ },
+ {
+ name: 'ordering',
+ xtype: 'proxmoxKVComboBox',
+ fieldLabel: gettext('Ordering'),
+ comboItems: Object.entries(PVE.UIOptions.tagOrderOptions),
+ defaultValue: '__default__',
+ value: '__default__',
+ deleteEmpty: true,
+ },
+ {
+ name: 'case-sensitive',
+ xtype: 'proxmoxcheckbox',
+ fieldLabel: gettext('Case-Sensitive'),
+ boxLabel: gettext('Applies to new edits'),
+ value: 0,
+ },
+ {
+ xtype: 'displayfield',
+ fieldLabel: gettext('Color Overrides'),
+ },
+ {
+ name: 'colors',
+ xtype: 'pveTagColorGrid',
+ deleteEmpty: true,
+ height: 300,
+ },
+ ],
+ },
+ ],
+ },
+ };
+
+ me.rows['user-tag-access'] = {
+ required: true,
+ renderer: (value) => {
+ if (value === undefined) {
+ return Ext.String.format(gettext('Mode: {0}'), 'free');
+ }
+ let mode = value?.['user-allow'] ?? 'free';
+ let list = value?.['user-allow-list']?.join(',') ?? '';
+ let modeTxt = Ext.String.format(gettext('Mode: {0}'), mode);
+ let overrides = PVE.UIOptions.tagOverrides;
+ let tags = PVE.Utils.renderTags(list, overrides);
+ let listTxt = tags !== '' ? `, ${gettext('Pre-defined:')} ${tags}` : '';
+ return `${modeTxt}${listTxt}`;
+ },
+ header: gettext('User Tag Access'),
+ editor: {
+ xtype: 'pveUserTagAccessEdit',
+ },
+ };
+
+ me.rows['registered-tags'] = {
+ required: true,
+ renderer: (value) => {
+ if (value === undefined) {
+ return gettext('No Registered Tags');
+ }
+ let overrides = PVE.UIOptions.tagOverrides;
+ return PVE.Utils.renderTags(value.join(','), overrides);
+ },
+ header: gettext('Registered Tags'),
+ editor: {
+ xtype: 'pveRegisteredTagEdit',
+ },
+ };
me.selModel = Ext.create('Ext.selection.RowModel', {});
}
var rec = store.getById('console');
- PVE.VersionInfo.console = rec.data.value;
+ PVE.UIOptions.options.console = rec.data.value;
if (rec.data.value === '__default__') {
- delete PVE.VersionInfo.console;
+ delete PVE.UIOptions.options.console;
}
+
+ PVE.UIOptions.options['tag-style'] = store.getById('tag-style')?.data?.value;
+ PVE.UIOptions.updateTagSettings(PVE.UIOptions.options['tag-style']);
+ PVE.UIOptions.fireUIConfigChanged();
});
me.on('activate', me.rstore.startUpdate);