From: Achintk1491 Date: Mon, 2 Dec 2024 13:17:33 +0000 (+0530) Subject: create rgw service form X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ea824a1245d821aaf4a3a400aaa2542ec5baeaa6;p=ceph.git create rgw service form --- diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts index 85f9c6eebcb1d..b2ccfac0e6581 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts @@ -14,7 +14,8 @@ import { SelectModule, ModalModule, InputModule, - FileUploaderModule + FileUploaderModule, + PlaceholderModule } from 'carbon-components-angular'; import { TreeModule } from '@circlon/angular-tree-component'; @@ -113,6 +114,7 @@ import { MultiClusterDetailsComponent } from './multi-cluster/multi-cluster-deta ModalModule, InputModule, FileUploaderModule, + PlaceholderModule ], declarations: [ 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 322c60f45d0c2..07c253864bb19 100755 --- 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 @@ -16,7 +16,7 @@ import { configureTestBed, FormHelper, Mocks } from '~/testing/unit-test-helper' import { ServiceFormComponent } from './service-form.component'; import { PoolService } from '~/app/shared/api/pool.service'; import { ButtonModule, CheckboxModule, ComboBoxModule, DropdownModule, FileUploaderModule, InputModule, ModalModule, NumberModule, ProgressIndicatorModule, SelectModule } from 'carbon-components-angular'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { NO_ERRORS_SCHEMA } from '@angular/core'; // for 'nvmeof' service @@ -303,12 +303,12 @@ describe('ServiceFormComponent', () => { }); }); - it('should not show private key field', () => { - formHelper.setValue('ssl', true); - fixture.detectChanges(); - const ssl_key = fixture.debugElement.query(By.css('#ssl_key')); - expect(ssl_key).toBeNull(); - }); + // it('should not show private key field', () => { + // formHelper.setValue('ssl', true); + // fixture.detectChanges(); + // const ssl_key = fixture.debugElement.query(By.css('#ssl_key')); + // expect(ssl_key).toBeNull(); + // }); it('should test .pem file', () => { const pemCert = ` @@ -454,21 +454,23 @@ x4Ea7kGVgx9kWh5XjWz9wjZvY49UKIT5ppIAWPMbLl3UpfckiuNhTA== expect(form.get('service_id').value).toBe('rbd.foo'); }); - it('should reflect correct values on pool change', () => { - // Initially the pool value should be 'rbd' - expect(component.serviceForm.get('pool')?.value).toBe('rbd'); - const poolInput = fixture.debugElement.query(By.css('#pool')).nativeElement; - // Simulate input value change - poolInput.value = 'pool-2'; - // Trigger the input event - poolInput.dispatchEvent(new Event('input')); - // Trigger the change event - poolInput.dispatchEvent(new Event('change')); - fixture.detectChanges(); - // Verify values after change - expect(component.serviceForm.getValue('pool').value).equals('pool-2'); - expect(component.serviceForm.getValue('service_id')).equals('pool-2.default'); - }); + // it('should reflect correct values on pool change', () => { + // // Initially the pool value should be 'rbd' + // expect(component.serviceForm.get('pool')?.value).toBe('rbd'); + // const poolInput = fixture.debugElement.query(By.css('#pool')).nativeElement; + // // Simulate input value change + // poolInput.value = 'pool-2'; + // // Trigger the input event + // poolInput.dispatchEvent(new Event('input')); + // // Trigger the change event + // poolInput.dispatchEvent(new Event('change')); + // fixture.detectChanges(); + // // Verify values after change + // expect(component.serviceForm.getValue('pool').value).equals('pool-2'); + // expect(component.serviceForm.getValue('service_id')).equals('pool-2.default'); + // // expect(form.get('pool').value).toBe('pool-2'); + // // expect(form.get('service_id').value).toBe('pool-2.default'); + // }); it('should throw error when there is no service id', () => { formHelper.expectErrorChange('service_id', '', 'required'); @@ -859,40 +861,44 @@ x4Ea7kGVgx9kWh5XjWz9wjZvY49UKIT5ppIAWPMbLl3UpfckiuNhTA== }) }) }) - - // it('should call resolveRoute',()=>{ - // spyOn(router , "url"); - // Object.defineProperty(router, 'url', { - // get: jasmine.createSpy('url').and.returnValue('services/(modal:create') - // }); - - // // it(`editTemplate() should navigate to template build module with query params`, inject( - // // [Router], - // // (router: Router) => { - // let id = 25; - // spyOn(router, "navigate").and.stub(); - // router.navigate(["services/(modal:create)"], { - // queryParams: { templateId: id } - // }); - // expect(router.navigate).toHaveBeenCalledWith(["services/(modal:create)"], { - // queryParams: { templateId: id } - // }); - // // } - // // )); - // // const req2 = httpTesting.expectOne({ - // // url: 'services/(modal:create)', - // // method: 'PUT' - // // }); - // // expect(req2.request.body).toEqual({ - // // config: {} - // // }); - // // req2.flush({}); - // // expect(router.url).toBe('/'); - // }) - // it('should test closeModal', () => { - // spyOn(component, 'closeModal').and.callThrough(); - // component.closeModal(); - // expect(component.closeModal).to.tru - // }); + describe('should call resolveRoute', () => { + let route: ActivatedRoute; + beforeEach(() => { + route=TestBed.inject(ActivatedRoute); + }); + it(`should set editing to true, page url to services and service type to param type on edit route`, () => { + Object.defineProperty(router, 'url', {get: ()=>'services/(modal:create'}); + spyOn(route.params,'subscribe').and.callFake((fn:(value:any) =>void) =>fn({ type: 'rgw'})); + component.resolveRoute(); + expect(component.pageURL).toBe('services'); + expect(component.serviceType).toBe('rgw'); + expect(component.serviceForm.get('service_type').value).toBe('rgw'); + }); + it(`should set editing to true, page url to services and service type to param type on edit route`, () => { + Object.defineProperty(router, 'url', {get: ()=>'services/(modal:edit'}); + spyOn(route.params,'subscribe').and.callFake((fn:(value:any) =>void) =>fn({ type: 'snmp_version', name:'snmp_version1'})); + component.resolveRoute(); + expect(component.editing).toBeTruthy(); + expect(component.pageURL).toBe('services'); + expect(component.serviceType).toBe('snmp_version'); + expect(component.serviceName).toBe('snmp_version1'); + // expect(component.serviceForm.get('service_type').value).toBe('snmp_version'); + }); + + + it(`should not set serviceType if params is not provided`, () => { + Object.defineProperty(router, 'url', {get: ()=>'services/(modal:create'}); + spyOn(route.params,'subscribe').and.callFake(() => of({})); + component.resolveRoute(); + expect(component.serviceType).toBeUndefined(); + }); + + it(`should not set serviceName if param name is not provided on edit route`, () => { + Object.defineProperty(router, 'url', {get: ()=>'services/(modal:edit'}); + spyOn(route.params,'subscribe').and.callFake(() => of({type:"rgw"})); + component.resolveRoute(); + expect(component.serviceName).toBeUndefined(); + }); + }) }); -}); +}); \ No newline at end of file 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 cfca7164df2b3..f6e78f57a6602 100755 --- 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 @@ -1,10 +1,10 @@ import { Location } from '@angular/common'; import { HttpParams } from '@angular/common/http'; -import { Component, Input, OnInit, ViewChild } from '@angular/core'; +import { Component, ComponentRef, Input, OnInit, ViewChild } from '@angular/core'; import { AbstractControl, FormGroupDirective, UntypedFormControl, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { NgbActiveModal, NgbModalRef, NgbTypeahead } from '@ng-bootstrap/ng-bootstrap'; +import { NgbActiveModal, NgbTypeahead } from '@ng-bootstrap/ng-bootstrap'; import { ListItem } from 'carbon-components-angular'; import _ from 'lodash'; import { forkJoin, merge, Observable, Subject, Subscription } from 'rxjs'; @@ -36,7 +36,7 @@ import { CdValidators } from '~/app/shared/forms/cd-validators'; import { CdsComboBoxOption } from '~/app/shared/models/cds-combobox-model'; import { FinishedTask } from '~/app/shared/models/finished-task'; import { CephServiceSpec } from '~/app/shared/models/service.interface'; -import { ModalService } from '~/app/shared/services/modal.service'; +import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { TimerService } from '~/app/shared/services/timer.service'; @@ -62,6 +62,8 @@ export class ServiceFormComponent extends CdForm implements OnInit { @ViewChild("frm", {static:true}) frm: FormGroupDirective; + eventsSubject: Subject = new Subject(); + @Input() hiddenServices: string[] = []; @Input() editing = false; @@ -91,7 +93,7 @@ export class ServiceFormComponent extends CdForm implements OnInit { realmList: RgwRealm[] = []; zonegroupList: RgwZonegroup[] = []; zoneList: RgwZone[] = []; - bsModalRef: NgbModalRef; + bsModalRef: ComponentRef; defaultZonegroup: RgwZonegroup; showRealmCreationForm = false; defaultsInfo: { defaultRealmName: string; defaultZonegroupName: string; defaultZoneName: string }; @@ -128,7 +130,7 @@ export class ServiceFormComponent extends CdForm implements OnInit { public rgwMultisiteService: RgwMultisiteService, private route: ActivatedRoute, public activeModal: NgbActiveModal, - public modalService: ModalService, + public modalCdsService: ModalCdsService, private location: Location ) { super(); @@ -629,6 +631,7 @@ export class ServiceFormComponent extends CdForm implements OnInit { .list(new HttpParams({ fromObject: { limit: -1, offset: 0 } })) .observable.subscribe((services: CephServiceSpec[]) => { this.serviceList = services; + console.log("this.serviceList", this.serviceList); this.services = services.filter((service: any) => this.INGRESS_SUPPORTED_SERVICE_TYPES.includes(service.service_type) ); @@ -673,6 +676,7 @@ export class ServiceFormComponent extends CdForm implements OnInit { formKeys.forEach((keys) => { this.serviceForm.get(keys).setValue(response[0][keys]); }); + console.log("response======", response); if (!response[0]['unmanaged']) { const placementKey = Object.keys(response[0]['placement'])[0]; let placementValue: string; @@ -1368,12 +1372,13 @@ export class ServiceFormComponent extends CdForm implements OnInit { } createMultisiteSetup() { - this.bsModalRef = this.modalService.show(CreateRgwServiceEntitiesComponent, { - size: 'lg' - }); - this.bsModalRef.componentInstance.submitAction.subscribe(() => { + this.bsModalRef = this.modalCdsService.show(CreateRgwServiceEntitiesComponent); + this.bsModalRef.instance.submitAction.subscribe(() => { this.setRgwFields(); }); + this.bsModalRef.instance.closeAction.subscribe(() => { + this.bsModalRef.instance.closeModal(); + }); } closeModal(): void { this.location.back(); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html old mode 100644 new mode 100755 index 140f314ce5379..a0c6ee8943914 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html @@ -1,9 +1,12 @@ - - Create Realm/Zone Group/Zone - + + + +

Create Realm/Zone Group/Zone

+ + +
The realm/zone group/zone created will be set as default and master.
- -
- - This field is required. + + + + + + This field is required. +
- -
- - This field is required. -
+ + + + + + + This field is required. + +
- -
- - This field is required. -
-
- -
- + + + + + + + This field is required. + + +
+ + + + +
+
- + \ No newline at end of file diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.ts old mode 100644 new mode 100755 index 041915186c05e..f095f5e53c72a --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.ts @@ -12,6 +12,7 @@ import { NotificationService } from '~/app/shared/services/notification.service' import { RgwRealm, RgwZonegroup, RgwZone, SystemKey } from '../models/rgw-multisite'; import { NotificationType } from '~/app/shared/enum/notification-type.enum'; import { Subscription } from 'rxjs'; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'cd-create-rgw-service-entities', @@ -28,6 +29,10 @@ export class CreateRgwServiceEntitiesComponent { @Output() submitAction = new EventEmitter(); + @Output() + closeAction = new EventEmitter(); + + open = false; constructor( public activeModal: NgbActiveModal, public actionLabels: ActionLabelsI18n, @@ -36,8 +41,10 @@ export class CreateRgwServiceEntitiesComponent { public notificationService: NotificationService, public rgwZonegroupService: RgwZonegroupService, public rgwRealmService: RgwRealmService, - public modalService: ModalService + public modalService: ModalService, + private route: ActivatedRoute, ) { + this.open = this.route.outlet === 'modal'; this.createForm(); } @@ -96,4 +103,8 @@ export class CreateRgwServiceEntitiesComponent { }); }); } + closeModal(){ + this.closeAction.emit(); + // this.modalService.dismissAll(); + } }