GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(basic.gblib): SET PAGED keyword #377.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-10-21 14:47:30 -03:00
parent 1575bf2661
commit 488ef9d0f8
2 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/basic.gblib/services/KeywordsExpressions.ts
View file

@ -348,6 +348,7 @@ export class KeywordsExpressions {
__calls = 0;
__index = 0;
__data = ${$2};
__pageMode = __data?.pageMode ? __data.pageMode : "none";
__url = __data.links?.next?.uri;
__seekToken = __data.links?.self?.headers["MS-ContinuationToken"]
@ -366,13 +367,15 @@ export class KeywordsExpressions {
return `
// TRUE if all items are processed.
__index = __index + 1;
if (__index >= __totalCount) {
// TRUE if all items are processed.
if (__index === __totalCount) {
// Checks if HTTP call limit has reached.
if (__calls < __totalCalls) {
if (__calls < __totalCalls && __pageMode === "auto") {
// Performs GET request using the constructed URL
@ -389,11 +392,11 @@ export class KeywordsExpressions {
} else {
next = false;
__next = false;
}
}
__index = __index + 1;
}
}`;
}
];

27
packages/basic.gblib/services/SystemKeywords.ts
View file

@ -1512,8 +1512,20 @@ export class SystemKeywords {
private flattenJSON(obj, res, extraKey, hierarchy = false) {
for (let key in obj) {
if (typeof obj[key] === 'function') {
continue;
}
if (typeof obj[key] !== 'object') {
res[extraKey + key] = obj[key];
// If not defined already add the flattened field.
if (!res[extraKey + key]){
res[extraKey + key] = obj[key];
}
else{
GBLog.info(`Ignoring duplicated field in flatten operation to storage: ${key}.`);
}
} else {
this.flattenJSON(obj[key], res, hierarchy ? `${extraKey}${key}.` : '');
};
@ -1535,7 +1547,7 @@ export class SystemKeywords {
const { min, user, params, proc } = await DialogKeywords.getProcessInfo(pid);
GBLogEx.info(min, `GET: ${url}`);
const pageMode = await DialogKeywords.getOption({ pid, name: 'pageMode' });
let pageMode = await DialogKeywords.getOption({ pid, name: 'pageMode' });
let continuationToken = await
DialogKeywords.getOption({ pid, name: `${proc.executable}-continuationToken` });
@ -1585,6 +1597,11 @@ export class SystemKeywords {
await DialogKeywords.setOption({ pid, name: 'continuationToken', value: continuationToken });
}
}
else {
pageMode = "none";
}
if (res) { res['pageMode'] = pageMode; }
return res;
@ -1966,7 +1983,6 @@ export class SystemKeywords {
if (key1Index) {
key1 = key1.charAt(0).toLowerCase() + key1.slice(1);
key1Value = row[key1];
const foundRow = key1Index[key1Value];
if (foundRow) {
@ -1977,13 +1993,12 @@ export class SystemKeywords {
if (found) {
row = this.flattenJSON(row, {}, '')
let keys = Object.keys(row);
for (let j = 0; j < header.length; j++) {
const columnName = header[j];
const columnNameLower = columnName.charAt(0).toLowerCase() + columnName.slice(1);
const value = row[columnNameLower];
let value = row[columnNameLower];
if (value === undefined) { value = null; }
if (value !== found[columnName]) {