From 0081d02b979ff5d98c5a834c60d8d8b5e83924ef Mon Sep 17 00:00:00 2001 From: Michael Kret <88898367+michael-radency@users.noreply.github.com> Date: Tue, 19 Apr 2022 12:48:41 +0300 Subject: [PATCH 01/49] fix(Postgres Node): Fix issue with columns containing spaces (#2989) * :hammer: fixed error when column name containes spaces * :zap: added lock fille to commit * :hammer: fix for column names wraped in square braces * :hammer: added lock file * :hammer: fix for update key not included in update columns * :zap: Revert imports Co-authored-by: Ricardo Espinoza Co-authored-by: Jan Oberhauser --- .../nodes/Postgres/Postgres.node.functions.ts | 78 ++++++++++++------- 1 file changed, 52 insertions(+), 26 deletions(-) diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts index f409c33d8e..26007788cd 100644 --- a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts +++ b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts @@ -1,4 +1,4 @@ -import { IDataObject, INodeExecutionData } from 'n8n-workflow'; +import { IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow'; import pgPromise from 'pg-promise'; import pg from 'pg-promise/typescript/pg-subset'; @@ -10,12 +10,18 @@ import pg from 'pg-promise/typescript/pg-subset'; * @param {string[]} properties The properties it should include * @returns */ -export function getItemsCopy(items: INodeExecutionData[], properties: string[]): IDataObject[] { +export function getItemsCopy(items: INodeExecutionData[], properties: string[], guardedColumns?: {[key: string]: string}): IDataObject[] { let newItem: IDataObject; return items.map(item => { newItem = {}; - for (const property of properties) { - newItem[property] = item.json[property]; + if (guardedColumns) { + Object.keys(guardedColumns).forEach( column => { + newItem[column] = item.json[guardedColumns[column]]; + }); + } else { + for (const property of properties) { + newItem[property] = item.json[property]; + } } return newItem; }); @@ -29,10 +35,16 @@ export function getItemsCopy(items: INodeExecutionData[], properties: string[]): * @param {string[]} properties The properties it should include * @returns */ -export function getItemCopy(item: INodeExecutionData, properties: string[]): IDataObject { +export function getItemCopy(item: INodeExecutionData, properties: string[], guardedColumns?: {[key: string]: string}): IDataObject { const newItem: IDataObject = {}; - for (const property of properties) { - newItem[property] = item.json[property]; + if (guardedColumns) { + Object.keys(guardedColumns).forEach( column => { + newItem[column] = item.json[guardedColumns[column]]; + }); + } else { + for (const property of properties) { + newItem[property] = item.json[property]; + } } return newItem; } @@ -93,7 +105,7 @@ export async function pgQuery( Array.prototype.push.apply(result, await t.any(allQueries[i].query, allQueries[i].values)); } catch (err) { if (continueOnFail === false) throw err; - result.push({ ...items[i].json, code: err.code, message: err.message }); + result.push({ ...items[i].json, code: (err as JsonObject).code, message: (err as JsonObject).message }); return result; } } @@ -107,7 +119,7 @@ export async function pgQuery( Array.prototype.push.apply(result, await t.any(allQueries[i].query, allQueries[i].values)); } catch (err) { if (continueOnFail === false) throw err; - result.push({ ...items[i].json, code: err.code, message: err.message }); + result.push({ ...items[i].json, code: (err as JsonObject).code, message: (err as JsonObject).message }); } } return result; @@ -136,9 +148,15 @@ export async function pgInsert( const table = getNodeParam('table', 0) as string; const schema = getNodeParam('schema', 0) as string; const columnString = getNodeParam('columns', 0) as string; + const guardedColumns: {[key: string]: string} = {}; + const columns = columnString.split(',') .map(column => column.trim().split(':')) - .map(([name, cast]) => ({ name, cast })); + .map(([name, cast], i) => { + guardedColumns[`column${i}`] = name; + return { name, cast, prop: `column${i}` }; + }); + const columnNames = columns.map(column => column.name); const cs = new pgp.helpers.ColumnSet(columns, { table: { table, schema } }); @@ -148,18 +166,18 @@ export async function pgInsert( const returning = generateReturning(pgp, getNodeParam('returnFields', 0) as string); if (mode === 'multiple') { - const query = pgp.helpers.insert(getItemsCopy(items, columnNames), cs) + returning; + const query = pgp.helpers.insert(getItemsCopy(items, columnNames, guardedColumns), cs) + returning; return db.any(query); } else if (mode === 'transaction') { return db.tx(async t => { const result: IDataObject[] = []; for (let i = 0; i < items.length; i++) { - const itemCopy = getItemCopy(items[i], columnNames); + const itemCopy = getItemCopy(items[i], columnNames, guardedColumns); try { result.push(await t.one(pgp.helpers.insert(itemCopy, cs) + returning)); } catch (err) { if (continueOnFail === false) throw err; - result.push({ ...itemCopy, code: err.code, message: err.message }); + result.push({ ...itemCopy, code: (err as JsonObject).code, message: (err as JsonObject).message }); return result; } } @@ -169,7 +187,7 @@ export async function pgInsert( return db.task(async t => { const result: IDataObject[] = []; for (let i = 0; i < items.length; i++) { - const itemCopy = getItemCopy(items[i], columnNames); + const itemCopy = getItemCopy(items[i], columnNames, guardedColumns); try { const insertResult = await t.oneOrNone(pgp.helpers.insert(itemCopy, cs) + returning); if (insertResult !== null) { @@ -179,7 +197,7 @@ export async function pgInsert( if (continueOnFail === false) { throw err; } - result.push({ ...itemCopy, code: err.code, message: err.message }); + result.push({ ...itemCopy, code: (err as JsonObject).code, message: (err as JsonObject).message }); } } return result; @@ -209,15 +227,21 @@ export async function pgUpdate( const schema = getNodeParam('schema', 0) as string; const updateKey = getNodeParam('updateKey', 0) as string; const columnString = getNodeParam('columns', 0) as string; - const columns = columnString.split(',') - .map(column => column.trim().split(':')) - .map(([name, cast]) => ({ name, cast })); + const guardedColumns: {[key: string]: string} = {}; - const updateKeys = updateKey.split(',').map(key => { + const columns: Array<{name:string, cast: string, prop:string}> = columnString.split(',') + .map(column => column.trim().split(':')) + .map(([name, cast], i) => { + guardedColumns[`column${i}`] = name; + return { name, cast, prop: `column${i}` }; + }); + + const updateKeys = updateKey.split(',').map((key, i) => { const [name, cast] = key.trim().split(':'); - const updateColumn = { name, cast }; const targetCol = columns.find((column) => column.name === name); + const updateColumn = { name, cast, prop: targetCol ? targetCol.prop : `updateColumn${i}` }; if (!targetCol) { + guardedColumns[updateColumn.prop] = name; columns.unshift(updateColumn); } else if (!targetCol.cast) { @@ -233,7 +257,7 @@ export async function pgUpdate( // Prepare the data to update and copy it to be returned const columnNames = columns.map(column => column.name); - const updateItems = getItemsCopy(items, columnNames); + const updateItems = getItemsCopy(items, columnNames, guardedColumns); const returning = generateReturning(pgp, getNodeParam('returnFields', 0) as string); if (mode === 'multiple') { @@ -246,17 +270,19 @@ export async function pgUpdate( + returning; return await db.any(query); } else { - const where = ' WHERE ' + updateKeys.map(updateKey => pgp.as.name(updateKey.name) + ' = ${' + updateKey.name + '}').join(' AND '); + const where = ' WHERE ' + + updateKeys.map(updateKey => pgp.as.name(updateKey.name) + + ' = ${' + updateKey.prop + '}').join(' AND '); if (mode === 'transaction') { return db.tx(async t => { const result: IDataObject[] = []; for (let i = 0; i < items.length; i++) { - const itemCopy = getItemCopy(items[i], columnNames); + const itemCopy = getItemCopy(items[i], columnNames, guardedColumns); try { Array.prototype.push.apply(result, await t.any(pgp.helpers.update(itemCopy, cs) + pgp.as.format(where, itemCopy) + returning)); } catch (err) { if (continueOnFail === false) throw err; - result.push({ ...itemCopy, code: err.code, message: err.message }); + result.push({ ...itemCopy, code: (err as JsonObject).code, message: (err as JsonObject).message }); return result; } } @@ -266,12 +292,12 @@ export async function pgUpdate( return db.task(async t => { const result: IDataObject[] = []; for (let i = 0; i < items.length; i++) { - const itemCopy = getItemCopy(items[i], columnNames); + const itemCopy = getItemCopy(items[i], columnNames, guardedColumns); try { Array.prototype.push.apply(result, await t.any(pgp.helpers.update(itemCopy, cs) + pgp.as.format(where, itemCopy) + returning)); } catch (err) { if (continueOnFail === false) throw err; - result.push({ ...itemCopy, code: err.code, message: err.message }); + result.push({ ...itemCopy, code: (err as JsonObject).code, message: (err as JsonObject).message }); } } return result; From f4e9562451d6e5e3bbb6d174b714702c2759dc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Tue, 19 Apr 2022 12:22:05 +0200 Subject: [PATCH 02/49] :bug: Update initialization checks (#3147) --- packages/cli/src/CredentialsHelper.ts | 2 +- packages/cli/src/WebhookServer.ts | 2 +- packages/cli/src/WorkflowExecuteAdditionalData.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/src/CredentialsHelper.ts b/packages/cli/src/CredentialsHelper.ts index 6477504b87..2400b952c9 100644 --- a/packages/cli/src/CredentialsHelper.ts +++ b/packages/cli/src/CredentialsHelper.ts @@ -423,7 +423,7 @@ export class CredentialsHelper extends ICredentialsHelper { // eslint-disable-next-line @typescript-eslint/await-thenable const credentials = await this.getCredentials(nodeCredentials, type); - if (Db.collections.Credentials === null) { + if (!Db.isInitialized) { // The first time executeWorkflow gets called the Database has // to get initialized first await Db.init(); diff --git a/packages/cli/src/WebhookServer.ts b/packages/cli/src/WebhookServer.ts index 700cadaa52..50c934d968 100644 --- a/packages/cli/src/WebhookServer.ts +++ b/packages/cli/src/WebhookServer.ts @@ -300,7 +300,7 @@ class App { } this.app.use((req: express.Request, res: express.Response, next: express.NextFunction) => { - if (Db.collections.Workflow === null) { + if (!Db.isInitialized) { const error = new ResponseHelper.ResponseError('Database is not ready!', undefined, 503); return ResponseHelper.sendErrorResponse(res, error); } diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts index 55f52b583b..287c362794 100644 --- a/packages/cli/src/WorkflowExecuteAdditionalData.ts +++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts @@ -789,7 +789,7 @@ export async function getWorkflowData( let workflowData: IWorkflowBase | undefined; if (workflowInfo.id !== undefined) { - if (Db.collections.Workflow === null) { + if (!Db.isInitialized) { // The first time executeWorkflow gets called the Database has // to get initialized first await Db.init(); From f56656929992b98a3473944fd2a395e05d5c42f0 Mon Sep 17 00:00:00 2001 From: Alex Grozav Date: Tue, 19 Apr 2022 13:28:31 +0300 Subject: [PATCH 03/49] feat(editor): Add drag and drop from nodes panel (#3123) * :sparkles: Added support for drag and drop from nodes main panel. :sparkles: Added node draggable placeholder. * :sparkles: Added snapping to grid. Changed how draggable ghost follows the cursor. * :lipstick: Changed node drag anchor position to be centered. * :sparkles: Added drag and drop animation. Added event cancellation when dropping node on main panel. * :recycle: Simplified drag and drop code and cleaned up prop-drilling. * :bug: Added check for nodeTypeName in dataTransfer when draging and dropping nodes. * :bug: Ensured MS Edge compatibility. MS edge does not send datatransfer in ondragover event. Co-authored-by: Mutasem --- .../components/NodeCreator/CreatorItem.vue | 10 +- .../components/NodeCreator/ItemIterator.vue | 15 ++- .../src/components/NodeCreator/MainPanel.vue | 28 ++-- .../components/NodeCreator/NodeCreator.vue | 32 ++++- .../src/components/NodeCreator/NodeItem.vue | 125 +++++++++++++++++- .../NodeCreator/SubcategoryPanel.vue | 9 +- packages/editor-ui/src/views/NodeView.vue | 101 ++++++++++---- 7 files changed, 259 insertions(+), 61 deletions(-) diff --git a/packages/editor-ui/src/components/NodeCreator/CreatorItem.vue b/packages/editor-ui/src/components/NodeCreator/CreatorItem.vue index a024c2ec4d..9c8597cbd6 100644 --- a/packages/editor-ui/src/components/NodeCreator/CreatorItem.vue +++ b/packages/editor-ui/src/components/NodeCreator/CreatorItem.vue @@ -5,8 +5,8 @@ clickable: props.clickable, active: props.active, }" - @click="listeners['click']" - > + @click="listeners.click" + > + @dragstart="listeners.dragstart" + @dragend="listeners.dragend" + /> @@ -54,4 +56,4 @@ export default { } } - \ No newline at end of file + diff --git a/packages/editor-ui/src/components/NodeCreator/ItemIterator.vue b/packages/editor-ui/src/components/NodeCreator/ItemIterator.vue index 39d0437d44..e07b5fed68 100644 --- a/packages/editor-ui/src/components/NodeCreator/ItemIterator.vue +++ b/packages/editor-ui/src/components/NodeCreator/ItemIterator.vue @@ -8,7 +8,12 @@ @before-leave="beforeLeave" @leave="leave" > -
+
@@ -36,12 +43,12 @@ export default Vue.extend({ }, props: ['elements', 'activeIndex', 'disabled', 'transitionsEnabled'], methods: { - selected(element: INodeCreateElement) { + emit(eventName: string, element: INodeCreateElement, event: Event) { if (this.$props.disabled) { return; } - this.$emit('selected', element); + this.$emit(eventName, { element, event }); }, beforeEnter(el: HTMLElement) { el.style.height = '0'; diff --git a/packages/editor-ui/src/components/NodeCreator/MainPanel.vue b/packages/editor-ui/src/components/NodeCreator/MainPanel.vue index dbff0d7584..1f03e81b4c 100644 --- a/packages/editor-ui/src/components/NodeCreator/MainPanel.vue +++ b/packages/editor-ui/src/components/NodeCreator/MainPanel.vue @@ -1,7 +1,18 @@ @@ -56,7 +70,6 @@ import { ALL_NODE_FILTER, CORE_NODES_CATEGORY, REGULAR_NODE_FILTER, TRIGGER_NODE import SlideTransition from '../transitions/SlideTransition.vue'; import { matchesNodeType, matchesSelectType } from './helpers'; - export default mixins(externalHooks).extend({ name: 'NodeCreateList', components: { @@ -235,18 +248,13 @@ export default mixins(externalHooks).extend({ }, selected(element: INodeCreateElement) { if (element.type === 'node') { - const properties = element.properties as INodeItemProps; - - this.nodeTypeSelected(properties.nodeType.name); + this.$emit('nodeTypeSelected', (element.properties as INodeItemProps).nodeType.name); } else if (element.type === 'category') { this.onCategorySelected(element.category); } else if (element.type === 'subcategory') { this.onSubcategorySelected(element); } }, - nodeTypeSelected(nodeTypeName: string) { - this.$emit('nodeTypeSelected', nodeTypeName); - }, onCategorySelected(category: string) { if (this.activeCategory.includes(category)) { this.activeCategory = this.activeCategory.filter( diff --git a/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue b/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue index 9ba458709f..b9bb417637 100644 --- a/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue +++ b/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue @@ -1,8 +1,20 @@