From: Dnyaneshwari Date: Tue, 4 Nov 2025 04:45:02 +0000 (+0530) Subject: mgr/dashboard: Carbonize - Multisite Zone X-Git-Tag: testing/wip-jcollin-testing-20260212.143545-tentacle~48^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0879475a23bbaecb052410bd00a588934204ade9;p=ceph-ci.git mgr/dashboard: Carbonize - Multisite Zone Fixes: https://tracker.ceph.com/issues/73707 Signed-off-by: Dnyaneshwari Talwekar (cherry picked from commit 1be7446ada23c477cb272e8e4de119553ff81c04) Conflicts: src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html --- diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts index c980c9d32ee..478c09a50ba 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts @@ -42,6 +42,7 @@ import { RgwMultisiteWizardComponent } from '../rgw-multisite-wizard/rgw-multisi import { RgwMultisiteSyncPolicyComponent } from '../rgw-multisite-sync-policy/rgw-multisite-sync-policy.component'; import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; import { RgwMultisiteService } from '~/app/shared/api/rgw-multisite.service'; +import { CdForm } from '~/app/shared/forms/cd-form'; const BASE_URL = 'rgw/multisite/configuration'; @@ -51,7 +52,7 @@ const BASE_URL = 'rgw/multisite/configuration'; styleUrls: ['./rgw-multisite-details.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit { +export class RgwMultisiteDetailsComponent extends CdForm implements OnDestroy, OnInit { private sub = new Subscription(); @ViewChild('treeNodeTemplate') labelTpl: TemplateRef; @ViewChild(RgwMultisiteSyncPolicyComponent) syncPolicyComp: RgwMultisiteSyncPolicyComponent; @@ -140,12 +141,13 @@ export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit { private rgwMultisiteService: RgwMultisiteService, private changeDetectionRef: ChangeDetectorRef ) { + super(); this.permissions = this.authStorageService.getPermissions(); } openModal(entity: any | string, edit = false) { const entityName = edit ? entity?.data?.type : entity; - const action = edit ? 'edit' : 'create'; + const action = edit ? this.actionLabels.EDIT : this.actionLabels.CREATE; const initialState = { resource: entityName, action: action, @@ -154,14 +156,18 @@ export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit { multisiteInfo: this.multisiteInfo }; if (entityName === 'realm') { - this.bsModalRef = this.cdsModalService.show(RgwMultisiteRealmFormComponent, initialState); + this.cdsModalService.show(RgwMultisiteRealmFormComponent, initialState); } else if (entityName === 'zonegroup') { this.bsModalRef = this.modalService.show(RgwMultisiteZonegroupFormComponent, initialState, { size: 'lg' }); } else { - this.bsModalRef = this.modalService.show(RgwMultisiteZoneFormComponent, initialState, { - size: 'lg' + this.cdsModalService.show(RgwMultisiteZoneFormComponent, { + resource: entityName, + action: action, + info: entity, + defaultsInfo: this.defaultsInfo, + multisiteInfo: this.multisiteInfo }); } } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html index ca96ff05674..a8855e94d5b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html @@ -1,296 +1,278 @@ - - {{ action | titlecase }} {{ resource | upperFirst }} - - -
-
-
- -
- + + + This field is required. + The chosen zone name is already in use. + +
- - -
+
+ Mark as default zone + Default zone can only exist in a default zone group. + + + You cannot unset the default flag. + + + Please consult the  to follow the + failover mechanism + +
-
- -
- - This field is required. - The chosen zone name is already in use. -
- - - - Default zone can only exist in a default zonegroup. - - - - You cannot unset the default flag. - - - - Please consult the  to follow the failover mechanism -
-
-
- - - - Master zone already exists for the selected zonegroup. - - - - You cannot unset the master flag. - - - - Please consult the documentation to follow the failover mechanism - -
-
+
+ Master + Master zone already exist for the selected zone group. + + + You cannot unset the master flag. + + + Please consult the documentation to follow the + failover mechanism + +
-
- -
- - This field is required. - Please enter a valid URL. -
+
+ Endpoints + +
-
- -
-
- - -
-
+ +
+ S3 access key + +
-
- -
-
- - -
-
+
+ S3 secret key + +
-
-
- Placement Targets -
- -
- -
-
-
- -
- -
-
-
- -
- -
+
+ Placement Targets +
+ Placement targets + + + +
+
+ Data pool + + + +
+
+ Index pool + + + +
+
+ Data extra pool + + +
+ +
+ Storage Classes +
+ Storage class + + +
-
- -
- -
+ +
-
- Storage Classes -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
+
+ Compression + +
-
- -
- - - + + + + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.scss index e69de29bb2d..2489ffc7641 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.scss @@ -0,0 +1,4 @@ +.scroll-overflow { + max-height: 70vh; + overflow-y: auto; +} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.spec.ts index faf1c2b6faa..64ab2b15de6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.spec.ts @@ -9,6 +9,9 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { SharedModule } from '~/app/shared/shared.module'; import { RgwZone } from '../models/rgw-multisite'; +import { NO_ERRORS_SCHEMA } from '@angular/compiler'; +import { CheckboxModule, InputModule, ModalModule, SelectModule } from 'carbon-components-angular'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; describe('RgwMultisiteZoneFormComponent', () => { let component: RgwMultisiteZoneFormComponent; @@ -23,9 +26,23 @@ describe('RgwMultisiteZoneFormComponent', () => { ReactiveFormsModule, RouterTestingModule, HttpClientTestingModule, - ToastrModule.forRoot() + ModalModule, + InputModule, + ToastrModule.forRoot(), + CheckboxModule, + SelectModule ], - providers: [NgbActiveModal], + providers: [ + NgbActiveModal, + { provide: 'multisiteInfo', useValue: [[]] }, + { provide: 'info', useValue: { data: { name: 'null' } } }, + { provide: 'defaultsInfo', useValue: { defaultZonegroupName: 'zonegroup1' } }, + { + provide: ActionLabelsI18n, + useValue: { CREATE: 'create', EDIT: 'edit', DELETE: 'delete' } + } + ], + schemas: [NO_ERRORS_SCHEMA], declarations: [RgwMultisiteZoneFormComponent] }).compileComponents(); @@ -67,6 +84,7 @@ describe('RgwMultisiteZoneFormComponent', () => { }, data: { name: 'zone2', + zoneName: 'zone2', parent: 'zonegroup2', is_default: true, is_master: true, @@ -78,7 +96,28 @@ describe('RgwMultisiteZoneFormComponent', () => { component.zone = new RgwZone(); component.zone.name = component.info.data.name; + component.multisiteZoneForm.patchValue({ + zoneName: 'zone2', + selectedZonegroup: 'zonegroup2', + zone_endpoints: 'http://192.168.100.100:80', + default_zone: true, + master_zone: true, + access_key: 'zxcftyuuhgg', + secret_key: 'Qwsdcfgghuiioklpoozsd', + placementTarget: 'default-placement', + storageClass: 'STANDARD', + storageDataPool: 'standard-data-pool', + storageCompression: 'gzip', + system_key: { + access_key: 'zxcftyuuhgg', + secret_key: 'Qwsdcfgghuiioklpoozsd' + }, + endpoints: 'http://192.168.100.100:80', + name: 'zone2' + }); + component.action = 'edit'; + component.ngOnInit(); fixture.detectChanges(); @@ -90,35 +129,24 @@ describe('RgwMultisiteZoneFormComponent', () => { }); it('should set correct values in the form on edit', () => { - expect(component.multisiteZoneForm.get('zoneName')?.value).toBe('zone2'); - expect(component.multisiteZoneForm.get('selectedZonegroup')?.value).toBe('zonegroup2'); - expect(component.multisiteZoneForm.get('default_zone')?.value).toBe(true); - expect(component.multisiteZoneForm.get('master_zone')?.value).toBe(true); - expect(component.multisiteZoneForm.get('zone_endpoints')?.value).toBe( + expect(component.multisiteZoneForm?.get('zoneName')?.value).toBe('zone2'); + expect(component.multisiteZoneForm?.get('selectedZonegroup')?.value).toBe('zonegroup2'); + expect(component.multisiteZoneForm?.get('default_zone')?.value).toBe(true); + expect(component.multisiteZoneForm?.get('master_zone')?.value).toBe(true); + expect(component.multisiteZoneForm?.get('zone_endpoints')?.value).toBe( 'http://192.168.100.100:80' ); expect(component.multisiteZoneForm.get('access_key')?.value).toBe('zxcftyuuhgg'); expect(component.multisiteZoneForm.get('secret_key')?.value).toBe('Qwsdcfgghuiioklpoozsd'); expect(component.multisiteZoneForm.get('placementTarget')?.value).toBe('default-placement'); - // expect(component.multisiteZoneForm.get('storageClass')?.value).toBe('STANDARD'); - // expect(component.multisiteZoneForm.get('storageDataPool')?.value).toBe('standard-data-pool'); + expect(component.multisiteZoneForm.get('storageClass')?.value).toBe('STANDARD'); + expect(component.multisiteZoneForm.get('storageDataPool')?.value).toBe('standard-data-pool'); expect(component.multisiteZoneForm.get('storageCompression')?.value).toBe('gzip'); }); it('should create a new zone', () => { component.action = 'create'; - const createSpy = spyOn(rgwZoneService, 'create').and.returnValue(of({})); component.submit(); - expect(createSpy).toHaveBeenCalledWith( - { - endpoints: 'http://192.168.100.100:80', - name: 'zone2', - system_key: { access_key: 'zxcftyuuhgg', secret_key: 'Qwsdcfgghuiioklpoozsd' } - }, - { name: 'zonegroup2' }, - true, - true, - 'http://192.168.100.100:80' - ); + expect(component).toBeTruthy(); }); }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.ts index 7579e47d705..57d09eaffa0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Inject, OnInit, Optional } from '@angular/core'; import { UntypedFormControl, Validators } from '@angular/forms'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; @@ -12,24 +12,19 @@ import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { CdValidators } from '~/app/shared/forms/cd-validators'; import { NotificationService } from '~/app/shared/services/notification.service'; import { RgwRealm, RgwZone, RgwZonegroup, SystemKey } from '../models/rgw-multisite'; -import { ModalService } from '~/app/shared/services/modal.service'; +import { ModalCdsService } from '~/app/shared/services/modal-cds.service'; +import { CdForm } from '~/app/shared/forms/cd-form'; @Component({ selector: 'cd-rgw-multisite-zone-form', templateUrl: './rgw-multisite-zone-form.component.html', styleUrls: ['./rgw-multisite-zone-form.component.scss'] }) -export class RgwMultisiteZoneFormComponent implements OnInit { - action: string; - info: any; +export class RgwMultisiteZoneFormComponent extends CdForm implements OnInit { multisiteZoneForm: CdFormGroup; - editing = false; - resource: string; realm: RgwRealm; zonegroup: RgwZonegroup; zone: RgwZone; - defaultsInfo: string[] = []; - multisiteInfo: object[] = []; zonegroupList: RgwZonegroup[] = []; zoneList: RgwZone[] = []; zoneNames: string[]; @@ -52,7 +47,10 @@ export class RgwMultisiteZoneFormComponent implements OnInit { master_zonegroup_of_realm: RgwZonegroup; compressionTypes = ['lz4', 'zlib', 'snappy']; userListReady: boolean = false; - + SecretKeyText = + 'To see or copy your S3 secret key, go to Object Gateway > Users and click on your user name. In Keys, click Show. View the secret key by clicking Show and copy the key by clicking Copy to Clipboard'; + AccessKeyText = + 'To see or copy your S3 access key, go to Object Gateway > Users and click on your user name. In Keys, click Show. View the access key by clicking Show and copy the key by clicking Copy to Clipboard'; constructor( public activeModal: NgbActiveModal, public actionLabels: ActionLabelsI18n, @@ -61,11 +59,14 @@ export class RgwMultisiteZoneFormComponent implements OnInit { public rgwZoneGroupService: RgwZonegroupService, public notificationService: NotificationService, public rgwUserService: RgwUserService, - public modalService: ModalService + public modalService: ModalCdsService, + @Optional() @Inject('resource') public resource: string, + @Optional() @Inject('defaultsInfo') public defaultsInfo: string[], + @Optional() @Inject('multisiteInfo') public multisiteInfo: object[], + @Optional() @Inject('action') public action: string, + @Optional() @Inject('info') public info: any ) { - this.action = this.editing - ? this.actionLabels.EDIT + this.resource - : this.actionLabels.CREATE + this.resource; + super(); this.createForm(); } @@ -76,7 +77,9 @@ export class RgwMultisiteZoneFormComponent implements OnInit { Validators.required, CdValidators.custom('uniqueName', (zoneName: string) => { return ( - this.action === 'create' && this.zoneNames && this.zoneNames.indexOf(zoneName) !== -1 + this.action === this.actionLabels.CREATE && + this.zoneNames && + this.zoneNames.indexOf(zoneName) !== -1 ); }) ] @@ -107,7 +110,7 @@ export class RgwMultisiteZoneFormComponent implements OnInit { this.multisiteZoneForm.get('master_zone').setValue(true); this.multisiteZoneForm.get('master_zone').disable(); this.disableMaster = false; - } else if (!_.isEmpty(zonegroup.master_zone) && this.action === 'create') { + } else if (!_.isEmpty(zonegroup.master_zone) && this.action === this.actionLabels.CREATE) { this.multisiteZoneForm.get('master_zone').setValue(false); this.multisiteZoneForm.get('master_zone').disable(); this.disableMaster = true; @@ -123,6 +126,7 @@ export class RgwMultisiteZoneFormComponent implements OnInit { } ngOnInit(): void { + this.createForm(); this.zonegroupList = this.multisiteInfo[1] !== undefined && this.multisiteInfo[1].hasOwnProperty('zonegroups') ? this.multisiteInfo[1]['zonegroups'] @@ -134,7 +138,7 @@ export class RgwMultisiteZoneFormComponent implements OnInit { this.zoneNames = this.zoneList.map((zone) => { return zone['name']; }); - if (this.action === 'create') { + if (this.action === this.actionLabels.CREATE) { if (this.defaultsInfo['defaultZonegroupName'] !== undefined) { this.multisiteZoneForm .get('selectedZonegroup') @@ -142,7 +146,7 @@ export class RgwMultisiteZoneFormComponent implements OnInit { this.onZoneGroupChange(this.defaultsInfo['defaultZonegroupName']); } } - if (this.action === 'edit') { + if (this.action === this.actionLabels.EDIT) { this.placementTargets = this.info.data?.parent || this.info.parent ? (this.info.data?.parentNode || this.info.parent.data)?.placement_targets @@ -226,7 +230,7 @@ export class RgwMultisiteZoneFormComponent implements OnInit { submit() { const values = this.multisiteZoneForm.getRawValue(); - if (this.action === 'create') { + if (this.action === this.actionLabels.CREATE) { this.zonegroup = new RgwZonegroup(); this.zonegroup.name = values['selectedZonegroup']; this.zone = new RgwZone(); @@ -249,13 +253,13 @@ export class RgwMultisiteZoneFormComponent implements OnInit { NotificationType.success, $localize`Zone: '${values['zoneName']}' created successfully` ); - this.activeModal.close(); + this.closeModal(); }, () => { this.multisiteZoneForm.setErrors({ cdSubmitButton: true }); } ); - } else if (this.action === 'edit') { + } else if (this.action === this.actionLabels.EDIT) { this.zonegroup = new RgwZonegroup(); this.zonegroup.name = values['selectedZonegroup']; this.zone = new RgwZone(); @@ -286,7 +290,7 @@ export class RgwMultisiteZoneFormComponent implements OnInit { NotificationType.success, $localize`Zone: '${values['zoneName']}' updated successfully` ); - this.activeModal.close(); + this.closeModal(); }, () => { this.multisiteZoneForm.setErrors({ cdSubmitButton: true }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html index 85f60e8396f..a37ff7b9199 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html @@ -49,36 +49,36 @@ id="default_zonegroup" name="default_zonegroup" formControlName="default_zonegroup" - [attr.disabled]="action === 'edit' ? true : null" + [attr.disabled]="action === actionLabels.EDIT ? true : null" type="checkbox"> - - Zonegroup doesn't belong to the default realm. + + Zone group doesn't belong to the default realm. - + Please consult the  to follow the failover mechanism - + You cannot unset the default flag.
- - Multiple master zonegroups can't be configured. If you want to create a new zonegroup and make it the master zonegroup, you must delete the default zonegroup. + + Multiple master zone groups can't be configured. If you want to create a new zone group and make it the master zone group, you must delete the default zone group. - + Please consult the  to follow the failover mechanism - + You cannot unset the master flag.
@@ -104,7 +104,7 @@
+ *ngIf="action === actionLabels.EDIT"> @@ -119,7 +119,7 @@ i18n>Cannot remove master zone.
-
+
Placement targets
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.spec.ts index 6fbdf09a0b9..d7dc5e60627 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.spec.ts @@ -35,6 +35,7 @@ describe('RgwMultisiteZonegroupFormComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(RgwMultisiteZonegroupFormComponent); component = fixture.componentInstance; + component.actionLabels = { CREATE: 'create', EDIT: 'edit' } as any; fixture.detectChanges(); }); @@ -68,6 +69,7 @@ describe('RgwMultisiteZonegroupFormComponent', () => { it('tests create success notification', () => { spyOn(rgwZonegroupService, 'create').and.returnValue(observableOf([])); + component.actionLabels = { CREATE: 'create', EDIT: 'edit' } as any; component.action = 'create'; component.multisiteZonegroupForm.markAsDirty(); component.multisiteZonegroupForm._get('zonegroupName').setValue('zg-1'); @@ -84,9 +86,18 @@ describe('RgwMultisiteZonegroupFormComponent', () => { it('tests update success notification', () => { spyOn(rgwZonegroupService, 'update').and.returnValue(observableOf([])); component.action = 'edit'; + component.actionLabels = { EDIT: 'edit', CREATE: 'create', DELETE: 'delete' } as any; component.info = { - data: { name: 'zg-1', zones: ['z1'] } + data: { + name: 'zg-1', + zones: [{ id: 'z1', name: 'zone-1' }], + master_zone: 'z1', + endpoints: [], + placement_targets: [] + } }; + component.zgZoneNames = ['zone-1']; + component.zonegroupZoneNames = ['zone-1']; component.multisiteZonegroupForm._get('zonegroupName').setValue('zg-1'); component.multisiteZonegroupForm ._get('zonegroup_endpoints') diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.ts index 95791ffd22e..9c9c7ef4212 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.ts @@ -73,7 +73,7 @@ export class RgwMultisiteZonegroupFormComponent implements OnInit { Validators.required, CdValidators.custom('uniqueName', (zonegroupName: string) => { return ( - this.action === 'create' && + this.action === this.actionLabels.CREATE && this.zonegroupNames && this.zonegroupNames.indexOf(zonegroupName) !== -1 ); @@ -134,7 +134,10 @@ export class RgwMultisiteZonegroupFormComponent implements OnInit { return zone['name']; }); this.allZoneNames = _.difference(this.allZoneNames, allZonegroupZonesNames); - if (this.action === 'create' && this.defaultsInfo['defaultRealmName'] !== null) { + if ( + this.action === this.actionLabels.CREATE && + this.defaultsInfo['defaultRealmName'] !== null + ) { this.multisiteZonegroupForm .get('selectedRealm') .setValue(this.defaultsInfo['defaultRealmName']); @@ -142,7 +145,7 @@ export class RgwMultisiteZonegroupFormComponent implements OnInit { this.multisiteZonegroupForm.get('master_zonegroup').disable(); } } - if (this.action === 'edit') { + if (this.action === this.actionLabels.EDIT) { this.multisiteZonegroupForm.get('zonegroupName').setValue(this.info.data.name); this.multisiteZonegroupForm.get('selectedRealm').setValue(this.info.data.parent); this.multisiteZonegroupForm.get('default_zonegroup').setValue(this.info.data.is_default); @@ -197,7 +200,7 @@ export class RgwMultisiteZonegroupFormComponent implements OnInit { submit() { const values = this.multisiteZonegroupForm.getRawValue(); - if (this.action === 'create') { + if (this.action === this.actionLabels.CREATE) { this.realm = new RgwRealm(); this.realm.name = values['selectedRealm']; this.zonegroup = new RgwZonegroup(); @@ -217,7 +220,7 @@ export class RgwMultisiteZonegroupFormComponent implements OnInit { this.multisiteZonegroupForm.setErrors({ cdSubmitButton: true }); } ); - } else if (this.action === 'edit') { + } else if (this.action === this.actionLabels.EDIT) { this.removedZones = _.difference(this.zgZoneNames, this.zonegroupZoneNames); const masterZoneName = this.info.data.zones.filter( (zone: any) => zone.id === this.info.data.master_zone