public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v5 8/9] ui: add move namespace action
Date: Thu, 19 Mar 2026 17:13:24 +0100	[thread overview]
Message-ID: <20260319161325.206846-9-h.laimer@proxmox.com> (raw)
In-Reply-To: <20260319161325.206846-1-h.laimer@proxmox.com>

When moving a namespace, exclude the source namespace and its subtree
from the 'New Parent' selector.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 www/Makefile                  |  1 +
 www/datastore/Content.js      | 27 +++++++++++-
 www/form/NamespaceSelector.js | 11 +++++
 www/window/NamespaceMove.js   | 79 +++++++++++++++++++++++++++++++++++
 4 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 www/window/NamespaceMove.js

diff --git a/www/Makefile b/www/Makefile
index 7745d9f4..f2011af3 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -80,6 +80,7 @@ JSSRC=							\
 	window/CreateDirectory.js			\
 	window/DataStoreEdit.js				\
 	window/NamespaceEdit.js				\
+	window/NamespaceMove.js				\
 	window/MaintenanceOptions.js			\
 	window/NotesEdit.js				\
 	window/RemoteEdit.js				\
diff --git a/www/datastore/Content.js b/www/datastore/Content.js
index b56cc4ac..e3e0d0c9 100644
--- a/www/datastore/Content.js
+++ b/www/datastore/Content.js
@@ -667,6 +667,26 @@ Ext.define('PBS.DataStoreContent', {
             });
         },
 
+        moveNS: function () {
+            let me = this;
+            let view = me.getView();
+            if (!view.namespace || view.namespace === '') {
+                return;
+            }
+            let win = Ext.create('PBS.window.NamespaceMove', {
+                datastore: view.datastore,
+                namespace: view.namespace,
+                taskDone: (success) => {
+                    if (success) {
+                        let newNs = win.getNewNamespace();
+                        view.down('pbsNamespaceSelector').store?.load();
+                        me.nsChange(null, newNs);
+                    }
+                },
+            });
+            win.show();
+        },
+
         moveGroup: function (data) {
             let me = this;
             let view = me.getView();
@@ -685,6 +705,8 @@ Ext.define('PBS.DataStoreContent', {
             let me = this;
             if (data.ty === 'group') {
                 me.moveGroup(data);
+            } else if (data.ty === 'ns') {
+                me.moveNS();
             }
         },
 
@@ -1113,10 +1135,13 @@ Ext.define('PBS.DataStoreContent', {
                         if (data.ty === 'group') {
                             return Ext.String.format(gettext("Move group '{0}'"), v);
                         }
-                        return '';
+                        return Ext.String.format(gettext("Move namespace '{0}'"), v);
                     },
                     getClass: (v, m, { data }) => {
                         if (data.ty === 'group') { return 'fa fa-arrows'; }
+                        if (data.ty === 'ns' && !data.isRootNS && data.ns === undefined) {
+                            return 'fa fa-arrows';
+                        }
                         return 'pmx-hidden';
                     },
                     isActionDisabled: (v, r, c, i, { data }) => false,
diff --git a/www/form/NamespaceSelector.js b/www/form/NamespaceSelector.js
index ddf68254..d349b568 100644
--- a/www/form/NamespaceSelector.js
+++ b/www/form/NamespaceSelector.js
@@ -90,6 +90,17 @@ Ext.define('PBS.form.NamespaceSelector', {
             },
         });
 
+        if (me.excludeNs) {
+            me.store.addFilter(
+                new Ext.util.Filter({
+                    filterFn: (rec) => {
+                        let ns = rec.data.ns;
+                        return ns !== me.excludeNs && !ns.startsWith(`${me.excludeNs}/`);
+                    },
+                }),
+            );
+        }
+
         me.callParent();
     },
 });
diff --git a/www/window/NamespaceMove.js b/www/window/NamespaceMove.js
new file mode 100644
index 00000000..415d509d
--- /dev/null
+++ b/www/window/NamespaceMove.js
@@ -0,0 +1,79 @@
+Ext.define('PBS.window.NamespaceMove', {
+    extend: 'Proxmox.window.Edit',
+    alias: 'widget.pbsNamespaceMove',
+    mixins: ['Proxmox.Mixin.CBind'],
+
+    onlineHelp: 'storage-namespaces',
+
+    submitText: gettext('Move'),
+    isCreate: true,
+    showTaskViewer: true,
+
+    cbind: {
+        url: '/api2/extjs/admin/datastore/{datastore}/namespace',
+        title: (get) => Ext.String.format(gettext("Move Namespace '{0}'"), get('namespace')),
+    },
+    method: 'PUT',
+
+    width: 450,
+    fieldDefaults: {
+        labelWidth: 120,
+    },
+
+    cbindData: function (initialConfig) {
+        let ns = initialConfig.namespace ?? '';
+        let parts = ns.split('/');
+        return { nsName: parts[parts.length - 1] };
+    },
+
+    // Returns the new-ns path that was submitted, for use by the caller after success.
+    getNewNamespace: function () {
+        let me = this;
+        let parent = me.down('[name=parent]').getValue() || '';
+        let name = me.down('[name=name]').getValue();
+        return parent ? `${parent}/${name}` : name;
+    },
+
+    items: {
+        xtype: 'inputpanel',
+        onGetValues: function (values) {
+            let parent = values.parent || '';
+            let newNs = parent ? `${parent}/${values.name}` : values.name;
+            return {
+                ns: this.up('window').namespace,
+                'new-ns': newNs,
+            };
+        },
+        items: [
+            {
+                xtype: 'displayfield',
+                fieldLabel: gettext('Namespace'),
+                cbind: {
+                    value: '{namespace}',
+                },
+            },
+            {
+                xtype: 'pbsNamespaceSelector',
+                name: 'parent',
+                fieldLabel: gettext('New Parent'),
+                allowBlank: true,
+                cbind: {
+                    datastore: '{datastore}',
+                    excludeNs: '{namespace}',
+                },
+            },
+            {
+                xtype: 'proxmoxtextfield',
+                name: 'name',
+                fieldLabel: gettext('New Name'),
+                allowBlank: false,
+                maxLength: 31,
+                regex: PBS.Utils.SAFE_ID_RE,
+                regexText: gettext("Only alpha numerical, '_' and '-' (if not at start) allowed"),
+                cbind: {
+                    value: '{nsName}',
+                },
+            },
+        ],
+    },
+});
-- 
2.47.3





  parent reply	other threads:[~2026-03-19 16:13 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-19 16:13 [PATCH proxmox-backup v5 0/9] fixes #6195: add support for moving groups and namespaces Hannes Laimer
2026-03-19 16:13 ` [PATCH proxmox-backup v5 1/9] ui: show empty groups Hannes Laimer
2026-03-19 16:13 ` [PATCH proxmox-backup v5 2/9] datastore: add namespace-level locking Hannes Laimer
2026-03-19 16:13 ` [PATCH proxmox-backup v5 3/9] datastore: add move_group Hannes Laimer
2026-03-19 16:13 ` [PATCH proxmox-backup v5 4/9] datastore: add move_namespace Hannes Laimer
2026-03-19 16:13 ` [PATCH proxmox-backup v5 5/9] api: add PUT endpoint for move_group Hannes Laimer
2026-03-19 16:13 ` [PATCH proxmox-backup v5 6/9] api: add PUT endpoint for move_namespace Hannes Laimer
2026-03-19 16:13 ` [PATCH proxmox-backup v5 7/9] ui: add move group action Hannes Laimer
2026-03-19 16:13 ` Hannes Laimer [this message]
2026-03-19 16:13 ` [PATCH proxmox-backup v5 9/9] cli: add move-namespace and move-group commands Hannes Laimer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260319161325.206846-9-h.laimer@proxmox.com \
    --to=h.laimer@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal