From: Avan Thakkar <athakkar@redhat.com>
Date: Tue, 4 May 2021 22:01:10 +0000 (+0530)
Subject: mgr/dashboard: ingress service creation follow-up
X-Git-Tag: v16.2.5~109^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17f4238086504ba935340d98ace0eb24c226a4d4;p=ceph.git

mgr/dashboard: ingress service creation follow-up

Fixes: https://tracker.ceph.com/issues/50568
Signed-off-by: Avan Thakkar <athakkar@redhat.com>

Pre-populating the service id(read-only) with the value same as backend service.

(cherry picked from commit 549daa7579c7f3e317e2f7de31010fa2d577416d)
---

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/services.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/services.po.ts
index 18b17c2f23ea..92bb1c392a73 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/services.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/services.po.ts
@@ -35,7 +35,7 @@ export class ServicesPageHelper extends PageHelper {
         cy.get('#count').type('1');
       } else if (serviceType === 'ingress') {
         this.selectOption('backend_service', 'rgw.rgw.foo');
-        cy.get('#service_id').type('rgw.rgw.foo');
+        cy.get('#service_id').should('have.value', 'rgw.rgw.foo');
         cy.get('#virtual_ip').type('192.168.20.1/24');
         cy.get('#frontend_port').type('8081');
         cy.get('#monitor_port').type('8082');
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 a0df3a5d4b0a..aed6da3f964d 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
@@ -41,7 +41,8 @@
               <select id="backend_service"
                       name="backend_service"
                       class="form-control custom-select"
-                      formControlName="backend_service">
+                      formControlName="backend_service"
+                      (change)="prePopulateId()">
                 <option *ngIf="services === null"
                         [ngValue]="null"
                         i18n>Loading...</option>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts
index 5b7fc6cac43b..e9e64b71cfe6 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts
@@ -335,7 +335,6 @@ describe('ServiceFormComponent', () => {
     describe('should test service ingress', () => {
       beforeEach(() => {
         formHelper.setValue('service_type', 'ingress');
-        formHelper.setValue('service_id', 'rgw.foo');
         formHelper.setValue('backend_service', 'rgw.foo');
         formHelper.setValue('virtual_ip', '192.168.20.1/24');
         formHelper.setValue('ssl', false);
@@ -355,6 +354,12 @@ describe('ServiceFormComponent', () => {
         });
       });
 
+      it('should pre-populate the service id', () => {
+        component.prePopulateId();
+        const prePopulatedID = component.serviceForm.getValue('service_id');
+        expect(prePopulatedID).toBe('rgw.foo');
+      });
+
       it('should submit valid frontend and monitor port', () => {
         // min value
         formHelper.setValue('frontend_port', 1);
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 aee978849a7b..c51e1c6ac3f0 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
@@ -281,6 +281,13 @@ export class ServiceFormComponent extends CdForm implements OnInit {
     reader.readAsText(file, 'utf8');
   }
 
+  prePopulateId() {
+    const control: AbstractControl = this.serviceForm.get('service_id');
+    const backendService = this.serviceForm.getValue('backend_service');
+    // Set Id as read-only
+    control.reset({ value: backendService, disabled: true });
+  }
+
   onSubmit() {
     const self = this;
     const values: object = this.serviceForm.value;
@@ -345,6 +352,7 @@ export class ServiceFormComponent extends CdForm implements OnInit {
           break;
         case 'ingress':
           serviceSpec['backend_service'] = values['backend_service'];
+          serviceSpec['service_id'] = values['backend_service'];
           if (_.isString(values['virtual_ip']) && !_.isEmpty(values['virtual_ip'])) {
             serviceSpec['virtual_ip'] = values['virtual_ip'].trim();
           }