ui: acl: add improved permission selector

taken mostly from PVE, with adaption to how PBS does things.
Main difference is that we do not have a resource store singleton
here which we can use, but for datastores we can already use the
always present datastore-list store. Register it to the store manager
with a "storeId" property (vs. our internal storeid one).

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/www/Makefile b/www/Makefile
index 073f03838d8b6b5ff6e91f3c45991bac172d004d..d8c91a1869c551ea1e461c23579209d9bcb4b5c8 100644 (file)
--- a/www/Makefile
+++ b/www/Makefile
@@ -9,6 +9,7 @@ JSSRC=                                                  \
        form/RemoteSelector.js                          \
        form/DataStoreSelector.js                       \
        form/CalendarEvent.js                           \
+       form/PermissionPathSelector.js                  \
        data/RunningTasksStore.js                       \
        button/TaskButton.js                            \
        config/UserView.js                              \

diff --git a/www/NavigationTree.js b/www/NavigationTree.js
index d36e25e8f90b17115e0ee014631bbba32577d6cc..0fd9458de4df3816de0150e4370776fbe414b892 100644 (file)
--- a/www/NavigationTree.js
+++ b/www/NavigationTree.js
@@ -102,6 +102,7 @@ Ext.define('PBS.view.main.NavigationTree', {
            view.rstore = Ext.create('Proxmox.data.UpdateStore', {
                autoStart: true,
                interval: 15 * 1000,
+               storeId: 'pbs-datastore-list',
                storeid: 'pbs-datastore-list',
                model: 'pbs-datastore-list'
            });

diff --git a/www/form/PermissionPathSelector.js b/www/form/PermissionPathSelector.js
new file mode 100644 (file)
index 0000000..0138fed
--- /dev/null
+++ b/www/form/PermissionPathSelector.js
@@ -0,0 +1,73 @@
+Ext.define('PBS.data.PermissionPathsStore', {
+    extend: 'Ext.data.Store',
+    alias: 'store.pbsPermissionPaths',
+    fields: ['value'],
+    autoLoad: false,
+    data: [
+       { 'value': '/' },
+       { 'value': '/access' },
+       { 'value': '/access/acl' },
+       { 'value': '/access/users' },
+       { 'value': '/datastore' },
+       { 'value': '/remote' },
+       { 'value': '/system' },
+       { 'value': '/system/disks' },
+       { 'value': '/system/log' },
+       { 'value': '/system/network' },
+       { 'value': '/system/network/dns' },
+       { 'value': '/system/network/interfaces' },
+       { 'value': '/system/services' },
+       { 'value': '/system/status' },
+       { 'value': '/system/tasks' },
+       { 'value': '/system/time' },
+    ],
+
+    constructor: function(config) {
+       let me = this;
+
+       config = config || {};
+       me.callParent([config]);
+
+       // TODO: this is but a HACK until we have some sort of resource
+       // storage like PVE
+       let datastores = Ext.data.StoreManager.lookup('pbs-datastore-list');
+
+       if (datastores) {
+           let donePaths = {};
+           me.suspendEvents();
+           datastores.each(function(record) {
+               let path = `/datastore/${record.data.store}`;
+               if (path !== undefined && !donePaths[path]) {
+                   me.add({ value: path });
+                   donePaths[path] = 1;
+               }
+           });
+           me.resumeEvents();
+
+           me.fireEvent('refresh', me);
+           me.fireEvent('datachanged', me);
+       }
+
+       me.sort({
+           property: 'value',
+           direction: 'ASC',
+       });
+    },
+});
+
+Ext.define('PBS.form.PermissionPathSelector', {
+    extend: 'Ext.form.field.ComboBox',
+    xtype: 'pbsPermissionPathSelector',
+
+    valueField: 'value',
+    displayField: 'value',
+    typeAhead: true,
+    anyMatch: true,
+    queryMode: 'local',
+
+    store: {
+       type: 'pbsPermissionPaths',
+    },
+    regexText: gettext('Invalid permission path.'),
+    regex: /\/((access|datastore|remote|system)\/.*)?/,
+});

diff --git a/www/window/ACLEdit.js b/www/window/ACLEdit.js
index ba7a7f86f3638c6a6d39d47028c62f2413d8beba..17879a3cefd4273b059ad88b87b4668bb760cfe8 100644 (file)
--- a/www/window/ACLEdit.js
+++ b/www/window/ACLEdit.js
@@ -7,6 +7,7 @@ Ext.define('PBS.window.ACLEdit', {
     method: 'PUT',
     isAdd: true,
     isCreate: true,
+    width: 450,
 
     // caller can give a static path
     path: undefined,
@@ -25,7 +26,7 @@ Ext.define('PBS.window.ACLEdit', {
 
     items: [
        {
-           xtype: 'pmxDisplayEditField',
+           xtype: 'pbsPermissionPathSelector',
            fieldLabel: gettext('Path'),
            cbind: {
                editable: '{!path}',