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(Google Sheets Node): Better error when column to match on is empty #10442

Merged
merged 9 commits into from
Aug 16, 2024
Merged

fix(Google Sheets Node): Better error when column to match on is empty #10442

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
20b46ea
fix
michael-radency Aug 15, 2024
b02e35f
Merge branch 'master' of https://github.com/n8n-io/n8n into node-1545…
michael-radency Aug 15, 2024
fa4d2ea
hint update
michael-radency Aug 16, 2024
ca493d9
Merge branch 'master' of https://github.com/n8n-io/n8n into node-1531…
michael-radency Aug 16, 2024
5996146
test fix
michael-radency Aug 16, 2024
03e8c76
service name update
michael-radency Aug 16, 2024
e6e00e8
Merge branch 'master' of https://github.com/n8n-io/n8n into node-1531…
michael-radency Aug 16, 2024
6efaf7b
Merge remote-tracking branch 'origin/master' into node-1531-google-sh…
ShireenMissi Aug 16, 2024
f460a90
Merge remote-tracking branch 'origin/master' into node-1531-google-sh…
ShireenMissi Aug 16, 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
14 changes: 12 additions & 2 deletions packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,18 @@ export async function execute(
} else {
const valueToMatchOn =
nodeVersion < 4
? (this.getNodeParameter('valueToMatchOn', i) as string)
: (this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i) as string);
? (this.getNodeParameter('valueToMatchOn', i, '') as string)
: (this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i, '') as string);

if (valueToMatchOn === '') {
throw new NodeOperationError(
this.getNode(),
"The 'Column to Match On' parameter is required",
{
itemIndex: i,
},
);
}

if (nodeVersion < 4) {
const valuesToSend = this.getNodeParameter('fieldsUi.values', i, []) as IDataObject[];
Expand Down
14 changes: 12 additions & 2 deletions packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,18 @@ export async function execute(
} else {
const valueToMatchOn =
nodeVersion < 4
? (this.getNodeParameter('valueToMatchOn', i) as string)
: (this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i) as string);
? (this.getNodeParameter('valueToMatchOn', i, '') as string)
: (this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i, '') as string);

if (valueToMatchOn === '') {
throw new NodeOperationError(
this.getNode(),
"The 'Column to Match On' parameter is required",
{
itemIndex: i,
},
);
}

if (nodeVersion < 4) {
const valuesToSend = this.getNodeParameter('fieldsUi.values', i, []) as IDataObject[];
Expand Down
2 changes: 1 addition & 1 deletion packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const properties: INodeProperties[] = [
loadOptionsDependsOn: ['schema.value', 'table.value'],
},
default: '',
hint: 'The column that identifies the row(s) to modify',
hint: 'The column to use when matching rows in Google Sheets to the input items of this node. Usually an ID.',
ShireenMissi marked this conversation as resolved.
Show resolved Hide resolved
displayOptions: {
show: {
'@version': [2, 2.1],
Expand Down