⚡ Small improvements to Mongo connection string support

packages/editor-ui/src/components/CredentialsInput.vue

@@ -21,18 +21,20 @@
 				<font-awesome-icon icon="question-circle" />
 			</el-tooltip>
 		</div>
-		<el-row v-for="parameter in credentialTypeData.properties" :key="parameter.name" class="parameter-wrapper">
-			<el-col :span="6" class="parameter-name">
-				{{parameter.displayName}}:
-				<el-tooltip placement="top" class="parameter-info" v-if="parameter.description" effect="light">
-					<div slot="content" v-html="parameter.description"></div>
-					<font-awesome-icon icon="question-circle"/>
-				</el-tooltip>
-			</el-col>
-			<el-col :span="18">
-				<parameter-input :parameter="parameter" :value="propertyValue[parameter.name]" :path="parameter.name" :isCredential="true" @valueChanged="valueChanged" />
-			</el-col>
-		</el-row>
+		<span v-for="parameter in credentialTypeData.properties" :key="parameter.name">
+			<el-row v-if="displayCredentialParameter(parameter)" class="parameter-wrapper">
+				<el-col :span="6" class="parameter-name">
+					{{parameter.displayName}}:
+					<el-tooltip placement="top" class="parameter-info" v-if="parameter.description" effect="light">
+						<div slot="content" v-html="parameter.description"></div>
+						<font-awesome-icon icon="question-circle"/>
+					</el-tooltip>
+				</el-col>
+				<el-col :span="18">
+					<parameter-input :parameter="parameter" :value="propertyValue[parameter.name]" :path="parameter.name" :isCredential="true" @valueChanged="valueChanged" />
+				</el-col>
+			</el-row>
+		</span>
 
 		<el-row class="nodes-access-wrapper">
 			<el-col :span="6" class="headline">
@@ -85,6 +87,7 @@ import {
 	ICredentialType,
 	ICredentialNodeAccess,
 	INodeCredentialDescription,
+	INodeProperties,
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
@@ -162,6 +165,14 @@ export default mixins(
 			tempValue[name] = parameterData.value;
 			Vue.set(this, 'propertyValue', tempValue);
 		},
+		displayCredentialParameter (parameter: INodeProperties): boolean {
+			if (parameter.displayOptions === undefined) {
+				// If it is not defined no need to do a proper check
+				return true;
+			}
+
+			return this.displayParameter(this.propertyValue, parameter, '');
+		},
 		async createCredentials (): Promise<void> {
 			const nodesAccess = this.nodesAccess.map((nodeType) => {
 				return {

packages/nodes-base/credentials/MongoDb.credentials.ts

@@ -4,10 +4,53 @@ export class MongoDb implements ICredentialType {
 	name = 'mongoDb';
 	displayName = 'MongoDB';
 	properties = [
+		{
+			displayName: 'Configuration Type',
+			name: 'configurationType',
+			type: 'options' as NodePropertyTypes,
+			options: [
+				{
+					name: 'Connection String',
+					value: 'connectionString',
+					description: 'Provide connection data via string',
+				},
+				{
+					name: 'Values',
+					value: 'values',
+					description: 'Provide connection data via values',
+				},
+			],
+			default: 'values',
+			description: 'The operation to perform.',
+		},
+		{
+			displayName: 'Connection String',
+			name: 'connectionString',
+			type: 'string' as NodePropertyTypes,
+			displayOptions: {
+				show: {
+					configurationType: [
+						'connectionString',
+					],
+				},
+			},
+			default: '',
+			placeholder: 'mongodb://<USERNAME>:<PASSWORD>@localhost:27017/?authSource=admin&readPreference=primary&appname=n8n&ssl=false',
+			required: false,
+			description: `If provided, the value here will be used as a MongoDB connection string,<br />
+						  and the MongoDB credentials will be ignored`
+		},
 		{
 			displayName: 'Host',
 			name: 'host',
 			type: 'string' as NodePropertyTypes,
+			displayOptions: {
+				show: {
+					configurationType: [
+						'values',
+					],
+				},
+			},
 			default: 'localhost'
 		},
 		{
@@ -15,13 +58,19 @@ export class MongoDb implements ICredentialType {
 			name: 'database',
 			type: 'string' as NodePropertyTypes,
 			default: '',
-			description:
-				'Note: the database should still be provided even if using an override connection string'
+			description: 'Note: the database should still be provided even if using an override connection string'
 		},
 		{
 			displayName: 'User',
 			name: 'user',
 			type: 'string' as NodePropertyTypes,
+			displayOptions: {
+				show: {
+					configurationType: [
+						'values',
+					],
+				},
+			},
 			default: ''
 		},
 		{
@@ -31,34 +80,27 @@ export class MongoDb implements ICredentialType {
 			typeOptions: {
 				password: true
 			},
+			displayOptions: {
+				show: {
+					configurationType: [
+						'values',
+					],
+				},
+			},
 			default: ''
 		},
 		{
 			displayName: 'Port',
 			name: 'port',
 			type: 'number' as NodePropertyTypes,
+			displayOptions: {
+				show: {
+					configurationType: [
+						'values',
+					],
+				},
+			},
 			default: 27017
 		},
-		{
-			displayName: 'Override conn string',
-			name: 'shouldOverrideConnString',
-			type: 'boolean' as NodePropertyTypes,
-			default: false,
-			required: false,
-			description:
-				'Whether to override the generated connection string. Credentials will also be ignored in this case.'
-		},
-		{
-			displayName: 'Conn string override',
-			name: 'connStringOverrideVal',
-			type: 'string' as NodePropertyTypes,
-			typeOptions: {
-				rows: 1
-			},
-			default: '',
-			placeholder: `mongodb://USERNAMEHERE:PASSWORDHERE@localhost:27017/?authSource=admin&readPreference=primary&appname=n8n&ssl=false`,
-			required: false,
-			description: `If provided, the value here will be used as a MongoDB connection string, and the MongoDB credentials will be ignored`
-		}
 	];
 }

packages/nodes-base/nodes/MongoDb/mongo.node.types.ts

@@ -7,7 +7,8 @@ export interface IMongoParametricCredentials {
 	/**
 	 * Whether to allow overriding the parametric credentials with a connection string
 	 */
-	shouldOverrideConnString: false | undefined | null;
+	configurationType: 'values';
+
 	host: string;
 	database: string;
 	user: string;
@@ -22,11 +23,11 @@ export interface IMongoOverrideCredentials {
 	/**
 	 * Whether to allow overriding the parametric credentials with a connection string
 	 */
-	shouldOverrideConnString: true;
+	configurationType: 'connectionString';
 	/**
 	 * If using an override connection string, this is where it will be.
 	 */
-	connStringOverrideVal: string;
+	connectionString: string;
 	database: string;
 }
 

packages/nodes-base/nodes/MongoDb/mongo.node.utils.ts

@@ -37,13 +37,13 @@ function buildMongoConnectionParams(
 		credentials.database && credentials.database.trim().length > 0
 			? credentials.database.trim()
 			: '';
-	if (credentials.shouldOverrideConnString) {
+	if (credentials.configurationType === 'connectionString') {
 		if (
-			credentials.connStringOverrideVal &&
-			credentials.connStringOverrideVal.trim().length > 0
+			credentials.connectionString &&
+			credentials.connectionString.trim().length > 0
 		) {
 			return {
-				connectionString: credentials.connStringOverrideVal.trim(),
+				connectionString: credentials.connectionString.trim(),
 				database: sanitizedDbName
 			};
 		} else {
@@ -67,11 +67,11 @@ function buildMongoConnectionParams(
 export function validateAndResolveMongoCredentials(
 	credentials?: ICredentialDataDecryptedObject
 ): IMongoCredentials {
-	if (credentials == undefined) {
+	if (credentials === undefined) {
 		throw new Error('No credentials got returned!');
 	} else {
 		return buildMongoConnectionParams(
-			(credentials as any) as IMongoCredentialsType
+			credentials as unknown as IMongoCredentialsType,
 		);
 	}
 }