admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 01:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Notion Node): Regex for block id (#8860)

Browse Source
This commit is contained in:
Michael Kret
2024-03-13 13:57:17 +02:00
committed by GitHub
parent e78cc2d8d2
commit a1f6c570d6
5 changed files with 124 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts
View File

@@ -41,6 +41,7 @@ const apiVersion: { [key: number]: string } = {
1: '2021-05-13',
2: '2021-08-16',
2.1: '2021-08-16',
2.2: '2021-08-16',
};
export async function notionApiRequest(
@@ -1128,3 +1129,44 @@ export function simplifyBlocksOutput(blocks: IDataObject[], rootId: string) {
return blocks;
}
export function extractBlockId(this: IExecuteFunctions, nodeVersion: number, itemIndex: number) {
let blockId: string;
if (nodeVersion < 2.2) {
blockId = extractPageId(
this.getNodeParameter('blockId', itemIndex, '', { extractValue: true }) as string,
);
} else {
const blockIdRLCData = this.getNodeParameter('blockId', itemIndex, {}) as IDataObject;
if (blockIdRLCData.mode === 'id') {
blockId = blockIdRLCData.value as string;
} else {
const blockRegex = /https:\/\/www\.notion\.so\/.+\?pvs=[0-9]+#([a-f0-9]{2,})/;
const match = (blockIdRLCData.value as string).match(blockRegex);
if (match === null) {
const pageRegex =
/(?:https|http):\/\/www\.notion\.so\/(?:[a-z0-9-]{2,}\/)?(?:[a-zA-Z0-9-]{2,}-)?([0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12})/;
const pageMatch = (blockIdRLCData.value as string).match(pageRegex);
if (pageMatch === null) {
throw new NodeOperationError(
this.getNode(),
'Invalid URL, could not find block ID or page ID',
{
itemIndex,
},
);
} else {
blockId = extractPageId(pageMatch[1]);
}
} else {
blockId = match[1];
}
}
}
return blockId;
}