ui: datastore: use safe destroy as base for dialog

only ask the name of the current NS, not the full NS path to avoid
too long input requirements on deep levels.

needs a few smaller hacks, ideally we would pull out the basic stuff
from Edit window in some EditBase window and let both, SafeDestroy
and Edit window derive from that, for better common, in sync
features.

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

diff --git a/www/Utils.js b/www/Utils.js
index b3d0df7e1abb6aaa55235e6cd01cf6f83a0a43ed..838b45117e68a274fd844afc219e5357e2df2f14 100644 (file)
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -385,6 +385,7 @@ Ext.define('PBS.Utils', {
            'barcode-label-media': [gettext('Drive'), gettext('Barcode-Label Media')],
            'catalog-media': [gettext('Drive'), gettext('Catalog Media')],
            'delete-datastore': [gettext('Datastore'), gettext('Remove Datastore')],
+           'delete-namespace': [gettext('Namespace'), gettext('Remove Namespace')],
            dircreate: [gettext('Directory Storage'), gettext('Create')],
            dirremove: [gettext('Directory'), gettext('Remove')],
            'eject-media': [gettext('Drive'), gettext('Eject Media')],

diff --git a/www/datastore/Content.js b/www/datastore/Content.js
index 1e4eeb0f178b0635c92d0b6ddaaccd02975a06a7..f7e1675bc4de27582654ee321451ef4c43bc1c1b 100644 (file)
--- a/www/datastore/Content.js
+++ b/www/datastore/Content.js
@@ -571,16 +571,16 @@ Ext.define('PBS.DataStoreContent', {
            let view = me.getView();
            if (!view.namespace || view.namespace === '') {
                console.warn('forgetNamespace called with root NS!');
-                return;
+               return;
            }
-           let parentNS = view.namespace.split('/').slice(0, -1).join('/');
+           let nsParts = view.namespace.split('/');
+           let nsName = nsParts.pop();
+           let parentNS = nsParts.join('/');
 
            Ext.create('PBS.window.NamespaceDelete', {
-               title: Ext.String.format(gettext("Destroy Namespace '{0}'"), view.namespace),
-               url: `/admin/datastore/${view.datastore}/namespace`,
                datastore: view.datastore,
                namespace: view.namespace,
-               autoShow: true,
+               item: { id: nsName },
                apiCallDone: success => {
                    if (success) {
                        view.namespace = parentNS; // move up before reload to avoid "ENOENT" error

diff --git a/www/window/NamespaceEdit.js b/www/window/NamespaceEdit.js
index 1619885e505c4ebbbd0f7015e7a6a4815629bb14..b6ea3f64764ffcd434173e0c334009b9e08f4e77 100644 (file)
--- a/www/window/NamespaceEdit.js
+++ b/www/window/NamespaceEdit.js
@@ -8,7 +8,7 @@ Ext.define('PBS.window.NamespaceEdit', {
     isCreate: true,
     subject: gettext('Namespace'),
     // avoid that the trigger of the combogrid fields open on window show
-    defaultFocus: 'proxmoxHelpButton',
+    defaultFocus: 'proxmoxtextfield[name=name]',
 
     cbind: {
        url: '/api2/extjs/admin/datastore/{datastore}/namespace',
@@ -53,56 +53,52 @@ Ext.define('PBS.window.NamespaceEdit', {
 });
 
 Ext.define('PBS.window.NamespaceDelete', {
-    extend: 'Proxmox.window.Edit',
+    extend: 'Proxmox.window.SafeDestroy',
     xtype: 'pbsNamespaceDelete',
     mixins: ['Proxmox.Mixin.CBind'],
 
-    //onlineHelp: 'namespaces', // TODO
-
     viewModel: {},
 
-    isRemove: true,
-    isCreate: true, // because edit window is, well, a bit stupid..
-    title: gettext('Destroy Namespace'),
-    // avoid that the trigger of the combogrid fields open on window show
-    defaultFocus: 'proxmoxHelpButton',
+    autoShow: true,
+    taskName: 'delete-namespace',
 
     cbind: {
        url: '/api2/extjs/admin/datastore/{datastore}/namespace',
     },
-    method: 'DELETE',
-
-    width: 450,
-
-    items: {
-       xtype: 'inputpanel',
-       items: [
-           {
-               xtype: 'displayfield',
-               name: 'ns',
-               fieldLabel: gettext('Namespace'),
-               cbind: {
-                   value: '{namespace}',
-                   datastore: '{datastore}',
+    additionalItems: [
+       {
+           xtype: 'proxmoxcheckbox',
+           name: 'delete-groups',
+           reference: 'rmGroups',
+           boxLabel: gettext('Delete all Backup Groups'),
+           value: false,
+           listeners: {
+               change: function(field, value) {
+                   let win = field.up('proxmoxSafeDestroy');
+                   if (value) {
+                       win.params['delete-groups'] = value;
+                   } else {
+                       delete win.params['delete-groups'];
+                   }
                },
-               submitValue: true,
-           },
-           {
-               xtype: 'proxmoxcheckbox',
-               name: 'delete-groups',
-               reference: 'rmGroups',
-               boxLabel: gettext('Delete all Backup Groups'),
-               value: false,
            },
-           {
-               xtype: 'box',
-               padding: '5 0 0 0',
-               html: `<span class="pmx-hint">${gettext('Note')}</span>: `
-                 + gettext('This will permanently remove all backups from the current namespace and all namespaces below it!'),
-               bind: {
-                   hidden: '{!rmGroups.checked}',
-               },
+       },
+       {
+           xtype: 'box',
+           padding: '5 0 0 0',
+           html: `<span class="pmx-hint">${gettext('Note')}</span>: `
+             + gettext('This will permanently remove all backups from the current namespace and all namespaces below it!'),
+           bind: {
+               hidden: '{!rmGroups.checked}',
            },
-       ],
+       },
+    ],
+
+    initComponent: function() {
+       let me = this;
+       me.title = Ext.String.format(gettext("Destroy Namespace '{0}'"), me.namespace);
+       me.params = { ns: me.namespace };
+
+       me.callParent();
     },
 });