* [pve-devel] [PATCH manager v2 2/3] ui: use AuthView and authSchema from widget-toolkit
2021-07-14 12:52 [pve-devel] [PATCH manager v2 1/3] ui: add Schema singleton Dominik Csapak
@ 2021-07-14 12:52 ` Dominik Csapak
2021-07-14 12:52 ` [pve-devel] [PATCH manager v2 3/3] ui: remove PVE.dc.AuthEditBase window Dominik Csapak
2021-07-15 12:36 ` [pve-devel] [PATCH manager v2 1/3] ui: add Schema singleton Thomas Lamprecht
2 siblings, 0 replies; 4+ messages in thread
From: Dominik Csapak @ 2021-07-14 12:52 UTC (permalink / raw)
To: pve-devel
* moves the authSchema to the overrideAuthSchema call so that it can
be found in Proxmox.Utils.authSchema instead.
* changes the dc/AuthView to be a subclass of Proxmox.panel.AuthView
with the necesary changes (onlinehelp, columns, etc.)
* changes all calls from PVE.Utils.authSchema to Proxmox.Utils.authSchema
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from v1:
* use Proxmox.Schema.authDomains instead of Proxmox.Utils.authSchema
www/manager6/Utils.js | 40 ----------
www/manager6/Workspace.js | 2 +-
www/manager6/dc/AuthEditBase.js | 2 +-
www/manager6/dc/AuthView.js | 126 ++++++--------------------------
www/manager6/dc/UserView.js | 8 +-
5 files changed, 27 insertions(+), 151 deletions(-)
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index a22eaaa7..8ec11b4c 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -720,46 +720,6 @@ Ext.define('PVE.Utils', {
return format === 'pbs-ct' || volid.match(':backup/vzdump-(lxc|openvz)-');
},
- authSchema: {
- ad: {
- name: gettext('Active Directory Server'),
- ipanel: 'pveAuthADPanel',
- syncipanel: 'pveAuthLDAPSyncPanel',
- add: true,
- tfa: true,
- pwchange: true,
- },
- ldap: {
- name: gettext('LDAP Server'),
- ipanel: 'pveAuthLDAPPanel',
- syncipanel: 'pveAuthLDAPSyncPanel',
- add: true,
- tfa: true,
- pwchange: true,
- },
- openid: {
- name: gettext('OpenID Connect Server'),
- ipanel: 'pveAuthOpenIDPanel',
- add: true,
- tfa: false,
- pwchange: false,
- iconCls: 'pmx-itype-icon-openid-logo',
- },
- pam: {
- name: 'Linux PAM',
- ipanel: 'pveAuthBasePanel',
- add: false,
- tfa: true,
- pwchange: true,
- },
- pve: {
- name: 'Proxmox VE authentication server',
- ipanel: 'pveAuthBasePanel',
- add: false,
- pwchange: true,
- },
- },
-
storageSchema: {
dir: {
name: Proxmox.Utils.directoryText,
diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js
index 0e2a750b..bb873d67 100644
--- a/www/manager6/Workspace.js
+++ b/www/manager6/Workspace.js
@@ -180,7 +180,7 @@ Ext.define('PVE.StdWorkspace', {
let [_username, realm] = Proxmox.Utils.parse_userid(Proxmox.UserName);
response.result.data.forEach((domain) => {
if (domain.realm === realm) {
- let schema = PVE.Utils.authSchema[domain.type];
+ let schema = Proxmox.Schema.authDomains[domain.type];
if (schema) {
me.query('#tfaitem')[0].setHidden(!schema.tfa);
me.query('#passworditem')[0].setHidden(!schema.pwchange);
diff --git a/www/manager6/dc/AuthEditBase.js b/www/manager6/dc/AuthEditBase.js
index e18fbc3b..996ed6a8 100644
--- a/www/manager6/dc/AuthEditBase.js
+++ b/www/manager6/dc/AuthEditBase.js
@@ -24,7 +24,7 @@ Ext.define('PVE.panel.AuthBase', {
initComponent: function() {
let me = this;
- let options = PVE.Utils.authSchema[me.type];
+ let options = Proxmox.Schema.authDomains[me.type];
if (!me.column1) { me.column1 = []; }
if (!me.column2) { me.column2 = []; }
diff --git a/www/manager6/dc/AuthView.js b/www/manager6/dc/AuthView.js
index 48a51015..521e16a2 100644
--- a/www/manager6/dc/AuthView.js
+++ b/www/manager6/dc/AuthView.js
@@ -1,17 +1,9 @@
Ext.define('PVE.dc.AuthView', {
- extend: 'Ext.grid.GridPanel',
-
- alias: ['widget.pveAuthView'],
+ extend: 'Proxmox.panel.AuthView',
+ alias: 'widget.pveAuthView',
onlineHelp: 'pveum_authentication_realms',
- stateful: true,
- stateId: 'grid-authrealms',
-
- viewConfig: {
- trackOver: false,
- },
-
columns: [
{
header: gettext('Realm'),
@@ -40,101 +32,25 @@ Ext.define('PVE.dc.AuthView', {
},
],
- store: {
- model: 'pmx-domains',
- sorters: {
- property: 'realm',
- order: 'DESC',
- },
- },
-
- openEditWindow: function(authType, realm) {
- let me = this;
- Ext.create('PVE.dc.AuthEditBase', {
- authType,
- realm,
- listeners: {
- destroy: () => me.reload(),
- },
- }).show();
- },
-
- reload: function() {
- let me = this;
- me.getStore().load();
- },
-
- run_editor: function() {
- let me = this;
- let rec = me.getSelection()[0];
- if (!rec) {
- return;
- }
- me.openEditWindow(rec.data.type, rec.data.realm);
- },
-
- open_sync_window: function() {
- let me = this;
- let rec = me.getSelection()[0];
- if (!rec) {
- return;
- }
- Ext.create('PVE.dc.SyncWindow', {
- realm: rec.data.realm,
- listeners: {
- destroy: () => me.reload(),
- },
- }).show();
- },
-
- initComponent: function() {
- var me = this;
-
- let items = [];
- for (const [authType, config] of Object.entries(PVE.Utils.authSchema)) {
- if (!config.add) { continue; }
- items.push({
- text: config.name,
- iconCls: 'fa fa-fw ' + (config.iconCls || 'fa-address-book-o'),
- handler: () => me.openEditWindow(authType),
- });
- }
-
- Ext.apply(me, {
- tbar: [
- {
- text: gettext('Add'),
- menu: {
- items: items,
+ extraButtons: [
+ {
+ xtype: 'proxmoxButton',
+ text: gettext('Sync'),
+ disabled: true,
+ enableFn: (rec) => Boolean(Proxmox.Schema.authDomains[rec.data.type].syncipanel),
+ handler: function() {
+ let panel = this.up('pveAuthView');
+ let rec = panel.getSelection()[0];
+ if (!rec) {
+ return;
+ }
+ Ext.create('PVE.dc.SyncWindow', {
+ realm: rec.data.realm,
+ listeners: {
+ destroy: () => panel.reload(),
},
- },
- {
- xtype: 'proxmoxButton',
- text: gettext('Edit'),
- disabled: true,
- handler: () => me.run_editor(),
- },
- {
- xtype: 'proxmoxStdRemoveButton',
- baseurl: '/access/domains/',
- enableFn: (rec) => PVE.Utils.authSchema[rec.data.type].add,
- callback: () => me.reload(),
- },
- '-',
- {
- xtype: 'proxmoxButton',
- text: gettext('Sync'),
- disabled: true,
- enableFn: (rec) => Boolean(PVE.Utils.authSchema[rec.data.type].syncipanel),
- handler: () => me.open_sync_window(),
- },
- ],
- listeners: {
- activate: () => me.reload(),
- itemdblclick: () => me.run_editor(),
+ }).show();
},
- });
-
- me.callParent();
- },
+ },
+ ],
});
diff --git a/www/manager6/dc/UserView.js b/www/manager6/dc/UserView.js
index ef394bdb..ed1ee8f4 100644
--- a/www/manager6/dc/UserView.js
+++ b/www/manager6/dc/UserView.js
@@ -61,8 +61,8 @@ Ext.define('PVE.dc.UserView', {
enableFn: function(record) {
let type = record.data['realm-type'];
if (type) {
- if (PVE.Utils.authSchema[type]) {
- return !!PVE.Utils.authSchema[type].pwchange;
+ if (Proxmox.Schema.authDomains[type]) {
+ return !!Proxmox.Schema.authDomains[type].pwchange;
}
}
return false;
@@ -84,8 +84,8 @@ Ext.define('PVE.dc.UserView', {
enableFn: function(record) {
let type = record.data['realm-type'];
if (type) {
- if (PVE.Utils.authSchema[type]) {
- return !!PVE.Utils.authSchema[type].tfa;
+ if (Proxmox.Schema.authDomains[type]) {
+ return !!Proxmox.Schema.authDomains[type].tfa;
}
}
return false;
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread* [pve-devel] [PATCH manager v2 3/3] ui: remove PVE.dc.AuthEditBase window
2021-07-14 12:52 [pve-devel] [PATCH manager v2 1/3] ui: add Schema singleton Dominik Csapak
2021-07-14 12:52 ` [pve-devel] [PATCH manager v2 2/3] ui: use AuthView and authSchema from widget-toolkit Dominik Csapak
@ 2021-07-14 12:52 ` Dominik Csapak
2021-07-15 12:36 ` [pve-devel] [PATCH manager v2 1/3] ui: add Schema singleton Thomas Lamprecht
2 siblings, 0 replies; 4+ messages in thread
From: Dominik Csapak @ 2021-07-14 12:52 UTC (permalink / raw)
To: pve-devel
this is not needed anymore since we now use Proxmox.window.AuthEditBase
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/dc/AuthEditBase.js | 91 ---------------------------------
1 file changed, 91 deletions(-)
diff --git a/www/manager6/dc/AuthEditBase.js b/www/manager6/dc/AuthEditBase.js
index 996ed6a8..3c66b4bf 100644
--- a/www/manager6/dc/AuthEditBase.js
+++ b/www/manager6/dc/AuthEditBase.js
@@ -64,94 +64,3 @@ Ext.define('PVE.panel.AuthBase', {
me.callParent();
},
});
-
-Ext.define('PVE.dc.AuthEditBase', {
- extend: 'Proxmox.window.Edit',
-
- onlineHelp: 'pveum_authentication_realms',
-
- isAdd: true,
-
- fieldDefaults: {
- labelWidth: 120,
- },
-
- initComponent: function() {
- var me = this;
-
- me.isCreate = !me.realm;
-
- if (me.isCreate) {
- me.url = '/api2/extjs/access/domains';
- me.method = 'POST';
- } else {
- me.url = '/api2/extjs/access/domains/' + me.realm;
- me.method = 'PUT';
- }
-
- let authConfig = PVE.Utils.authSchema[me.authType];
- if (!authConfig) {
- throw 'unknown auth type';
- } else if (!authConfig.add && me.isCreate) {
- throw 'trying to add non addable realm';
- }
-
- me.subject = authConfig.name;
-
- let items;
- let bodyPadding;
- if (authConfig.syncipanel) {
- bodyPadding = 0;
- items = {
- xtype: 'tabpanel',
- region: 'center',
- layout: 'fit',
- bodyPadding: 10,
- items: [
- {
- title: gettext('General'),
- realm: me.realm,
- xtype: authConfig.ipanel,
- isCreate: me.isCreate,
- type: me.authType,
- },
- {
- title: gettext('Sync Options'),
- realm: me.realm,
- xtype: authConfig.syncipanel,
- isCreate: me.isCreate,
- type: me.authType,
- },
- ],
- };
- } else {
- items = [{
- realm: me.realm,
- xtype: authConfig.ipanel,
- isCreate: me.isCreate,
- type: me.authType,
- }];
- }
-
- Ext.apply(me, {
- items,
- bodyPadding,
- });
-
- me.callParent();
-
- if (!me.isCreate) {
- me.load({
- success: function(response, options) {
- var data = response.result.data || {};
- // just to be sure (should not happen)
- if (data.type !== me.authType) {
- me.close();
- throw "got wrong auth type";
- }
- me.setValues(data);
- },
- });
- }
- },
-});
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [pve-devel] [PATCH manager v2 1/3] ui: add Schema singleton
2021-07-14 12:52 [pve-devel] [PATCH manager v2 1/3] ui: add Schema singleton Dominik Csapak
2021-07-14 12:52 ` [pve-devel] [PATCH manager v2 2/3] ui: use AuthView and authSchema from widget-toolkit Dominik Csapak
2021-07-14 12:52 ` [pve-devel] [PATCH manager v2 3/3] ui: remove PVE.dc.AuthEditBase window Dominik Csapak
@ 2021-07-15 12:36 ` Thomas Lamprecht
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Lamprecht @ 2021-07-15 12:36 UTC (permalink / raw)
To: Proxmox VE development discussion, Dominik Csapak
On 14.07.21 14:52, Dominik Csapak wrote:
> and override the Proxmox.Schema.authDomains in its constructor
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> new in v2
>
IMO the patch order is a bit weird as we add the overrides here already but remove
the existing ones only in the second one, rather I'd either:
* squash patch 1 and patch 2
* really only add the schema boilerplate in patch 1
Besides that it would then also be good to move the storage schema and possible
other such things over to the new module, else we have two places with that
stuff, which is not really nice (and can be confusing for people adding the
next schema).
> www/manager6/Makefile | 1 +
> www/manager6/Schema.js | 53 ++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 54 insertions(+)
> create mode 100644 www/manager6/Schema.js
>
> diff --git a/www/manager6/Makefile b/www/manager6/Makefile
> index 75d355a5..0b0d833e 100644
> --- a/www/manager6/Makefile
> +++ b/www/manager6/Makefile
> @@ -4,6 +4,7 @@ JSSRC= \
> Parser.js \
> StateProvider.js \
> Utils.js \
> + Schema.js \
> Toolkit.js \
> VNCConsole.js \
> button/ConsoleButton.js \
> diff --git a/www/manager6/Schema.js b/www/manager6/Schema.js
> new file mode 100644
> index 00000000..4e8ca8b9
> --- /dev/null
> +++ b/www/manager6/Schema.js
> @@ -0,0 +1,53 @@
> +Ext.define('PVE.Schema', { // a singleton
> + singleton: true,
> +
> + constructor: function() {
> + var me = this;
> +
> +
> + Proxmox.Schema.overrideAuthDomains({
> + ad: {
> + name: gettext('Active Directory Server'),
> + ipanel: 'pveAuthADPanel',
> + syncipanel: 'pveAuthLDAPSyncPanel',
> + add: true,
> + edit: true,
> + tfa: true,
> + pwchange: true,
> + },
> + ldap: {
> + name: gettext('LDAP Server'),
> + ipanel: 'pveAuthLDAPPanel',
> + syncipanel: 'pveAuthLDAPSyncPanel',
> + add: true,
> + edit: true,
> + tfa: true,
> + pwchange: true,
> + },
> + openid: {
> + name: gettext('OpenID Connect Server'),
> + ipanel: 'pveAuthOpenIDPanel',
> + add: true,
> + edit: true,
> + tfa: false,
> + pwchange: false,
> + iconCls: 'pmx-itype-icon-openid-logo',
> + },
> + pam: {
> + name: 'Linux PAM',
> + ipanel: 'pveAuthBasePanel',
> + add: false,
> + edit: true,
> + tfa: true,
> + pwchange: true,
> + },
> + pve: {
> + name: 'Proxmox VE authentication server',
> + ipanel: 'pveAuthBasePanel',
> + add: false,
> + edit: true,
> + pwchange: true,
> + },
> + });
> + },
> +});
>
^ permalink raw reply [flat|nested] 4+ messages in thread