mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/n8n-io/n8n into node-2481-form-node-issue-on-internal

Browse source
This commit is contained in:
Michael Kret 2025-03-04 15:30:55 +02:00
parent 6f3547e2b3 be441fb91f
commit ad47e10523
21 changed files with 652 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/release-publish.yml vendored
View file

@ -109,7 +109,6 @@ jobs:
context: ./docker/images/n8n
build-args: |
N8N_VERSION=${{ needs.publish-to-npm.outputs.release }}
N8N_RELEASE_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
platforms: linux/amd64,linux/arm64
provenance: false
push: true

19
cypress/e2e/9-expression-editor-modal.cy.ts
View file

@ -1,4 +1,6 @@
import { META_KEY } from '../constants';
import { NDV } from '../pages/ndv';
import { successToast } from '../pages/notifications';
import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
const WorkflowPage = new WorkflowPageClass();
@ -11,6 +13,23 @@ describe('Expression editor modal', () => {
cy.on('uncaught:exception', (error) => error.name !== 'ExpressionError');
});
describe('Keybinds', () => {
beforeEach(() => {
WorkflowPage.actions.addNodeToCanvas('Hacker News');
WorkflowPage.actions.zoomToFit();
WorkflowPage.actions.openNode('Hacker News');
WorkflowPage.actions.openExpressionEditorModal();
});
it('should save the workflow with save keybind', () => {
WorkflowPage.getters.expressionModalInput().clear();
WorkflowPage.getters.expressionModalInput().click().type('{{ "hello"');
WorkflowPage.getters.expressionModalOutput().contains('hello');
WorkflowPage.getters.expressionModalInput().click().type(`{${META_KEY}+s}`);
successToast().should('be.visible');
});
});
describe('Static data', () => {
beforeEach(() => {
WorkflowPage.actions.addNodeToCanvas('Hacker News');

3
docker/images/n8n/Dockerfile
View file

@ -4,18 +4,15 @@ FROM n8nio/base:${NODE_VERSION}
ARG N8N_VERSION
RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi
ARG N8N_RELEASE_DATE
LABEL org.opencontainers.image.title="n8n"
LABEL org.opencontainers.image.description="Workflow Automation Tool"
LABEL org.opencontainers.image.source="https://github.com/n8n-io/n8n"
LABEL org.opencontainers.image.url="https://n8n.io"
LABEL org.opencontainers.image.version=${N8N_VERSION}
LABEL org.opencontainers.image.created=${N8N_RELEASE_DATE}
ENV N8N_VERSION=${N8N_VERSION}
ENV NODE_ENV=production
ENV N8N_RELEASE_TYPE=stable
ENV N8N_RELEASE_DATE=${N8N_RELEASE_DATE}
RUN set -eux; \
npm install -g --omit=dev n8n@${N8N_VERSION} --ignore-scripts && \
npm rebuild --prefix=/usr/local/lib/node_modules/n8n sqlite3 && \

3
packages/@n8n/config/src/configs/generic.config.ts
View file

@ -9,9 +9,6 @@ export class GenericConfig {
@Env('N8N_RELEASE_TYPE')
releaseChannel: 'stable' | 'beta' | 'nightly' | 'dev' = 'dev';
@Env('N8N_RELEASE_DATE')
releaseDate?: Date;
/** Grace period (in seconds) to wait for components to shut down before process exit. */
@Env('N8N_GRACEFUL_SHUTDOWN_TIMEOUT')
gracefulShutdownTimeout: number = 30;

8
packages/@n8n/config/src/configs/sentry.config.ts
View file

@ -10,14 +10,6 @@ export class SentryConfig {
@Env('N8N_FRONTEND_SENTRY_DSN')
frontendDsn: string = '';
/**
* Version of the n8n instance
*
* @example '1.73.0'
*/
@Env('N8N_VERSION')
n8nVersion: string = '';
/**
* Environment of the n8n instance.
*

17
packages/@n8n/config/test/config.test.ts
View file

@ -243,7 +243,6 @@ describe('GlobalConfig', () => {
sentry: {
backendDsn: '',
frontendDsn: '',
n8nVersion: '',
environment: '',
deploymentName: '',
},
@ -326,7 +325,6 @@ describe('GlobalConfig', () => {
DB_LOGGING_MAX_EXECUTION_TIME: '0',
N8N_METRICS: 'TRUE',
N8N_TEMPLATES_ENABLED: '0',
N8N_RELEASE_DATE: '2025-02-17T13:54:15Z',
};
const config = Container.get(GlobalConfig);
expect(structuredClone(config)).toEqual({
@ -358,10 +356,6 @@ describe('GlobalConfig', () => {
...defaultConfig.templates,
enabled: false,
},
generic: {
...defaultConfig.generic,
releaseDate: new Date('2025-02-17T13:54:15.000Z'),
},
});
expect(mockFs.readFileSync).not.toHaveBeenCalled();
});
@ -397,15 +391,4 @@ describe('GlobalConfig', () => {
'Invalid number value for DB_LOGGING_MAX_EXECUTION_TIME: abcd',
);
});
it('should handle invalid timestamps', () => {
process.env = {
N8N_RELEASE_DATE: 'abcd',
};
const config = Container.get(GlobalConfig);
expect(config.generic.releaseDate).toBeUndefined();
expect(consoleWarnMock).toHaveBeenCalledWith(
'Invalid timestamp value for N8N_RELEASE_DATE: abcd',
);
});
});

15
packages/cli/src/commands/base-command.ts
View file

@ -14,7 +14,13 @@ import { ensureError, sleep, UserError } from 'n8n-workflow';
import type { AbstractServer } from '@/abstract-server';
import config from '@/config';
import { LICENSE_FEATURES, inDevelopment, inTest } from '@/constants';
import {
LICENSE_FEATURES,
N8N_VERSION,
N8N_RELEASE_DATE,
inDevelopment,
inTest,
} from '@/constants';
import * as CrashJournal from '@/crash-journal';
import * as Db from '@/db';
import { getDataDeduplicationService } from '@/deduplication';
@ -63,15 +69,14 @@ export abstract class BaseCommand extends Command {
async init(): Promise<void> {
this.errorReporter = Container.get(ErrorReporter);
const { releaseDate } = this.globalConfig.generic;
const { backendDsn, n8nVersion, environment, deploymentName } = this.globalConfig.sentry;
const { backendDsn, environment, deploymentName } = this.globalConfig.sentry;
await this.errorReporter.init({
serverType: this.instanceSettings.instanceType,
dsn: backendDsn,
environment,
release: n8nVersion,
release: N8N_VERSION,
serverName: deploymentName,
releaseDate,
releaseDate: N8N_RELEASE_DATE,
});
initExpressionEvaluator();

11
packages/cli/src/constants.ts
View file

@ -1,4 +1,4 @@
import { readFileSync } from 'fs';
import { readFileSync, statSync } from 'fs';
import type { n8n } from 'n8n-core';
import type { ITaskDataConnections } from 'n8n-workflow';
import { jsonParse, TRIMMED_TASK_DATA_CONNECTIONS_KEY } from 'n8n-workflow';
@ -18,9 +18,10 @@ export const TEMPLATES_DIR = join(CLI_DIR, 'templates');
export const NODES_BASE_DIR = dirname(require.resolve('n8n-nodes-base'));
export const EDITOR_UI_DIST_DIR = join(dirname(require.resolve('n8n-editor-ui')), 'dist');
export function getN8nPackageJson() {
return jsonParse<n8n.PackageJson>(readFileSync(join(CLI_DIR, 'package.json'), 'utf8'));
}
const packageJsonPath = join(CLI_DIR, 'package.json');
const n8nPackageJson = jsonParse<n8n.PackageJson>(readFileSync(packageJsonPath, 'utf8'));
export const N8N_VERSION = n8nPackageJson.version;
export const N8N_RELEASE_DATE = statSync(packageJsonPath).mtime;
export const STARTING_NODES = [
'@n8n/n8n-nodes-langchain.manualChatTrigger',
@ -28,8 +29,6 @@ export const STARTING_NODES = [
'n8n-nodes-base.manualTrigger',
];
export const N8N_VERSION = getN8nPackageJson().version;
export const NODE_PACKAGE_PREFIX = 'n8n-nodes-';
export const STARTER_TEMPLATE_NAME = `${NODE_PACKAGE_PREFIX}starter`;

4
packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts
View file

@ -5,7 +5,7 @@ import { InstanceSettings, Logger } from 'n8n-core';
import type { IWorkflowBase } from 'n8n-workflow';
import config from '@/config';
import { getN8nPackageJson, inDevelopment } from '@/constants';
import { inDevelopment, N8N_VERSION } from '@/constants';
import { isApiEnabled } from '@/public-api';
import {
ENV_VARS_DOCS_URL,
@ -175,7 +175,7 @@ export class InstanceRiskReporter implements RiskReporter {
private async getOutdatedState() {
let versions = [];
const localVersion = getN8nPackageJson().version;
const localVersion = N8N_VERSION;
try {
versions = await this.getNextVersions(localVersion).then((v) => this.removeIconData(v));

10
packages/cli/test/integration/security-audit/utils.ts
View file

@ -114,9 +114,8 @@ export const MOCK_PACKAGE: InstalledPackages[] = [
export function simulateOutdatedInstanceOnce(versionName = MOCK_01110_N8N_VERSION.name) {
const baseUrl = Container.get(GlobalConfig).versionNotifications.endpoint + '/';
jest
.spyOn(constants, 'getN8nPackageJson')
.mockReturnValueOnce({ name: 'n8n', version: versionName });
// @ts-expect-error readonly export
constants.N8N_VERSION = versionName;
nock(baseUrl).get(versionName).reply(200, [MOCK_01110_N8N_VERSION, MOCK_09990_N8N_VERSION]);
}
@ -124,9 +123,8 @@ export function simulateOutdatedInstanceOnce(versionName = MOCK_01110_N8N_VERSIO
export function simulateUpToDateInstance(versionName = MOCK_09990_N8N_VERSION.name) {
const baseUrl = Container.get(GlobalConfig).versionNotifications.endpoint + '/';
jest
.spyOn(constants, 'getN8nPackageJson')
.mockReturnValueOnce({ name: 'n8n', version: versionName });
// @ts-expect-error readonly export
constants.N8N_VERSION = versionName;
nock(baseUrl).persist().get(versionName).reply(200, [MOCK_09990_N8N_VERSION]);
}

25
packages/core/src/errors/error-reporter.ts
View file

@ -24,7 +24,8 @@ type ErrorReporterInitOptions = {
beforeSendFilter?: (event: ErrorEvent, hint: EventHint) => boolean;
};
const SIX_WEEKS_IN_MS = 6 * 7 * 24 * 60 * 60 * 1000;
const ONE_DAY_IN_MS = 24 * 60 * 60 * 1000;
const SIX_WEEKS_IN_MS = 6 * 7 * ONE_DAY_IN_MS;
const RELEASE_EXPIRATION_WARNING =
'Error tracking disabled because this release is older than 6 weeks.';
@ -86,17 +87,23 @@ export class ErrorReporter {
});
if (releaseDate) {
const releaseExpiresInMs = releaseDate.getTime() + SIX_WEEKS_IN_MS - Date.now();
if (releaseExpiresInMs <= 0) {
const releaseExpiresAtMs = releaseDate.getTime() + SIX_WEEKS_IN_MS;
const releaseExpiresInMs = () => releaseExpiresAtMs - Date.now();
if (releaseExpiresInMs() <= 0) {
this.logger.warn(RELEASE_EXPIRATION_WARNING);
return;
}
// Once this release expires, reject all events
this.expirationTimer = setTimeout(() => {
this.logger.warn(RELEASE_EXPIRATION_WARNING);
// eslint-disable-next-line @typescript-eslint/unbound-method
this.report = this.defaultReport;
}, releaseExpiresInMs);
const checkForExpiration = () => {
// Once this release expires, reject all events
if (releaseExpiresInMs() <= 0) {
this.logger.warn(RELEASE_EXPIRATION_WARNING);
// eslint-disable-next-line @typescript-eslint/unbound-method
this.report = this.defaultReport;
} else {
setTimeout(checkForExpiration, ONE_DAY_IN_MS);
}
};
checkForExpiration();
}
if (!dsn) return;

217
packages/core/src/execution-engine/partial-execution-utils/__tests__/find-trigger-for-partial-execution.test.ts Normal file
View file

@ -0,0 +1,217 @@
import { mock } from 'jest-mock-extended';
import type { IConnections, INode, INodeType, INodeTypes, IPinData } from 'n8n-workflow';
import { Workflow } from 'n8n-workflow';
import { toIConnections } from './helpers';
import { findTriggerForPartialExecution } from '../find-trigger-for-partial-execution';
describe('findTriggerForPartialExecution', () => {
const nodeTypes = mock<INodeTypes>();
const createMockWorkflow = (nodes: INode[], connections: IConnections, pinData?: IPinData) =>
new Workflow({
active: false,
nodes,
connections,
nodeTypes,
pinData,
});
const createNode = (name: string, type: string, disabled = false) =>
mock<INode>({ name, type, disabled });
const manualTriggerNode = createNode('ManualTrigger', 'n8n-nodes-base.manualTrigger');
const disabledTriggerNode = createNode('DisabledTrigger', 'n8n-nodes-base.manualTrigger', true);
const pinnedTrigger = createNode('PinnedTrigger', 'n8n-nodes-base.manualTrigger');
const setNode = createNode('Set', 'n8n-nodes-base.set');
const noOpNode = createNode('No Operation', 'n8n-nodes-base.noOp');
const webhookNode = createNode('Webhook', 'n8n-nodes-base.webhook');
const webhookNode1 = createNode('Webhook1', 'n8n-nodes-base.webhook');
beforeEach(() => {
nodeTypes.getByNameAndVersion.mockImplementation((type) => {
const isTrigger = type.endsWith('Trigger') || type.endsWith('webhook');
return mock<INodeType>({
description: {
group: isTrigger ? ['trigger'] : [],
properties: [],
},
});
});
});
const testGroups: Record<
string,
Array<{
description: string;
nodes: INode[];
connections: Array<{ to: INode; from: INode }>;
destinationNodeName: string;
pinData?: IPinData;
expectedTrigger?: INode;
}>
> = {
'Single trigger node': [
{
description: 'should return the destination node if it is a trigger',
nodes: [manualTriggerNode],
connections: [],
destinationNodeName: manualTriggerNode.name,
expectedTrigger: manualTriggerNode,
},
{
description: 'should return a parent trigger node for a non-trigger destination',
nodes: [manualTriggerNode, setNode],
connections: [{ from: manualTriggerNode, to: setNode }],
destinationNodeName: setNode.name,
expectedTrigger: manualTriggerNode,
},
],
'Multiple trigger nodes': [
{
description: 'should prioritize webhook nodes when multiple parent triggers exist',
nodes: [webhookNode, manualTriggerNode, setNode],
connections: [
{ from: webhookNode, to: setNode },
{ from: manualTriggerNode, to: setNode },
],
destinationNodeName: setNode.name,
expectedTrigger: webhookNode,
},
{
description: 'should handle multiple webhook triggers',
nodes: [webhookNode, webhookNode1, setNode],
connections: [
{ from: webhookNode, to: setNode },
{ from: webhookNode1, to: setNode },
],
destinationNodeName: setNode.name,
expectedTrigger: webhookNode1,
},
{
description: 'should prioritize webhook node, even if it is further up',
nodes: [manualTriggerNode, setNode, noOpNode, webhookNode],
connections: [
{ from: manualTriggerNode, to: setNode },
{ from: setNode, to: noOpNode },
{ from: webhookNode, to: noOpNode },
],
destinationNodeName: noOpNode.name,
expectedTrigger: webhookNode,
},
{
description: 'should ignore disabled parent trigger nodes',
nodes: [disabledTriggerNode, manualTriggerNode, setNode],
connections: [
{ from: disabledTriggerNode, to: setNode },
{ from: manualTriggerNode, to: setNode },
],
destinationNodeName: setNode.name,
expectedTrigger: manualTriggerNode,
},
],
'No trigger nodes': [
{
description: 'should return undefined when no valid parent triggers found',
nodes: [setNode, noOpNode],
connections: [{ from: setNode, to: noOpNode }],
destinationNodeName: noOpNode.name,
expectedTrigger: undefined,
},
],
'Trigger node with pinned data': [
{
description: 'should prioritize pinned trigger nodes',
nodes: [pinnedTrigger, manualTriggerNode, setNode],
connections: [
{ from: pinnedTrigger, to: setNode },
{ from: manualTriggerNode, to: setNode },
],
destinationNodeName: setNode.name,
pinData: { [pinnedTrigger.name]: [{ json: { test: true } }] },
expectedTrigger: pinnedTrigger,
},
{
description: 'should prioritize pinned webhook triggers',
nodes: [pinnedTrigger, manualTriggerNode, webhookNode, setNode],
connections: [
{ from: pinnedTrigger, to: setNode },
{ from: webhookNode, to: setNode },
{ from: manualTriggerNode, to: setNode },
],
destinationNodeName: setNode.name,
pinData: {
[pinnedTrigger.name]: [{ json: { test: true } }],
[webhookNode.name]: [{ json: { test: true } }],
},
expectedTrigger: webhookNode,
},
{
description: 'should prioritize the first connected pinned webhook triggers',
nodes: [webhookNode, webhookNode1, pinnedTrigger, manualTriggerNode, setNode],
connections: [
{ from: pinnedTrigger, to: setNode },
{ from: webhookNode, to: setNode },
{ from: webhookNode1, to: setNode },
{ from: manualTriggerNode, to: setNode },
],
destinationNodeName: setNode.name,
pinData: {
[pinnedTrigger.name]: [{ json: { test: true } }],
[webhookNode.name]: [{ json: { test: true } }],
[webhookNode1.name]: [{ json: { test: true } }],
},
expectedTrigger: webhookNode,
},
{
description: 'should prioritize the first connected pinned webhook triggers (reverse)',
nodes: [webhookNode1, webhookNode, pinnedTrigger, manualTriggerNode, setNode],
connections: [
{ from: pinnedTrigger, to: setNode },
{ from: webhookNode1, to: setNode },
{ from: webhookNode, to: setNode },
{ from: manualTriggerNode, to: setNode },
],
destinationNodeName: setNode.name,
pinData: {
[pinnedTrigger.name]: [{ json: { test: true } }],
[webhookNode.name]: [{ json: { test: true } }],
[webhookNode1.name]: [{ json: { test: true } }],
},
expectedTrigger: webhookNode1,
},
],
};
for (const [group, tests] of Object.entries(testGroups)) {
describe(group, () => {
test.each(tests)(
'$description',
({ nodes, connections, destinationNodeName, expectedTrigger, pinData }) => {
const workflow = createMockWorkflow(nodes, toIConnections(connections), pinData);
expect(findTriggerForPartialExecution(workflow, destinationNodeName)).toBe(
expectedTrigger,
);
},
);
});
}
describe('Error and Edge Case Handling', () => {
it('should handle non-existent destination node gracefully', () => {
const workflow = createMockWorkflow([], {});
expect(findTriggerForPartialExecution(workflow, 'NonExistentNode')).toBeUndefined();
});
it('should handle empty workflow', () => {
const workflow = createMockWorkflow([], {});
expect(findTriggerForPartialExecution(workflow, '')).toBeUndefined();
});
it('should handle workflow with no connections', () => {
const workflow = createMockWorkflow([manualTriggerNode], {});
expect(findTriggerForPartialExecution(workflow, manualTriggerNode.name)).toBe(
manualTriggerNode,
);
});
});
});

33
packages/core/src/execution-engine/partial-execution-utils/find-trigger-for-partial-execution.ts
View file

@ -1,5 +1,7 @@
import * as assert from 'assert/strict';
import type { INode, Workflow } from 'n8n-workflow';
import type { INode, INodeType, Workflow } from 'n8n-workflow';
const isTriggerNode = (nodeType: INodeType) => nodeType.description.group.includes('trigger');
function findAllParentTriggers(workflow: Workflow, destinationNodeName: string) {
const parentNodes = workflow
@ -17,35 +19,50 @@ function findAllParentTriggers(workflow: Workflow, destinationNodeName: string)
};
})
.filter((value) => value !== null)
.filter(({ nodeType }) => nodeType.description.group.includes('trigger'))
.filter(({ nodeType }) => isTriggerNode(nodeType))
.map(({ node }) => node);
return parentNodes;
}
// TODO: write unit tests for this
// TODO: rewrite this using DirectedGraph instead of workflow.
export function findTriggerForPartialExecution(
workflow: Workflow,
destinationNodeName: string,
): INode | undefined {
// First, check if the destination node itself is a trigger
const destinationNode = workflow.getNode(destinationNodeName);
if (!destinationNode) return;
const destinationNodeType = workflow.nodeTypes.getByNameAndVersion(
destinationNode.type,
destinationNode.typeVersion,
);
if (isTriggerNode(destinationNodeType) && !destinationNode.disabled) {
return destinationNode;
}
// Since the destination node wasn't a trigger, we try to find a parent node that's a trigger
const parentTriggers = findAllParentTriggers(workflow, destinationNodeName).filter(
(trigger) => !trigger.disabled,
);
// Prioritize webhook triggers with pinned-data
const pinnedTriggers = parentTriggers
// TODO: add the other filters here from `findAllPinnedActivators`, see
// copy below.
.filter((trigger) => workflow.pinData?.[trigger.name])
// TODO: Make this sorting more predictable
// Put nodes which names end with 'webhook' first, while also reversing the
// order they had in the original array.
.sort((n) => (n.type.endsWith('webhook') ? -1 : 1));
.sort((a, b) => (a.type.endsWith('webhook') ? -1 : b.type.endsWith('webhook') ? 1 : 0));
if (pinnedTriggers.length) {
return pinnedTriggers[0];
} else {
return parentTriggers[0];
}
// Prioritize webhook triggers over other parent triggers
const webhookTriggers = parentTriggers.filter((trigger) => trigger.type.endsWith('webhook'));
return webhookTriggers.length > 0 ? webhookTriggers[0] : parentTriggers[0];
}
//function findAllPinnedActivators(workflow: Workflow, pinData?: IPinData) {

12
packages/frontend/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
View file

@ -198,6 +198,16 @@ const onSelect = (value: number) => {
expirationDate.value = '';
showExpirationDateSelector.value = false;
};
async function handleEnterKey(event: KeyboardEvent) {
if (event.key === 'Enter') {
if (props.mode === 'new') {
await onSave();
} else {
await onEdit();
}
}
}
</script>
<template>
@ -212,7 +222,7 @@ const onSelect = (value: number) => {
:show-close="true"
>
<template #content>
<div>
<div @keyup.enter="handleEnterKey">
<n8n-card v-if="newApiKey" class="mb-4xs">
<CopyInput
:label="newApiKey.label"

4
packages/frontend/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
View file

@ -54,7 +54,9 @@ const isSubmitEnabled = computed(() => {
hasExecutionData.value
);
});
const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
const hasExecutionData = computed(
() => (useNDVStore().ndvInputDataWithPinnedData || []).length > 0,
);
const loadingString = computed(() =>
i18n.baseText(`codeNodeEditor.askAi.loadingPhrase${loadingPhraseIndex.value}` as BaseTextKey),
);

6
packages/frontend/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
View file

@ -300,6 +300,12 @@ async function onConnectionStateChange() {
flex-direction: row;
align-items: center;
flex: 1;
svg,
img {
max-width: 28px;
max-height: 28px;
}
}
.providerActions {

147
packages/frontend/editor-ui/src/components/NodeDetailsView.test.ts
View file

@ -1,5 +1,5 @@
import { createPinia, setActivePinia } from 'pinia';
import { waitFor } from '@testing-library/vue';
import { waitFor, waitForElementToBeRemoved, fireEvent } from '@testing-library/vue';
import { mock } from 'vitest-mock-extended';
import NodeDetailsView from '@/components/NodeDetailsView.vue';
@ -24,7 +24,7 @@ vi.mock('vue-router', () => {
};
});
async function createPiniaWithActiveNode() {
async function createPiniaStore(isActiveNode: boolean) {
const node = mockNodes[0];
const workflow = mock<IWorkflowDb>({
connections: {},
@ -42,12 +42,19 @@ async function createPiniaWithActiveNode() {
nodeTypesStore.setNodeTypes(defaultNodeDescriptions);
workflowsStore.workflow = workflow;
workflowsStore.nodeMetadata[node.name] = { pristine: true };
ndvStore.activeNodeName = node.name;
if (isActiveNode) {
ndvStore.activeNodeName = node.name;
}
await useSettingsStore().getSettings();
await useUsersStore().loginWithCookie();
return { pinia, currentWorkflow: workflowsStore.getCurrentWorkflow() };
return {
pinia,
currentWorkflow: workflowsStore.getCurrentWorkflow(),
nodeName: node.name,
};
}
describe('NodeDetailsView', () => {
@ -71,7 +78,7 @@ describe('NodeDetailsView', () => {
});
it('should render correctly', async () => {
const { pinia, currentWorkflow } = await createPiniaWithActiveNode();
const { pinia, currentWorkflow } = await createPiniaStore(true);
const renderComponent = createComponentRenderer(NodeDetailsView, {
props: {
@ -94,4 +101,134 @@ describe('NodeDetailsView', () => {
await waitFor(() => expect(getByTestId('ndv')).toBeInTheDocument());
});
describe('keyboard listener', () => {
test('should register and unregister keydown listener based on modal open state', async () => {
const { pinia, currentWorkflow, nodeName } = await createPiniaStore(false);
const ndvStore = useNDVStore();
const renderComponent = createComponentRenderer(NodeDetailsView, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
},
global: {
mocks: {
$route: {
name: VIEWS.WORKFLOW,
},
},
},
});
const { getByTestId, queryByTestId } = renderComponent({
pinia,
});
const addEventListenerSpy = vi.spyOn(document, 'addEventListener');
const removeEventListenerSpy = vi.spyOn(document, 'removeEventListener');
ndvStore.activeNodeName = nodeName;
await waitFor(() => expect(getByTestId('ndv')).toBeInTheDocument());
await waitFor(() => expect(queryByTestId('ndv-modal')).toBeInTheDocument());
expect(addEventListenerSpy).toHaveBeenCalledWith('keydown', expect.any(Function), true);
expect(removeEventListenerSpy).not.toHaveBeenCalledWith(
'keydown',
expect.any(Function),
true,
);
ndvStore.activeNodeName = null;
await waitForElementToBeRemoved(queryByTestId('ndv-modal'));
expect(removeEventListenerSpy).toHaveBeenCalledWith('keydown', expect.any(Function), true);
addEventListenerSpy.mockRestore();
removeEventListenerSpy.mockRestore();
});
test('should unregister keydown listener on unmount', async () => {
const { pinia, currentWorkflow, nodeName } = await createPiniaStore(false);
const ndvStore = useNDVStore();
const renderComponent = createComponentRenderer(NodeDetailsView, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
},
global: {
mocks: {
$route: {
name: VIEWS.WORKFLOW,
},
},
},
});
const { getByTestId, queryByTestId, unmount } = renderComponent({
pinia,
});
ndvStore.activeNodeName = nodeName;
await waitFor(() => expect(getByTestId('ndv')).toBeInTheDocument());
await waitFor(() => expect(queryByTestId('ndv-modal')).toBeInTheDocument());
const removeEventListenerSpy = vi.spyOn(document, 'removeEventListener');
expect(removeEventListenerSpy).not.toHaveBeenCalledWith(
'keydown',
expect.any(Function),
true,
);
unmount();
expect(removeEventListenerSpy).toHaveBeenCalledWith('keydown', expect.any(Function), true);
removeEventListenerSpy.mockRestore();
});
test("should emit 'saveKeyboardShortcut' when save shortcut keybind is pressed", async () => {
const { pinia, currentWorkflow, nodeName } = await createPiniaStore(false);
const ndvStore = useNDVStore();
const renderComponent = createComponentRenderer(NodeDetailsView, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
},
global: {
mocks: {
$route: {
name: VIEWS.WORKFLOW,
},
},
},
});
const { getByTestId, queryByTestId, emitted } = renderComponent({
pinia,
});
ndvStore.activeNodeName = nodeName;
await waitFor(() => expect(getByTestId('ndv')).toBeInTheDocument());
await waitFor(() => expect(queryByTestId('ndv-modal')).toBeInTheDocument());
await fireEvent.keyDown(getByTestId('ndv'), {
key: 's',
ctrlKey: true,
bubbles: true,
cancelable: true,
});
expect(emitted().saveKeyboardShortcut).toBeTruthy();
});
});
});

34
packages/frontend/editor-ui/src/components/NodeDetailsView.vue
View file

@ -352,15 +352,19 @@ const setIsTooltipVisible = ({ isTooltipVisible }: DataPinningDiscoveryEvent) =>
const onKeyDown = (e: KeyboardEvent) => {
if (e.key === 's' && deviceSupport.isCtrlKeyPressed(e)) {
e.stopPropagation();
e.preventDefault();
if (props.readOnly) return;
emit('saveKeyboardShortcut', e);
onSaveWorkflow(e);
}
};
const onSaveWorkflow = (e: KeyboardEvent) => {
e.stopPropagation();
e.preventDefault();
if (props.readOnly) return;
emit('saveKeyboardShortcut', e);
};
const onInputItemHover = (e: { itemIndex: number; outputIndex: number } | null) => {
if (e === null || !inputNodeName.value || !isPairedItemHoveringEnabled.value) {
ndvStore.setHoveringItem(null);
@ -597,11 +601,25 @@ const onSearch = (search: string) => {
isPairedItemHoveringEnabled.value = !search;
};
const registerKeyboardListener = () => {
document.addEventListener('keydown', onKeyDown, true);
};
const unregisterKeyboardListener = () => {
document.removeEventListener('keydown', onKeyDown, true);
};
//watchers
watch(
activeNode,
(node, oldNode) => {
if (node && !oldNode) {
registerKeyboardListener();
} else if (!node) {
unregisterKeyboardListener();
}
if (node && node.name !== oldNode?.name && !isActiveStickyNode.value) {
runInputIndex.value = -1;
runOutputIndex.value = -1;
@ -655,6 +673,7 @@ watch(
},
{ immediate: true },
);
watch(maxOutputRun, () => {
runOutputIndex.value = -1;
});
@ -681,6 +700,7 @@ onMounted(() => {
onBeforeUnmount(() => {
dataPinningEventBus.off('data-pinning-discovery', setIsTooltipVisible);
unregisterKeyboardListener();
});
</script>
@ -719,8 +739,8 @@ onBeforeUnmount(() => {
v-if="activeNode"
ref="container"
class="data-display"
data-test-id="ndv-modal"
tabindex="0"
@keydown.capture="onKeyDown"
>
<div :class="$style.modalBackground" @click="close"></div>
<NDVDraggablePanels

96
packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/linter.test.ts Normal file
View file

@ -0,0 +1,96 @@
import { mock, mockDeep } from 'vitest-mock-extended';
import type * as tsvfs from '@typescript/vfs';
import ts from 'typescript';
import { getDiagnostics, tsCategoryToSeverity } from './linter';
describe('linter > getDiagnostics', () => {
it('should return diagnostics for a given file', () => {
const env = mockDeep<tsvfs.VirtualTypeScriptEnvironment>();
const fileName = 'testFile.ts';
const semanticDiagnostics = [
mock<ts.DiagnosticWithLocation>({
file: { fileName },
start: 0,
length: 10,
messageText: 'Semantic error',
category: ts.DiagnosticCategory.Error,
code: 1234,
}),
];
const syntacticDiagnostics = [
mock<ts.DiagnosticWithLocation>({
file: { fileName },
start: 15,
length: 5,
messageText: 'Syntactic warning',
category: ts.DiagnosticCategory.Warning,
code: 5678,
}),
];
env.languageService.getSemanticDiagnostics.mockReturnValue(semanticDiagnostics);
env.languageService.getSyntacticDiagnostics.mockReturnValue(syntacticDiagnostics);
env.getSourceFile.mockReturnValue({ fileName } as ts.SourceFile);
const result = getDiagnostics({ env, fileName });
expect(result).toHaveLength(2);
expect(result[0].message).toBe('Semantic error');
expect(result[0].severity).toBe('error');
expect(result[1].message).toBe('Syntactic warning');
expect(result[1].severity).toBe('warning');
});
it('should filter out ignored diagnostics', () => {
const env = mockDeep<tsvfs.VirtualTypeScriptEnvironment>();
const fileName = 'testFile.ts';
const diagnostics = [
mock<ts.DiagnosticWithLocation>({
file: { fileName },
start: 0,
length: 10,
messageText: 'No implicit any',
category: ts.DiagnosticCategory.Error,
code: 7006,
}),
mock<ts.DiagnosticWithLocation>({
file: { fileName },
start: 0,
length: 10,
messageText: 'Cannot find module or its corresponding type declarations.',
category: ts.DiagnosticCategory.Error,
code: 2307,
}),
mock<ts.DiagnosticWithLocation>({
file: { fileName },
start: 0,
length: 10,
messageText: 'Not ignored error',
category: ts.DiagnosticCategory.Error,
code: 1234,
}),
];
env.languageService.getSemanticDiagnostics.mockReturnValue(diagnostics);
env.languageService.getSyntacticDiagnostics.mockReturnValue([]);
env.getSourceFile.mockReturnValue({ fileName } as ts.SourceFile);
const result = getDiagnostics({ env, fileName });
expect(result).toHaveLength(1);
expect(result[0].message).toBe('Not ignored error');
});
it('should map diagnostic categories to severities correctly', () => {
const diagnostic = mock<ts.DiagnosticWithLocation>({
category: ts.DiagnosticCategory.Error,
code: 1234,
});
const severity = tsCategoryToSeverity(diagnostic);
expect(severity).toBe('error');
});
});

11
packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts
View file

@ -49,8 +49,15 @@ function isDiagnosticWithLocation(
}
function isIgnoredDiagnostic(diagnostic: ts.Diagnostic) {
// No implicit any
return diagnostic.code === 7006;
switch (diagnostic.code) {
// No implicit any
case 7006:
// Cannot find module or its corresponding type declarations.
case 2307:
return true;
}
return false;
}
/**

105
packages/frontend/editor-ui/src/views/SettingsApiView.vue
View file

@ -138,55 +138,62 @@ function onEdit(id: string) {
</i18n-t>
</n8n-text>
</p>
<template v-if="apiKeysSortByCreationDate.length">
<el-row
v-for="apiKey in apiKeysSortByCreationDate"
:key="apiKey.id"
:gutter="10"
:class="$style.destinationItem"
>
<el-col>
<ApiKeyCard :api-key="apiKey" @delete="onDelete" @edit="onEdit" />
</el-col>
</el-row>
<div v-if="isPublicApiEnabled && apiKeysSortByCreationDate.length" :class="$style.BottomHint">
<N8nText size="small" color="text-light">
{{
i18n.baseText(
`settings.api.view.${settingsStore.isSwaggerUIEnabled ? 'tryapi' : 'more-details'}`,
)
}}
</N8nText>
{{ ' ' }}
<n8n-link
v-if="isSwaggerUIEnabled"
data-test-id="api-playground-link"
:to="apiDocsURL"
:new-window="true"
size="small"
<div :class="$style.apiKeysContainer">
<template v-if="apiKeysSortByCreationDate.length">
<el-row
v-for="(apiKey, index) in apiKeysSortByCreationDate"
:key="apiKey.id"
:gutter="10"
:class="[{ [$style.destinationItem]: index !== apiKeysSortByCreationDate.length - 1 }]"
>
{{ i18n.baseText('settings.api.view.apiPlayground') }}
</n8n-link>
<n8n-link
v-else
data-test-id="api-endpoint-docs-link"
:to="apiDocsURL"
:new-window="true"
size="small"
>
{{ i18n.baseText(`settings.api.view.external-docs`) }}
</n8n-link>
</div>
<div class="mt-m text-right">
<n8n-button size="large" @click="onCreateApiKey">
{{ i18n.baseText('settings.api.create.button') }}
</n8n-button>
</div>
</template>
<el-col>
<ApiKeyCard :api-key="apiKey" @delete="onDelete" @edit="onEdit" />
</el-col>
</el-row>
</template>
</div>
<div v-if="isPublicApiEnabled && apiKeysSortByCreationDate.length" :class="$style.BottomHint">
<N8nText size="small" color="text-light">
{{
i18n.baseText(
`settings.api.view.${settingsStore.isSwaggerUIEnabled ? 'tryapi' : 'more-details'}`,
)
}}
</N8nText>
{{ ' ' }}
<n8n-link
v-if="isSwaggerUIEnabled"
data-test-id="api-playground-link"
:to="apiDocsURL"
:new-window="true"
size="small"
>
{{ i18n.baseText('settings.api.view.apiPlayground') }}
</n8n-link>
<n8n-link
v-else
data-test-id="api-endpoint-docs-link"
:to="apiDocsURL"
:new-window="true"
size="small"
>
{{ i18n.baseText(`settings.api.view.external-docs`) }}
</n8n-link>
</div>
<div class="mt-m text-right">
<n8n-button
v-if="isPublicApiEnabled && apiKeysSortByCreationDate.length"
size="large"
@click="onCreateApiKey"
>
{{ i18n.baseText('settings.api.create.button') }}
</n8n-button>
</div>
<n8n-action-box
v-else-if="!isPublicApiEnabled && cloudPlanStore.userIsTrialing"
v-if="!isPublicApiEnabled && cloudPlanStore.userIsTrialing"
data-test-id="public-api-upgrade-cta"
:heading="i18n.baseText('settings.api.trial.upgradePlan.title')"
:description="i18n.baseText('settings.api.trial.upgradePlan.description')"
@ -246,5 +253,13 @@ function onEdit(id: string) {
.BottomHint {
margin-bottom: var(--spacing-s);
margin-top: var(--spacing-s);
}
.apiKeysContainer {
max-height: 45vh;
overflow-y: auto;
overflow-x: hidden;
scrollbar-width: none;
}
</style>