🔀 Merge master

This commit is contained in:
Iván Ovejero
2021-11-29 10:05:37 +01:00
166 changed files with 46944 additions and 728 deletions

View File

@@ -854,7 +854,8 @@ export class ExecuteBatch extends Command {
}
}
} catch (e) {
executionResult.error = 'Workflow failed to execute.';
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
executionResult.error = `Workflow failed to execute: ${e.message}`;
executionResult.executionStatus = 'error';
}
clearTimeout(timeoutTimer);

View File

@@ -1,6 +1,6 @@
{
"name": "n8n",
"version": "0.150.0",
"version": "0.151.0",
"description": "n8n Workflow Automation Tool",
"license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io",
@@ -111,10 +111,10 @@
"localtunnel": "^2.0.0",
"lodash.get": "^4.4.2",
"mysql2": "~2.3.0",
"n8n-core": "~0.94.0",
"n8n-editor-ui": "~0.117.0",
"n8n-nodes-base": "~0.147.0",
"n8n-workflow": "~0.77.0",
"n8n-core": "~0.95.0",
"n8n-editor-ui": "~0.118.0",
"n8n-nodes-base": "~0.148.0",
"n8n-workflow": "~0.78.0",
"oauth-1.0a": "^2.2.6",
"open": "^7.0.0",
"pg": "^8.3.0",
@@ -123,7 +123,7 @@
"sqlite3": "^5.0.1",
"sse-channel": "^3.1.1",
"tslib": "1.14.1",
"typeorm": "^0.2.30",
"typeorm": "0.2.30",
"winston": "^3.3.3"
},
"jest": {

View File

@@ -1611,8 +1611,7 @@ class App {
async (req: express.Request, res: express.Response): Promise<ICredentialsResponse[]> => {
const findQuery = {} as FindManyOptions;
if (req.query.filter) {
findQuery.where = JSON.parse(req.query.filter as string);
// @ts-ignore
findQuery.where = JSON.parse(req.query.filter as string) as IDataObject;
if (findQuery.where.id !== undefined) {
// No idea if multiple where parameters make db search
// slower but to be sure that that is not the case we