- {{nodeOperation}}
+
+ {{nodeSubtitle}}
@@ -43,6 +43,7 @@
import Vue from 'vue';
import { nodeBase } from '@/components/mixins/nodeBase';
+import { workflowHelpers } from '@/components/mixins/workflowHelpers';
import {
INodeIssueObjectProperty,
@@ -56,7 +57,7 @@ import NodeIcon from '@/components/NodeIcon.vue';
import mixins from 'vue-typed-mixins';
-export default mixins(nodeBase).extend({
+export default mixins(nodeBase, workflowHelpers).extend({
name: 'Node',
components: {
NodeIcon,
@@ -88,8 +89,8 @@ export default mixins(nodeBase).extend({
classes.push('disabled');
}
- if (this.nodeOperation) {
- classes.push('has-operation');
+ if (this.nodeSubtitle) {
+ classes.push('has-subtitle');
}
if (this.isExecuting) {
@@ -118,7 +119,11 @@ export default mixins(nodeBase).extend({
return 'play';
}
},
- nodeOperation (): string | null {
+ nodeSubtitle (): string | null {
+ if (this.nodeType.subtitle !== undefined) {
+ return this.workflow.getSimpleParameterValue(this, this.nodeType.subtitle)
+ }
+
if (this.data.parameters.operation !== undefined) {
const operation = this.data.parameters.operation as string;
if (this.nodeType === null) {
@@ -150,6 +155,9 @@ export default mixins(nodeBase).extend({
workflowRunning (): boolean {
return this.$store.getters.isActionActive('workflowRunning');
},
+ workflow () {
+ return this.getWorkflow();
+ },
},
data () {
return {
@@ -211,7 +219,7 @@ export default mixins(nodeBase).extend({
border-style: solid;
}
- &.has-operation {
+ &.has-subtitle {
line-height: 38px;
.node-info-icon {
@@ -332,7 +340,7 @@ export default mixins(nodeBase).extend({
margin: 0 37px;
}
- .node-operation {
+ .node-subtitle {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/packages/node-dev/README.md b/packages/node-dev/README.md
index bbf76b6b35..13e6b173ad 100644
--- a/packages/node-dev/README.md
+++ b/packages/node-dev/README.md
@@ -170,6 +170,7 @@ The following properties can be set in the node description:
- **maxNodes** [optional]: If not an unlimited amount of nodes of that type can exist in a workflow the max-amount can be specified
- **name** [required]: Nme of the node (for n8n to use internally in camelCase)
- **properties** [required]: Properties which get displayed in the Editor UI and can be set by the user
+ - **subtitle** [optional]: Text which should be displayed underneath the name of the node in the Editor UI (can be an expression)
- **version** [required]: Version of the node. Currently always "1" (integer). For future usage does not get used yet.
- **webhooks** [optional]: Webhooks the node should listen to
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index c907a34e78..ebe0be20a1 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -401,6 +401,7 @@ export interface INodeTypeDescription {
properties: INodeProperties[];
credentials?: INodeCredentialDescription[];
maxNodes?: number; // How many nodes of that type can be created in a workflow
+ subtitle?: string;
hooks?: {
[key: string]: INodeHookDescription[] | undefined;
activate?: INodeHookDescription[];
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 3140bfb7bf..0e38053d3d 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -370,7 +370,7 @@ export function getNodeWebhooks(workflow: Workflow, node: INode, additionalData:
const returnData: IWebhookData[] = [];
for (const webhookDescription of nodeType.description.webhooks) {
- let nodeWebhookPath = workflow.getWebhookParameterValue(node, webhookDescription, 'path', 'GET');
+ let nodeWebhookPath = workflow.getSimpleParameterValue(node, webhookDescription['path'], 'GET');
if (nodeWebhookPath === undefined) {
// TODO: Use a proper logger
console.error(`No webhook path could be found for node "${node.name}" in workflow "${workflow.id}".`);
@@ -383,7 +383,7 @@ export function getNodeWebhooks(workflow: Workflow, node: INode, additionalData:
const path = getNodeWebhookPath(workflow.id, node, nodeWebhookPath);
- const httpMethod = workflow.getWebhookParameterValue(node, webhookDescription, 'httpMethod', 'GET');
+ const httpMethod = workflow.getSimpleParameterValue(node, webhookDescription['httpMethod'], 'GET');
if (httpMethod === undefined) {
// TODO: Use a proper logger
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index 7f13777960..e56e695253 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -16,7 +16,6 @@ import {
ITaskDataConnections,
ITriggerResponse,
IWebhookData,
- IWebhookDescription,
IWebhookResonseData,
WebhookSetupMethodNames,
WorkflowDataProxy,
@@ -648,18 +647,15 @@ export class Workflow {
/**
- * Resolves parameter value of parameter in webhook description
+ * Resolves value of parameter. But does not work for workflow-data.
*
- * @export
* @param {INode} node
- * @param {IWebhookDescription} webhookDescription
- * @param {string} parameterName
+ * @param {(string | undefined)} parameterValue
* @param {string} [defaultValue]
* @returns {(string | undefined)}
+ * @memberof Workflow
*/
- getWebhookParameterValue(node: INode, webhookDescription: IWebhookDescription, parameterName: string, defaultValue?: string): string | undefined {
- const parameterValue: string | undefined = webhookDescription[parameterName];
-
+ getSimpleParameterValue(node: INode, parameterValue: string | undefined, defaultValue?: string): string | undefined {
if (parameterValue === undefined) {
// Value is not set so return the default
return defaultValue;