Skip to content

fix(ui): temporarily disable frontend undo and redo #3571

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

Merged
merged 4 commits into from
Jul 18, 2025
Merged

fix(ui): temporarily disable frontend undo and redo #3571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abb58f5
fix output port writer thread closed by finalizing an input port.
Xiao-zhen-Liu Jul 18, 2025
3702d6e
temporarily disable undo redo.
Xiao-zhen-Liu Jul 18, 2025
2c931e6
Merge remote-tracking branch 'origin/xiaozhen-disable-undo-redo' into…
Xiao-zhen-Liu Jul 18, 2025
2920eef
temporarily disable undo redo.
Xiao-zhen-Liu Jul 18, 2025
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
32 changes: 16 additions & 16 deletions core/gui/src/app/workspace/component/menu/menu.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,22 +291,22 @@
nzType="database"
nzTheme="twotone"></i>
</button>
<button
(click)="undoRedoService.undoAction()"
[disabled]="displayParticularWorkflowVersion || !undoRedoService.canUndo()"
nz-button>
<i
nz-icon
nzType="undo"></i>
</button>
<button
(click)="undoRedoService.redoAction()"
[disabled]="displayParticularWorkflowVersion || !undoRedoService.canRedo()"
nz-button>
<i
nz-icon
nzType="redo"></i>
</button>
<!-- <button-->
<!-- (click)="undoRedoService.undoAction()"-->
<!-- [disabled]="displayParticularWorkflowVersion || !undoRedoService.canUndo()"-->
<!-- nz-button>-->
<!-- <i-->
<!-- nz-icon-->
<!-- nzType="undo"></i>-->
<!-- </button>-->
<!-- <button-->
<!-- (click)="undoRedoService.redoAction()"-->
<!-- [disabled]="displayParticularWorkflowVersion || !undoRedoService.canRedo()"-->
<!-- nz-button>-->
<!-- <i-->
<!-- nz-icon-->
<!-- nzType="redo"></i>-->
<!-- </button>-->
</nz-button-group>
</ng-template>
<nz-dropdown-menu #menu="nzDropdownMenu">
Expand Down
100 changes: 51 additions & 49 deletions core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,54 +897,56 @@ describe("WorkflowEditorComponent", () => {
expect(jointGraphWrapper.getCurrentHighlightedOperatorIDs()).toContain(mockResultPredicate.operatorID);
});

//undo
it("should undo action when user presses command + Z or control + Z", () => {
spyOn(workflowVersionService, "getDisplayParticularVersionStream").and.returnValue(of(false));
spyOn(undoRedoService, "canUndo").and.returnValue(true);
let undoSpy = spyOn(undoRedoService, "undoAction");
fixture.detectChanges();
const commandZEvent = new KeyboardEvent("keydown", { key: "Z", metaKey: true, shiftKey: false });
(document.activeElement as HTMLElement)?.blur();
document.dispatchEvent(commandZEvent);
fixture.detectChanges();
expect(undoSpy).toHaveBeenCalledTimes(1);

const controlZEvent = new KeyboardEvent("keydown", { key: "Z", ctrlKey: true, shiftKey: false });
(document.activeElement as HTMLElement)?.blur();
document.dispatchEvent(controlZEvent);
fixture.detectChanges();
expect(undoSpy).toHaveBeenCalledTimes(2);
});

//redo
it("should redo action when user presses command/control + Y or command/control + shift + Z", () => {
spyOn(workflowVersionService, "getDisplayParticularVersionStream").and.returnValue(of(false));
spyOn(undoRedoService, "canRedo").and.returnValue(true);
let redoSpy = spyOn(undoRedoService, "redoAction");
fixture.detectChanges();
const commandYEvent = new KeyboardEvent("keydown", { key: "y", metaKey: true, shiftKey: false });
(document.activeElement as HTMLElement)?.blur();
document.dispatchEvent(commandYEvent);
fixture.detectChanges();
expect(redoSpy).toHaveBeenCalledTimes(1);

const controlYEvent = new KeyboardEvent("keydown", { key: "y", ctrlKey: true, shiftKey: false });
(document.activeElement as HTMLElement)?.blur();
document.dispatchEvent(controlYEvent);
fixture.detectChanges();
expect(redoSpy).toHaveBeenCalledTimes(2);

const commandShitZEvent = new KeyboardEvent("keydown", { key: "z", metaKey: true, shiftKey: true });
(document.activeElement as HTMLElement)?.blur();
document.dispatchEvent(commandShitZEvent);
fixture.detectChanges();
expect(redoSpy).toHaveBeenCalledTimes(3);

const controlShitZEvent = new KeyboardEvent("keydown", { key: "z", ctrlKey: true, shiftKey: true });
(document.activeElement as HTMLElement)?.blur();
document.dispatchEvent(controlShitZEvent);
fixture.detectChanges();
expect(redoSpy).toHaveBeenCalledTimes(4);
});
// Temporarily disabling undo-redo because of a bug that can cause invalid workflow structures.
// TODO: enable after fixing the bug.
// //undo
// it("should undo action when user presses command + Z or control + Z", () => {
// spyOn(workflowVersionService, "getDisplayParticularVersionStream").and.returnValue(of(false));
// spyOn(undoRedoService, "canUndo").and.returnValue(true);
// let undoSpy = spyOn(undoRedoService, "undoAction");
// fixture.detectChanges();
// const commandZEvent = new KeyboardEvent("keydown", { key: "Z", metaKey: true, shiftKey: false });
// (document.activeElement as HTMLElement)?.blur();
// document.dispatchEvent(commandZEvent);
// fixture.detectChanges();
// expect(undoSpy).toHaveBeenCalledTimes(1);
//
// const controlZEvent = new KeyboardEvent("keydown", { key: "Z", ctrlKey: true, shiftKey: false });
// (document.activeElement as HTMLElement)?.blur();
// document.dispatchEvent(controlZEvent);
// fixture.detectChanges();
// expect(undoSpy).toHaveBeenCalledTimes(2);
// });
//
// //redo
// it("should redo action when user presses command/control + Y or command/control + shift + Z", () => {
// spyOn(workflowVersionService, "getDisplayParticularVersionStream").and.returnValue(of(false));
// spyOn(undoRedoService, "canRedo").and.returnValue(true);
// let redoSpy = spyOn(undoRedoService, "redoAction");
// fixture.detectChanges();
// const commandYEvent = new KeyboardEvent("keydown", { key: "y", metaKey: true, shiftKey: false });
// (document.activeElement as HTMLElement)?.blur();
// document.dispatchEvent(commandYEvent);
// fixture.detectChanges();
// expect(redoSpy).toHaveBeenCalledTimes(1);
//
// const controlYEvent = new KeyboardEvent("keydown", { key: "y", ctrlKey: true, shiftKey: false });
// (document.activeElement as HTMLElement)?.blur();
// document.dispatchEvent(controlYEvent);
// fixture.detectChanges();
// expect(redoSpy).toHaveBeenCalledTimes(2);
//
// const commandShitZEvent = new KeyboardEvent("keydown", { key: "z", metaKey: true, shiftKey: true });
// (document.activeElement as HTMLElement)?.blur();
// document.dispatchEvent(commandShitZEvent);
// fixture.detectChanges();
// expect(redoSpy).toHaveBeenCalledTimes(3);
//
// const controlShitZEvent = new KeyboardEvent("keydown", { key: "z", ctrlKey: true, shiftKey: true });
// (document.activeElement as HTMLElement)?.blur();
// document.dispatchEvent(controlShitZEvent);
// fixture.detectChanges();
// expect(redoSpy).toHaveBeenCalledTimes(4);
// });
});
});
32 changes: 17 additions & 15 deletions core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,21 +182,23 @@ export class WorkflowEditorComponent implements AfterViewInit, OnDestroy {
.pipe(takeUntil(this._onProcessKeyboardActionObservable))
.subscribe(displayParticularWorkflowVersion => {
if (!displayParticularWorkflowVersion) {
// cmd/ctrl+z undo ; ctrl+y or cmd/ctrl + shift+z for redo
if ((event.metaKey || event.ctrlKey) && !event.shiftKey && event.key.toLowerCase() === "z") {
// UNDO
if (this.undoRedoService.canUndo()) {
this.undoRedoService.undoAction();
}
} else if (
((event.metaKey || event.ctrlKey) && !event.shiftKey && event.key.toLowerCase() === "y") ||
((event.metaKey || event.ctrlKey) && event.shiftKey && event.key.toLowerCase() === "z")
) {
// redo
if (this.undoRedoService.canRedo()) {
this.undoRedoService.redoAction();
}
}
// Temporarily disabling undo-redo because of a bug that can cause invalid workflow structures.
// TODO: enable after fixing the bug.
// // cmd/ctrl+z undo ; ctrl+y or cmd/ctrl + shift+z for redo
// if ((event.metaKey || event.ctrlKey) && !event.shiftKey && event.key.toLowerCase() === "z") {
// // UNDO
// if (this.undoRedoService.canUndo()) {
// this.undoRedoService.undoAction();
// }
// } else if (
// ((event.metaKey || event.ctrlKey) && !event.shiftKey && event.key.toLowerCase() === "y") ||
// ((event.metaKey || event.ctrlKey) && event.shiftKey && event.key.toLowerCase() === "z")
// ) {
// // redo
// if (this.undoRedoService.canRedo()) {
// this.undoRedoService.redoAction();
// }
// }
// below for future hotkeys
}
this._onProcessKeyboardActionObservable.complete();
Expand Down
Loading