From 5322802992032e4e5f7c528a1b0668dcbed49db2 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Tue, 4 Jun 2024 17:24:18 +0200
Subject: [PATCH] feat(editor): Chat Trigger tweaks (#9618)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/@n8n/chat/src/components/Message.vue |  2 +-
 .../trigger/ChatTrigger/ChatTrigger.node.ts   |  2 +-
 .../ManualChatTrigger.node.ts                 |  2 +-
 .../OpenAi/actions/versionDescription.ts      |  2 +-
 packages/core/src/ActiveWorkflows.ts          |  2 +-
 packages/core/src/DirectoryLoader.ts          |  2 +-
 packages/core/src/NodeExecuteFunctions.ts     | 36 +++++++++----------
 packages/core/src/WorkflowExecute.ts          |  2 +-
 .../src/components/WorkflowLMChat.vue         |  5 ++-
 .../src/plugins/i18n/locales/en.json          |  1 +
 packages/editor-ui/src/views/NodeView.vue     | 15 ++++++--
 11 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/packages/@n8n/chat/src/components/Message.vue b/packages/@n8n/chat/src/components/Message.vue
index 27391c7d2a..fdcdba101d 100644
--- a/packages/@n8n/chat/src/components/Message.vue
+++ b/packages/@n8n/chat/src/components/Message.vue
@@ -52,7 +52,7 @@ const markdownOptions = {
 	},
 };
 
-const messageComponents = options.messageComponents ?? {};
+const messageComponents = options?.messageComponents ?? {};
 </script>
 <template>
 	<div class="chat-message" :class="classes">
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
index 200fe9c5a0..cf00bb2d82 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
@@ -23,7 +23,7 @@ export class ChatTrigger implements INodeType {
 		version: 1,
 		description: 'Runs the workflow when an n8n generated webchat is submitted',
 		defaults: {
-			name: 'Chat Trigger',
+			name: 'When chat message received',
 		},
 		codex: {
 			categories: ['Core Nodes'],
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
index 58dac30fd5..272213d539 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
@@ -18,7 +18,7 @@ export class ManualChatTrigger implements INodeType {
 		maxNodes: 1,
 		hidden: true,
 		defaults: {
-			name: 'On new manual Chat Message',
+			name: 'When chat message received',
 			color: '#909298',
 		},
 		codex: {
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
index 1143c6c097..3c8aa518f7 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
@@ -76,7 +76,7 @@ export const versionDescription: INodeTypeDescription = {
 		name: 'OpenAI',
 	},
 	codex: {
-		alias: ['LangChain', 'ChatGPT', 'DallE'],
+		alias: ['LangChain', 'ChatGPT', 'DallE', 'whisper', 'audio', 'transcribe', 'tts', 'assistant'],
 		categories: ['AI'],
 		subcategories: {
 			AI: ['Agents', 'Miscellaneous', 'Root Nodes'],
diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/ActiveWorkflows.ts
index fb64f0fef7..22836d0bf6 100644
--- a/packages/core/src/ActiveWorkflows.ts
+++ b/packages/core/src/ActiveWorkflows.ts
@@ -181,7 +181,7 @@ export class ActiveWorkflows {
 			const cronTimeParts = cronTime.split(' ');
 			if (cronTimeParts.length > 0 && cronTimeParts[0].includes('*')) {
 				throw new ApplicationError(
-					'The polling interval is too short. It has to be at least a minute!',
+					'The polling interval is too short. It has to be at least a minute.',
 				);
 			}
 
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index cd4de72cba..698076c07c 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -118,7 +118,7 @@ export abstract class DirectoryLoader {
 
 			if (currentVersionNode.hasOwnProperty('executeSingle')) {
 				throw new ApplicationError(
-					'"executeSingle" has been removed. Please update the code of this node to use "execute" instead!',
+					'"executeSingle" has been removed. Please update the code of this node to use "execute" instead.',
 					{ extra: { nodeName: `${this.packageName}.${nodeName}` } },
 				);
 			}
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 50bd416986..08a45f27f1 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -1547,11 +1547,11 @@ export async function requestOAuth1(
 	const credentials = await this.getCredentials(credentialsType);
 
 	if (credentials === undefined) {
-		throw new ApplicationError('No credentials were returned!');
+		throw new ApplicationError('No credentials were returned');
 	}
 
 	if (credentials.oauthTokenData === undefined) {
-		throw new ApplicationError('OAuth credentials not connected!');
+		throw new ApplicationError('OAuth credentials not connected');
 	}
 
 	const oauth = new clientOAuth1({
@@ -1647,7 +1647,7 @@ export async function httpRequestWithAuthentication(
 		if (credentialsDecrypted === undefined) {
 			throw new NodeOperationError(
 				node,
-				`Node "${node.name}" does not have any credentials of type "${credentialsType}" set!`,
+				`Node "${node.name}" does not have any credentials of type "${credentialsType}" set`,
 				{ level: 'warning' },
 			);
 		}
@@ -1844,7 +1844,7 @@ export async function requestWithAuthentication(
 		if (credentialsDecrypted === undefined) {
 			throw new NodeOperationError(
 				node,
-				`Node "${node.name}" does not have any credentials of type "${credentialsType}" set!`,
+				`Node "${node.name}" does not have any credentials of type "${credentialsType}" set`,
 				{ level: 'warning' },
 			);
 		}
@@ -1990,7 +1990,7 @@ export async function getCredentials(
 	if (nodeType === undefined) {
 		throw new NodeOperationError(
 			node,
-			`Node type "${node.type}" is not known so can not get credentials!`,
+			`Node type "${node.type}" is not known so can not get credentials`,
 		);
 	}
 
@@ -2003,7 +2003,7 @@ export async function getCredentials(
 		if (nodeType.description.credentials === undefined) {
 			throw new NodeOperationError(
 				node,
-				`Node type "${node.type}" does not have any credentials defined!`,
+				`Node type "${node.type}" does not have any credentials defined`,
 				{ level: 'warning' },
 			);
 		}
@@ -2014,7 +2014,7 @@ export async function getCredentials(
 		if (nodeCredentialDescription === undefined) {
 			throw new NodeOperationError(
 				node,
-				`Node type "${node.type}" does not have any credentials of type "${type}" defined!`,
+				`Node type "${node.type}" does not have any credentials of type "${type}" defined`,
 				{ level: 'warning' },
 			);
 		}
@@ -2039,16 +2039,14 @@ export async function getCredentials(
 		if (nodeCredentialDescription?.required === true) {
 			// Credentials are required so error
 			if (!node.credentials) {
-				throw new NodeOperationError(node, 'Node does not have any credentials set!', {
+				throw new NodeOperationError(node, 'Node does not have any credentials set', {
 					level: 'warning',
 				});
 			}
 			if (!node.credentials[type]) {
-				throw new NodeOperationError(
-					node,
-					`Node does not have any credentials set for "${type}"!`,
-					{ level: 'warning' },
-				);
+				throw new NodeOperationError(node, `Node does not have any credentials set for "${type}"`, {
+					level: 'warning',
+				});
 			}
 		} else {
 			// Credentials are not required
@@ -2782,7 +2780,7 @@ async function getInputConnectionData(
 	const nodes = await Promise.all(constParentNodes);
 
 	if (inputConfiguration.required && nodes.length === 0) {
-		throw new NodeOperationError(node, `A ${inputName} processor node must be connected!`);
+		throw new NodeOperationError(node, `A ${inputName} processor node must be connected`);
 	}
 	if (
 		inputConfiguration.maxConnections !== undefined &&
@@ -2790,7 +2788,7 @@ async function getInputConnectionData(
 	) {
 		throw new NodeOperationError(
 			node,
-			`Only ${inputConfiguration.maxConnections} ${inputName} processor nodes are/is allowed to be connected!`,
+			`Only ${inputConfiguration.maxConnections} ${inputName} processor nodes are/is allowed to be connected`,
 		);
 	}
 
@@ -3335,12 +3333,12 @@ export function getExecutePollFunctions(
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
 			__emit: (): void => {
 				throw new ApplicationError(
-					'Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emit function!',
+					'Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emit function',
 				);
 			},
 			__emitError() {
 				throw new ApplicationError(
-					'Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emitError function!',
+					'Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emitError function',
 				);
 			},
 			getMode: () => mode,
@@ -3398,12 +3396,12 @@ export function getExecuteTriggerFunctions(
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
 			emit: (): void => {
 				throw new ApplicationError(
-					'Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function!',
+					'Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function',
 				);
 			},
 			emitError: (): void => {
 				throw new ApplicationError(
-					'Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function!',
+					'Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function',
 				);
 			},
 			getMode: () => mode,
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index c518eb2c1b..95445fb603 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -1707,7 +1707,7 @@ export class WorkflowExecute {
 						return await this.processSuccessExecution(
 							startedAt,
 							workflow,
-							new WorkflowOperationError('Workflow has been canceled or timed out!'),
+							new WorkflowOperationError('Workflow has been canceled or timed out'),
 							closeFunction,
 						);
 					}
diff --git a/packages/editor-ui/src/components/WorkflowLMChat.vue b/packages/editor-ui/src/components/WorkflowLMChat.vue
index 7ee8a0ef89..86e84d4a37 100644
--- a/packages/editor-ui/src/components/WorkflowLMChat.vue
+++ b/packages/editor-ui/src/components/WorkflowLMChat.vue
@@ -156,6 +156,7 @@ import { useRouter } from 'vue-router';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
 import { usePinnedData } from '@/composables/usePinnedData';
+import { isEmpty } from '@/utils/typesUtils';
 
 const RunDataAi = defineAsyncComponent(
 	async () => await import('@/components/RunDataAi/RunDataAi.vue'),
@@ -495,7 +496,9 @@ export default defineComponent({
 			this.waitForExecution(response.executionId);
 		},
 		extractResponseMessage(responseData?: IDataObject) {
-			if (!responseData) return '<NO RESPONSE FOUND>';
+			if (!responseData || isEmpty(responseData)) {
+				return this.$locale.baseText('chat.window.chat.response.empty');
+			}
 
 			// Paths where the response message might be located
 			const paths = ['output', 'text', 'response.text'];
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 60c0c132b2..27cd1c76b4 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -170,6 +170,7 @@
 	"chat.window.chat.unpinAndExecute.title": "Unpin chat output data?",
 	"chat.window.chat.unpinAndExecute.confirm": "Unpin and send",
 	"chat.window.chat.unpinAndExecute.cancel": "Cancel",
+	"chat.window.chat.response.empty": "[No response. Make sure the last executed node outputs the content to display here]",
 	"chatEmbed.infoTip.description": "Add chat to external applications using the n8n chat package.",
 	"chatEmbed.infoTip.link": "More info",
 	"chatEmbed.title": "Embed Chat in your website",
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 183686a30e..a7cda90679 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -725,12 +725,23 @@ export default defineComponent({
 			);
 		},
 		isManualChatOnly(): boolean {
-			return this.containsChatNodes && this.triggerNodes.length === 1;
+			if (!this.canvasChatNode) return false;
+
+			return this.containsChatNodes && this.triggerNodes.length === 1 && !this.pinnedChatNodeData;
+		},
+		canvasChatNode() {
+			return this.nodes.find((node) => node.type === CHAT_TRIGGER_NODE_TYPE);
+		},
+		pinnedChatNodeData() {
+			if (!this.canvasChatNode) return null;
+
+			return this.workflowsStore.pinDataByNodeName(this.canvasChatNode.name);
 		},
 		isExecutionDisabled(): boolean {
 			if (
 				this.containsChatNodes &&
-				this.triggerNodes.every((node) => node.disabled || node.type === CHAT_TRIGGER_NODE_TYPE)
+				this.triggerNodes.every((node) => node.disabled || node.type === CHAT_TRIGGER_NODE_TYPE) &&
+				!this.pinnedChatNodeData
 			) {
 				return true;
 			}