mgr/dashboard: Fix service name disablemnt in servcie form UI

- the servcie name field was blank with no name
- added logic to populate the service name and disabled text

Signed-off-by: Afreen Misbah <afreen@ibm.com>

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 648b0282202d39737a63d88c0dd34755904096d7..333523bf1d7e107fb6f923ac664e4c981efee160 100644 (file)
--- 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
@@ -181,14 +181,17 @@
         <div class="cds-input-group">
           <div class="fit-content">
             <cds-text-label cdRequiredField="Service name"
+                            [disabled]="editing"
                             i18n>
               <input cdsText
                      type="text"
                      [value]="serviceForm.controls.service_type.value + '.'"
+                     [disabled]="editing"
                      readonly="true">
             </cds-text-label>
           </div>
           <cds-text-label [invalid]="serviceForm.controls.service_id.invalid && serviceForm.controls.service_id.dirty"
+                          [disabled]="editing"
                           [invalidText]="serviceIdError">
             <!-- Invisible character to set input fields on same line -->
             &#8203;
@@ -201,6 +204,7 @@
         </div>
         } @else {
         <cds-text-label [invalid]="serviceForm.controls.service_id.invalid && serviceForm.controls.service_id.dirty"
+                        [disabled]="editing"
                         [invalidText]="serviceIdError">
           Service name
           <input cdsText

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 6ecb3ba29158b58515db427de13e09358297986d..dc7a81e5e050d8d2fabc0989ca521fd94219c04c 100644 (file)
--- 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
@@ -924,6 +924,9 @@ export class ServiceFormComponent extends CdForm implements OnInit {
                 this.serviceForm.get('ssl_cert').setValue(response[0].spec?.ssl_cert);
                 this.serviceForm.get('ssl_key').setValue(response[0].spec?.ssl_key);
               }
+              break;
+            default:
+              this.serviceForm.get('service_id').setValue(this.serviceName);
           }
         });
     }