Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NAS-128883 / 24.10 / Porting jbof and set enclosure label dialog (#10044
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| import { HarnessLoader } from '@angular/cdk/testing'; | ||
| import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; | ||
| import { MatButtonHarness } from '@angular/material/button/testing'; | ||
| import { MatDialog, MatDialogRef } from '@angular/material/dialog'; | ||
| import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; | ||
| import { of } from 'rxjs'; | ||
| import { DashboardEnclosure } from 'app/interfaces/enclosure.interface'; | ||
| import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; | ||
| import { | ||
| EnclosureDashboardComponent, | ||
| } from 'app/pages/system/enclosure/components/enclosure-dashboard/enclosure-dashboard.component'; | ||
| import { | ||
| SetEnclosureLabelDialogComponent, | ||
| } from 'app/pages/system/enclosure/components/enclosure-dashboard/set-enclosure-label-dialog/set-enclosure-label-dialog.component'; | ||
| import { EnclosureStore } from 'app/pages/system/enclosure/services/enclosure.store'; | ||
|
|
||
| describe('EnclosureDashboardComponent', () => { | ||
| let spectator: Spectator<EnclosureDashboardComponent>; | ||
| let loader: HarnessLoader; | ||
| const createComponent = createComponentFactory({ | ||
| component: EnclosureDashboardComponent, | ||
| shallow: true, | ||
| imports: [ | ||
| PageHeaderModule, | ||
| ], | ||
| providers: [ | ||
| mockProvider(MatDialog), | ||
| mockProvider(EnclosureStore, { | ||
| selectedEnclosure$: of({ | ||
| id: 'enclosure-id', | ||
| name: 'M50', | ||
| label: 'Current label', | ||
| } as DashboardEnclosure), | ||
| initiate: jest.fn(), | ||
| renameSelectedEnclosure: jest.fn(), | ||
| }), | ||
| ], | ||
| }); | ||
|
|
||
| beforeEach(() => { | ||
| }); | ||
|
|
||
| it.skip('initializes store when component is initialized', () => { | ||
| expect(spectator.inject(EnclosureStore).initiate).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('opens edit dialog when Edit Label is pressed', async () => { | ||
| spectator = createComponent(); | ||
| loader = TestbedHarnessEnvironment.loader(spectator.fixture); | ||
|
|
||
| console.info('a'); | ||
| jest.spyOn(spectator.inject(MatDialog), 'open').mockReturnValue({ | ||
| afterClosed: () => of('new label'), | ||
| } as MatDialogRef<SetEnclosureLabelDialogComponent>); | ||
|
|
||
| console.info('b'); | ||
| const editLabel = await loader.getHarness(MatButtonHarness.with({ text: 'Edit Label' })); | ||
| await editLabel.click(); | ||
|
|
||
| console.info('c'); | ||
| expect(spectator.inject(MatDialog).open).toHaveBeenCalledWith(SetEnclosureLabelDialogComponent, { | ||
| data: { | ||
| currentLabel: 'Current label', | ||
| defaultLabel: 'M50', | ||
| enclosureId: 'enclosure-id', | ||
| }, | ||
| }); | ||
|
|
||
| console.info('d'); | ||
| expect(spectator.inject(EnclosureStore).renameSelectedEnclosure).toHaveBeenCalledWith('new label'); | ||
| }); | ||
| }); | ||
GitHub Actions
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,58 @@ | ||
| import { ChangeDetectionStrategy, Component, computed } from '@angular/core'; | ||
| import { toSignal } from '@angular/core/rxjs-interop'; | ||
| import { MatDialog } from '@angular/material/dialog'; | ||
| import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; | ||
| import { filter } from 'rxjs'; | ||
| import { Role } from 'app/enums/role.enum'; | ||
| import { | ||
| SetEnclosureLabelDialogComponent, | ||
| SetEnclosureLabelDialogData, | ||
| } from 'app/pages/system/enclosure/components/enclosure-dashboard/set-enclosure-label-dialog/set-enclosure-label-dialog.component'; | ||
| import { EnclosureStore } from 'app/pages/system/enclosure/services/enclosure.store'; | ||
| import { getEnclosureLabel } from 'app/pages/system/enclosure/utils/get-enclosure-label.utils'; | ||
| import { WebSocketService } from 'app/services/ws.service'; | ||
|
|
||
| @UntilDestroy() | ||
| @Component({ | ||
| selector: 'ix-enclosure-dashboard', | ||
| templateUrl: './enclosure-dashboard.component.html', | ||
| styleUrls: ['./enclosure-dashboard.component.scss'], | ||
| changeDetection: ChangeDetectionStrategy.OnPush, | ||
| }) | ||
| export class EnclosureDashboardComponent { | ||
| protected readonly requiredRoles = [Role.FullAdmin]; | ||
|
|
||
| readonly selectedSlot$ = this.enclosureStore.selectedSlot$; | ||
| readonly isJbofLicensed$ = this.ws.call('jbof.licensed'); | ||
|
|
||
| readonly selectedEnclosure = toSignal(this.enclosureStore.selectedEnclosure$); | ||
|
|
||
| readonly enclosureLabel = computed(() => getEnclosureLabel(this.selectedEnclosure())); | ||
|
|
||
| constructor( | ||
| private enclosureStore: EnclosureStore, | ||
| private matDialog: MatDialog, | ||
| private ws: WebSocketService, | ||
| ) { | ||
| this.enclosureStore.initiate(); | ||
| } | ||
|
|
||
| onEditLabel(): void { | ||
| const enclosure = this.selectedEnclosure(); | ||
| const dialogConfig: SetEnclosureLabelDialogData = { | ||
| currentLabel: this.enclosureLabel(), | ||
| defaultLabel: enclosure.name, | ||
| enclosureId: enclosure.id, | ||
| }; | ||
|
|
||
| this.matDialog.open(SetEnclosureLabelDialogComponent, { data: dialogConfig }) | ||
| .afterClosed() | ||
| .pipe( | ||
| filter(Boolean), | ||
| untilDestroyed(this), | ||
| ) | ||
| .subscribe((newLabel: string) => { | ||
| this.enclosureStore.renameSelectedEnclosure(newLabel); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <ix-modal-header [requiredRoles]="requiredRoles" [title]="title" [loading]="isFormLoading"></ix-modal-header> | ||
| <mat-card> | ||
| <mat-card-content> | ||
| <form class="ix-form-container" [formGroup]="form" (submit)="onSubmit()"> | ||
| <ix-fieldset> | ||
| <ix-input | ||
| formControlName="description" | ||
| [label]="'Description' | translate" | ||
| [required]="true" | ||
| ></ix-input> | ||
| <ix-input | ||
| formControlName="mgmt_ip1" | ||
| [label]="'IP' | translate" | ||
| [required]="true" | ||
| [tooltip]="'IP of 1st Redfish management interface.' | translate" | ||
| ></ix-input> | ||
| <ix-input | ||
| formControlName="mgmt_ip2" | ||
| [label]="'Optional IP' | translate" | ||
| [tooltip]="'Optional IP of 2nd Redfish management interface.' | translate" | ||
| ></ix-input> | ||
| <ix-input | ||
| formControlName="mgmt_username" | ||
| [label]="'Username' | translate" | ||
| [required]="true" | ||
| [tooltip]="'Redfish administrative username.' | translate" | ||
| ></ix-input> | ||
| <ix-input | ||
| formControlName="mgmt_password" | ||
| type="password" | ||
| [label]="'Password' | translate" | ||
| [required]="true" | ||
| [tooltip]="'Redfish administrative password.' | translate" | ||
| ></ix-input> | ||
| </ix-fieldset> | ||
|
|
||
| <ix-form-actions> | ||
| <button | ||
| *ixRequiresRoles="requiredRoles" | ||
| mat-button | ||
| type="submit" | ||
| color="primary" | ||
| ixTest="save" | ||
| [disabled]="form.invalid || isFormLoading" | ||
| > | ||
| {{ 'Save' | translate }} | ||
| </button> | ||
| </ix-form-actions> | ||
| </form> | ||
| </mat-card-content> | ||
| </mat-card> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| import { HarnessLoader } from '@angular/cdk/testing'; | ||
| import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; | ||
| import { ReactiveFormsModule } from '@angular/forms'; | ||
| import { MatButtonHarness } from '@angular/material/button/testing'; | ||
| import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; | ||
| import { mockAuth } from 'app/core/testing/utils/mock-auth.utils'; | ||
| import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; | ||
| import { Jbof } from 'app/interfaces/jbof.interface'; | ||
| import { IxSlideInRef } from 'app/modules/ix-forms/components/ix-slide-in/ix-slide-in-ref'; | ||
| import { SLIDE_IN_DATA } from 'app/modules/ix-forms/components/ix-slide-in/ix-slide-in.token'; | ||
| import { IxFormsModule } from 'app/modules/ix-forms/ix-forms.module'; | ||
| import { FormErrorHandlerService } from 'app/modules/ix-forms/services/form-error-handler.service'; | ||
| import { IxFormHarness } from 'app/modules/ix-forms/testing/ix-form.harness'; | ||
| import { JbosFormComponent } from 'app/pages/system/old-view-enclosure/components/jbof-form/jbof-form.component'; | ||
| import { IxSlideInService } from 'app/services/ix-slide-in.service'; | ||
| import { WebSocketService } from 'app/services/ws.service'; | ||
|
|
||
| describe('JbofFormComponent', () => { | ||
| let spectator: Spectator<JbosFormComponent>; | ||
| let loader: HarnessLoader; | ||
| let ws: WebSocketService; | ||
| const createComponent = createComponentFactory({ | ||
| component: JbosFormComponent, | ||
| imports: [ | ||
| IxFormsModule, | ||
| ReactiveFormsModule, | ||
| ], | ||
| providers: [ | ||
| mockWebSocket([ | ||
| mockCall('jbof.create'), | ||
| mockCall('jbof.update'), | ||
| ]), | ||
| mockProvider(IxSlideInService), | ||
| mockProvider(FormErrorHandlerService), | ||
| mockProvider(IxSlideInRef), | ||
| mockAuth(), | ||
| { provide: SLIDE_IN_DATA, useValue: undefined }, | ||
| ], | ||
| }); | ||
|
|
||
| describe('adding a new jbof', () => { | ||
| beforeEach(() => { | ||
| spectator = createComponent(); | ||
| loader = TestbedHarnessEnvironment.loader(spectator.fixture); | ||
| ws = spectator.inject(WebSocketService); | ||
| }); | ||
|
|
||
| it('sends a create payload to websocket and closes modal form is saved', async () => { | ||
| const form = await loader.getHarness(IxFormHarness); | ||
| await form.fillForm({ | ||
| Description: 'new description', | ||
| IP: '11.11.11.11', | ||
| 'Optional IP': '12.12.12.12', | ||
| Username: 'admin', | ||
| Password: 'qwerty', | ||
| }); | ||
|
|
||
| const saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' })); | ||
| await saveButton.click(); | ||
|
|
||
| expect(ws.call).toHaveBeenCalledWith('jbof.create', [{ | ||
| description: 'new description', | ||
| mgmt_ip1: '11.11.11.11', | ||
| mgmt_ip2: '12.12.12.12', | ||
| mgmt_username: 'admin', | ||
| mgmt_password: 'qwerty', | ||
| }]); | ||
|
|
||
| expect(spectator.inject(IxSlideInRef).close).toHaveBeenCalled(); | ||
| }); | ||
| }); | ||
|
|
||
| describe('editing a jbof', () => { | ||
| beforeEach(() => { | ||
| spectator = createComponent({ | ||
| providers: [ | ||
| { | ||
| provide: SLIDE_IN_DATA, | ||
| useValue: { | ||
| id: 131, | ||
| description: 'editing description', | ||
| mgmt_ip1: '13.13.13.13', | ||
| mgmt_ip2: '14.14.14.14', | ||
| mgmt_username: 'user', | ||
| mgmt_password: '12345678', | ||
| } as Jbof, | ||
| }, | ||
| ], | ||
| }); | ||
| loader = TestbedHarnessEnvironment.loader(spectator.fixture); | ||
| ws = spectator.inject(WebSocketService); | ||
| }); | ||
|
|
||
| it('shows current group values when form is being edited', async () => { | ||
| const form = await loader.getHarness(IxFormHarness); | ||
| const values = await form.getValues(); | ||
|
|
||
| expect(values).toEqual({ | ||
| Description: 'editing description', | ||
| IP: '13.13.13.13', | ||
| 'Optional IP': '14.14.14.14', | ||
| Username: 'user', | ||
| Password: '12345678', | ||
| }); | ||
| }); | ||
|
|
||
| it('sends an update payload to websocket when save is pressed', async () => { | ||
| const form = await loader.getHarness(IxFormHarness); | ||
| await form.fillForm({ | ||
| Description: 'updated description', | ||
| IP: '15.15.15.15', | ||
| 'Optional IP': '', | ||
| Username: 'admin', | ||
| Password: 'qwerty', | ||
| }); | ||
|
|
||
| const saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' })); | ||
| await saveButton.click(); | ||
|
|
||
| expect(ws.call).toHaveBeenCalledWith('jbof.update', [ | ||
| 131, | ||
| { | ||
| description: 'updated description', | ||
| mgmt_ip1: '15.15.15.15', | ||
| mgmt_ip2: '', | ||
| mgmt_username: 'admin', | ||
| mgmt_password: 'qwerty', | ||
| }, | ||
| ]); | ||
| }); | ||
| }); | ||
| }); |
Oops, something went wrong.