From e18ad63c7b9d2ecede8f0650248524d33db4b6f4 Mon Sep 17 00:00:00 2001
From: Ivo Almeida <ialmeida@redhat.com>
Date: Mon, 19 Feb 2024 12:42:34 +0000
Subject: [PATCH] mgr/dashboard: fix subvolume group edit

Fixes: https://tracker.ceph.com/issues/64487
Signed-off-by: Ivo Almeida <ialmeida@redhat.com>
(cherry picked from commit 8aaa0bca47fa49073e797ee427bcec282ef1adbe)
---
 .../cephfs-subvolumegroup-form.component.html         |  3 +--
 .../cephfs-subvolumegroup-form.component.ts           | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolumegroup-form/cephfs-subvolumegroup-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolumegroup-form/cephfs-subvolumegroup-form.component.html
index 58bb86021bdb7..bd91014a0e6a6 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolumegroup-form/cephfs-subvolumegroup-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolumegroup-form/cephfs-subvolumegroup-form.component.html
@@ -132,8 +132,7 @@
                                    inputField="mode"
                                    [isTableForOctalMode]="true"
                                    [initialValue]="initialMode"
-                                   [scopes]="scopes"
-                                   [isDisabled]="isEdit"></cd-checked-table-form>
+                                   [scopes]="scopes"></cd-checked-table-form>
           </div>
         </div>
       </div>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolumegroup-form/cephfs-subvolumegroup-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolumegroup-form/cephfs-subvolumegroup-form.component.ts
index 8ecf1eafa8c9f..accbb61b7eeeb 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolumegroup-form/cephfs-subvolumegroup-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolumegroup-form/cephfs-subvolumegroup-form.component.ts
@@ -123,9 +123,6 @@ export class CephfsSubvolumegroupFormComponent extends CdForm implements OnInit
       .subscribe((resp: any) => {
         // Disabled these fields since its not editable
         this.subvolumegroupForm.get('subvolumegroupName').disable();
-        this.subvolumegroupForm.get('pool').disable();
-        this.subvolumegroupForm.get('uid').disable();
-        this.subvolumegroupForm.get('gid').disable();
 
         this.subvolumegroupForm.get('subvolumegroupName').setValue(this.subvolumegroupName);
         if (resp.bytes_quota !== 'infinite') {
@@ -155,10 +152,14 @@ export class CephfsSubvolumegroupFormComponent extends CdForm implements OnInit
           task: new FinishedTask('cephfs/subvolume/group/' + URLVerbs.EDIT, {
             subvolumegroupName: subvolumegroupName
           }),
-          call: this.cephfsSubvolumeGroupService.update(
+          call: this.cephfsSubvolumeGroupService.create(
             this.fsName,
             subvolumegroupName,
-            String(editSize)
+            pool,
+            String(editSize),
+            uid,
+            gid,
+            mode
           )
         })
         .subscribe({
-- 
2.39.5