Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1143,6 +1143,80 @@ describe('WorkflowEngineService', () => {
);
});

it('falls back to the top-level manager id when custom fields carry none', (): void => {
const fixture = createServiceFixture({
currentVersionId: 'template-version-1',
formVersionStatus: FormDefinitionVersionStatusEnum.PUBLISHED,
templateVersionStatus: ApprovalTemplateVersionStatusEnum.PUBLISHED,
});

const result = fixture.service.dryRunApprovalWorkflow({
formDataJson: '{}',
initiatorMemberId: 'member-001',
initiatorMetadataSnapshotJson: JSON.stringify({
customFields: {},
managerMemberId: 'member-manager',
memberId: 'member-001',
}),
workflowDefinitionJson: JSON.stringify(
createLinearUserTaskWorkflow({
approverResolver: {
baseFromInitiator: true,
levelsUp: 1,
type: 'ORG_MANAGER',
},
}),
),
});

expect(result.valid).toBe(true);
expect(result.steps).toEqual(
expect.arrayContaining([
expect.objectContaining({
assigneeMemberId: 'member-manager',
nodeId: 'task_finance',
}),
]),
);
});

it('prefers the manager id carried by custom fields', (): void => {
const fixture = createServiceFixture({
currentVersionId: 'template-version-1',
formVersionStatus: FormDefinitionVersionStatusEnum.PUBLISHED,
templateVersionStatus: ApprovalTemplateVersionStatusEnum.PUBLISHED,
});

const result = fixture.service.dryRunApprovalWorkflow({
formDataJson: '{}',
initiatorMemberId: 'member-001',
initiatorMetadataSnapshotJson: JSON.stringify({
customFields: { managerMemberId: 'member-custom' },
managerMemberId: 'member-manager',
memberId: 'member-001',
}),
workflowDefinitionJson: JSON.stringify(
createLinearUserTaskWorkflow({
approverResolver: {
baseFromInitiator: true,
levelsUp: 1,
type: 'ORG_MANAGER',
},
}),
),
});

expect(result.valid).toBe(true);
expect(result.steps).toEqual(
expect.arrayContaining([
expect.objectContaining({
assigneeMemberId: 'member-custom',
nodeId: 'task_finance',
}),
]),
);
});

it('reports dry run matches for pure CEL edge expressions', (): void => {
const fixture = createServiceFixture({
currentVersionId: 'template-version-1',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5548,7 +5548,10 @@ function readManagerMemberIdFromInitiatorSnapshot(

const customFields = initiatorMetadataSnapshot.customFields;

if (isRecord(customFields)) {
// An empty `customFields` object must not swallow the top-level fallback:
// callers commonly send `{ customFields: {}, managerMemberId: '...' }`, and
// returning early there resolves no approver at all.
if (isRecord(customFields) && customFields.managerMemberId !== undefined) {
return customFields.managerMemberId;
}

Expand Down
Loading