From 442d4495a61dab42d3ff1a292c5b491e85c5ac30 Mon Sep 17 00:00:00 2001 From: oleg Date: Wed, 29 Nov 2023 15:11:54 +0100 Subject: [PATCH] fix(Notion Node): Fix broken Notion node parameters (#7864) We've introduced a new version(`2.1` of Notion node in #7791 but not all `diplayOptions` conditions were updated. This would effectively prevent most of the required Notion fields from loading. This PR adds the new version to all `@version` display conditions which contain version `2`. https://github.com/n8n-io/n8n/assets/12657221/4254c646-43b6-46b3-adcc-1b17746901da Github issue / Community forum post (link here to close automatically): --------- Signed-off-by: Oleg Ivaniv Co-authored-by: Michael Kret --- .../nodes/Notion/DatabaseDescription.ts | 8 ++++-- .../nodes/Notion/DatabasePageDescription.ts | 28 ++++++++++++++----- .../nodes/Notion/GenericFunctions.ts | 20 +++++++++---- .../nodes/Notion/PageDescription.ts | 12 ++++++-- 4 files changed, 51 insertions(+), 17 deletions(-) diff --git a/packages/nodes-base/nodes/Notion/DatabaseDescription.ts b/packages/nodes-base/nodes/Notion/DatabaseDescription.ts index d5932e9765c10..aee9c8d886f23 100644 --- a/packages/nodes-base/nodes/Notion/DatabaseDescription.ts +++ b/packages/nodes-base/nodes/Notion/DatabaseDescription.ts @@ -8,9 +8,11 @@ export const databaseOperations: INodeProperties[] = [ noDataExpression: true, displayOptions: { show: { - '@version': [2], resource: ['database'], }, + hide: { + '@version': [1], + }, }, options: [ { @@ -178,10 +180,12 @@ export const databaseFields: INodeProperties[] = [ type: 'boolean', displayOptions: { show: { - '@version': [2], resource: ['database'], operation: ['getAll', 'get'], }, + hide: { + '@version': [1], + }, }, default: true, description: 'Whether to return a simplified version of the response instead of the raw data', diff --git a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts index 4ab8e423136ff..6ecf6d7b94037 100644 --- a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts +++ b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts @@ -14,9 +14,11 @@ export const databasePageOperations: INodeProperties[] = [ noDataExpression: true, displayOptions: { show: { - '@version': [2], resource: ['databasePage'], }, + hide: { + '@version': [1], + }, }, options: [ { @@ -161,10 +163,12 @@ export const databasePageFields: INodeProperties[] = [ default: '', displayOptions: { show: { - '@version': [2], resource: ['databasePage'], operation: ['create'], }, + hide: { + '@version': [1], + }, }, description: 'Page title. Appears at the top of the page and can be found via Quick Find.', }, @@ -502,9 +506,11 @@ export const databasePageFields: INodeProperties[] = [ }, displayOptions: { show: { - '@version': [2], type: ['files'], }, + hide: { + '@version': [1], + }, }, default: {}, options: [ @@ -969,9 +975,11 @@ export const databasePageFields: INodeProperties[] = [ }, displayOptions: { show: { - '@version': [2], type: ['files'], }, + hide: { + '@version': [1], + }, }, default: {}, options: [ @@ -1097,10 +1105,12 @@ export const databasePageFields: INodeProperties[] = [ ], displayOptions: { show: { - '@version': [2], resource: ['databasePage'], operation: ['get'], }, + hide: { + '@version': [1], + }, }, description: 'The Notion Database Page to get', }, @@ -1110,10 +1120,12 @@ export const databasePageFields: INodeProperties[] = [ type: 'boolean', displayOptions: { show: { - '@version': [2], resource: ['databasePage'], operation: ['get'], }, + hide: { + '@version': [1], + }, }, default: true, description: 'Whether to return a simplified version of the response instead of the raw data', @@ -1254,10 +1266,12 @@ export const databasePageFields: INodeProperties[] = [ type: 'boolean', displayOptions: { show: { - '@version': [2], '/resource': ['databasePage'], '/operation': ['getAll'], }, + hide: { + '@version': [1], + }, }, default: false, description: "Whether to download a file if a database's field contains it", diff --git a/packages/nodes-base/nodes/Notion/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/GenericFunctions.ts index f1ce288c63226..b95925b80164d 100644 --- a/packages/nodes-base/nodes/Notion/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Notion/GenericFunctions.ts @@ -936,10 +936,12 @@ export function getSearchFilters(resource: string) { ], displayOptions: { show: { - '@version': [2], resource: [resource], operation: ['getAll'], }, + hide: { + '@version': [1], + }, }, default: 'none', }, @@ -959,11 +961,13 @@ export function getSearchFilters(resource: string) { ], displayOptions: { show: { - '@version': [2], resource: [resource], operation: ['getAll'], filterType: ['manual'], }, + hide: { + '@version': [1], + }, }, default: 'anyFilter', }, @@ -976,11 +980,13 @@ export function getSearchFilters(resource: string) { }, displayOptions: { show: { - '@version': [2], resource: [resource], operation: ['getAll'], filterType: ['manual'], }, + hide: { + '@version': [1], + }, }, default: {}, placeholder: 'Add Condition', @@ -999,11 +1005,13 @@ export function getSearchFilters(resource: string) { type: 'notice', displayOptions: { show: { - '@version': [2], resource: [resource], operation: ['getAll'], filterType: ['json'], }, + hide: { + '@version': [1], + }, }, default: '', }, @@ -1013,11 +1021,13 @@ export function getSearchFilters(resource: string) { type: 'string', displayOptions: { show: { - '@version': [2], resource: [resource], operation: ['getAll'], filterType: ['json'], }, + hide: { + '@version': [1], + }, }, default: '', }, diff --git a/packages/nodes-base/nodes/Notion/PageDescription.ts b/packages/nodes-base/nodes/Notion/PageDescription.ts index 41dd8a07063f9..d0abb0f3f0cb1 100644 --- a/packages/nodes-base/nodes/Notion/PageDescription.ts +++ b/packages/nodes-base/nodes/Notion/PageDescription.ts @@ -43,9 +43,11 @@ export const pageOperations: INodeProperties[] = [ noDataExpression: true, displayOptions: { show: { - '@version': [2], resource: ['page'], }, + hide: { + '@version': [1], + }, }, options: [ { @@ -127,10 +129,12 @@ export const pageFields: INodeProperties[] = [ ], displayOptions: { show: { - '@version': [2], resource: ['page'], operation: ['archive'], }, + hide: { + '@version': [1], + }, }, description: 'The Notion Page to archive', }, @@ -140,10 +144,12 @@ export const pageFields: INodeProperties[] = [ type: 'boolean', displayOptions: { show: { - '@version': [2], resource: ['page'], operation: ['archive'], }, + hide: { + '@version': [1], + }, }, default: true, description: 'Whether to return a simplified version of the response instead of the raw data',