ui: datastore permissions: allow ACL path edit & query namespaces

Without namespaces this had not much use, but now that we can have
permissions below we should allow so.

For convenience also query the namsepaces here and add them to the
list of available ACL paths, the read-dir shouldn't be that expensive
(albeit, we could cache them in the frontend)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-05-18 18:09:15 +02:00
parent a502bc5617
commit 33612525e1
4 changed files with 59 additions and 17 deletions

View File

@ -39,6 +39,7 @@ Ext.define('PBS.config.ACLView', {
Ext.create('PBS.window.ACLEdit', {
path: view.aclPath,
aclType: 'user',
datastore: view.datastore,
listeners: {
destroy: () => me.reload(),
},
@ -51,6 +52,7 @@ Ext.define('PBS.config.ACLView', {
Ext.create('PBS.window.ACLEdit', {
path: view.aclPath,
aclType: 'token',
datastore: view.datastore,
listeners: {
destroy: () => me.reload(),
},

View File

@ -97,6 +97,7 @@ Ext.define('PBS.DataStorePanel', {
iconCls: 'fa fa-unlock',
cbind: {
aclPath: '{aclPath}',
datastore: '{datastore}',
},
},
],

View File

@ -50,6 +50,10 @@ Ext.define('PBS.data.PermissionPathsStore', {
});
me.resumeEvents();
if (me.datastore) {
me.setDatastore(me.datastore);
}
me.fireEvent('refresh', me);
me.fireEvent('datachanged', me);
}
@ -58,6 +62,34 @@ Ext.define('PBS.data.PermissionPathsStore', {
property: 'value',
direction: 'ASC',
});
me.initialized = true;
},
setDatastore: async function(datastore) {
let me = this;
if (!datastore) {
me.clearFilter();
return;
}
let url = `/api2/extjs/admin/datastore/${datastore}/namespace?max-depth=7`;
let { result: { data: ns } } = await Proxmox.Async.api2({ url });
// TODO: remove "old" datastore's ns paths?
if (ns.length > 0) {
if (me.initialized) {
me.suspendEvents();
}
for (const item of ns) {
if (item.ns !== '') {
me.add({ value: `/datastore/${datastore}/${item.ns}` });
}
}
if (me.initialized) {
me.resumeEvents();
me.fireEvent('refresh', me);
me.fireEvent('datachanged', me);
}
}
me.filter(item => item.get('value')?.startsWith(`/datastore/${datastore}`));
},
});
@ -66,6 +98,26 @@ Ext.define('PBS.form.PermissionPathSelector', {
xtype: 'pbsPermissionPathSelector',
mixins: ['Proxmox.Mixin.CBind'],
config: {
datastore: null, // set to filter by a datastore, could be also made generic path
},
setDatastore: function(datastore) {
let me = this;
if (me.datastore === datastore) {
return;
}
me.datastore = datastore;
let store = me.getStore();
if (!me.rendered) {
if (store) {
store.datastore = datastore;
}
} else {
store.setDatastore(datastore);
}
},
valueField: 'value',
displayField: 'value',
cbind: {

View File

@ -21,15 +21,13 @@ Ext.define('PBS.window.ACLEdit', {
me.items = [];
me.items.push({
xtype: 'pmxDisplayEditField',
xtype: 'pbsPermissionPathSelector',
name: 'path',
fieldLabel: gettext('Path'),
editConfig: {
xtype: 'pbsPermissionPathSelector',
allowBlank: false,
},
editable: !me.path,
allowBlank: false,
//editable: !me.path,
value: me.path,
datastore: me.datastore,
});
if (me.aclType === 'user') {
@ -65,15 +63,4 @@ Ext.define('PBS.window.ACLEdit', {
me.callParent();
},
getValues: function(dirtyOnly) {
let me = this;
let values = me.callParent(arguments);
if (me.path) {
values.path = me.path;
}
return values;
},
});