From 27a8b2f2883fcc1fc4128b3e8995a7819a5ae51e Mon Sep 17 00:00:00 2001
From: Afreen Misbah <afreen23.git@gmail.com>
Date: Sat, 22 Jun 2024 07:48:33 +0530
Subject: [PATCH] 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>
---
 .../services/service-form/service-form.component.html       | 2 +-
 .../cluster/services/service-form/service-form.component.ts | 6 ++++++
 .../core/navigation/navigation/navigation.component.html    | 4 ----
 3 files changed, 7 insertions(+), 5 deletions(-)

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 7a439e23dfe..c659d76b97e 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
@@ -223,7 +223,7 @@
             <select id="placement"
                     class="form-select"
                     formControlName="placement"
-                    (change)="onServiceTypeChange($event.target.value)">
+                    (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 85a8d4df8e4..da7fca61bc2 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
@@ -811,6 +811,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) {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
index 7a05299e182..0d1a6fc7287 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html
@@ -323,8 +323,4 @@
     </div>
     </ng-container>
   </ng-template>
-<<<<<<< HEAD
   </div>
-=======
-  </div>
->>>>>>> 851da7eae8e (mgr/dashboard: Introduce NVMe/TCP navigation)
-- 
2.39.5