admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-18 02:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚡ Add pagination to resource report for Google Analytics (#1755)

Browse Source
This commit is contained in:
Ricardo Espinoza
2021-05-08 16:26:06 -04:00
committed by GitHub
parent 77da5b70bc
commit 3a1a5fd49c
3 changed files with 107 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
packages/nodes-base/nodes/Google/Analytics/GenericFunctions.ts
View File

@@ -27,11 +27,13 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
};
options = Object.assign({}, options, option);
try {
if (Object.keys(body).length === 0) {
delete options.body;
}
if (Object.keys(qs).length === 0) {
delete options.qs;
}
//@ts-ignore
return await this.helpers.requestOAuth2.call(this, 'googleAnalyticsOAuth2', options);
@@ -45,12 +47,11 @@ export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOp
const returnData: IDataObject[] = [];
let responseData;
body.pageSize = 100;
do {
responseData = await googleApiRequest.call(this, method, endpoint, body, query, uri);
if (body.reportRequests && Array.isArray(body.reportRequests)) {
body.reportRequests[0].pageToken = responseData['nextPageToken'];
body.reportRequests[0]['pageToken'] = responseData[propertyName][0].nextPageToken;
} else {
body.pageToken = responseData['nextPageToken'];
}
@@ -58,28 +59,42 @@ export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOp
} while (
(responseData['nextPageToken'] !== undefined &&
responseData['nextPageToken'] !== '') ||
(responseData['reports'] &&
responseData['reports'][0].nextPageToken &&
responseData['reports'][0].nextPageToken !== undefined)
(responseData[propertyName] &&
responseData[propertyName][0].nextPageToken &&
responseData[propertyName][0].nextPageToken !== undefined)
);
return returnData;
}
export function simplify(responseData: any) { // tslint:disable-line:no-any
const { columnHeader: { dimensions }, data: { rows } } = responseData[0];
responseData = [];
for (const row of rows) {
const data: IDataObject = {};
if (dimensions) {
for (let i = 0; i < dimensions.length; i++) {
data[dimensions[i]] = row.dimensions[i];
export function simplify(responseData: any | [any]) { // tslint:disable-line:no-any
const response = [];
for (const { columnHeader: { dimensions }, data: { rows } } of responseData) {
for (const row of rows) {
const data: IDataObject = {};
if (dimensions) {
for (let i = 0; i < dimensions.length; i++) {
data[dimensions[i]] = row.dimensions[i];
data['total'] = row.metrics[0].values.join(',');
}
} else {
data['total'] = row.metrics[0].values.join(',');
}
} else {
data['total'] = row.metrics[0].values.join(',');
response.push(data);
}
responseData.push(data);
}
return responseData;
return response;
}
export function merge(responseData: [any]) { // tslint:disable-line:no-any
const response: { columnHeader: IDataObject, data: { rows: [] } } = {
columnHeader: responseData[0].columnHeader,
data: responseData[0].data,
};
const allRows = [];
for (const { data: { rows } } of responseData) {
allRows.push(...rows);
}
response.data.rows = allRows as [];
return [response];
}