NIFI-13125 - Flow Version Diff View #10473
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser'; | |
| import { ChangeVersionDialog } from './change-version-dialog'; | ||
| import { ChangeVersionDialogRequest } from '../../../../../state/flow'; | ||
| import { VersionedFlowSnapshotMetadata } from '../../../../../../../state/shared'; | ||
| import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; | ||
| import { provideMockStore } from '@ngrx/store/testing'; | ||
| import { initialState } from '../../../../../state/flow/flow.reducer'; | ||
| import { NoopAnimationsModule } from '@angular/platform-browser/animations'; | ||
|
|
@@ -33,6 +33,7 @@ import { currentUserFeatureKey } from '../../../../../../../state/current-user'; | |
| import { canvasFeatureKey } from '../../../../../state'; | ||
| import { flowFeatureKey } from '../../../../../state/flow'; | ||
| import { Sort } from '@angular/material/sort'; | ||
| import { FlowDiffDialog } from '../flow-diff-dialog/flow-diff-dialog'; | ||
|
|
||
| interface SetupOptions { | ||
| dialogData?: ChangeVersionDialogRequest; | ||
|
|
@@ -92,6 +93,7 @@ describe('ChangeVersionDialog', () => { | |
| async function setup(options: SetupOptions = {}) { | ||
| const dialogData = options.dialogData || createMockDialogData(); | ||
| const timeOffset = options.timeOffset || 0; | ||
| const matDialogOpen = jest.fn(); | ||
|
|
||
| await TestBed.configureTestingModule({ | ||
| imports: [ChangeVersionDialog, NoopAnimationsModule], | ||
|
|
@@ -112,15 +114,21 @@ describe('ChangeVersionDialog', () => { | |
| } | ||
| ] | ||
| }), | ||
| { provide: MatDialogRef, useValue: null }, | ||
| { | ||
| provide: MatDialog, | ||
| useValue: { | ||
| open: matDialogOpen | ||
| } | ||
| } | ||
| ] | ||
| }).compileComponents(); | ||
|
|
||
| const fixture = TestBed.createComponent(ChangeVersionDialog); | ||
| const component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
|
|
||
| return { fixture, component, dialogData, matDialogOpen }; | ||
| } | ||
|
|
||
| beforeEach(() => { | ||
|
|
@@ -133,6 +141,12 @@ describe('ChangeVersionDialog', () => { | |
| expect(component).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('should include flow diff action column', async () => { | ||
| const { component } = await setup(); | ||
|
|
||
| expect(component.displayedColumns).toContain('actions'); | ||
| }); | ||
|
|
||
| describe('Component Initialization', () => { | ||
| it('should initialize with sorted flow versions', async () => { | ||
| const { component } = await setup(); | ||
|
|
@@ -214,6 +228,34 @@ describe('ChangeVersionDialog', () => { | |
| }); | ||
| }); | ||
|
|
||
| describe('Flow Diff', () => { | ||
| it('should open the flow diff dialog when the action is triggered', async () => { | ||
| const { fixture, matDialogOpen, dialogData } = await setup(); | ||
| const diffButton = fixture.debugElement.query(By.css('[data-qa="view-flow-diff-button"]')); | ||
| const mockEvent = { | ||
| preventDefault: jest.fn(), | ||
| stopPropagation: jest.fn() | ||
| } as unknown as MouseEvent; | ||
|
|
||
| diffButton.triggerEventHandler('click', mockEvent); | ||
|
|
||
| expect(mockEvent.preventDefault).toHaveBeenCalled(); | ||
| expect(mockEvent.stopPropagation).toHaveBeenCalled(); | ||
| const icon = diffButton.query(By.css('i')); | ||
| expect(icon.nativeElement.classList).toContain('fa-exchange'); | ||
| expect(matDialogOpen).toHaveBeenCalledWith( | ||
| FlowDiffDialog, | ||
| expect.objectContaining({ | ||
| data: expect.objectContaining({ | ||
| versionControlInformation: dialogData.versionControlInformation, | ||
| currentVersion: dialogData.versionControlInformation.version, | ||
| selectedVersion: dialogData.versions[0].versionedFlowSnapshotMetadata.version | ||
| }) | ||
| }) | ||
| ); | ||
| }); | ||
| }); | ||
|
|
||
| describe('Selection Validation', () => { | ||
| it('should be invalid when no version is selected', async () => { | ||
| const { component } = await setup(); | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -16,16 +16,17 @@ | |
| */ | ||
|
|
||
| import { Component, EventEmitter, Output, inject } from '@angular/core'; | ||
| import { MatButton, MatIconButton } from '@angular/material/button'; | ||
| import { MatCell, MatCellDef, MatColumnDef, MatTableDataSource, MatTableModule } from '@angular/material/table'; | ||
| import { MAT_DIALOG_DATA, MatDialog, MatDialogModule } from '@angular/material/dialog'; | ||
| import { MatSortModule, Sort } from '@angular/material/sort'; | ||
| import { VersionedFlowSnapshotMetadata } from '../../../../../../../state/shared'; | ||
| import { ChangeVersionDialogRequest, VersionControlInformation } from '../../../../../state/flow'; | ||
| import { Store } from '@ngrx/store'; | ||
| import { CanvasState } from '../../../../../state'; | ||
| import { selectTimeOffset } from '../../../../../../../state/flow-configuration/flow-configuration.selectors'; | ||
| import { NiFiCommon, CloseOnEscapeDialog, NifiTooltipDirective, TextTip, LARGE_DIALOG } from '@nifi/shared'; | ||
| import { FlowDiffDialog, FlowDiffDialogData } from '../flow-diff-dialog/flow-diff-dialog'; | ||
|
|
||
| @Component({ | ||
| selector: 'change-version-dialog', | ||
|
|
@@ -37,7 +38,8 @@ import { NiFiCommon, CloseOnEscapeDialog, NifiTooltipDirective, TextTip } from ' | |
| MatDialogModule, | ||
| MatSortModule, | ||
| MatTableModule, | ||
| NifiTooltipDirective, | ||
| MatIconButton | ||
| ], | ||
| templateUrl: './change-version-dialog.html', | ||
| styleUrl: './change-version-dialog.scss' | ||
|
|
@@ -47,16 +49,18 @@ export class ChangeVersionDialog extends CloseOnEscapeDialog { | |
| private nifiCommon = inject(NiFiCommon); | ||
| private store = inject<Store<CanvasState>>(Store); | ||
|
|
||
| displayedColumns: string[] = ['actions', 'current', 'version', 'created', 'comments']; | ||
|
||
| dataSource: MatTableDataSource<VersionedFlowSnapshotMetadata> = | ||
| new MatTableDataSource<VersionedFlowSnapshotMetadata>(); | ||
| selectedFlowVersion: VersionedFlowSnapshotMetadata | null = null; | ||
| private allFlowVersions: VersionedFlowSnapshotMetadata[] = []; | ||
| sort: Sort = { | ||
| active: 'created', | ||
| direction: 'desc' | ||
| }; | ||
| versionControlInformation: VersionControlInformation; | ||
| private timeOffset = this.store.selectSignal(selectTimeOffset); | ||
| private dialog = inject(MatDialog); | ||
|
|
||
| @Output() changeVersion: EventEmitter<VersionedFlowSnapshotMetadata> = | ||
| new EventEmitter<VersionedFlowSnapshotMetadata>(); | ||
|
|
@@ -66,6 +70,7 @@ export class ChangeVersionDialog extends CloseOnEscapeDialog { | |
| const dialogRequest = this.dialogRequest; | ||
|
|
||
| const flowVersions = dialogRequest.versions.map((entity) => entity.versionedFlowSnapshotMetadata); | ||
| this.allFlowVersions = flowVersions; | ||
| const sortedFlowVersions = this.sortVersions(flowVersions, this.sort); | ||
| this.selectedFlowVersion = sortedFlowVersions[0]; | ||
| this.dataSource.data = sortedFlowVersions; | ||
|
|
@@ -151,5 +156,27 @@ export class ChangeVersionDialog extends CloseOnEscapeDialog { | |
| return flowVersion.version === this.versionControlInformation.version; | ||
| } | ||
|
|
||
| openFlowDiff(flowVersion: VersionedFlowSnapshotMetadata, event: MouseEvent) { | ||
| event.preventDefault(); | ||
| event.stopPropagation(); | ||
|
|
||
| if (!this.versionControlInformation) { | ||
| return; | ||
| } | ||
|
|
||
| const dialogData: FlowDiffDialogData = { | ||
| versionControlInformation: this.versionControlInformation, | ||
| versions: this.allFlowVersions, | ||
| currentVersion: this.versionControlInformation.version, | ||
| selectedVersion: flowVersion.version | ||
| }; | ||
|
|
||
| this.dialog.open(FlowDiffDialog, { | ||
| ...LARGE_DIALOG, | ||
| data: dialogData, | ||
| autoFocus: false | ||
| }); | ||
| } | ||
|
|
||
| protected readonly TextTip = TextTip; | ||
| } | ||
This file contains hidden or 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,123 @@ | ||||||||
| <!-- | ||||||||
| ~ Licensed to the Apache Software Foundation (ASF) under one or more | ||||||||
| ~ contributor license agreements. See the NOTICE file distributed with | ||||||||
| ~ this work for additional information regarding copyright ownership. | ||||||||
| ~ The ASF licenses this file to You under the Apache License, Version 2.0 | ||||||||
| ~ (the "License"); you may not use this file except in compliance with | ||||||||
| ~ the License. You may obtain a copy of the License at | ||||||||
| ~ | ||||||||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||||||||
| ~ | ||||||||
| ~ Unless required by applicable law or agreed to in writing, software | ||||||||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||||||||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||||
| ~ See the License for the specific language governing permissions and | ||||||||
| ~ limitations under the License. | ||||||||
| --> | ||||||||
|
|
||||||||
| <h2 mat-dialog-title> | ||||||||
| Flow Version Diff - {{ flowName }} | ||||||||
| </h2> | ||||||||
| <div class="flow-diff"> | ||||||||
| <mat-dialog-content> | ||||||||
| <div class="dialog-content flex flex-col gap-y-4"> | ||||||||
| <div | ||||||||
| class="flow-diff-message" | ||||||||
| data-qa="flow-diff-message" | ||||||||
| *ngIf="comparisonSummary.length > 0"> | ||||||||
| <div class="flow-diff-message-title">Comparing versions:</div> | ||||||||
| <ul class="flow-diff-message-list"> | ||||||||
|
||||||||
| <li *ngFor="let summary of comparisonSummary"> | ||||||||
| <span class="flow-diff-version">Version {{ summary.version }}</span> | ||||||||
| <span *ngIf="summary.created" class="flow-diff-created"> | ||||||||
| ({{ summary.created }}) | ||||||||
| </span> | ||||||||
| </li> | ||||||||
| </ul> | ||||||||
| </div> | ||||||||
|
|
||||||||
| <div class="flow-diff-controls flex flex-wrap gap-4"> | ||||||||
| <mat-form-field class="flow-diff-select" appearance="outline"> | ||||||||
| <mat-label>Current Version</mat-label> | ||||||||
| <mat-select [formControl]="currentVersionControl" data-qa="current-version-select"> | ||||||||
| <mat-option *ngFor="let version of versionOptions" [value]="version"> | ||||||||
| {{ formatVersionOption(version) }} | ||||||||
| </mat-option> | ||||||||
| </mat-select> | ||||||||
| </mat-form-field> | ||||||||
|
|
||||||||
| <mat-form-field class="flow-diff-select" appearance="outline"> | ||||||||
| <mat-label>Selected Version</mat-label> | ||||||||
| <mat-select [formControl]="selectedVersionControl" data-qa="selected-version-select"> | ||||||||
| <mat-option *ngFor="let version of versionOptions" [value]="version"> | ||||||||
| {{ formatVersionOption(version) }} | ||||||||
| </mat-option> | ||||||||
| </mat-select> | ||||||||
| </mat-form-field> | ||||||||
|
|
||||||||
| <mat-form-field class="flow-diff-filter" appearance="outline"> | ||||||||
| <mat-label>Filter</mat-label> | ||||||||
| <input | ||||||||
| matInput | ||||||||
| type="text" | ||||||||
| [formControl]="filterControl" | ||||||||
| placeholder="Filter differences" | ||||||||
| data-qa="flow-diff-filter" /> | ||||||||
| </mat-form-field> | ||||||||
| </div> | ||||||||
|
|
||||||||
| <div class="flow-diff-table flex-1"> | ||||||||
| <div class="flow-diff-loading" *ngIf="isLoading"> | ||||||||
| <mat-progress-spinner diameter="36" mode="indeterminate"></mat-progress-spinner> | ||||||||
| </div> | ||||||||
|
||||||||
| <div class="flow-diff-loading" *ngIf="isLoading"> | |
| <mat-progress-spinner diameter="36" mode="indeterminate"></mat-progress-spinner> | |
| </div> |
Outdated
Contributor
There was a problem hiding this comment.
The listings in nifi do not show errors like this. If there is an error when requesting the diff it should be displayed in a context error banner at the top of the dialog like we do in other cases.
Suggested change
| <div *ngIf="errorMessage" class="flow-diff-error" data-qa="flow-diff-error"> | |
| {{ errorMessage }} | |
| </div> |
Contributor
There was a problem hiding this comment.
Ths styles for this table do not match the style for other listings throughout the app.
Contributor
There was a problem hiding this comment.
Suggested change
| *ngIf="dataSource.data.length > 0" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The actions column should be displayed as the last column in the table listing.