Merge remote-tracking branch 'origin/master' into user-management-p2

packages/cli/src/Server.ts

@@ -29,14 +29,12 @@
 /* eslint-disable import/no-dynamic-require */
 /* eslint-disable no-await-in-loop */
 
-import bodyParser from 'body-parser';
 import { exec as callbackExec } from 'child_process';
-import history from 'connect-history-api-fallback';
+import { promises, readFileSync } from 'fs';
+import os from 'os';
 import cookieParser from 'cookie-parser';
 import express from 'express';
-import { promises, readFileSync } from 'fs';
 import _ from 'lodash';
-import os from 'os';
 import { dirname as pathDirname, join as pathJoin, resolve as pathResolve } from 'path';
 import { FindManyOptions, getConnectionManager, In } from 'typeorm';
 // eslint-disable-next-line import/no-extraneous-dependencies
@@ -71,41 +69,11 @@ import timezones from 'google-timezones-json';
 import parseUrl from 'parseurl';
 import promClient, { Registry } from 'prom-client';
 import { promisify } from 'util';
-import {
-	ActiveExecutions,
-	ActiveWorkflowRunner,
-	CredentialsHelper,
-	CredentialsOverwrites,
-	CredentialTypes,
-	DatabaseType,
-	Db,
-	ExternalHooks,
-	GenericHelpers,
-	getCredentialForUser,
-	getCredentialWithoutUser,
-	ICredentialsDb,
-	ICredentialsOverwrite,
-	ICustomRequest,
-	IDiagnosticInfo,
-	IExecutionFlattedDb,
-	IExecutionsStopData,
-	IExecutionsSummary,
-	IExternalHooksClass,
-	IN8nUISettings,
-	IPackageVersions,
-	NodeTypes,
-	Push,
-	ResponseHelper,
-	TestWebhooks,
-	WaitTracker,
-	WaitTrackerClass,
-	WebhookHelpers,
-	WebhookServer,
-	WorkflowExecuteAdditionalData,
-} from '.';
+import history from 'connect-history-api-fallback';
+import bodyParser from 'body-parser';
+import config from '../config';
 import * as Queue from './Queue';
 
-import config from '../config';
 
 import { InternalHooksManager } from './InternalHooksManager';
 import { getCredentialTranslationPath } from './TranslationHelpers';
@@ -137,6 +105,38 @@ import {
 	isEmailSetUp,
 	isUserManagementEnabled,
 } from './UserManagement/UserManagementHelper';
+import {
+	ActiveExecutions,
+	ActiveWorkflowRunner,
+	CredentialsHelper,
+	CredentialsOverwrites,
+	CredentialTypes,
+	DatabaseType,
+	Db,
+	ExternalHooks,
+	GenericHelpers,
+	getCredentialForUser,
+	getCredentialWithoutUser,
+	ICredentialsDb,
+	ICredentialsOverwrite,
+	ICustomRequest,
+	IDiagnosticInfo,
+	IExecutionFlattedDb,
+	IExecutionsStopData,
+	IExecutionsSummary,
+	IExternalHooksClass,
+	IN8nUISettings,
+	IPackageVersions,
+	NodeTypes,
+	Push,
+	ResponseHelper,
+	TestWebhooks,
+	WaitTracker,
+	WaitTrackerClass,
+	WebhookHelpers,
+	WebhookServer,
+	WorkflowExecuteAdditionalData,
+} from '.';
 
 require('body-parser-xml')(bodyParser);
 

packages/cli/src/WorkflowRunnerProcess.ts

@@ -103,13 +103,7 @@ export class WorkflowRunnerProcess {
 			const { className, sourcePath } = this.data.nodeTypeData[nodeTypeName];
 
 			try {
-				const nodeObject = loadClassInIsolation(sourcePath, className);
-				if (nodeObject.getNodeType !== undefined) {
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-					tempNode = nodeObject.getNodeType();
-				} else {
-					tempNode = nodeObject;
-				}
+				tempNode = loadClassInIsolation(sourcePath, className);
 			} catch (error) {
 				throw new Error(`Error loading node "${nodeTypeName}" from: "${sourcePath}"`);
 			}

packages/cli/src/databases/migrations/mysqldb/1657062385367-CreateCredentialsEditorRole.ts → packages/cli/src/databases/migrations/mysqldb/1660062385367-CreateCredentialsEditorRole.ts

@@ -1,10 +1,10 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
 import config from '../../../../config';
 
-export class CreateCredentialsEditorRole1657062385367 implements MigrationInterface {
-	name = 'CreateCredentialsEditorRole1657062385367';
+export class CreateCredentialsEditorRole1660062385367 implements MigrationInterface {
+	name = 'CreateCredentialsEditorRole1660062385367';
 
-	public async up(queryRunner: QueryRunner): Promise<void> {
+	async up(queryRunner: QueryRunner): Promise<void> {
 		const tablePrefix = config.getEnv('database.tablePrefix');
 
 		await queryRunner.query(`
@@ -13,7 +13,7 @@ export class CreateCredentialsEditorRole1657062385367 implements MigrationInterf
 		`);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
+	async down(queryRunner: QueryRunner): Promise<void> {
 		const tablePrefix = config.getEnv('database.tablePrefix');
 
 		await queryRunner.query(`

packages/cli/src/databases/migrations/mysqldb/index.ts

@@ -1,8 +1,8 @@
 import { InitialMigration1588157391238 } from './1588157391238-InitialMigration';
 import { WebhookModel1592447867632 } from './1592447867632-WebhookModel';
 import { CreateIndexStoppedAt1594902918301 } from './1594902918301-CreateIndexStoppedAt';
-import { MakeStoppedAtNullable1607431743767 } from './1607431743767-MakeStoppedAtNullable';
 import { AddWebhookId1611149998770 } from './1611149998770-AddWebhookId';
+import { MakeStoppedAtNullable1607431743767 } from './1607431743767-MakeStoppedAtNullable';
 import { ChangeDataSize1615306975123 } from './1615306975123-ChangeDataSize';
 import { CreateTagEntity1617268711084 } from './1617268711084-CreateTagEntity';
 import { ChangeCredentialDataSize1620729500000 } from './1620729500000-ChangeCredentialDataSize';
@@ -13,13 +13,13 @@ import { UpdateWorkflowCredentials1630451444017 } from './1630451444017-UpdateWo
 import { AddExecutionEntityIndexes1644424784709 } from './1644424784709-AddExecutionEntityIndexes';
 import { CreateUserManagement1646992772331 } from './1646992772331-CreateUserManagement';
 import { LowerCaseUserEmail1648740597343 } from './1648740597343-LowerCaseUserEmail';
-import { CommunityNodes1652254514003 } from './1652254514003-CommunityNodes';
 import { AddUserSettings1652367743993 } from './1652367743993-AddUserSettings';
+import { CommunityNodes1652254514003 } from './1652254514003-CommunityNodes';
 import { AddAPIKeyColumn1652905585850 } from './1652905585850-AddAPIKeyColumn';
 import { IntroducePinData1654090101303 } from './1654090101303-IntroducePinData';
-import { CreateCredentialsEditorRole1657062385367 } from './1657062385367-CreateCredentialsEditorRole';
 import { AddNodeIds1658932910559 } from './1658932910559-AddNodeIds';
 import { AddJsonKeyPinData1659895550980 } from './1659895550980-AddJsonKeyPinData';
+import { CreateCredentialsEditorRole1660062385367 } from './1660062385367-CreateCredentialsEditorRole';
 
 export const mysqlMigrations = [
 	InitialMigration1588157391238,
@@ -41,7 +41,7 @@ export const mysqlMigrations = [
 	CommunityNodes1652254514003,
 	AddAPIKeyColumn1652905585850,
 	IntroducePinData1654090101303,
-	CreateCredentialsEditorRole1657062385367,
 	AddNodeIds1658932910559,
 	AddJsonKeyPinData1659895550980,
+	CreateCredentialsEditorRole1660062385367,
 ];

packages/cli/src/databases/migrations/postgresdb/1657062385367-CreateCredentialsEditorRole.ts → packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsEditorRole.ts

@@ -1,10 +1,10 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
 import config from '../../../../config';
 
-export class CreateCredentialsEditorRole1657062385367 implements MigrationInterface {
-	name = 'CreateCredentialsEditorRole1657062385367';
+export class CreateCredentialsEditorRole1660062385367 implements MigrationInterface {
+	name = 'CreateCredentialsEditorRole1660062385367';
 
-	public async up(queryRunner: QueryRunner): Promise<void> {
+	async up(queryRunner: QueryRunner): Promise<void> {
 		const tablePrefix = config.getEnv('database.tablePrefix');
 
 		await queryRunner.query(`
@@ -13,7 +13,7 @@ export class CreateCredentialsEditorRole1657062385367 implements MigrationInterf
 		`);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
+	async down(queryRunner: QueryRunner): Promise<void> {
 		const tablePrefix = config.getEnv('database.tablePrefix');
 
 		await queryRunner.query(`

packages/cli/src/databases/migrations/postgresdb/index.ts

@@ -1,8 +1,8 @@
 import { InitialMigration1587669153312 } from './1587669153312-InitialMigration';
 import { WebhookModel1589476000887 } from './1589476000887-WebhookModel';
 import { CreateIndexStoppedAt1594828256133 } from './1594828256133-CreateIndexStoppedAt';
-import { MakeStoppedAtNullable1607431743768 } from './1607431743768-MakeStoppedAtNullable';
 import { AddWebhookId1611144599516 } from './1611144599516-AddWebhookId';
+import { MakeStoppedAtNullable1607431743768 } from './1607431743768-MakeStoppedAtNullable';
 import { CreateTagEntity1617270242566 } from './1617270242566-CreateTagEntity';
 import { UniqueWorkflowNames1620824779533 } from './1620824779533-UniqueWorkflowNames';
 import { AddwaitTill1626176912946 } from './1626176912946-AddwaitTill';
@@ -11,13 +11,13 @@ import { AddExecutionEntityIndexes1644422880309 } from './1644422880309-AddExecu
 import { IncreaseTypeVarcharLimit1646834195327 } from './1646834195327-IncreaseTypeVarcharLimit';
 import { CreateUserManagement1646992772331 } from './1646992772331-CreateUserManagement';
 import { LowerCaseUserEmail1648740597343 } from './1648740597343-LowerCaseUserEmail';
-import { CommunityNodes1652254514002 } from './1652254514002-CommunityNodes';
 import { AddUserSettings1652367743993 } from './1652367743993-AddUserSettings';
+import { CommunityNodes1652254514002 } from './1652254514002-CommunityNodes';
 import { AddAPIKeyColumn1652905585850 } from './1652905585850-AddAPIKeyColumn';
 import { IntroducePinData1654090467022 } from './1654090467022-IntroducePinData';
-import { CreateCredentialsEditorRole1657062385367 } from './1657062385367-CreateCredentialsEditorRole';
 import { AddNodeIds1658932090381 } from './1658932090381-AddNodeIds';
 import { AddJsonKeyPinData1659902242948 } from './1659902242948-AddJsonKeyPinData';
+import { CreateCredentialsEditorRole1660062385367 } from './1660062385367-CreateCredentialsEditorRole';
 
 export const postgresMigrations = [
 	InitialMigration1587669153312,
@@ -37,7 +37,7 @@ export const postgresMigrations = [
 	CommunityNodes1652254514002,
 	AddAPIKeyColumn1652905585850,
 	IntroducePinData1654090467022,
-	CreateCredentialsEditorRole1657062385367,
+	CreateCredentialsEditorRole1660062385367,
 	AddNodeIds1658932090381,
 	AddJsonKeyPinData1659902242948,
 ];

packages/cli/src/databases/migrations/sqlite/1657062385367-CreateCredentialsEditorRole.ts → packages/cli/src/databases/migrations/sqlite/1660062385367-CreateCredentialsEditorRole.ts

@@ -2,10 +2,10 @@ import { MigrationInterface, QueryRunner } from 'typeorm';
 import * as config from '../../../../config';
 import { logMigrationEnd, logMigrationStart } from '../../utils/migrationHelpers';
 
-export class CreateCredentialsEditorRole1657062385367 implements MigrationInterface {
-	name = 'CreateCredentialsEditorRole1657062385367';
+export class CreateCredentialsEditorRole1660062385367 implements MigrationInterface {
+	name = 'CreateCredentialsEditorRole1660062385367';
 
-	public async up(queryRunner: QueryRunner): Promise<void> {
+	async up(queryRunner: QueryRunner): Promise<void> {
 		logMigrationStart(this.name);
 
 		const tablePrefix = config.getEnv('database.tablePrefix');
@@ -18,7 +18,7 @@ export class CreateCredentialsEditorRole1657062385367 implements MigrationInterf
 		logMigrationEnd(this.name);
 	}
 
-	public async down(queryRunner: QueryRunner): Promise<void> {
+	async down(queryRunner: QueryRunner): Promise<void> {
 		const tablePrefix = config.getEnv('database.tablePrefix');
 
 		await queryRunner.query(`

packages/cli/src/databases/migrations/sqlite/index.ts

@@ -14,9 +14,9 @@ import { AddUserSettings1652367743993 } from './1652367743993-AddUserSettings';
 import { CommunityNodes1652254514001 } from './1652254514001-CommunityNodes';
 import { AddAPIKeyColumn1652905585850 } from './1652905585850-AddAPIKeyColumn';
 import { IntroducePinData1654089251344 } from './1654089251344-IntroducePinData';
-import { CreateCredentialsEditorRole1657062385367 } from './1657062385367-CreateCredentialsEditorRole';
 import { AddNodeIds1658930531669 } from './1658930531669-AddNodeIds';
 import { AddJsonKeyPinData1659888469333 } from './1659888469333-AddJsonKeyPinData';
+import { CreateCredentialsEditorRole1660062385367 } from './1660062385367-CreateCredentialsEditorRole';
 
 const sqliteMigrations = [
 	InitialMigration1588102412422,
@@ -35,9 +35,9 @@ const sqliteMigrations = [
 	CommunityNodes1652254514001,
 	AddAPIKeyColumn1652905585850,
 	IntroducePinData1654089251344,
-	CreateCredentialsEditorRole1657062385367,
 	AddNodeIds1658930531669,
 	AddJsonKeyPinData1659888469333,
+	CreateCredentialsEditorRole1660062385367,
 ];
 
 export { sqliteMigrations };

packages/editor-ui/src/App.vue

@@ -30,11 +30,13 @@ import { mapGetters } from 'vuex';
 import { userHelpers } from './components/mixins/userHelpers';
 import { addHeaders, loadLanguage } from './plugins/i18n';
 import { restApi } from '@/components/mixins/restApi';
+import { globalLinkActions } from '@/components/mixins/globalLinkActions';
 
 export default mixins(
 	showMessage,
 	userHelpers,
 	restApi,
+	globalLinkActions,
 ).extend({
 	name: 'App',
 	components: {

packages/editor-ui/src/Interface.ts

@@ -6,14 +6,10 @@ import {
 	ICredentialsEncrypted,
 	ICredentialType,
 	IDataObject,
-	ILoadOptions,
 	INode,
-	INodeCredentials,
 	INodeIssues,
 	INodeParameters,
-	INodePropertyOptions,
 	INodeTypeDescription,
-	INodeTypeNameVersion,
 	IPinData,
 	IRunExecutionData,
 	IRun,
@@ -37,6 +33,7 @@ declare module 'jsplumb' {
 		outlineWidth?: number;
 	}
 
+	// Extend jsPlumb Anchor interface
 	interface Anchor {
 		lastReturnValue: number[];
 	}
@@ -140,7 +137,6 @@ export interface INodeUpdatePropertiesInformation {
 
 export type XYPosition = [number, number];
 
-export type MessageType = 'success' | 'warning' | 'info' | 'error';
 export interface INodeUi extends INode {
 	position: XYPosition;
 	color?: string;
@@ -419,8 +415,6 @@ export interface IExecutionDeleteFilter {
 	ids?: string[];
 }
 
-export type IPushDataType = IPushData['type'];
-
 export type IPushData =
 	| PushDataExecutionFinished
 	| PushDataExecutionStarted
@@ -706,6 +700,7 @@ export interface IN8nUISettings {
 		oauth1: string;
 		oauth2: string;
 	};
+	urlBaseEditor: string;
 	urlBaseWebhook: string;
 	versionCli: string;
 	n8nMetadata?: {
@@ -888,6 +883,7 @@ export interface IRootState {
 	nodeViewMoveInProgress: boolean;
 	selectedNodes: INodeUi[];
 	sessionId: string;
+	urlBaseEditor: string;
 	urlBaseWebhook: string;
 	workflow: IWorkflowDb;
 	sidebarMenuItems: IMenuItem[];