From 3862c76be6d1ba9bb0e9d8d3bf67c8a3791c2349 Mon Sep 17 00:00:00 2001
From: Dnyaneshwari
 <dnyaneshwari@li-9c9fbecc-2d5c-11b2-a85c-e2a7cc8a424f.ibm.com>
Date: Wed, 6 Aug 2025 15:12:43 +0530
Subject: [PATCH] mgr/dashboard:[NFS] add Subvolume Groups and Subvolumes in
 "Edit NFS Export" form

Fixes: https://tracker.ceph.com/issues/72435

Signed-off-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>
(cherry picked from commit aa7a586c5690e26bfc99687a601f8c0c3c221aa7)
---
 .../ceph/nfs/nfs-form/nfs-form.component.html |  4 +--
 .../ceph/nfs/nfs-form/nfs-form.component.ts   | 28 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
index 6b091e14639..0da4913e9b8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
@@ -153,7 +153,7 @@
       </div>
 
       <div class="form-item"
-           *ngIf="storageBackend === 'CEPH' && nfsForm.getValue('fsal').fs_name && !this.isEdit">
+           *ngIf="storageBackend === 'CEPH' && nfsForm.getValue('fsal').fs_name">
         <cds-select formControlName="subvolume_group"
                     name="subvolume_group"
                     for="subvolume_group"
@@ -174,7 +174,7 @@
       </div>
 
     <div class="form-group row"
-         *ngIf="storageBackend === 'CEPH' && nfsForm.getValue('fsal').fs_name && !this.isEdit">
+         *ngIf="storageBackend === 'CEPH' && nfsForm.getValue('fsal').fs_name">
       <cds-select formControlName="subvolume"
                   name="subvolume"
                   for="subvolume"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts
index 2d6dffcb298..65e3f3acc9f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts
@@ -188,6 +188,7 @@ export class NfsFormComponent extends CdForm implements OnInit {
   async getSubVol() {
     const fs_name = this.nfsForm.getValue('fsal').fs_name;
     const subvolgrp = this.nfsForm.getValue('subvolume_group');
+
     await this.setSubVolGrpPath();
 
     (subvolgrp === this.defaultSubVolGroup
@@ -264,7 +265,7 @@ export class NfsFormComponent extends CdForm implements OnInit {
     const subVolumeControl = this.nfsForm.get('subvolume');
 
     // SubVolume is required if SubVolume Group is "_nogroup".
-    if (subvolumeGroup == this.defaultSubVolGroup) {
+    if (subvolumeGroup === DEFAULT_SUBVOLUME_GROUP) {
       subVolumeControl?.setValidators([Validators.required]);
     } else {
       subVolumeControl?.clearValidators();
@@ -401,6 +402,31 @@ export class NfsFormComponent extends CdForm implements OnInit {
     this.nfsForm.patchValue(res);
     this.setPathValidation();
     this.clients = res.clients;
+
+    if (this.isEdit) {
+      if (res?.fsal?.name === SUPPORTED_FSAL.CEPH && res?.path) {
+        this.getSubVolGrp(res.fsal.fs_name);
+        this.resolveCephfsPath(res.path, res.fsal.fs_name);
+      }
+    }
+  }
+
+  // Setting up Subvolumegroup and Subvolume for CephFS paths on Edit.
+  resolveCephfsPath(path: string, fsName: string) {
+    if (!path?.startsWith('/volumes/')) return;
+
+    const splitPath = path.split('/');
+    const subvolumeGroup = splitPath[2] ?? null;
+    const subvolume = splitPath[3] ?? null;
+
+    this.nfsForm.patchValue({
+      fsal: {
+        ...this.nfsForm.get('fsal').value,
+        fs_name: fsName
+      },
+      subvolumeGroup,
+      subvolume
+    });
   }
 
   resolveClusters(clusters: string[]) {
-- 
2.39.5