Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NIFI-13285: If there is no transform to restore for the current viewport, executing a zoom fit #8874

Merged
merged 2 commits into from
May 29, 2024
Merged

NIFI-13285: If there is no transform to restore for the current viewport, executing a zoom fit #8874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae24635
NIFI-13285:
mcgilman May 24, 2024
09d56fc
NIFI-13285:
mcgilman May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions ...ifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,16 +609,16 @@ export class CanvasView {
/**
* Zooms to fit the entire graph on the canvas.
*/
public fit(): void {
public fit(allowTransition: boolean): void {
const translate = [this.x, this.y];
const scale: number = this.k;
let newScale: number;

// get the canvas normalized width and height
const canvasContainer: any = document.getElementById('canvas-container');
const canvasBoundingBox: any = canvasContainer.getBoundingClientRect();
const canvasWidth = canvasBoundingBox.width;
const canvasHeight = canvasBoundingBox.height;
const canvasWidth = canvasBoundingBox.width - 50;
const canvasHeight = canvasBoundingBox.height - 50;

// get the bounding box for the graph
const graph: any = d3.select('#canvas');
Expand All @@ -627,6 +627,8 @@ export class CanvasView {
const graphHeight: number = graphBox.height / scale;
let graphLeft: number = graphBox.left / scale;
let graphTop: number = (graphBox.top - canvasBoundingBox.top) / scale;
const x = translate[0] / scale;
const y = translate[1] / scale;

// adjust the scale to ensure the entire graph is visible
if (graphWidth > canvasWidth || graphHeight > canvasHeight) {
Expand All @@ -637,15 +639,14 @@ export class CanvasView {
} else {
newScale = 1;

// since the entire graph will fit on the canvas, offset origin appropriately
graphLeft -= 100;
graphTop -= 50;
graphLeft -= (canvasWidth - graphWidth) / 2;
graphTop -= (canvasHeight - graphHeight) / 2;
}

this.allowTransition = true;
this.allowTransition = allowTransition;
this.centerBoundingBox({
x: graphLeft - translate[0] / scale,
y: graphTop - translate[1] / scale,
x: graphLeft - x,
y: graphTop - y,
width: canvasWidth / newScale,
height: canvasHeight / newScale,
scale: newScale
Expand Down
2 changes: 1 addition & 1 deletion ...b-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ export const zoomIn = createAction('[Transform] Zoom In');

export const zoomOut = createAction('[Transform] Zoom Out');

export const zoomFit = createAction('[Transform] Zoom Fit');
export const zoomFit = createAction('[Transform] Zoom Fit', props<{ transition: boolean }>());

export const zoomActual = createAction('[Transform] Zoom Actual');
9 changes: 7 additions & 2 deletions ...b-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.effects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ export class TransformEffects {
if (isFinite(item.scale) && isFinite(item.translateX) && isFinite(item.translateY)) {
// restore previous view
this.canvasView.transform([item.translateX, item.translateY], item.scale);
} else {
this.store.dispatch(TransformActions.zoomFit({ transition: false }));
}
} else {
this.store.dispatch(TransformActions.zoomFit({ transition: false }));
}
} catch (e) {
// likely could not parse item... ignoring
Expand Down Expand Up @@ -143,8 +147,9 @@ export class TransformEffects {
() =>
this.actions$.pipe(
ofType(TransformActions.zoomFit),
tap(() => {
this.canvasView.fit();
map((action) => action.transition),
tap((transition) => {
this.canvasView.fit(transition);
})
),
{ dispatch: false }
Expand Down
6 changes: 3 additions & 3 deletions ...fi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

.canvas-background {
position: absolute;
top: 98px;
top: 97px;
left: 0;
bottom: 0;
bottom: 33px;
right: 0;
background-size: 14px 14px;
z-index: 1;
Expand All @@ -30,7 +30,7 @@

:host ::ng-deep svg.canvas-svg {
width: 100%;
height: calc(100% - 33px);
height: 100%;

-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
Expand Down
2 changes: 1 addition & 1 deletion ...flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export class NavigationControl {
}

zoomFit(): void {
this.store.dispatch(zoomFit());
this.store.dispatch(zoomFit({ transition: true }));
}

zoomActual(): void {
Expand Down