🔀 Merge master

packages/editor-ui/src/components/mixins/nodeBase.ts

@@ -11,6 +11,7 @@ import { Endpoint } from 'jsplumb';
 import {
 	INodeTypeDescription,
 } from 'n8n-workflow';
+import { getStyleTokenValue } from '../helpers';
 
 export const nodeBase = mixins(
 	deviceSupportHelpers,
@@ -68,13 +69,14 @@ export const nodeBase = mixins(
 					endpointStyle: CanvasHelpers.getInputEndpointStyle(nodeTypeData, '--color-foreground-xdark'),
 					endpointHoverStyle: CanvasHelpers.getInputEndpointStyle(nodeTypeData, '--color-primary'),
 					isSource: false,
-					isTarget: !this.isReadOnly,
+					isTarget: !this.isReadOnly && nodeTypeData.inputs.length > 1, // only enabled for nodes with multiple inputs.. otherwise attachment handled by connectionDrag event in NodeView,
 					parameters: {
 						nodeIndex: this.nodeIndex,
 						type: inputName,
 						index,
 					},
-					enabled: !this.isReadOnly && nodeTypeData.inputs.length > 1, // only enabled for nodes with multiple inputs.. otherwise attachment handled by connectionDrag event in NodeView
+					enabled: !this.isReadOnly, // enabled in default case to allow dragging
+					cssClass: 'rect-input-endpoint',
 					dragAllowedWhenFull: true,
 					dropOptions: {
 						tolerance: 'touch',
@@ -92,7 +94,9 @@ export const nodeBase = mixins(
 				const endpoint: Endpoint = this.instance.addEndpoint(this.nodeId, newEndpointData);
 				endpoint.__meta = {
 					nodeName: node.name,
+					nodeId: this.nodeId,
 					index: i,
+					totalEndpoints: nodeTypeData.inputs.length,
 				};
 
 				// TODO: Activate again if it makes sense. Currently makes problems when removing
@@ -140,6 +144,7 @@ export const nodeBase = mixins(
 						type: inputName,
 						index,
 					},
+					cssClass: 'dot-output-endpoint',
 					dragAllowedWhenFull: false,
 					dragProxy: ['Rectangle', { width: 1, height: 1, strokeWidth: 0 }],
 				};
@@ -151,11 +156,53 @@ export const nodeBase = mixins(
 					];
 				}
 
-				const endpoint: Endpoint = this.instance.addEndpoint(this.nodeId, newEndpointData);
+				const endpoint: Endpoint = this.instance.addEndpoint(this.nodeId, {...newEndpointData});
 				endpoint.__meta = {
 					nodeName: node.name,
+					nodeId: this.nodeId,
 					index: i,
+					totalEndpoints: nodeTypeData.outputs.length,
 				};
+
+				if (!this.isReadOnly) {
+					const plusEndpointData: IEndpointOptions = {
+						uuid: CanvasHelpers.getOutputEndpointUUID(this.nodeIndex, index),
+						anchor: anchorPosition,
+						maxConnections: -1,
+						endpoint: 'N8nPlus',
+						isSource: true,
+						isTarget: false,
+						enabled: !this.isReadOnly,
+						endpointStyle: {
+							fill: getStyleTokenValue('--color-xdark'),
+							outlineStroke: 'none',
+							hover: false,
+							showOutputLabel: nodeTypeData.outputs.length === 1,
+							size: nodeTypeData.outputs.length >= 3 ? 'small' : 'medium',
+						},
+						endpointHoverStyle: {
+							fill: getStyleTokenValue('--color-primary'),
+							outlineStroke: 'none',
+							hover: true, // hack to distinguish hover state
+						},
+						parameters: {
+							nodeIndex: this.nodeIndex,
+							type: inputName,
+							index,
+						},
+						cssClass: 'plus-draggable-endpoint',
+						dragAllowedWhenFull: false,
+						dragProxy: ['Rectangle', { width: 1, height: 1, strokeWidth: 0 }],
+					};
+
+					const plusEndpoint: Endpoint = this.instance.addEndpoint(this.nodeId, plusEndpointData);
+					plusEndpoint.__meta = {
+						nodeName: node.name,
+						nodeId: this.nodeId,
+						index: i,
+						totalEndpoints: nodeTypeData.outputs.length,
+					};
+				}
 			});
 		},
 		__makeInstanceDraggable(node: INodeUi) {

packages/editor-ui/src/components/mixins/pushConnection.ts

@@ -165,7 +165,7 @@ export const pushConnection = mixins(
 
 				if (receivedData.type === 'sendConsoleMessage') {
 					const pushData = receivedData.data;
-					console.log(pushData.source, pushData.message); // eslint-disable-line no-console
+					console.log(pushData.source, ...pushData.messages); // eslint-disable-line no-console
 					return true;
 				}