From: Afreen Misbah <afreen23.git@gmail.com>
Date: Sat, 22 Jun 2024 02:18:33 +0000 (+0530)
Subject: mgr/dashboard: fix service form count bugs
X-Git-Tag: v19.1.1~130^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d2ff4f263cf3edbd5969763a50531cd4205ae8d;p=ceph.git

mgr/dashboard: fix service form count bugs

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

- for services which do not have a count set default count to be null, otherwise the previous selected service's count is used which is wrong
- make count null when label is selected for placement

Signed-off-by: Afreen Misbah <afreen23.git@gmail.com>
(cherry picked from commit 27a8b2f2883fcc1fc4128b3e8995a7819a5ae51e)

Conflicts:
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
	src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
index 62333d3391b7..c659d76b97e1 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
@@ -222,7 +222,8 @@
           <div class="cd-col-form-input">
             <select id="placement"
                     class="form-select"
-                    formControlName="placement">
+                    formControlName="placement"
+                    (change)="onPlacementChange($event.target.value)">
               <option i18n
                       value="hosts">Hosts</option>
               <option i18n
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts
index 6142f7457c22..436dd5364bb6 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts
@@ -796,6 +796,12 @@ export class ServiceFormComponent extends CdForm implements OnInit {
     }
   }
 
+  onPlacementChange(selected: string) {
+    if (selected === 'label') {
+      this.serviceForm.get('count').setValue(null);
+    }
+  }
+
   onBlockPoolChange() {
     const selectedBlockPool = this.serviceForm.get('pool').value;
     if (selectedBlockPool) {