From 93cd12024a9c6814f21d37e50728afffd1ba6047 Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Fri, 19 May 2023 16:48:14 +0530 Subject: [PATCH] mgr/dashboard: fix create snapshot is disabled for rbd images also the rename and rollback option in the snapshot list is enabled even if there isn't anything in the list also disabled the Mirror Image Snapshot option in the Create RBD Snapshot form (only shown for images configured with Snapshot mirroring) with the helpe Fixes: https://tracker.ceph.com/issues/61296 Signed-off-by: Nizamudeen A (cherry picked from commit 896ae75901b564677ea1611a89f4d61da881a6e1) --- .../rbd-snapshot-form-modal.component.html | 12 ++++++--- .../rbd-snapshot-form-modal.component.spec.ts | 22 ++++++++++++++++ .../rbd-snapshot-form-modal.component.ts | 26 ++++++++++++------- .../rbd-snapshot-actions.model.ts | 6 +++-- .../rbd-snapshot-list.component.spec.ts | 7 ++--- .../rbd-snapshot-list.component.ts | 12 --------- 6 files changed, 53 insertions(+), 32 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.html index fb246a44451..e84ecab695a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.html @@ -24,13 +24,14 @@ autofocus> This field is required.

+ i18n>This field is required. Snapshot mode is enabled on image {{ imageName }}: snapshot names are auto generated -
-
+ +
+ The peer must be registered to do this action.
-
+
{ let component: RbdSnapshotFormModalComponent; let fixture: ComponentFixture; + let rbdMirrorService: RbdMirroringService; configureTestBed({ imports: [ @@ -32,6 +35,7 @@ describe('RbdSnapshotFormModalComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(RbdSnapshotFormModalComponent); component = fixture.componentInstance; + rbdMirrorService = TestBed.inject(RbdMirroringService); }); it('should create', () => { @@ -59,4 +63,22 @@ describe('RbdSnapshotFormModalComponent', () => { const button = fixture.debugElement.nativeElement.querySelector('cd-submit-button'); expect(button.textContent).toBe('Rename RBD Snapshot'); }); + + it('should enable the mirror image snapshot creation when peer is configured', () => { + spyOn(rbdMirrorService, 'getPeerForPool').and.returnValue(of(['test_peer'])); + component.mirroring = 'snapshot'; + component.ngOnInit(); + fixture.detectChanges(); + const radio = fixture.debugElement.nativeElement.querySelector('#mirrorImageSnapshot'); + expect(radio.disabled).toBe(false); + }); + + it('should disable the mirror image snapshot creation when peer is not configured', () => { + spyOn(rbdMirrorService, 'getPeerForPool').and.returnValue(of([])); + component.mirroring = 'snapshot'; + component.ngOnInit(); + fixture.detectChanges(); + const radio = fixture.debugElement.nativeElement.querySelector('#mirrorImageSnapshot'); + expect(radio.disabled).toBe(true); + }); }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.ts index 9fc5179e23b..f3665f6d049 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.ts @@ -1,8 +1,9 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { FormControl, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { Subject } from 'rxjs'; +import { Observable, Subject } from 'rxjs'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; import { RbdService } from '~/app/shared/api/rbd.service'; import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; @@ -17,7 +18,7 @@ import { TaskManagerService } from '~/app/shared/services/task-manager.service'; templateUrl: './rbd-snapshot-form-modal.component.html', styleUrls: ['./rbd-snapshot-form-modal.component.scss'] }) -export class RbdSnapshotFormModalComponent { +export class RbdSnapshotFormModalComponent implements OnInit { poolName: string; namespace: string; imageName: string; @@ -32,12 +33,15 @@ export class RbdSnapshotFormModalComponent { public onSubmit: Subject = new Subject(); + peerConfigured$: Observable; + constructor( public activeModal: NgbActiveModal, private rbdService: RbdService, private taskManagerService: TaskManagerService, private notificationService: NotificationService, - private actionLabels: ActionLabelsI18n + private actionLabels: ActionLabelsI18n, + private rbdMirrorService: RbdMirroringService ) { this.action = this.actionLabels.CREATE; this.resource = $localize`RBD Snapshot`; @@ -53,18 +57,22 @@ export class RbdSnapshotFormModalComponent { }); } + ngOnInit(): void { + this.peerConfigured$ = this.rbdMirrorService.getPeerForPool(this.poolName); + } + setSnapName(snapName: string) { this.snapName = snapName; - if (this.mirroring !== 'snapshot') { - this.snapshotForm.get('snapshotName').setValue(snapName); - } else { - this.snapshotForm.get('snapshotName').clearValidators(); - } + this.snapshotForm.get('snapshotName').setValue(snapName); } onMirrorCheckBoxChange() { if (this.snapshotForm.getValue('mirrorImageSnapshot') === true) { this.snapshotForm.get('snapshotName').setValue(''); + this.snapshotForm.get('snapshotName').clearValidators(); + } else { + this.snapshotForm.get('snapshotName').setValue(this.snapName); + this.snapshotForm.get('snapshotName').setValidators([Validators.required]); } } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts index cc0d61f91aa..8b40111b8c8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts @@ -35,7 +35,8 @@ export class RbdSnapshotActionsModel { permission: 'update', icon: Icons.edit, name: actionLabels.RENAME, - disable: (selection: CdTableSelection) => this.disableForMirrorSnapshot(selection) + disable: (selection: CdTableSelection) => + this.disableForMirrorSnapshot(selection) || !selection.hasSingleSelection }; this.protect = { permission: 'update', @@ -76,7 +77,8 @@ export class RbdSnapshotActionsModel { permission: 'update', icon: Icons.undo, name: actionLabels.ROLLBACK, - disable: (selection: CdTableSelection) => this.disableForMirrorSnapshot(selection) + disable: (selection: CdTableSelection) => + this.disableForMirrorSnapshot(selection) || !selection.hasSingleSelection }; this.deleteSnap = { permission: 'delete', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts index 0d89f2e2a05..797fc35a11c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts @@ -7,7 +7,6 @@ import { NgbModalModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { MockComponent } from 'ng-mocks'; import { ToastrModule } from 'ngx-toastr'; import { Subject, throwError as observableThrowError } from 'rxjs'; -import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; import { RbdService } from '~/app/shared/api/rbd.service'; import { ComponentsModule } from '~/app/shared/components/components.module'; @@ -86,7 +85,6 @@ describe('RbdSnapshotListComponent', () => { describe('api delete request', () => { let called: boolean; let rbdService: RbdService; - let rbdMirroringService: RbdMirroringService; let notificationService: NotificationService; let authStorageService: AuthStorageService; @@ -95,7 +93,6 @@ describe('RbdSnapshotListComponent', () => { const modalService = TestBed.inject(ModalService); const actionLabelsI18n = TestBed.inject(ActionLabelsI18n); called = false; - rbdMirroringService = new RbdMirroringService(null, null); rbdService = new RbdService(null, null); notificationService = new NotificationService(null, null, null); authStorageService = new AuthStorageService(); @@ -106,7 +103,6 @@ describe('RbdSnapshotListComponent', () => { null, null, rbdService, - rbdMirroringService, null, notificationService, null, @@ -205,7 +201,8 @@ describe('RbdSnapshotListComponent', () => { null, null, null, - TestBed.inject(ActionLabelsI18n) + TestBed.inject(ActionLabelsI18n), + null ); ref.componentInstance.onSubmit = new Subject(); return ref; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts index 81e2f4e0149..579b6879173 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts @@ -12,7 +12,6 @@ import { import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import moment from 'moment'; import { of } from 'rxjs'; -import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; import { RbdService } from '~/app/shared/api/rbd.service'; import { CdHelperClass } from '~/app/shared/classes/cd-helper.class'; @@ -79,8 +78,6 @@ export class RbdSnapshotListComponent implements OnInit, OnChanges { modalRef: NgbModalRef; - peerConfigured = false; - builders = { 'rbd/snap/create': (metadata: any) => { const model = new RbdSnapshotModel(); @@ -95,7 +92,6 @@ export class RbdSnapshotListComponent implements OnInit, OnChanges { private dimlessBinaryPipe: DimlessBinaryPipe, private cdDatePipe: CdDatePipe, private rbdService: RbdService, - private rbdMirrorService: RbdMirroringService, private taskManagerService: TaskManagerService, private notificationService: NotificationService, private summaryService: SummaryService, @@ -148,20 +144,12 @@ export class RbdSnapshotListComponent implements OnInit, OnChanges { } ]; - this.rbdMirrorService.getPeerForPool(this.poolName).subscribe((resp: any) => { - if (resp.length > 0) { - this.peerConfigured = true; - } - }); - this.imageSpec = new ImageSpec(this.poolName, this.namespace, this.rbdName); this.rbdTableActions = new RbdSnapshotActionsModel( this.actionLabels, this.featuresName, this.rbdService ); - this.rbdTableActions.create.disable = () => - !this.primary || (!this.peerConfigured && this.mirroring === 'snapshot'); this.rbdTableActions.create.click = () => this.openCreateSnapshotModal(); this.rbdTableActions.rename.click = () => this.openEditSnapshotModal(); this.rbdTableActions.protect.click = () => this.toggleProtection(); -- 2.39.5