Skip to content

Commit

Permalink
fix(editor): Fix NDV close after using input select (#7544)
Browse files Browse the repository at this point in the history
  • Loading branch information
cstuncsik committed Oct 30, 2023
1 parent 784b433 commit 3b5e181
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
5 changes: 4 additions & 1 deletion cypress/e2e/5-ndv.cy.ts
Expand Up @@ -42,14 +42,17 @@ describe('NDV', () => {
ndv.getters.outputDisplayMode().should('have.length.at.least', 1).and('be.visible');
});

it('should change input', () => {
it('should change input and go back to canvas', () => {
cy.createFixtureWorkflow('NDV-test-select-input.json', `NDV test select input ${uuid()}`);
workflowPage.actions.zoomToFit();
workflowPage.getters.canvasNodes().last().dblclick();
ndv.getters.inputSelect().click();
ndv.getters.inputOption().last().click();
ndv.getters.inputDataContainer().find('[class*=schema_]').should('exist');
ndv.getters.inputDataContainer().should('contain', 'start');
ndv.getters.backToCanvas().click();
ndv.getters.container().should('not.be.visible');
cy.shouldNotHaveConsoleErrors();
});

it('should show correct validation state for resource locator params', () => {
Expand Down
7 changes: 7 additions & 0 deletions cypress/support/commands.ts
Expand Up @@ -161,3 +161,10 @@ Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
}
});
});

Cypress.Commands.add('shouldNotHaveConsoleErrors', () => {
cy.window().then((win) => {
const spy = cy.spy(win.console, 'error');
cy.wrap(spy).should('not.have.been.called');
});
});
1 change: 1 addition & 0 deletions cypress/support/index.ts
Expand Up @@ -37,6 +37,7 @@ declare global {
options?: { abs?: boolean; index?: number; realMouse?: boolean },
): void;
draganddrop(draggableSelector: string, droppableSelector: string): void;
shouldNotHaveConsoleErrors(): void;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/editor-ui/src/components/NodeDetailsView.vue
Expand Up @@ -344,7 +344,7 @@ export default defineComponent({
return Math.min(this.runOutputIndex, this.maxOutputRun);
},
maxInputRun(): number {
if (this.inputNode === null && this.activeNode === null) {
if (this.inputNode === null || this.activeNode === null) {
return 0;
}
Expand All @@ -355,7 +355,7 @@ export default defineComponent({
const runData: IRunData | null = this.workflowRunData;
if (outputs.filter((output) => output !== NodeConnectionType.Main).length) {
if (outputs.some((output) => output !== NodeConnectionType.Main)) {
node = this.activeNode;
}
Expand Down

0 comments on commit 3b5e181

Please sign in to comment.