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

fix(Notion (Beta) Node): Fix create database page fails if relation param is empty/undefined #5182

Merged
merged 6 commits into from
Jan 19, 2023
Merged

fix(Notion (Beta) Node): Fix create database page fails if relation param is empty/undefined #5182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b070324
🐛 fix create database page fails if relation param is empty/undefined
maspio Jan 17, 2023
b656abb
Merge branch 'master' of https://github.com/n8n-io/n8n into node-172-…
michael-radency Jan 18, 2023
3f104b8
:zap: uuid validation
michael-radency Jan 18, 2023
c04e8b7
⚡ uuid error handling
maspio Jan 18, 2023
cd82c37
Merge branch 'master' into node-172-notion-create-page-node-fails-when
maspio Jan 18, 2023
30f3c72
Merge branch 'master' into node-172-notion-create-page-node-fails-when
maspio Jan 19, 2023
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
49 changes: 39 additions & 10 deletions packages/nodes-base/nodes/Notion/GenericFunctions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
INodeProperties,
IPollFunctions,
NodeApiError,
NodeOperationError,
} from 'n8n-workflow';

import { camelCase, capitalCase, snakeCase } from 'change-case';
Expand All @@ -25,6 +26,22 @@ import moment from 'moment-timezone';

import { validate as uuidValidate } from 'uuid';

function uuidValidateWithoutDashes(this: IExecuteFunctions, value: string) {
if (!value || typeof value !== 'string') return false;
if (uuidValidate(value)) return true;
if (value.length == 32) {
//prettier-ignore
const strWithDashes = `${value.slice(0, 8)}-${value.slice(8, 12)}-${value.slice(12, 16)}-${value.slice(16, 20)}-${value.slice(20)}`;
if (uuidValidate(strWithDashes)) return true;
}
throw new NodeOperationError(
this.getNode(),
`The relation id "${value}" is not a valid uuid with optional dashes.`,
);
michael-radency marked this conversation as resolved.
Show resolved Hide resolved
}

export type SortData = { key: string; type: string; direction: string; timestamp: boolean };

const apiVersion: { [key: number]: string } = {
1: '2021-05-13',
2: '2021-08-16',
Expand Down Expand Up @@ -261,7 +278,13 @@ function getDateFormat(includeTime: boolean) {
return '';
}

function getPropertyKeyValue(value: any, type: string, timezone: string, version = 1) {
function getPropertyKeyValue(
this: IExecuteFunctions,
value: any,
type: string,
timezone: string,
version = 1,
) {
const ignoreIfEmpty = <T>(v: T, cb: (v: T) => any) =>
!v && value.ignoreIfEmpty ? undefined : cb(v);
let result: IDataObject = {};
Expand Down Expand Up @@ -289,10 +312,13 @@ function getPropertyKeyValue(value: any, type: string, timezone: string, version
case 'relation':
result = {
type: 'relation',

relation: value.relationValue.reduce((acc: [], cur: any) => {
return acc.concat(cur.split(',').map((relation: string) => ({ id: relation.trim() })));
}, []),
relation: value.relationValue
.filter((rv: string) => {
return uuidValidateWithoutDashes.call(this, rv);
})
.reduce((acc: [], cur: any) => {
return acc.concat(cur.split(',').map((relation: string) => ({ id: relation.trim() })));
}, []),
};
break;
case 'multi_select':
Expand Down Expand Up @@ -392,7 +418,12 @@ function getNameAndType(key: string) {
};
}

export function mapProperties(properties: IDataObject[], timezone: string, version = 1) {
export function mapProperties(
this: IExecuteFunctions,
properties: IDataObject[],
timezone: string,
version = 1,
) {
return properties
.filter(
(property): property is Record<string, { key: string; [k: string]: any }> =>
Expand All @@ -402,7 +433,7 @@ export function mapProperties(properties: IDataObject[], timezone: string, versi
(property) =>
[
`${property.key.split('|')[0]}`,
getPropertyKeyValue(property, property.key.split('|')[1], timezone, version),
getPropertyKeyValue.call(this, property, property.key.split('|')[1], timezone, version),
] as const,
)
.filter(([, value]) => value)
Expand All @@ -415,9 +446,7 @@ export function mapProperties(properties: IDataObject[], timezone: string, versi
);
}

export function mapSorting(
data: [{ key: string; type: string; direction: string; timestamp: boolean }],
) {
export function mapSorting(data: SortData[]) {
return data.map((sort) => {
return {
direction: sort.direction,
Expand Down
4 changes: 2 additions & 2 deletions packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ export class NotionV1 implements INodeType {
[],
) as IDataObject[];
if (properties.length !== 0) {
body.properties = mapProperties(properties, timezone) as IDataObject;
body.properties = mapProperties.call(this, properties, timezone) as IDataObject;
}
const blockValues = this.getNodeParameter('blockUi.blockValues', i, []) as IDataObject[];
extractDatabaseMentionRLC(blockValues);
Expand Down Expand Up @@ -460,7 +460,7 @@ export class NotionV1 implements INodeType {
properties: {},
};
if (properties.length !== 0) {
body.properties = mapProperties(properties, timezone) as IDataObject;
body.properties = mapProperties.call(this, properties, timezone) as IDataObject;
}
responseData = await notionApiRequest.call(this, 'PATCH', `/pages/${pageId}`, body);
if (simple) {
Expand Down
8 changes: 4 additions & 4 deletions packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
notionApiRequest,
notionApiRequestAllItems,
simplifyObjects,
SortData,
validateJSON,
} from '../GenericFunctions';

Expand Down Expand Up @@ -457,7 +458,7 @@ export class NotionV2 implements INodeType {
if (propertiesValues.length !== 0) {
body.properties = Object.assign(
body.properties,
mapProperties(propertiesValues, timezone, 2) as IDataObject,
mapProperties.call(this, propertiesValues, timezone, 2) as IDataObject,
);
}
const blockValues = this.getNodeParameter('blockUi.blockValues', i, []) as IDataObject[];
Expand Down Expand Up @@ -536,8 +537,7 @@ export class NotionV2 implements INodeType {
delete body.filter;
}
if (sort) {
//@ts-expect-error
body.sorts = mapSorting(sort);
body.sorts = mapSorting(sort as SortData[]);
}
if (returnAll) {
responseData = await notionApiRequestAllItems.call(
Expand Down Expand Up @@ -590,7 +590,7 @@ export class NotionV2 implements INodeType {
properties: {},
};
if (properties.length !== 0) {
body.properties = mapProperties(properties, timezone, 2) as IDataObject;
body.properties = mapProperties.call(this, properties, timezone, 2) as IDataObject;
}
responseData = await notionApiRequest.call(this, 'PATCH', `/pages/${pageId}`, body);
if (simple) {
Expand Down