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

fix(core): Prevent node param resolution from failing telemetry graph generation #9257

Merged
merged 2 commits into from
Apr 30, 2024
Merged

fix(core): Prevent node param resolution from failing telemetry graph generation #9257

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
6d2e92a
fix(core): Prevent node param resolution from failing telemetry graph…
ivov Apr 30, 2024
710a62c
Fix test
ivov Apr 30, 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
22 changes: 14 additions & 8 deletions packages/workflow/src/TelemetryHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,20 @@ export function generateNodesGraph(
return;
}

const nodeParameters =
getNodeParameters(
stickyType.description.properties,
stickyNote.parameters,
true,
false,
stickyNote,
) ?? {};
let nodeParameters: IDataObject = {};

try {
nodeParameters =
getNodeParameters(
stickyType.description.properties,
stickyNote.parameters,
true,
false,
stickyNote,
) ?? {};
} catch {
// prevent node param resolution from failing graph generation
}

const height: number = typeof nodeParameters.height === 'number' ? nodeParameters.height : 0;
const width: number = typeof nodeParameters.width === 'number' ? nodeParameters.width : 0;
Expand Down
14 changes: 13 additions & 1 deletion packages/workflow/test/TelemetryHelpers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import {
getDomainBase,
getDomainPath,
} from '@/TelemetryHelpers';
import type { IWorkflowBase } from '@/index';
import { ApplicationError, STICKY_NODE_TYPE, type IWorkflowBase } from '@/index';
import { nodeTypes } from './ExpressionExtensions/Helpers';
import { mock } from 'jest-mock-extended';
import * as nodeHelpers from '@/NodeHelpers';

describe('getDomainBase should return protocol plus domain', () => {
test('in valid URLs', () => {
Expand Down Expand Up @@ -763,6 +765,16 @@ describe('generateNodesGraph', () => {
webhookNodeNames: [],
});
});

test('should not fail on error to resolve a node parameter for sticky node type', () => {
const workflow = mock<IWorkflowBase>({ nodes: [{ type: STICKY_NODE_TYPE }] });

jest.spyOn(nodeHelpers, 'getNodeParameters').mockImplementationOnce(() => {
throw new ApplicationError('Could not find property option');
});

expect(() => generateNodesGraph(workflow, nodeTypes)).not.toThrow();
});
});

function validUrls(idMaker: typeof alphanumericId | typeof email, char = CHAR) {
Expand Down
Loading