mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-21 02:56:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(Google Sheets Node): Fix for auto-range detection

Browse source
This commit is contained in:
Michael Kret 2023-01-06 00:25:28 +02:00 committed by GitHub
parent acfb3518ad
commit 77031a2950
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
View file

@ -582,6 +582,7 @@ export class GoogleSheet {
} }
} }
} }
// Loop over all the lookup values and try to find a row to return // Loop over all the lookup values and try to find a row to return
let rowIndex: number; let rowIndex: number;
let returnColumnIndex: number; let returnColumnIndex: number;
@ -617,7 +618,13 @@ export class GoogleSheet {
} }
} }
return this.convertSheetDataArrayToObjectArray(removeEmptyColumns(returnData), 1, keys, true); const dataWithoutEmptyColumns = removeEmptyColumns(returnData);
return this.convertSheetDataArrayToObjectArray(
dataWithoutEmptyColumns,
1,
dataWithoutEmptyColumns[0] as string[],
true,
);
} }
private async convertObjectArrayToSheetDataArray( private async convertObjectArrayToSheetDataArray(

4
packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
View file

@ -134,6 +134,10 @@ export function removeEmptyColumns(data: SheetRangeData) {
const longestRow = data.reduce((a, b) => (a.length > b.length ? a : b), []).length; const longestRow = data.reduce((a, b) => (a.length > b.length ? a : b), []).length;
for (let col = 0; col < longestRow; col++) { for (let col = 0; col < longestRow; col++) {
const column = data.map((row) => row[col]); const column = data.map((row) => row[col]);
if (column[0] !== '') {
returnData.push(column);
continue;
}
const hasData = column.slice(1).some((cell) => cell || typeof cell === 'number'); const hasData = column.slice(1).some((cell) => cell || typeof cell === 'number');
if (hasData) { if (hasData) {
returnData.push(column); returnData.push(column);