+
-
+
-
+
⚠️ {{ message.content }}
@@ -173,7 +184,11 @@ function growInput() {
@undo="() => emit('codeUndo', i)"
/>
-
+
{{ t('assistantChat.sessionEndMessage.1') }}
@@ -193,7 +208,7 @@ function growInput() {
:class="$style.quickReplies"
>
{{ t('assistantChat.quickRepliesTitle') }}
-
+
-
+
Hi {{ user?.firstName }} 👋
@@ -232,6 +247,7 @@ function growInput() {
@@ -290,12 +308,14 @@ p {
border: var(--border-base);
border-top: 0;
height: 100%;
- overflow: scroll;
+ overflow-x: hidden;
+ overflow-y: auto;
padding-bottom: 250px; // make scrollable at the end
position: relative;
- pre {
- text-wrap: stable;
+ pre,
+ code {
+ text-wrap: wrap;
}
}
diff --git a/packages/design-system/src/components/CodeDiff/CodeDiff.vue b/packages/design-system/src/components/CodeDiff/CodeDiff.vue
index 7f6acafcc2..de4a8d8274 100644
--- a/packages/design-system/src/components/CodeDiff/CodeDiff.vue
+++ b/packages/design-system/src/components/CodeDiff/CodeDiff.vue
@@ -82,7 +82,7 @@ const diffs = computed(() => {
-
+
N8nCheckbox > should render with both child and label 1`]
class="el-checkbox__input"
>
N8nCheckbox > should render with child 1`] = `
class="el-checkbox__input"
>
@@ -106,7 +104,6 @@ exports[`components > N8nCheckbox > should render with label 1`] = `
class="el-checkbox__input"
>
N8nCheckbox > should render without label and child conten
class="el-checkbox__input"
>
diff --git a/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap b/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
index d0714ea407..5289cc34aa 100644
--- a/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
+++ b/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
@@ -9,6 +9,7 @@ exports[`components > N8nColorPicker > should render with input 1`] = `
{{ title }}
@@ -109,17 +109,26 @@ const diffs = computed(() => {
{{ t('codeDiff.couldNotReplace') }}
- {{
- t('codeDiff.undo')
- }}
+
+ {{ t('codeDiff.undo') }}
+
N8nColorPicker > should render without input 1`] = `
{
expect(wrapper.container.querySelectorAll('tbody tr td').length).toEqual(
columns.length * rowsPerPage,
);
+ removeDynamicAttributes(wrapper.container);
expect(wrapper.html()).toMatchSnapshot();
});
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap b/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
index 0d5d029f17..63c2e64694 100644
--- a/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
+++ b/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
@@ -113,7 +113,6 @@ exports[`components > N8nDatatable > should render correctly 1`] = `
-
@@ -121,7 +120,7 @@ exports[`components > N8nDatatable > should render correctly 1`] = `
diff --git a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts b/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
index 2ee22f4e25..170cfdaa3f 100644
--- a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
+++ b/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
@@ -3,6 +3,7 @@ import { render, waitFor, within } from '@testing-library/vue';
import userEvent from '@testing-library/user-event';
import N8nSelect from '../Select.vue';
import N8nOption from '../../N8nOption/Option.vue';
+import { removeDynamicAttributes } from 'n8n-design-system/utils';
describe('components', () => {
describe('N8nSelect', () => {
@@ -21,6 +22,7 @@ describe('components', () => {
],
},
});
+ removeDynamicAttributes(wrapper.container);
expect(wrapper.html()).toMatchSnapshot();
});
diff --git a/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap b/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
index 7277454cf3..c69860442a 100644
--- a/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
+++ b/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
@@ -6,7 +6,6 @@ exports[`components > N8nSelect > should render correctly 1`] = `
-
+
-
= {}): IWorkflowDb {
+ return {
+ createdAt: '',
+ updatedAt: '',
+ id,
+ name,
+ nodes,
+ connections,
+ active,
+ settings,
+ versionId: '1',
+ meta: {},
+ pinData,
+ ...rest,
+ };
+}
+
export function createTestNode(node: Partial = {}): INode {
return {
id: uuid(),
diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/editor-ui/src/__tests__/utils.ts
index 8090227ee5..ccbcd13bd3 100644
--- a/packages/editor-ui/src/__tests__/utils.ts
+++ b/packages/editor-ui/src/__tests__/utils.ts
@@ -72,7 +72,7 @@ export const SETTINGS_STORE_DEFAULT_STATE: ISettingsState = {
};
export const getDropdownItems = async (dropdownTriggerParent: HTMLElement) => {
- await userEvent.click(within(dropdownTriggerParent).getByRole('textbox'));
+ await userEvent.click(within(dropdownTriggerParent).getByRole('combobox'));
const selectTrigger = dropdownTriggerParent.querySelector(
'.select-trigger[aria-describedby]',
) as HTMLElement;
@@ -84,3 +84,9 @@ export const getDropdownItems = async (dropdownTriggerParent: HTMLElement) => {
return selectDropdown.querySelectorAll('.el-select-dropdown__item');
};
+
+export const getSelectedDropdownValue = async (items: NodeListOf) => {
+ const selectedItem = Array.from(items).find((item) => item.classList.contains('selected'));
+ expect(selectedItem).toBeInTheDocument();
+ return selectedItem?.querySelector('p')?.textContent?.trim();
+};
diff --git a/packages/editor-ui/src/api/assistant.ts b/packages/editor-ui/src/api/assistant.ts
index d9e9ec0cde..4b1d127ef1 100644
--- a/packages/editor-ui/src/api/assistant.ts
+++ b/packages/editor-ui/src/api/assistant.ts
@@ -9,7 +9,14 @@ export function chatWithAssistant(
onDone: () => void,
onError: (e: Error) => void,
): void {
- void streamRequest(ctx, '/ai-assistant/chat', payload, onMessageUpdated, onDone, onError);
+ void streamRequest(
+ ctx,
+ '/ai-assistant/chat',
+ payload,
+ onMessageUpdated,
+ onDone,
+ onError,
+ );
}
export async function replaceCode(
diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts
index a27faea7b7..aedbd0b594 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -90,7 +90,6 @@ export async function changePassword(
}
export type UpdateCurrentUserParams = {
- id?: string;
firstName?: string;
lastName?: string;
email: string;
diff --git a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue b/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
index 073b7f937f..6a379e0a5f 100644
--- a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
+++ b/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
@@ -71,6 +71,7 @@ function onClose() {
:supported-directions="['left']"
:width="assistantStore.chatWidth"
:class="$style.container"
+ data-test-id="ask-assistant-sidebar"
@resize="onResizeDebounced"
>
@@ -14,7 +13,7 @@ exports[`components > N8nSelect > should render correctly 1`] = `
diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss
index 6a812552ac..8865fb2e3e 100644
--- a/packages/design-system/src/css/_tokens.dark.scss
+++ b/packages/design-system/src/css/_tokens.dark.scss
@@ -71,6 +71,7 @@
--color-canvas-dot: var(--prim-gray-670);
--color-canvas-read-only-line: var(--prim-gray-800);
--color-canvas-selected: var(--prim-gray-0-alpha-025);
+ --color-canvas-selected-transparent: var(--color-canvas-selected);
// Nodes
--color-node-background: var(--prim-gray-740);
diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
index e65856f192..7b1adf0d36 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -79,6 +79,7 @@
--color-canvas-dot: var(--prim-gray-120);
--color-canvas-read-only-line: var(--prim-gray-30);
--color-canvas-selected: var(--prim-gray-70);
+ --color-canvas-selected-transparent: hsla(var(--prim-gray-h), 47%, 30%, 0.1);
// Nodes
--color-node-background: var(--color-background-xlight);
diff --git a/packages/design-system/src/locale/lang/en.ts b/packages/design-system/src/locale/lang/en.ts
index 444acc61c0..449a617f91 100644
--- a/packages/design-system/src/locale/lang/en.ts
+++ b/packages/design-system/src/locale/lang/en.ts
@@ -32,7 +32,7 @@ export default {
'askAssistantButton.askAssistant': 'Ask Assistant',
'assistantChat.errorParsingMarkdown': 'Error parsing markdown content',
'assistantChat.aiAssistantLabel': 'AI Assistant',
- 'assistantChat.aiAssistantName': 'Ava',
+ 'assistantChat.aiAssistantName': 'Assistant',
'assistantChat.sessionEndMessage.1':
'This Assistant session has ended. To start a new session with the Assistant, click an',
'assistantChat.sessionEndMessage.2': 'button in n8n',
diff --git a/packages/design-system/src/utils/index.ts b/packages/design-system/src/utils/index.ts
index 3f4ed339f0..be6ddc6375 100644
--- a/packages/design-system/src/utils/index.ts
+++ b/packages/design-system/src/utils/index.ts
@@ -4,3 +4,4 @@ export * from './markdown';
export * from './typeguards';
export * from './uid';
export * from './valueByPath';
+export * from './testUtils';
diff --git a/packages/design-system/src/utils/testUtils.ts b/packages/design-system/src/utils/testUtils.ts
new file mode 100644
index 0000000000..e632d3e1bf
--- /dev/null
+++ b/packages/design-system/src/utils/testUtils.ts
@@ -0,0 +1,18 @@
+const DYNAMIC_ATTRIBUTES = ['aria-controls'];
+
+/**
+ * Deletes dynamic attributes from the container children so snapshots can be tested.
+ *
+ * Background:
+ * Vue test utils use server rendering to render components (https://v1.test-utils.vuejs.org/api/render.html#render).
+ * Element UI in SSR mode adds dynamic attributes to the rendered HTML each time the test is run (https://element-plus.org/en-US/guide/ssr#provide-an-id).
+ *
+ * NOTE: Make sure to manually remove same attributes from the expected snapshot.
+ */
+// TODO: Find a way to inject static value for dynamic attributes in tests
+export function removeDynamicAttributes(container: Element): void {
+ DYNAMIC_ATTRIBUTES.forEach((attribute) => {
+ const elements = container.querySelectorAll(`[${attribute}]`);
+ elements.forEach((element) => element.removeAttribute(attribute));
+ });
+}
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 279233c94f..c81e9b960a 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "n8n-editor-ui",
- "version": "1.55.0",
+ "version": "1.56.0",
"description": "Workflow Editor UI for n8n",
"main": "index.js",
"scripts": {
@@ -44,6 +44,7 @@
"@vueuse/components": "^10.11.0",
"@vueuse/core": "^10.11.0",
"axios": "catalog:",
+ "bowser": "2.11.0",
"chart.js": "^4.4.0",
"codemirror-lang-html-n8n": "^1.0.0",
"dateformat": "^3.0.3",
diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index 835ddd11c0..cc9c141500 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -47,7 +47,7 @@ import AskAssistantFloatingButton from '@/components/AskAssistant/AskAssistantFl
import { HIRING_BANNER, VIEWS } from '@/constants';
import { loadLanguage } from '@/plugins/i18n';
-import useGlobalLinkActions from '@/composables/useGlobalLinkActions';
+import { useGlobalLinkActions } from '@/composables/useGlobalLinkActions';
import { useExternalHooks } from '@/composables/useExternalHooks';
import { useToast } from '@/composables/useToast';
import { useCloudPlanStore } from '@/stores/cloudPlan.store';
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 05c40402f1..a3f17a5582 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -48,6 +48,7 @@ import type {
NodeConnectionType,
INodeCredentialsDetails,
StartNodeData,
+ IPersonalizationSurveyAnswersV4,
} from 'n8n-workflow';
import type { BulkCommand, Undoable } from '@/models/history';
import type { PartialBy, TupleToUnion } from '@/utils/typeHelpers';
@@ -648,24 +649,6 @@ export type IPersonalizationSurveyAnswersV3 = {
email?: string | null;
};
-export type IPersonalizationSurveyAnswersV4 = {
- version: 'v4';
- automationGoalDevops?: string[] | null;
- automationGoalDevopsOther?: string | null;
- companyIndustryExtended?: string[] | null;
- otherCompanyIndustryExtended?: string[] | null;
- companySize?: string | null;
- companyType?: string | null;
- automationGoalSm?: string[] | null;
- automationGoalSmOther?: string | null;
- usageModes?: string[] | null;
- email?: string | null;
- role?: string | null;
- roleOther?: string | null;
- reportedSource?: string | null;
- reportedSourceOther?: string | null;
-};
-
export type IPersonalizationLatestVersion = IPersonalizationSurveyAnswersV4;
export type IPersonalizationSurveyVersions =
diff --git a/packages/editor-ui/src/__tests__/mocks.ts b/packages/editor-ui/src/__tests__/mocks.ts
index dad814f6eb..dac9c9c478 100644
--- a/packages/editor-ui/src/__tests__/mocks.ts
+++ b/packages/editor-ui/src/__tests__/mocks.ts
@@ -25,7 +25,7 @@ import {
SET_NODE_TYPE,
STICKY_NODE_TYPE,
} from '@/constants';
-import type { INodeUi } from '@/Interface';
+import type { INodeUi, IWorkflowDb } from '@/Interface';
export const mockNode = ({
id = uuid(),
@@ -147,6 +147,35 @@ export function createTestWorkflowObject({
});
}
+export function createTestWorkflow({
+ id = uuid(),
+ name = 'Test Workflow',
+ nodes = [],
+ connections = {},
+ active = false,
+ settings = {
+ timezone: 'DEFAULT',
+ executionOrder: 'v1',
+ },
+ pinData = {},
+ ...rest
+}: Partial
-
+
{
const onClick = () => {
assistantStore.openChat();
- telemetry.track(
- 'User opened assistant',
- {
- source: 'canvas',
- task: 'placeholder',
- has_existing_session: !assistantStore.isSessionEnded,
- workflow_id: workflowStore.workflowId,
- },
- { withPostHog: true },
- );
+ telemetry.track('User opened assistant', {
+ source: 'canvas',
+ task: 'placeholder',
+ has_existing_session: !assistantStore.isSessionEnded,
+ workflow_id: workflowStore.workflowId,
+ });
};
@@ -45,6 +41,7 @@ const onClick = () => {
{
const startNewSession = async () => {
await assistantStore.initErrorHelper(props.data.context);
- telemetry.track(
- 'User opened assistant',
- {
- source: 'error',
- task: 'error',
- has_existing_session: true,
- workflow_id: workflowsStore.workflowId,
- node_type: props.data.context.node.type,
- error: props.data.context.error,
- chat_session_id: assistantStore.currentSessionId,
- },
- { withPostHog: true },
- );
+ telemetry.track('User opened assistant', {
+ source: 'error',
+ task: 'error',
+ has_existing_session: true,
+ workflow_id: workflowsStore.workflowId,
+ node_type: props.data.context.node.type,
+ error: props.data.context.error,
+ chat_session_id: assistantStore.currentSessionId,
+ });
close();
};
-
+
{{ i18n.baseText('aiAssistant.newSessionModal.title.part1') }}
>();
const emit = defineEmits<{ action: [action: ContextMenuAction, nodeIds: string[]] }>();
+const container = ref();
watch(
isOpen,
@@ -26,7 +28,7 @@ function onActionSelect(item: string) {
emit('action', action, contextMenu.targetNodeIds.value);
}
-function onClickOutside(event: MouseEvent) {
+function closeMenu(event: MouseEvent) {
event.preventDefault();
event.stopPropagation();
contextMenu.close();
@@ -37,12 +39,14 @@ function onVisibleChange(open: boolean) {
contextMenu.close();
}
}
+
+onClickOutside(container, closeMenu);
-
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
index abf7ac6a09..939701e141 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
@@ -2,7 +2,6 @@
{
+ if (inputRef.value) {
emit('blur', inputRef.value.value);
}
-}
+});
function onEscape() {
emit('esc');
diff --git a/packages/editor-ui/src/components/ExpressionParameterInput.vue b/packages/editor-ui/src/components/ExpressionParameterInput.vue
index 86e4c540a2..cb0c22ec30 100644
--- a/packages/editor-ui/src/components/ExpressionParameterInput.vue
+++ b/packages/editor-ui/src/components/ExpressionParameterInput.vue
@@ -1,5 +1,6 @@
-
+
diff --git a/packages/editor-ui/src/components/FilterConditions/OperatorSelect.vue b/packages/editor-ui/src/components/FilterConditions/OperatorSelect.vue
index ec7090bd2a..0cc0bec7dd 100644
--- a/packages/editor-ui/src/components/FilterConditions/OperatorSelect.vue
+++ b/packages/editor-ui/src/components/FilterConditions/OperatorSelect.vue
@@ -4,13 +4,15 @@ import { computed, ref } from 'vue';
import { OPERATOR_GROUPS } from './constants';
import type { FilterOperator } from './types';
import { getFilterOperator } from './utils';
+import type { FilterOperatorType } from 'n8n-workflow';
interface Props {
selected: string;
+ suggestedType?: FilterOperatorType;
readOnly?: boolean;
}
-const props = withDefaults(defineProps(), { readOnly: false });
+const props = withDefaults(defineProps(), { readOnly: false, suggestedType: 'any' });
const selected = ref(props.selected);
const menuOpen = ref(false);
@@ -31,6 +33,8 @@ const selectedGroupIcon = computed(
const selectedOperator = computed(() => getFilterOperator(selected.value));
+const selectedType = computed(() => selectedOperator.value.type);
+
const onOperatorChange = (operator: string): void => {
selected.value = operator;
emit('operatorChange', operator);
@@ -65,12 +69,7 @@ function onGroupSelect(group: string) {
@mouseenter="shouldRenderItems = true"
>
-
@@ -84,12 +83,18 @@ function onGroupSelect(group: string) {
>
(() => {
resourceMapperTypeOptions.value?.multiKeyMatch === true
? `${pluralFieldWord.value}`
: `${singularFieldWord.value}`,
+ nodeDisplayName: props.serviceName,
},
});
});
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index a9188f2358..ec26ef9964 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -50,15 +50,17 @@
data-test-id="run-data-pane-header"
@click.stop
>
-
+
nodes.value.filter((node) => !props.search || !isDataEmpty(node.schema)),
);
+const nodeAdditionalInfo = (node: INodeUi) => {
+ const returnData: string[] = [];
+ if (node.disabled) {
+ returnData.push(i18n.baseText('node.disabled'));
+ }
+
+ const connections = ndvStore.ndvNodeInputNumber[node.name];
+ if (connections) {
+ if (connections.length === 1) {
+ returnData.push(`Input ${connections}`);
+ } else {
+ returnData.push(`Inputs ${connections.join(', ')}`);
+ }
+ }
+
+ return returnData.length ? `(${returnData.join(' | ')})` : '';
+};
+
const isDataEmpty = (schema: Schema | null) => {
if (!schema) return true;
// Utilize the generated schema instead of looping over the entire data again
@@ -292,7 +310,9 @@ watch(
div {
margin-bottom: var(--spacing-xs);
@@ -477,6 +498,13 @@ watch(
cursor: pointer;
}
+.subtitle {
+ margin-left: auto;
+ padding-left: var(--spacing-2xs);
+ color: var(--color-text-light);
+ font-weight: var(--font-weight-regular);
+}
+
.header {
display: flex;
align-items: center;
diff --git a/packages/editor-ui/src/components/RunDataSchemaItem.vue b/packages/editor-ui/src/components/RunDataSchemaItem.vue
index 34979053f7..18b1419329 100644
--- a/packages/editor-ui/src/components/RunDataSchemaItem.vue
+++ b/packages/editor-ui/src/components/RunDataSchemaItem.vue
@@ -198,6 +198,8 @@ const getIconBySchemaType = (type: Schema['type']): string => {
display: flex;
gap: var(--spacing-2xs);
align-items: baseline;
+ flex-grow: 1;
+ min-width: 0;
}
.sub {
@@ -212,6 +214,7 @@ const getIconBySchemaType = (type: Schema['type']): string => {
display: inline-flex;
flex-direction: column;
order: -1;
+ min-width: 0;
.innerSub > div:first-child {
margin-top: var(--spacing-2xs);
@@ -242,21 +245,14 @@ const getIconBySchemaType = (type: Schema['type']): string => {
height: 24px;
padding: 0 var(--spacing-3xs);
border: 1px solid var(--color-foreground-light);
- border-radius: 4px;
+ border-radius: var(--border-radius-base);
background-color: var(--color-background-xlight);
font-size: var(--font-size-2xs);
color: var(--color-text-dark);
+ max-width: 50%;
- span {
- display: flex;
- height: 100%;
- align-items: center;
-
- svg {
- path {
- fill: var(--color-text-light);
- }
- }
+ path {
+ fill: var(--color-text-light);
}
&.mappable {
@@ -273,11 +269,26 @@ const getIconBySchemaType = (type: Schema['type']): string => {
}
.label {
+ display: flex;
+ min-width: 0;
+ align-items: center;
+
> span {
+ display: flex;
+ align-items: center;
+
margin-left: var(--spacing-3xs);
padding-left: var(--spacing-3xs);
border-left: 1px solid var(--color-foreground-light);
+ overflow: hidden;
+
+ span {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
&.arrayIndex {
border: 0;
padding-left: 0;
diff --git a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
index b6ef67981e..06ec2606b4 100644
--- a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
+++ b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
@@ -154,7 +154,7 @@ watch(segments, () => {
});
onMounted(() => {
- codeNodeEditorEventBus.on('error-line-number', highlightLine);
+ codeNodeEditorEventBus.on('highlightLine', highlightLine);
if (props.fullscreen) {
focus();
@@ -162,7 +162,7 @@ onMounted(() => {
});
onBeforeUnmount(() => {
- codeNodeEditorEventBus.off('error-line-number', highlightLine);
+ codeNodeEditorEventBus.off('highlightLine', highlightLine);
});
function line(lineNumber: number): Line | null {
diff --git a/packages/editor-ui/src/components/Sticky.vue b/packages/editor-ui/src/components/Sticky.vue
index f2ab61580a..8c2cd1fdd3 100644
--- a/packages/editor-ui/src/components/Sticky.vue
+++ b/packages/editor-ui/src/components/Sticky.vue
@@ -47,6 +47,7 @@
();
+
const setForceActions = (value: boolean) => {
forceActions.value = value;
};
@@ -200,6 +205,8 @@ export default defineComponent({
emit: emit as (event: string, ...args: unknown[]) => void,
});
+ onClickOutside(stickOptions, () => setColorPopoverVisible(false));
+
return {
deviceSupport,
toast,
@@ -209,6 +216,7 @@ export default defineComponent({
setForceActions,
isColorPopoverVisible,
setColorPopoverVisible,
+ stickOptions,
};
},
data() {
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index bcd02fd6fa..2b799f96a5 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -1,9 +1,5 @@
-
-
{{ currentNode.node.name }}
- ({{ $locale.baseText('node.disabled') }})
+ {{
+ nodeAdditionalInfo(currentNode.node)
+ }}
+
;
type TagRef = InstanceType;
@@ -116,6 +113,8 @@ export default defineComponent({
const focused = ref(false);
const preventUpdate = ref(false);
+ const container = ref();
+
const allTags = computed(() => {
return tagsStore.allTags;
});
@@ -252,18 +251,13 @@ export default defineComponent({
});
}
- function onClickOutside(e: Event) {
- const tagsDropdown = document.querySelector('.tags-dropdown');
- const tagsModal = document.querySelector('#tags-manager-modal');
-
- const clickInsideTagsDropdowns =
- tagsDropdown?.contains(e.target as Node) ?? tagsDropdown === e.target;
- const clickInsideTagsModal = tagsModal?.contains(e.target as Node) ?? tagsModal === e.target;
-
- if (!clickInsideTagsDropdowns && !clickInsideTagsModal && e.type === 'click') {
+ onClickOutside(
+ container,
+ () => {
emit('blur');
- }
- }
+ },
+ { ignore: ['.tags-dropdown', '#tags-manager-modal'] },
+ );
return {
i18n,
@@ -285,7 +279,7 @@ export default defineComponent({
filterOptions,
onVisibleChange,
onRemoveTag,
- onClickOutside,
+ container,
...useToast(),
};
},
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
new file mode 100644
index 0000000000..41ba8d1a1b
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
@@ -0,0 +1,315 @@
+
+
+
+ ,
+ inputRef: Ref,
+) {
+ const isDropdownVisible = ref(false);
+ const resourceDropdownHiding = ref(false);
+
+ function showDropdown() {
+ if (!isListMode.value || resourceDropdownHiding.value) {
+ return;
+ }
+
+ isDropdownVisible.value = true;
+ }
+
+ function hideDropdown() {
+ isDropdownVisible.value = false;
+
+ resourceDropdownHiding.value = true;
+ void nextTick(() => {
+ inputRef.value?.blur?.();
+ resourceDropdownHiding.value = false;
+ });
+ }
+
+ return {
+ isDropdownVisible,
+ showDropdown,
+ hideDropdown,
+ };
+}
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorModes.ts b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorModes.ts
new file mode 100644
index 0000000000..1e6cae4db5
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorModes.ts
@@ -0,0 +1,67 @@
+import type { Ref } from 'vue';
+import { computed } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import type {
+ INodeParameterResourceLocator,
+ INodePropertyMode,
+ ResourceLocatorModes,
+} from 'n8n-workflow';
+import type { Router } from 'vue-router';
+import { useWorkflowResourcesLocator } from './useWorkflowResourcesLocator';
+
+export function useWorkflowResourceLocatorModes(
+ modelValue: Ref,
+ router: Router,
+) {
+ const i18n = useI18n();
+ const { getWorkflowName } = useWorkflowResourcesLocator(router);
+
+ const supportedModes = computed(() => [
+ {
+ name: 'list',
+ type: 'list',
+ displayName: i18n.baseText('resourceLocator.mode.list'),
+ },
+ {
+ type: 'string',
+ name: 'id',
+ displayName: i18n.baseText('resourceLocator.mode.id'),
+ },
+ ]);
+
+ const selectedMode = computed(() => modelValue.value?.mode || 'list');
+ const isListMode = computed(() => selectedMode.value === 'list');
+
+ function getUpdatedModePayload(value: ResourceLocatorModes): INodeParameterResourceLocator {
+ if (typeof modelValue !== 'object') {
+ return { __rl: true, value: modelValue, mode: value };
+ }
+
+ if (value === 'id' && selectedMode.value === 'list' && modelValue.value.value) {
+ return { __rl: true, mode: value, value: modelValue.value.value };
+ }
+
+ return {
+ __rl: true,
+ mode: value,
+ value: modelValue.value.value,
+ cachedResultName: getWorkflowName(modelValue.value.value?.toString() ?? ''),
+ };
+ }
+
+ function getModeLabel(mode: INodePropertyMode): string | null {
+ if (mode.name === 'id' || mode.name === 'list') {
+ return i18n.baseText(`resourceLocator.mode.${mode.name}`);
+ }
+
+ return mode.displayName;
+ }
+
+ return {
+ supportedModes,
+ selectedMode,
+ isListMode,
+ getUpdatedModePayload,
+ getModeLabel,
+ };
+}
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts
new file mode 100644
index 0000000000..a34e9018e9
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts
@@ -0,0 +1,93 @@
+import { ref, computed } from 'vue';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { sortBy } from 'lodash-es';
+import type { Router } from 'vue-router';
+import { VIEWS } from '@/constants';
+
+import type { IWorkflowDb } from '@/Interface';
+
+export function useWorkflowResourcesLocator(router: Router) {
+ const workflowsStore = useWorkflowsStore();
+ const workflowsResources = ref>([]);
+ const isLoadingResources = ref(true);
+ const searchFilter = ref('');
+ const PAGE_SIZE = 40;
+
+ const sortedWorkflows = computed(() =>
+ sortBy(workflowsStore.allWorkflows, (workflow) =>
+ new Date(workflow.updatedAt).valueOf(),
+ ).reverse(),
+ );
+
+ const hasMoreWorkflowsToLoad = computed(
+ () => workflowsStore.allWorkflows.length > workflowsResources.value.length,
+ );
+
+ const filteredResources = computed(() => {
+ if (!searchFilter.value) return workflowsResources.value;
+
+ return workflowsStore.allWorkflows
+ .filter((resource) => resource.name.toLowerCase().includes(searchFilter.value.toLowerCase()))
+ .map(workflowDbToResourceMapper);
+ });
+
+ async function populateNextWorkflowsPage() {
+ if (workflowsStore.allWorkflows.length <= 1) {
+ await workflowsStore.fetchAllWorkflows();
+ }
+ const nextPage = sortedWorkflows.value.slice(
+ workflowsResources.value.length,
+ workflowsResources.value.length + PAGE_SIZE,
+ );
+
+ workflowsResources.value.push(...nextPage.map(workflowDbToResourceMapper));
+ }
+
+ async function setWorkflowsResources() {
+ isLoadingResources.value = true;
+ await populateNextWorkflowsPage();
+ isLoadingResources.value = false;
+ }
+
+ function workflowDbToResourceMapper(workflow: IWorkflowDb) {
+ return {
+ name: getWorkflowName(workflow.id),
+ value: workflow.id,
+ url: getWorkflowUrl(workflow.id),
+ };
+ }
+
+ function getWorkflowUrl(workflowId: string) {
+ const { href } = router.resolve({ name: VIEWS.WORKFLOW, params: { name: workflowId } });
+ return href;
+ }
+
+ function getWorkflowName(id: string): string {
+ const workflow = workflowsStore.getWorkflowById(id);
+ if (workflow) {
+ // Add the project name if it's not a personal project
+ if (workflow.homeProject && workflow.homeProject.type !== 'personal') {
+ return `${workflow.homeProject.name} — ${workflow.name}`;
+ }
+ return workflow.name;
+ }
+ return id;
+ }
+
+ function onSearchFilter(filter: string) {
+ searchFilter.value = filter;
+ }
+
+ return {
+ workflowsResources,
+ isLoadingResources,
+ hasMoreWorkflowsToLoad,
+ filteredResources,
+ searchFilter,
+ getWorkflowUrl,
+ onSearchFilter,
+ getWorkflowName,
+ populateNextWorkflowsPage,
+ setWorkflowsResources,
+ };
+}
diff --git a/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts b/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
index afc9a6cf03..96f627026e 100644
--- a/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
+++ b/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
@@ -182,13 +182,18 @@ describe('ResourceMapper.vue', () => {
},
{ merge: true },
);
+
await waitAllPromises();
expect(getByText('Set the value for each foo')).toBeInTheDocument();
expect(
getByText('Look for incoming data that matches the foos in the service'),
).toBeInTheDocument();
expect(getByText('Foos to Match On')).toBeInTheDocument();
- expect(getByText('The foos that identify the row(s) to modify')).toBeInTheDocument();
+ expect(
+ getByText(
+ 'The foos to use when matching rows in the service to the input items of this node. Usually an ID.',
+ ),
+ ).toBeInTheDocument();
});
it('should render correct fields based on saved schema', async () => {
diff --git a/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts b/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts
index 41134e47ee..44716b1173 100644
--- a/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts
+++ b/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts
@@ -116,8 +116,10 @@ describe('WorkflowLMChatModal', () => {
await fireEvent.click(chatSendButton);
}
- await waitFor(() => expect(chatDialog.querySelectorAll('.chat-message')).toHaveLength(1));
+ await waitFor(() =>
+ expect(chatDialog.querySelectorAll('.chat-message-from-user')).toHaveLength(1),
+ );
- expect(chatDialog.querySelector('.chat-message')).toHaveTextContent('Hello!');
+ expect(chatDialog.querySelector('.chat-message-from-user')).toHaveTextContent('Hello!');
});
});
diff --git a/packages/editor-ui/src/components/canvas/Canvas.spec.ts b/packages/editor-ui/src/components/canvas/Canvas.spec.ts
index 9a3293738e..86a23e4651 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.spec.ts
+++ b/packages/editor-ui/src/components/canvas/Canvas.spec.ts
@@ -8,16 +8,16 @@ import { createCanvasConnection, createCanvasNodeElement } from '@/__tests__/dat
import { NodeConnectionType } from 'n8n-workflow';
import type { useDeviceSupport } from 'n8n-design-system';
+const matchMedia = global.window.matchMedia;
// @ts-expect-error Initialize window object
global.window = jsdom.window as unknown as Window & typeof globalThis;
+global.window.matchMedia = matchMedia;
vi.mock('n8n-design-system', async (importOriginal) => {
const actual = await importOriginal();
return { ...actual, useDeviceSupport: vi.fn(() => ({ isCtrlKeyPressed: vi.fn() })) };
});
-vi.mock('@/composables/useDeviceSupport');
-
let renderComponent: ReturnType;
beforeEach(() => {
const pinia = createPinia();
diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue
index c5995c5cd6..866bc644f7 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/editor-ui/src/components/canvas/Canvas.vue
@@ -1,9 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.spec.ts.snap
new file mode 100644
index 0000000000..6c9b638b90
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.spec.ts.snap
@@ -0,0 +1,25 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`CanvasChatButton > should render correctly 1`] = `
+"
+
+
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
index 4a62ee0e18..2f50454baa 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
@@ -123,6 +123,7 @@ function openContextMenu(event: MouseEvent) {
--configurable-node--icon-offset: 40px;
--configurable-node--icon-size: 30px;
--trigger-node--border-radius: 36px;
+ --canvas-node--status-icons-offset: var(--spacing-2xs);
height: var(--canvas-node--height);
width: var(--canvas-node--width);
@@ -184,7 +185,7 @@ function openContextMenu(event: MouseEvent) {
*/
&.selected {
- box-shadow: 0 0 0 4px var(--color-canvas-selected);
+ box-shadow: 0 0 0 8px var(--color-canvas-selected-transparent);
}
&.success {
@@ -213,7 +214,7 @@ function openContextMenu(event: MouseEvent) {
top: 100%;
position: absolute;
width: 100%;
- min-width: 200px;
+ min-width: calc(var(--canvas-node--width) * 2);
margin-top: var(--spacing-2xs);
display: flex;
flex-direction: column;
@@ -223,22 +224,33 @@ function openContextMenu(event: MouseEvent) {
.label {
font-size: var(--font-size-m);
- line-height: var(--font-line-height-compact);
text-align: center;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
+ overflow-wrap: anywhere;
+ font-weight: var(--font-weight-bold);
+ line-height: var(--font-line-height-compact);
}
.subtitle {
+ width: 100%;
+ text-align: center;
color: var(--color-text-light);
font-size: var(--font-size-xs);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+ line-height: var(--font-line-height-compact);
+ font-weight: 400;
}
.statusIcons {
position: absolute;
- bottom: var(--spacing-2xs);
- right: var(--spacing-2xs);
+ bottom: var(--canvas-node--status-icons-offset);
+ right: var(--canvas-node--status-icons-offset);
}
.triggerIcon {
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.spec.ts
index 5327d71524..1488006841 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.spec.ts
@@ -15,7 +15,7 @@ describe('CanvasNodeStatusIcons', () => {
},
});
- expect(getByTestId('canvas-node-status-pinned')).toHaveTextContent('5');
+ expect(getByTestId('canvas-node-status-pinned')).toBeInTheDocument();
});
it('should render correctly for a running node', () => {
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
index 6c5136bcdf..cd730f885a 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
@@ -7,7 +7,6 @@ import { useCanvasNode } from '@/composables/useCanvasNode';
const nodeHelpers = useNodeHelpers();
const {
- pinnedDataCount,
hasPinnedData,
issues,
hasIssues,
@@ -51,7 +50,6 @@ const hideNodeIssues = computed(() => false); // @TODO Implement this
:class="[$style.status, $style.pinnedData]"
>
{
const webhookUrl = this.getNodeWebhookUrl('default');
const webhookData = this.getWorkflowStaticData('node');
- const events = this.getNodeParameter('events') as string;
+ const events = this.getNodeParameter('events') as string[];
const authenticationType = await getAuthenticationType.call(this);
@@ -160,16 +160,14 @@ export class CalendlyTrigger implements INodeType {
const { collection } = await calendlyApiRequest.call(this, 'GET', endpoint, {}, qs);
for (const webhook of collection) {
- if (webhook.callback_url === webhookUrl) {
- for (const event of events) {
- if (!webhook.events.includes(event)) {
- return false;
- }
- }
+ if (
+ webhook.callback_url === webhookUrl &&
+ events.length === webhook.events.length &&
+ events.every((event: string) => webhook.events.includes(event))
+ ) {
+ webhookData.webhookURI = webhook.uri;
+ return true;
}
-
- webhookData.webhookURI = webhook.uri;
- return true;
}
}
@@ -178,7 +176,7 @@ export class CalendlyTrigger implements INodeType {
async create(this: IHookFunctions): Promise {
const webhookData = this.getWorkflowStaticData('node');
const webhookUrl = this.getNodeWebhookUrl('default');
- const events = this.getNodeParameter('events') as string;
+ const events = this.getNodeParameter('events') as string[];
const authenticationType = await getAuthenticationType.call(this);
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
index 6ab3c4cbf1..0dfd4b2edf 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -16,7 +16,7 @@ export class ExecuteWorkflow implements INodeType {
icon: 'fa:sign-in-alt',
iconColor: 'orange-red',
group: ['transform'],
- version: 1,
+ version: [1, 1.1],
subtitle: '={{"Workflow: " + $parameter["workflowId"]}}',
description: 'Execute another workflow',
defaults: {
@@ -79,6 +79,7 @@ export class ExecuteWorkflow implements INodeType {
displayOptions: {
show: {
source: ['database'],
+ '@version': [1],
},
},
default: '',
@@ -87,7 +88,20 @@ export class ExecuteWorkflow implements INodeType {
description:
"Note on using an expression here: if this node is set to run once with all items, they will all be sent to the same workflow. That workflow's ID will be calculated by evaluating the expression for the first input item.",
},
-
+ {
+ displayName: 'Workflow',
+ name: 'workflowId',
+ type: 'workflowSelector',
+ displayOptions: {
+ show: {
+ source: ['database'],
+ '@version': [{ _cnd: { gte: 1.1 } }],
+ },
+ },
+ default: '',
+ required: true,
+ hint: "Note on using an expression here: if this node is set to run once with all items, they will all be sent to the same workflow. That workflow's ID will be calculated by evaluating the expression for the first input item.",
+ },
// ----------------------------------
// source:localFile
// ----------------------------------
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts b/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
index 9e212eb194..7588040bf8 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
@@ -1,13 +1,27 @@
import { readFile as fsReadFile } from 'fs/promises';
import { NodeOperationError, jsonParse } from 'n8n-workflow';
-import type { IExecuteFunctions, IExecuteWorkflowInfo, IRequestOptions } from 'n8n-workflow';
+import type {
+ IExecuteFunctions,
+ IExecuteWorkflowInfo,
+ INodeParameterResourceLocator,
+ IRequestOptions,
+} from 'n8n-workflow';
export async function getWorkflowInfo(this: IExecuteFunctions, source: string, itemIndex = 0) {
const workflowInfo: IExecuteWorkflowInfo = {};
-
+ const nodeVersion = this.getNode().typeVersion;
if (source === 'database') {
// Read workflow from database
- workflowInfo.id = this.getNodeParameter('workflowId', itemIndex) as string;
+ if (nodeVersion === 1) {
+ workflowInfo.id = this.getNodeParameter('workflowId', itemIndex) as string;
+ } else {
+ const { value } = this.getNodeParameter(
+ 'workflowId',
+ itemIndex,
+ {},
+ ) as INodeParameterResourceLocator;
+ workflowInfo.id = value as string;
+ }
} else if (source === 'localFile') {
// Read workflow from filesystem
const workflowPath = this.getNodeParameter('workflowPath', itemIndex) as string;
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index 9a88354d2a..0a4a4eb7f9 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -80,6 +80,18 @@ export class FacebookGraphApi implements INodeType {
name: 'Default',
value: '',
},
+ {
+ name: 'v20.0',
+ value: 'v20.0',
+ },
+ {
+ name: 'v19.0',
+ value: 'v19.0',
+ },
+ {
+ name: 'v18.0',
+ value: 'v18.0',
+ },
{
name: 'v17.0',
value: 'v17.0',
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
index 3c62c7c093..e8e7b8e69a 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
@@ -1,4 +1,10 @@
-import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+import type {
+ IExecuteFunctions,
+ INodeExecutionData,
+ INodeProperties,
+ JsonObject,
+} from 'n8n-workflow';
import glob from 'fast-glob';
import { errorMapper } from '../helpers/utils';
@@ -124,7 +130,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
},
});
}
-
returnData.push(...newItems);
} catch (error) {
const nodeOperatioinError = errorMapper.call(this, error, itemIndex, {
@@ -142,7 +147,7 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
});
continue;
}
- throw nodeOperatioinError;
+ throw new NodeApiError(this.getNode(), error as JsonObject, { itemIndex });
}
}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
index 55796b8064..27eb340f4e 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
@@ -1,6 +1,11 @@
import type { Readable } from 'stream';
-import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { BINARY_ENCODING } from 'n8n-workflow';
+import type {
+ IExecuteFunctions,
+ INodeExecutionData,
+ INodeProperties,
+ JsonObject,
+} from 'n8n-workflow';
+import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
import { errorMapper } from '../helpers/utils';
import { updateDisplayOptions } from '@utils/utilities';
@@ -114,7 +119,7 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
});
continue;
}
- throw nodeOperatioinError;
+ throw new NodeApiError(this.getNode(), error as JsonObject, { itemIndex });
}
}
diff --git a/packages/nodes-base/nodes/Filter/Filter.node.ts b/packages/nodes-base/nodes/Filter/Filter.node.ts
index 69a46d4a4f..7eb36ca4f0 100644
--- a/packages/nodes-base/nodes/Filter/Filter.node.ts
+++ b/packages/nodes-base/nodes/Filter/Filter.node.ts
@@ -13,11 +13,13 @@ export class Filter extends VersionedNodeType {
iconColor: 'light-blue',
group: ['transform'],
description: 'Remove items matching a condition',
+ defaultVersion: 2.1,
};
const nodeVersions: IVersionedNodeType['nodeVersions'] = {
1: new FilterV1(baseDescription),
2: new FilterV2(baseDescription),
+ 2.1: new FilterV2(baseDescription),
};
super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts b/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
index 6c7e50c197..06df074cd5 100644
--- a/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
+++ b/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
@@ -1,12 +1,16 @@
import set from 'lodash/set';
-import type {
- IExecuteFunctions,
- INodeExecutionData,
- INodeType,
- INodeTypeBaseDescription,
- INodeTypeDescription,
+import {
+ ApplicationError,
+ NodeOperationError,
+ type IExecuteFunctions,
+ type INodeExecutionData,
+ type INodeType,
+ type INodeTypeBaseDescription,
+ type INodeTypeDescription,
} from 'n8n-workflow';
import { ENABLE_LESS_STRICT_TYPE_VALIDATION } from '../../../utils/constants';
+import { getTypeValidationParameter, getTypeValidationStrictness } from '../../If/V2/utils';
+import { looseTypeValidationProperty } from '../../../utils/descriptions';
export class FilterV2 implements INodeType {
description: INodeTypeDescription;
@@ -14,7 +18,7 @@ export class FilterV2 implements INodeType {
constructor(baseDescription: INodeTypeBaseDescription) {
this.description = {
...baseDescription,
- version: 2,
+ version: [2, 2.1],
defaults: {
name: 'Filter',
color: '#229eff',
@@ -33,7 +37,16 @@ export class FilterV2 implements INodeType {
typeOptions: {
filter: {
caseSensitive: '={{!$parameter.options.ignoreCase}}',
- typeValidation: '={{$parameter.options.looseTypeValidation ? "loose" : "strict"}}',
+ typeValidation: getTypeValidationStrictness(2.1),
+ },
+ },
+ },
+ {
+ ...looseTypeValidationProperty,
+ default: false,
+ displayOptions: {
+ show: {
+ '@version': [{ _cnd: { gte: 2.1 } }],
},
},
},
@@ -52,11 +65,12 @@ export class FilterV2 implements INodeType {
default: true,
},
{
- displayName: 'Less Strict Type Validation',
- description: 'Whether to try casting value types based on the selected operator',
- name: 'looseTypeValidation',
- type: 'boolean',
- default: true,
+ ...looseTypeValidationProperty,
+ displayOptions: {
+ show: {
+ '@version': [{ _cnd: { lt: 2.1 } }],
+ },
+ },
},
],
},
@@ -80,7 +94,10 @@ export class FilterV2 implements INodeType {
extractValue: true,
}) as boolean;
} catch (error) {
- if (!options.looseTypeValidation && !error.description) {
+ if (
+ !getTypeValidationParameter(2.1)(this, itemIndex, options.looseTypeValidation) &&
+ !error.description
+ ) {
set(error, 'description', ENABLE_LESS_STRICT_TYPE_VALIDATION);
}
set(error, 'context.itemIndex', itemIndex);
@@ -101,7 +118,18 @@ export class FilterV2 implements INodeType {
if (this.continueOnFail(error)) {
discardedItems.push(item);
} else {
- throw error;
+ if (error instanceof NodeOperationError) {
+ throw error;
+ }
+
+ if (error instanceof ApplicationError) {
+ set(error, 'context.itemIndex', itemIndex);
+ throw error;
+ }
+
+ throw new NodeOperationError(this.getNode(), error, {
+ itemIndex,
+ });
}
}
});
diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index 079ae4278c..35f06496ce 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -170,8 +170,8 @@ export async function formWebhook(
}
} catch (error) {
if (error instanceof WebhookAuthorizationError) {
- res.writeHead(error.responseCode, { 'WWW-Authenticate': 'Basic realm="Webhook"' });
- res.end(error.message);
+ res.setHeader('WWW-Authenticate', 'Basic realm="Enter credentials"');
+ res.status(401).send();
return { noWebhookResponse: true };
}
throw error;
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
index 293cea5414..da0befd1fb 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheets.node.ts
@@ -11,7 +11,7 @@ export class GoogleSheets extends VersionedNodeType {
name: 'googleSheets',
icon: 'file:googleSheets.svg',
group: ['input', 'output'],
- defaultVersion: 4.4,
+ defaultVersion: 4.5,
subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
description: 'Read, update and write data to Google Sheets',
};
@@ -25,6 +25,7 @@ export class GoogleSheets extends VersionedNodeType {
4.2: new GoogleSheetsV2(baseDescription),
4.3: new GoogleSheetsV2(baseDescription),
4.4: new GoogleSheetsV2(baseDescription),
+ 4.5: new GoogleSheetsV2(baseDescription),
};
super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
index 4ec7b16c5e..42b255ac1a 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
@@ -14,7 +14,7 @@ import {
mapFields,
untilSheetSelected,
} from '../../helpers/GoogleSheets.utils';
-import { cellFormat, handlingExtraData } from './commonDescription';
+import { cellFormat, handlingExtraData, useAppendOption } from './commonDescription';
export const description: SheetProperties = [
{
@@ -198,14 +198,7 @@ export const description: SheetProperties = [
...handlingExtraData,
displayOptions: { show: { '/columns.mappingMode': ['autoMapInputData'] } },
},
- {
- displayName: 'Use Append',
- name: 'useAppend',
- type: 'boolean',
- default: false,
- description:
- 'Whether to use append instead of update(default), this is more efficient but in some cases data might be misaligned',
- },
+ useAppendOption,
],
},
];
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
index 0260c889ed..469181ecb2 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
@@ -18,7 +18,12 @@ import {
checkForSchemaChanges,
untilSheetSelected,
} from '../../helpers/GoogleSheets.utils';
-import { cellFormat, handlingExtraData, locationDefine } from './commonDescription';
+import {
+ cellFormat,
+ handlingExtraData,
+ locationDefine,
+ useAppendOption,
+} from './commonDescription';
export const description: SheetProperties = [
{
@@ -212,14 +217,7 @@ export const description: SheetProperties = [
...handlingExtraData,
displayOptions: { show: { '/columns.mappingMode': ['autoMapInputData'] } },
},
- {
- displayName: 'Use Append',
- name: 'useAppend',
- type: 'boolean',
- default: false,
- description:
- 'Whether to use append instead of update(default), this is more efficient but in some cases data might be misaligned',
- },
+ useAppendOption,
],
},
];
@@ -340,8 +338,18 @@ export async function execute(
} else {
const valueToMatchOn =
nodeVersion < 4
- ? (this.getNodeParameter('valueToMatchOn', i) as string)
- : (this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i) as string);
+ ? (this.getNodeParameter('valueToMatchOn', i, '') as string)
+ : (this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i, '') as string);
+
+ if (valueToMatchOn === '') {
+ throw new NodeOperationError(
+ this.getNode(),
+ "The 'Column to Match On' parameter is required",
+ {
+ itemIndex: i,
+ },
+ );
+ }
if (nodeVersion < 4) {
const valuesToSend = this.getNodeParameter('fieldsUi.values', i, []) as IDataObject[];
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts
index 66fdd1166c..bd73aaaebf 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts
@@ -258,3 +258,13 @@ export const handlingExtraData: INodeProperties = {
default: 'insertInNewColumn',
description: "What do to with fields that don't match any columns in the Google Sheet",
};
+
+export const useAppendOption: INodeProperties = {
+ displayName: 'Minimise API Calls',
+ name: 'useAppend',
+ type: 'boolean',
+ default: false,
+ hint: 'Use if your sheet has no gaps between rows or columns',
+ description:
+ 'Whether to use append instead of update(default), this is more efficient but in some cases data might be misaligned',
+};
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
index 5f87c8baa5..8f8959a463 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
@@ -135,6 +135,19 @@ export const description: SheetProperties = [
options: [
dataLocationOnSheet,
outputFormatting,
+ {
+ displayName: 'Return only First Matching Row',
+ name: 'returnFirstMatch',
+ type: 'boolean',
+ default: false,
+ description:
+ 'Whether to select the first row of the sheet or the first matching row (if filters are set)',
+ displayOptions: {
+ show: {
+ '@version': [{ _cnd: { gte: 4.5 } }],
+ },
+ },
+ },
{
displayName: 'When Filter Has Multiple Matches',
name: 'returnAllMatches',
@@ -154,6 +167,11 @@ export const description: SheetProperties = [
],
description:
'By default only the first result gets returned, Set to "Return All Matches" to get multiple matches',
+ displayOptions: {
+ show: {
+ '@version': [{ _cnd: { lt: 4.5 } }],
+ },
+ },
},
],
},
@@ -219,7 +237,12 @@ export async function execute(
const inputData = data as string[][];
if (lookupValues.length) {
- const returnAllMatches = options.returnAllMatches === 'returnAllMatches' ? true : false;
+ let returnAllMatches;
+ if (nodeVersion < 4.5) {
+ returnAllMatches = options.returnAllMatches === 'returnAllMatches' ? true : false;
+ } else {
+ returnAllMatches = options.returnFirstMatch ? false : true;
+ }
if (nodeVersion <= 4.1) {
for (let i = 1; i < items.length; i++) {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
index 3d69573c43..ba72e993d9 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
@@ -318,8 +318,18 @@ export async function execute(
} else {
const valueToMatchOn =
nodeVersion < 4
- ? (this.getNodeParameter('valueToMatchOn', i) as string)
- : (this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i) as string);
+ ? (this.getNodeParameter('valueToMatchOn', i, '') as string)
+ : (this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i, '') as string);
+
+ if (valueToMatchOn === '') {
+ throw new NodeOperationError(
+ this.getNode(),
+ "The 'Column to Match On' parameter is required",
+ {
+ itemIndex: i,
+ },
+ );
+ }
if (nodeVersion < 4) {
const valuesToSend = this.getNodeParameter('fieldsUi.values', i, []) as IDataObject[];
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts
index 013b4bd702..ebaa2e40ba 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts
@@ -9,7 +9,7 @@ export const versionDescription: INodeTypeDescription = {
name: 'googleSheets',
icon: 'file:googleSheets.svg',
group: ['input', 'output'],
- version: [3, 4, 4.1, 4.2, 4.3, 4.4],
+ version: [3, 4, 4.1, 4.2, 4.3, 4.4, 4.5],
subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
description: 'Read, update and write data to Google Sheets',
defaults: {
@@ -20,7 +20,7 @@ export const versionDescription: INodeTypeDescription = {
hints: [
{
message:
- "Use the 'Use Append' option for greater efficiency if your sheet is uniformly formatted without gaps between columns or rows",
+ "Use the 'Minimise API Calls' option for greater efficiency if your sheet is uniformly formatted without gaps between columns or rows",
displayCondition:
'={{$parameter["operation"] === "append" && !$parameter["options"]["useAppend"]}}',
whenToDisplay: 'beforeExecution',
diff --git a/packages/nodes-base/nodes/If/If.node.ts b/packages/nodes-base/nodes/If/If.node.ts
index 7bc1d459ca..4942fdebf2 100644
--- a/packages/nodes-base/nodes/If/If.node.ts
+++ b/packages/nodes-base/nodes/If/If.node.ts
@@ -13,12 +13,13 @@ export class If extends VersionedNodeType {
iconColor: 'green',
group: ['transform'],
description: 'Route items to different branches (true/false)',
- defaultVersion: 2,
+ defaultVersion: 2.1,
};
const nodeVersions: IVersionedNodeType['nodeVersions'] = {
1: new IfV1(baseDescription),
2: new IfV2(baseDescription),
+ 2.1: new IfV2(baseDescription),
};
super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/If/V2/IfV2.node.ts b/packages/nodes-base/nodes/If/V2/IfV2.node.ts
index 2e90747bed..691fc2e0b9 100644
--- a/packages/nodes-base/nodes/If/V2/IfV2.node.ts
+++ b/packages/nodes-base/nodes/If/V2/IfV2.node.ts
@@ -1,12 +1,16 @@
import set from 'lodash/set';
-import type {
- IExecuteFunctions,
- INodeExecutionData,
- INodeType,
- INodeTypeBaseDescription,
- INodeTypeDescription,
+import {
+ ApplicationError,
+ NodeOperationError,
+ type IExecuteFunctions,
+ type INodeExecutionData,
+ type INodeType,
+ type INodeTypeBaseDescription,
+ type INodeTypeDescription,
} from 'n8n-workflow';
import { ENABLE_LESS_STRICT_TYPE_VALIDATION } from '../../../utils/constants';
+import { looseTypeValidationProperty } from '../../../utils/descriptions';
+import { getTypeValidationParameter, getTypeValidationStrictness } from './utils';
export class IfV2 implements INodeType {
description: INodeTypeDescription;
@@ -14,7 +18,7 @@ export class IfV2 implements INodeType {
constructor(baseDescription: INodeTypeBaseDescription) {
this.description = {
...baseDescription,
- version: 2,
+ version: [2, 2.1],
defaults: {
name: 'If',
color: '#408000',
@@ -33,7 +37,16 @@ export class IfV2 implements INodeType {
typeOptions: {
filter: {
caseSensitive: '={{!$parameter.options.ignoreCase}}',
- typeValidation: '={{$parameter.options.looseTypeValidation ? "loose" : "strict"}}',
+ typeValidation: getTypeValidationStrictness(2.1),
+ },
+ },
+ },
+ {
+ ...looseTypeValidationProperty,
+ default: false,
+ displayOptions: {
+ show: {
+ '@version': [{ _cnd: { gte: 2.1 } }],
},
},
},
@@ -52,11 +65,12 @@ export class IfV2 implements INodeType {
default: true,
},
{
- displayName: 'Less Strict Type Validation',
- description: 'Whether to try casting value types based on the selected operator',
- name: 'looseTypeValidation',
- type: 'boolean',
- default: true,
+ ...looseTypeValidationProperty,
+ displayOptions: {
+ show: {
+ '@version': [{ _cnd: { lt: 2.1 } }],
+ },
+ },
},
],
},
@@ -80,7 +94,10 @@ export class IfV2 implements INodeType {
extractValue: true,
}) as boolean;
} catch (error) {
- if (!options.looseTypeValidation && !error.description) {
+ if (
+ !getTypeValidationParameter(2.1)(this, itemIndex, options.looseTypeValidation) &&
+ !error.description
+ ) {
set(error, 'description', ENABLE_LESS_STRICT_TYPE_VALIDATION);
}
set(error, 'context.itemIndex', itemIndex);
@@ -101,7 +118,18 @@ export class IfV2 implements INodeType {
if (this.continueOnFail(error)) {
falseItems.push(item);
} else {
- throw error;
+ if (error instanceof NodeOperationError) {
+ throw error;
+ }
+
+ if (error instanceof ApplicationError) {
+ set(error, 'context.itemIndex', itemIndex);
+ throw error;
+ }
+
+ throw new NodeOperationError(this.getNode(), error, {
+ itemIndex,
+ });
}
}
});
diff --git a/packages/nodes-base/nodes/If/V2/utils.ts b/packages/nodes-base/nodes/If/V2/utils.ts
new file mode 100644
index 0000000000..21af372421
--- /dev/null
+++ b/packages/nodes-base/nodes/If/V2/utils.ts
@@ -0,0 +1,15 @@
+import type { IExecuteFunctions } from 'n8n-workflow';
+
+export const getTypeValidationStrictness = (version: number) => {
+ return `={{ ($nodeVersion < ${version} ? $parameter.options.looseTypeValidation : $parameter.looseTypeValidation) ? "loose" : "strict" }}`;
+};
+
+export const getTypeValidationParameter = (version: number) => {
+ return (context: IExecuteFunctions, itemIndex: number, option: boolean | undefined) => {
+ if (context.getNode().typeVersion < version) {
+ return option;
+ } else {
+ return context.getNodeParameter('looseTypeValidation', itemIndex, false) as boolean;
+ }
+ };
+};
diff --git a/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
index 729c6a8b77..a53d0e271e 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
@@ -53,6 +53,7 @@ export const expenseFields: INodeProperties[] = [
default: {},
displayOptions: {
show: {
+ apiVersion: ['v4'],
operation: ['create'],
resource: ['expense'],
},
@@ -120,11 +121,6 @@ export const expenseFields: INodeProperties[] = [
displayName: 'Payment Type',
name: 'paymentType',
type: 'options',
- displayOptions: {
- show: {
- apiVersion: ['v4'],
- },
- },
options: [
{
name: 'ACH',
@@ -257,15 +253,137 @@ export const expenseFields: INodeProperties[] = [
],
default: 1,
},
+ {
+ displayName: 'Private Notes',
+ name: 'privateNotes',
+ type: 'string',
+ default: '',
+ },
+ {
+ displayName: 'Public Notes',
+ name: 'publicNotes',
+ type: 'string',
+ default: '',
+ },
+ {
+ displayName: 'Tax Name 1',
+ name: 'taxName1',
+ type: 'string',
+ default: '',
+ },
+ {
+ displayName: 'Tax Name 2',
+ name: 'taxName2',
+ type: 'string',
+ default: '',
+ },
+ {
+ displayName: 'Tax Rate 1',
+ name: 'taxRate1',
+ type: 'number',
+ default: 0,
+ },
+ {
+ displayName: 'Tax Rate 2',
+ name: 'taxRate2',
+ type: 'number',
+ default: 0,
+ },
+ {
+ displayName: 'Transaction Reference',
+ name: 'transactionReference',
+ type: 'string',
+ default: '',
+ },
+ {
+ displayName: 'Vendor Name or ID',
+ name: 'vendor',
+ type: 'options',
+ description:
+ 'Choose from the list, or specify an ID using an expression',
+ typeOptions: {
+ loadOptionsMethod: 'getVendors',
+ },
+ default: '',
+ },
+ ],
+ },
+ {
+ displayName: 'Additional Fields',
+ name: 'additionalFields',
+ type: 'collection',
+ placeholder: 'Add Field',
+ default: {},
+ displayOptions: {
+ show: {
+ apiVersion: ['v5'],
+ operation: ['create'],
+ resource: ['expense'],
+ },
+ },
+ options: [
+ {
+ displayName: 'Amount',
+ name: 'amount',
+ type: 'number',
+ default: 0,
+ },
+ {
+ displayName: 'Billable',
+ name: 'billable',
+ type: 'boolean',
+ default: false,
+ },
+ {
+ displayName: 'Client Name or ID',
+ name: 'client',
+ type: 'options',
+ description:
+ 'Choose from the list, or specify an ID using an expression',
+ typeOptions: {
+ loadOptionsMethod: 'getClients',
+ },
+ default: '',
+ },
+ {
+ displayName: 'Custom Value 1',
+ name: 'customValue1',
+ type: 'string',
+ default: '',
+ },
+ {
+ displayName: 'Custom Value 2',
+ name: 'customValue2',
+ type: 'string',
+ default: '',
+ },
+ {
+ displayName: 'Category Name or ID',
+ name: 'category',
+ type: 'options',
+ description:
+ 'Choose from the list, or specify an ID using an expression',
+ typeOptions: {
+ loadOptionsMethod: 'getExpenseCategories',
+ },
+ default: '',
+ },
+ {
+ displayName: 'Expense Date',
+ name: 'expenseDate',
+ type: 'dateTime',
+ default: '',
+ },
+ {
+ displayName: 'Payment Date',
+ name: 'paymentDate',
+ type: 'dateTime',
+ default: '',
+ },
{
displayName: 'Payment Type',
name: 'paymentType',
type: 'options',
- displayOptions: {
- show: {
- apiVersion: ['v5'],
- },
- },
options: [
{
name: 'Bank Transfer',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
index 17ae0938e9..82680ef85e 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
@@ -85,6 +85,7 @@ export const paymentFields: INodeProperties[] = [
default: {},
displayOptions: {
show: {
+ apiVersion: ['v4'],
operation: ['create'],
resource: ['payment'],
},
@@ -94,11 +95,6 @@ export const paymentFields: INodeProperties[] = [
displayName: 'Payment Type',
name: 'paymentType',
type: 'options',
- displayOptions: {
- show: {
- apiVersion: ['v4'],
- },
- },
options: [
{
name: 'ACH',
@@ -231,15 +227,38 @@ export const paymentFields: INodeProperties[] = [
],
default: 1,
},
+ {
+ displayName: 'Transfer Reference',
+ name: 'transferReference',
+ type: 'string',
+ default: '',
+ },
+ {
+ displayName: 'Private Notes',
+ name: 'privateNotes',
+ type: 'string',
+ default: '',
+ },
+ ],
+ },
+ {
+ displayName: 'Additional Fields',
+ name: 'additionalFields',
+ type: 'collection',
+ placeholder: 'Add Field',
+ default: {},
+ displayOptions: {
+ show: {
+ apiVersion: ['v5'],
+ operation: ['create'],
+ resource: ['payment'],
+ },
+ },
+ options: [
{
displayName: 'Payment Type',
name: 'paymentType',
type: 'options',
- displayOptions: {
- show: {
- apiVersion: ['v5'],
- },
- },
options: [
{
name: 'Bank Transfer',
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
index 6c5db84770..c6c866cf5a 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
@@ -82,7 +82,7 @@ const properties: INodeProperties[] = [
loadOptionsDependsOn: ['schema.value', 'table.value'],
},
default: '',
- hint: 'The column that identifies the row(s) to modify',
+ hint: 'The column to use when matching rows in Postgres to the input items of this node. Usually an ID.',
displayOptions: {
show: {
'@version': [2, 2.1],
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
index d9de41cc15..fbb1a6af56 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
@@ -290,7 +290,11 @@ export class RespondToWebhook implements INodeType {
const items = this.getInputData();
const nodeVersion = this.getNode().typeVersion;
- const WEBHOOK_NODE_TYPES = ['n8n-nodes-base.webhook', 'n8n-nodes-base.formTrigger'];
+ const WEBHOOK_NODE_TYPES = [
+ 'n8n-nodes-base.webhook',
+ 'n8n-nodes-base.formTrigger',
+ '@n8n/n8n-nodes-langchain.chatTrigger',
+ ];
try {
if (nodeVersion >= 1.1) {
diff --git a/packages/nodes-base/nodes/Schedule/tests/ScheduleTrigger.node.test.ts b/packages/nodes-base/nodes/Schedule/tests/ScheduleTrigger.node.test.ts
index fa1d2cd615..0693806f4c 100644
--- a/packages/nodes-base/nodes/Schedule/tests/ScheduleTrigger.node.test.ts
+++ b/packages/nodes-base/nodes/Schedule/tests/ScheduleTrigger.node.test.ts
@@ -1,6 +1,6 @@
import * as n8nWorkflow from 'n8n-workflow';
import type { INode, ITriggerFunctions, Workflow } from 'n8n-workflow';
-import { returnJsonArray } from 'n8n-core';
+import { type InstanceSettings, returnJsonArray } from 'n8n-core';
import { ScheduledTaskManager } from 'n8n-core/dist/ScheduledTaskManager';
import { mock } from 'jest-mock-extended';
import { ScheduleTrigger } from '../ScheduleTrigger.node';
@@ -18,7 +18,8 @@ describe('ScheduleTrigger', () => {
const node = mock({ typeVersion: 1 });
const workflow = mock({ timezone });
- const scheduledTaskManager = new ScheduledTaskManager();
+ const instanceSettings = mock({ isLeader: true });
+ const scheduledTaskManager = new ScheduledTaskManager(instanceSettings);
const helpers = mock({
returnJsonArray,
registerCron: (cronExpression, onTick) =>
diff --git a/packages/nodes-base/nodes/Switch/Switch.node.ts b/packages/nodes-base/nodes/Switch/Switch.node.ts
index c54f5b55da..fb7262f742 100644
--- a/packages/nodes-base/nodes/Switch/Switch.node.ts
+++ b/packages/nodes-base/nodes/Switch/Switch.node.ts
@@ -14,13 +14,14 @@ export class Switch extends VersionedNodeType {
iconColor: 'light-blue',
group: ['transform'],
description: 'Route items depending on defined expression or rules',
- defaultVersion: 3,
+ defaultVersion: 3.1,
};
const nodeVersions: IVersionedNodeType['nodeVersions'] = {
1: new SwitchV1(baseDescription),
2: new SwitchV2(baseDescription),
3: new SwitchV3(baseDescription),
+ 3.1: new SwitchV3(baseDescription),
};
super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
index 42939ddec6..c4ac82c990 100644
--- a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
+++ b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
@@ -9,10 +9,12 @@ import type {
INodeTypeBaseDescription,
INodeTypeDescription,
} from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
import set from 'lodash/set';
import { capitalize } from '@utils/utilities';
import { ENABLE_LESS_STRICT_TYPE_VALIDATION } from '../../../utils/constants';
+import { looseTypeValidationProperty } from '../../../utils/descriptions';
+import { getTypeValidationParameter, getTypeValidationStrictness } from '../../If/V2/utils';
const configuredOutputs = (parameters: INodeParameters) => {
const mode = parameters.mode as string;
@@ -48,7 +50,7 @@ export class SwitchV3 implements INodeType {
this.description = {
...baseDescription,
subtitle: `=mode: {{(${capitalize})($parameter["mode"])}}`,
- version: [3],
+ version: [3, 3.1],
defaults: {
name: 'Switch',
color: '#506000',
@@ -157,8 +159,7 @@ export class SwitchV3 implements INodeType {
multipleValues: false,
filter: {
caseSensitive: '={{!$parameter.options.ignoreCase}}',
- typeValidation:
- '={{$parameter.options.looseTypeValidation ? "loose" : "strict"}}',
+ typeValidation: getTypeValidationStrictness(3.1),
},
},
},
@@ -184,6 +185,15 @@ export class SwitchV3 implements INodeType {
},
],
},
+ {
+ ...looseTypeValidationProperty,
+ default: false,
+ displayOptions: {
+ show: {
+ '@version': [{ _cnd: { gte: 3.1 } }],
+ },
+ },
+ },
{
displayName: 'Options',
name: 'options',
@@ -218,11 +228,12 @@ export class SwitchV3 implements INodeType {
default: true,
},
{
- displayName: 'Less Strict Type Validation',
- description: 'Whether to try casting value types based on the selected operator',
- name: 'looseTypeValidation',
- type: 'boolean',
- default: true,
+ ...looseTypeValidationProperty,
+ displayOptions: {
+ show: {
+ '@version': [{ _cnd: { lt: 3.1 } }],
+ },
+ },
},
{
displayName: 'Rename Fallback Output',
@@ -349,7 +360,14 @@ export class SwitchV3 implements INodeType {
},
) as boolean;
} catch (error) {
- if (!options.looseTypeValidation && !error.description) {
+ if (
+ !getTypeValidationParameter(3.1)(
+ this,
+ itemIndex,
+ options.looseTypeValidation as boolean,
+ ) &&
+ !error.description
+ ) {
error.description = ENABLE_LESS_STRICT_TYPE_VALIDATION;
}
set(error, 'context.itemIndex', itemIndex);
@@ -382,7 +400,18 @@ export class SwitchV3 implements INodeType {
returnData[0].push({ json: { error: error.message } });
continue;
}
- throw new NodeOperationError(this.getNode(), error);
+ if (error instanceof NodeOperationError) {
+ throw error;
+ }
+
+ if (error instanceof ApplicationError) {
+ set(error, 'context.itemIndex', itemIndex);
+ throw error;
+ }
+
+ throw new NodeOperationError(this.getNode(), error, {
+ itemIndex,
+ });
}
}
diff --git a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
index 48b018a215..6b766730c8 100644
--- a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
@@ -24,21 +24,10 @@ export async function togglApiRequest(
query?: IDataObject,
uri?: string,
) {
- const credentials = await this.getCredentials('togglApi');
- const headerWithAuthentication = Object.assign(
- {},
- {
- Authorization: ` Basic ${Buffer.from(
- `${credentials.username}:${credentials.password}`,
- ).toString('base64')}`,
- },
- );
-
const options: IRequestOptions = {
- headers: headerWithAuthentication,
method,
qs: query,
- uri: uri || `https://api.track.toggl.com/api/v8${resource}`,
+ uri: uri || `https://api.track.toggl.com/api/v9/me${resource}`,
body,
json: true,
};
@@ -46,7 +35,7 @@ export async function togglApiRequest(
delete options.body;
}
try {
- return await this.helpers.request(options);
+ return await this.helpers.requestWithAuthentication.call(this, 'togglApi', options);
} catch (error) {
throw new NodeApiError(this.getNode(), error as JsonObject);
}
diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
index fcfcf87846..a95d35ce13 100644
--- a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
+++ b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
@@ -9,6 +9,7 @@ import type {
import { NodeApiError, NodeOperationError } from 'n8n-workflow';
import moment from 'moment-timezone';
+import { DateTime } from 'luxon';
import { togglApiRequest } from './GenericFunctions';
export class TogglTrigger implements INodeType {
@@ -62,7 +63,7 @@ export class TogglTrigger implements INodeType {
const qs: IDataObject = {};
let timeEntries = [];
- qs.start_date = webhookData.lastTimeChecked;
+ qs.start_date = webhookData.lastTimeChecked ?? DateTime.now().toISODate();
qs.end_date = moment().format();
try {
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index b4c524520b..db05bf38c1 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
{
"name": "n8n-nodes-base",
- "version": "1.55.0",
+ "version": "1.56.0",
"description": "Base nodes of n8n",
"main": "index.js",
"scripts": {
@@ -822,7 +822,7 @@
"@types/promise-ftp": "^1.3.4",
"@types/rfc2047": "^2.0.1",
"@types/showdown": "^1.9.4",
- "@types/snowflake-sdk": "^1.6.20",
+ "@types/snowflake-sdk": "^1.6.24",
"@types/ssh2-sftp-client": "^5.1.0",
"@types/uuid": "catalog:",
"@types/xml2js": "catalog:",
@@ -885,7 +885,7 @@
"semver": "7.5.4",
"showdown": "2.1.0",
"simple-git": "3.17.0",
- "snowflake-sdk": "1.9.2",
+ "snowflake-sdk": "1.12.0",
"ssh2-sftp-client": "7.2.3",
"tmp-promise": "3.0.3",
"ts-ics": "^1.2.2",
diff --git a/packages/nodes-base/utils/descriptions.ts b/packages/nodes-base/utils/descriptions.ts
index 1465d3e314..fb6772a12b 100644
--- a/packages/nodes-base/utils/descriptions.ts
+++ b/packages/nodes-base/utils/descriptions.ts
@@ -33,6 +33,14 @@ export const returnAllOrLimit: INodeProperties[] = [
},
];
+export const looseTypeValidationProperty: INodeProperties = {
+ displayName: 'Less Strict Type Validation',
+ description: 'Whether to try casting value types based on the selected operator',
+ name: 'looseTypeValidation',
+ type: 'boolean',
+ default: true,
+};
+
export const encodeDecodeOptions: INodePropertyOptions[] = [
{
name: 'armscii8',
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 49d904bdf2..bbddb85cd4 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
{
"name": "n8n-workflow",
- "version": "1.54.0",
+ "version": "1.55.0",
"description": "Workflow base code of n8n",
"main": "dist/index.js",
"module": "src/index.ts",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 3faa825f7b..cab0c6d0e1 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1204,7 +1204,8 @@ export type NodePropertyTypes =
| 'resourceMapper'
| 'filter'
| 'assignmentCollection'
- | 'credentials';
+ | 'credentials'
+ | 'workflowSelector';
export type CodeAutocompleteTypes = 'function' | 'functionItem';
@@ -2789,3 +2790,23 @@ export type Functionality = 'regular' | 'configuration-node' | 'pairedItem';
export type Result = { ok: true; result: T } | { ok: false; error: E };
export type CallbackManager = CallbackManagerLC;
+
+export type IPersonalizationSurveyAnswersV4 = {
+ version: 'v4';
+ personalization_survey_submitted_at: string;
+ personalization_survey_n8n_version: string;
+ automationGoalDevops?: string[] | null;
+ automationGoalDevopsOther?: string | null;
+ companyIndustryExtended?: string[] | null;
+ otherCompanyIndustryExtended?: string[] | null;
+ companySize?: string | null;
+ companyType?: string | null;
+ automationGoalSm?: string[] | null;
+ automationGoalSmOther?: string | null;
+ usageModes?: string[] | null;
+ email?: string | null;
+ role?: string | null;
+ roleOther?: string | null;
+ reportedSource?: string | null;
+ reportedSourceOther?: string | null;
+};
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 1f27bacee9..485ad0d9b1 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -1580,7 +1580,7 @@ export function addToIssuesIfMissing(
(nodeProperties.type === 'multiOptions' && Array.isArray(value) && value.length === 0) ||
(nodeProperties.type === 'dateTime' && value === undefined) ||
(nodeProperties.type === 'options' && (value === '' || value === undefined)) ||
- (nodeProperties.type === 'resourceLocator' &&
+ ((nodeProperties.type === 'resourceLocator' || nodeProperties.type === 'workflowSelector') &&
!isValidResourceLocatorParameterValue(value as INodeParameterResourceLocator))
) {
// Parameter is required but empty
@@ -1654,7 +1654,10 @@ export function getParameterIssues(
}
}
- if (nodeProperties.type === 'resourceLocator' && isDisplayed) {
+ if (
+ (nodeProperties.type === 'resourceLocator' || nodeProperties.type === 'workflowSelector') &&
+ isDisplayed
+ ) {
const value = getParameterValueByPath(nodeValues, nodeProperties.name, path);
if (isINodeParameterResourceLocator(value)) {
const mode = nodeProperties.modes?.find((option) => option.name === value.mode);
diff --git a/packages/workflow/src/NodeParameters/FilterParameter.ts b/packages/workflow/src/NodeParameters/FilterParameter.ts
index 1d8c1a9a25..2c2fabf96b 100644
--- a/packages/workflow/src/NodeParameters/FilterParameter.ts
+++ b/packages/workflow/src/NodeParameters/FilterParameter.ts
@@ -94,14 +94,61 @@ function parseFilterConditionValues(
)} ${suffix}`;
};
- const invalidTypeDescription = 'Try changing the type of comparison.';
+ const getTypeDescription = (isStrict: boolean) => {
+ if (isStrict)
+ return 'Try changing the type of the comparison, or enabling less strict type validation.';
+ return 'Try changing the type of the comparison.';
+ };
+
+ const composeInvalidTypeDescription = (
+ type: string,
+ fromType: string,
+ valuePosition: 'first' | 'second',
+ ) => {
+ fromType = fromType.toLocaleLowerCase();
+ const expectedType = withIndefiniteArticle(type);
+
+ let convertionFunction = '';
+ if (type === 'string') {
+ convertionFunction = '.toString()';
+ } else if (type === 'number') {
+ convertionFunction = '.toNumber()';
+ } else if (type === 'boolean') {
+ convertionFunction = '.toBoolean()';
+ }
+
+ if (strict && convertionFunction) {
+ const suggestFunction = ` by adding
+
+
+
+
+
+
+
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorDropdown.ts b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorDropdown.ts
new file mode 100644
index 0000000000..f63b9207a9
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorDropdown.ts
@@ -0,0 +1,34 @@
+import type { Ref } from 'vue';
+import { nextTick, ref } from 'vue';
+
+export function useWorkflowResourceLocatorDropdown(
+ isListMode: Ref
+
+ {{ i18n.baseText('resourceLocator.mode.list.error.title') }}
+
+
+
+
+
+
+
+
+
+ {{ getModeLabel(mode) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
"
+`;
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.vue b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.vue
index acd164f5fe..fab32bf008 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.vue
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.vue
@@ -35,6 +35,7 @@ function onDelete() {
@@ -90,7 +88,13 @@ const hideNodeIssues = computed(() => false); // @TODO Implement this
}
.running {
- color: var(--color-primary);
+ width: calc(100% - 2 * var(--canvas-node--status-icons-offset));
+ height: calc(100% - 2 * var(--canvas-node--status-icons-offset));
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 3.75em;
+ color: hsla(var(--color-primary-h), var(--color-primary-s), var(--color-primary-l), 0.7);
}
.issues {
diff --git a/packages/editor-ui/src/composables/__tests__/useWorkflowHelpers.spec.ts b/packages/editor-ui/src/composables/__tests__/useWorkflowHelpers.spec.ts
index 81643f52aa..f50261a1aa 100644
--- a/packages/editor-ui/src/composables/__tests__/useWorkflowHelpers.spec.ts
+++ b/packages/editor-ui/src/composables/__tests__/useWorkflowHelpers.spec.ts
@@ -3,6 +3,10 @@ import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
import router from '@/router';
import { createTestingPinia } from '@pinia/testing';
import { setActivePinia } from 'pinia';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
+import { useTagsStore } from '@/stores/tags.store';
+import { createTestWorkflow } from '@/__tests__/mocks';
const getDuplicateTestWorkflow = (): IWorkflowDataUpdate => ({
name: 'Duplicate webhook test',
@@ -50,32 +54,23 @@ const getDuplicateTestWorkflow = (): IWorkflowDataUpdate => ({
connections: {},
});
-vi.mock('@/stores/workflows.store', () => ({
- useWorkflowsStore: vi.fn(() => ({
- workflowsById: {},
- createNewWorkflow: vi.fn(() => {}),
- addWorkflow: vi.fn(() => {}),
- setActive: vi.fn(() => {}),
- setWorkflowId: vi.fn(() => {}),
- setWorkflowVersionId: vi.fn(() => {}),
- setWorkflowName: vi.fn(() => {}),
- setWorkflowSettings: vi.fn(() => {}),
- setNodeValue: vi.fn(() => {}),
- setWorkflowTagIds: vi.fn(() => {}),
- getCurrentWorkflow: vi.fn(() => ({})),
- })),
-}));
-
describe('useWorkflowHelpers', () => {
+ let workflowsStore: ReturnType;
+ let workflowsEEStore: ReturnType;
+ let tagsStore: ReturnType;
+
+ beforeAll(() => {
+ setActivePinia(createTestingPinia());
+ workflowsStore = useWorkflowsStore();
+ workflowsEEStore = useWorkflowsEEStore();
+ tagsStore = useTagsStore();
+ });
+
+ afterEach(() => {
+ vi.clearAllMocks();
+ });
+
describe('saveAsNewWorkflow', () => {
- beforeAll(() => {
- setActivePinia(createTestingPinia());
- });
-
- afterEach(() => {
- vi.clearAllMocks();
- });
-
it('should respect `resetWebhookUrls: false` when duplicating workflows', async () => {
const workflow = getDuplicateTestWorkflow();
if (!workflow.nodes) {
@@ -120,4 +115,101 @@ describe('useWorkflowHelpers', () => {
expect(pathsPreSave).not.toEqual(pathsPostSave);
});
});
+
+ describe('initState', () => {
+ it('should initialize workflow state with provided data', () => {
+ const { initState } = useWorkflowHelpers({ router });
+
+ const workflowData = createTestWorkflow({
+ id: '1',
+ name: 'Test Workflow',
+ active: true,
+ pinData: {},
+ meta: {},
+ scopes: ['workflow:create'],
+ usedCredentials: [],
+ sharedWithProjects: [],
+ tags: [],
+ });
+ const addWorkflowSpy = vi.spyOn(workflowsStore, 'addWorkflow');
+ const setActiveSpy = vi.spyOn(workflowsStore, 'setActive');
+ const setWorkflowIdSpy = vi.spyOn(workflowsStore, 'setWorkflowId');
+ const setWorkflowNameSpy = vi.spyOn(workflowsStore, 'setWorkflowName');
+ const setWorkflowSettingsSpy = vi.spyOn(workflowsStore, 'setWorkflowSettings');
+ const setWorkflowPinDataSpy = vi.spyOn(workflowsStore, 'setWorkflowPinData');
+ const setWorkflowVersionIdSpy = vi.spyOn(workflowsStore, 'setWorkflowVersionId');
+ const setWorkflowMetadataSpy = vi.spyOn(workflowsStore, 'setWorkflowMetadata');
+ const setWorkflowScopesSpy = vi.spyOn(workflowsStore, 'setWorkflowScopes');
+ const setUsedCredentialsSpy = vi.spyOn(workflowsStore, 'setUsedCredentials');
+ const setWorkflowSharedWithSpy = vi.spyOn(workflowsEEStore, 'setWorkflowSharedWith');
+ const setWorkflowTagIdsSpy = vi.spyOn(workflowsStore, 'setWorkflowTagIds');
+ const upsertTagsSpy = vi.spyOn(tagsStore, 'upsertTags');
+
+ initState(workflowData);
+
+ expect(addWorkflowSpy).toHaveBeenCalledWith(workflowData);
+ expect(setActiveSpy).toHaveBeenCalledWith(true);
+ expect(setWorkflowIdSpy).toHaveBeenCalledWith('1');
+ expect(setWorkflowNameSpy).toHaveBeenCalledWith({
+ newName: 'Test Workflow',
+ setStateDirty: false,
+ });
+ expect(setWorkflowSettingsSpy).toHaveBeenCalledWith({
+ executionOrder: 'v1',
+ timezone: 'DEFAULT',
+ });
+ expect(setWorkflowPinDataSpy).toHaveBeenCalledWith({});
+ expect(setWorkflowVersionIdSpy).toHaveBeenCalledWith('1');
+ expect(setWorkflowMetadataSpy).toHaveBeenCalledWith({});
+ expect(setWorkflowScopesSpy).toHaveBeenCalledWith(['workflow:create']);
+ expect(setUsedCredentialsSpy).toHaveBeenCalledWith([]);
+ expect(setWorkflowSharedWithSpy).toHaveBeenCalledWith({
+ workflowId: '1',
+ sharedWithProjects: [],
+ });
+ expect(setWorkflowTagIdsSpy).toHaveBeenCalledWith([]);
+ expect(upsertTagsSpy).toHaveBeenCalledWith([]);
+ });
+
+ it('should handle missing `usedCredentials` and `sharedWithProjects` gracefully', () => {
+ const { initState } = useWorkflowHelpers({ router });
+
+ const workflowData = createTestWorkflow({
+ id: '1',
+ name: 'Test Workflow',
+ active: true,
+ pinData: {},
+ meta: {},
+ scopes: [],
+ tags: [],
+ });
+ const setUsedCredentialsSpy = vi.spyOn(workflowsStore, 'setUsedCredentials');
+ const setWorkflowSharedWithSpy = vi.spyOn(workflowsEEStore, 'setWorkflowSharedWith');
+
+ initState(workflowData);
+
+ expect(setUsedCredentialsSpy).not.toHaveBeenCalled();
+ expect(setWorkflowSharedWithSpy).not.toHaveBeenCalled();
+ });
+
+ it('should handle missing `tags` gracefully', () => {
+ const { initState } = useWorkflowHelpers({ router });
+
+ const workflowData = createTestWorkflow({
+ id: '1',
+ name: 'Test Workflow',
+ active: true,
+ pinData: {},
+ meta: {},
+ scopes: [],
+ });
+ const setWorkflowTagIdsSpy = vi.spyOn(workflowsStore, 'setWorkflowTagIds');
+ const upsertTagsSpy = vi.spyOn(tagsStore, 'upsertTags');
+
+ initState(workflowData);
+
+ expect(setWorkflowTagIdsSpy).toHaveBeenCalledWith([]);
+ expect(upsertTagsSpy).toHaveBeenCalledWith([]);
+ });
+ });
});
diff --git a/packages/editor-ui/src/composables/useBeforeUnload.spec.ts b/packages/editor-ui/src/composables/useBeforeUnload.spec.ts
new file mode 100644
index 0000000000..725b6fe1f2
--- /dev/null
+++ b/packages/editor-ui/src/composables/useBeforeUnload.spec.ts
@@ -0,0 +1,86 @@
+import { useBeforeUnload } from '@/composables/useBeforeUnload';
+import { STORES, VIEWS } from '@/constants';
+import { useUIStore } from '@/stores/ui.store';
+import { useCanvasStore } from '@/stores/canvas.store';
+import type { useRoute } from 'vue-router';
+import { setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { mock } from 'vitest-mock-extended';
+import { describe } from 'vitest';
+
+describe('useBeforeUnload', () => {
+ const defaultRoute = mock>({ name: 'someRoute' });
+
+ let uiStore: ReturnType;
+ let canvasStore: ReturnType;
+
+ beforeEach(() => {
+ const pinia = createTestingPinia({
+ initialState: {
+ [STORES.UI]: {
+ stateIsDirty: false,
+ },
+ },
+ });
+ setActivePinia(pinia);
+
+ uiStore = useUIStore();
+ canvasStore = useCanvasStore();
+ });
+
+ describe('onBeforeUnload', () => {
+ it('should do nothing if route is demo', () => {
+ const route = mock>({ name: VIEWS.DEMO });
+ const { onBeforeUnload } = useBeforeUnload({ route });
+ const event = new Event('beforeunload');
+
+ const result = onBeforeUnload(event);
+
+ expect(result).toBeUndefined();
+ });
+
+ it('should prompt user if state is dirty', () => {
+ uiStore.stateIsDirty = true;
+ const { onBeforeUnload } = useBeforeUnload({ route: defaultRoute });
+ const event = new Event('beforeunload');
+
+ const result = onBeforeUnload(event);
+
+ expect(result).toBe(true);
+ });
+
+ it('should start loading if state is not dirty', () => {
+ uiStore.stateIsDirty = false;
+ const startLoadingSpy = vi.spyOn(canvasStore, 'startLoading');
+ const { onBeforeUnload } = useBeforeUnload({ route: defaultRoute });
+ const event = new Event('beforeunload');
+
+ const result = onBeforeUnload(event);
+
+ expect(startLoadingSpy).toHaveBeenCalledWith(expect.any(String));
+ expect(result).toBeUndefined();
+ });
+ });
+
+ describe('addBeforeUnloadEventBindings', () => {
+ it('should add beforeunload event listener', () => {
+ const { addBeforeUnloadEventBindings } = useBeforeUnload({ route: defaultRoute });
+ const addEventListenerSpy = vi.spyOn(window, 'addEventListener');
+
+ addBeforeUnloadEventBindings();
+
+ expect(addEventListenerSpy).toHaveBeenCalledWith('beforeunload', expect.any(Function));
+ });
+ });
+
+ describe('removeBeforeUnloadEventBindings', () => {
+ it('should remove beforeunload event listener', () => {
+ const { removeBeforeUnloadEventBindings } = useBeforeUnload({ route: defaultRoute });
+ const removeEventListenerSpy = vi.spyOn(window, 'removeEventListener');
+
+ removeBeforeUnloadEventBindings();
+
+ expect(removeEventListenerSpy).toHaveBeenCalledWith('beforeunload', expect.any(Function));
+ });
+ });
+});
diff --git a/packages/editor-ui/src/composables/useBeforeUnload.ts b/packages/editor-ui/src/composables/useBeforeUnload.ts
new file mode 100644
index 0000000000..5469c43ee8
--- /dev/null
+++ b/packages/editor-ui/src/composables/useBeforeUnload.ts
@@ -0,0 +1,48 @@
+import { useCanvasStore } from '@/stores/canvas.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useI18n } from '@/composables/useI18n';
+import { computed } from 'vue';
+import { VIEWS } from '@/constants';
+import type { useRoute } from 'vue-router';
+
+/**
+ * Composable to handle the beforeunload event in canvas views.
+ *
+ * This hook will prevent closing the tab and prompt the user if the ui state is dirty
+ * (workflow has changes) and the user tries to leave the page.
+ */
+
+export function useBeforeUnload({ route }: { route: ReturnType }) {
+ const uiStore = useUIStore();
+ const canvasStore = useCanvasStore();
+
+ const i18n = useI18n();
+
+ const isDemoRoute = computed(() => route.name === VIEWS.DEMO);
+
+ function onBeforeUnload(e: BeforeUnloadEvent) {
+ if (isDemoRoute.value || window.preventNodeViewBeforeUnload) {
+ return;
+ } else if (uiStore.stateIsDirty) {
+ e.returnValue = true; //Gecko + IE
+ return true; //Gecko + Webkit, Safari, Chrome etc.
+ } else {
+ canvasStore.startLoading(i18n.baseText('nodeView.redirecting'));
+ return;
+ }
+ }
+
+ function addBeforeUnloadEventBindings() {
+ window.addEventListener('beforeunload', onBeforeUnload);
+ }
+
+ function removeBeforeUnloadEventBindings() {
+ window.removeEventListener('beforeunload', onBeforeUnload);
+ }
+
+ return {
+ onBeforeUnload,
+ addBeforeUnloadEventBindings,
+ removeBeforeUnloadEventBindings,
+ };
+}
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.ts b/packages/editor-ui/src/composables/useCanvasOperations.ts
index 11e40f39b3..63fa57c7fd 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.ts
@@ -105,6 +105,7 @@ type AddNodeOptions = {
openNDV?: boolean;
trackHistory?: boolean;
isAutoAdd?: boolean;
+ telemetry?: boolean;
};
export function useCanvasOperations({ router }: { router: ReturnType }) {
@@ -434,6 +435,7 @@ export function useCanvasOperations({ router }: { router: ReturnType,
+ customActions: {} as Record,
delegatedClickHandler: null as null | ((e: MouseEvent) => void),
});
-export default () => {
- function registerCustomAction({ key, action }: { key: string; action: Function }) {
+export function useGlobalLinkActions() {
+ function registerCustomAction({ key, action }: RegisterCustomActionOpts) {
state.customActions[key] = action;
}
function unregisterCustomAction(key: string) {
@@ -51,7 +52,7 @@ export default () => {
}
}
- const availableActions = computed<{ [key: string]: Function }>(() => ({
+ const availableActions = computed<{ [key: string]: LinkActionFn }>(() => ({
reload,
...state.customActions,
}));
@@ -76,4 +77,4 @@ export default () => {
registerCustomAction,
unregisterCustomAction,
};
-};
+}
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
index a8c763b11f..fd2fb50a81 100644
--- a/packages/editor-ui/src/composables/useNodeHelpers.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.ts
@@ -63,6 +63,7 @@ import { useCanvasStore } from '@/stores/canvas.store';
import { getEndpointScope } from '@/utils/nodeViewUtils';
import { useSourceControlStore } from '@/stores/sourceControl.store';
import { getConnectionInfo } from '@/utils/canvasUtils';
+import type { UnpinNodeDataEvent } from '@/event-bus/data-pinning';
declare namespace HttpRequestNode {
namespace V2 {
@@ -992,8 +993,8 @@ export function useNodeHelpers() {
});
}
- function removePinDataConnections(pinData: IPinData) {
- Object.keys(pinData).forEach((nodeName) => {
+ function removePinDataConnections(event: UnpinNodeDataEvent) {
+ for (const nodeName of event.nodeNames) {
const node = workflowsStore.getNodeByName(nodeName);
if (!node) {
return;
@@ -1015,7 +1016,7 @@ export function useNodeHelpers() {
canvasStore.jsPlumbInstance.setSuspendDrawing(true);
connectionsArray.forEach(NodeViewUtils.resetConnection);
canvasStore.jsPlumbInstance.setSuspendDrawing(false, true);
- });
+ }
}
function getOutputEndpointUUID(
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/editor-ui/src/composables/usePushConnection.ts
index 7c5c229a19..77d7201ca1 100644
--- a/packages/editor-ui/src/composables/usePushConnection.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -295,7 +295,7 @@ export function usePushConnection({ router }: { router: ReturnType
Your n8n server is configured to use a secure cookie,
🚫
-Your n8n server is configured to use a secure cookie,
however you are visiting this via an insecure URL
+Your n8n server is configured to use a secure cookie,
however you are either visiting this via an insecure URL, or using Safari.
To fix this, please consider the following options:
- Setup TLS/HTTPS (recommended), or
- - If you are running this locally, try using localhost instead
+ - If you are running this locally, and not using Safari, try using localhost instead
- If you prefer to disable this security feature (not recommended), set the environment variable
N8N_SECURE_COOKIE to false
@@ -852,3 +859,6 @@ export const INSECURE_CONNECTION_WARNING = `
export const CanvasNodeKey = 'canvasNode' as unknown as InjectionKey;
export const CanvasNodeHandleKey =
'canvasNodeHandle' as unknown as InjectionKey;
+
+/** Auth */
+export const BROWSER_ID_STORAGE_KEY = 'n8n-browserId';
diff --git a/packages/editor-ui/src/event-bus/code-node-editor.ts b/packages/editor-ui/src/event-bus/code-node-editor.ts
index 128e07606f..6ba3a32a7c 100644
--- a/packages/editor-ui/src/event-bus/code-node-editor.ts
+++ b/packages/editor-ui/src/event-bus/code-node-editor.ts
@@ -1,3 +1,13 @@
import { createEventBus } from 'n8n-design-system/utils';
-export const codeNodeEditorEventBus = createEventBus();
+export type HighlightLineEvent = number | 'final';
+
+export interface CodeNodeEditorEventBusEvents {
+ /** Event that a diff have been applied to the code node editor */
+ codeDiffApplied: never;
+
+ /** Command to highlight a specific line in the code node editor */
+ highlightLine: HighlightLineEvent;
+}
+
+export const codeNodeEditorEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/data-pinning.ts b/packages/editor-ui/src/event-bus/data-pinning.ts
index aa6548741f..4f29fdc772 100644
--- a/packages/editor-ui/src/event-bus/data-pinning.ts
+++ b/packages/editor-ui/src/event-bus/data-pinning.ts
@@ -1,3 +1,23 @@
import { createEventBus } from 'n8n-design-system/utils';
+import type { IPinData } from 'n8n-workflow';
-export const dataPinningEventBus = createEventBus();
+export type DataPinningDiscoveryEvent = {
+ isTooltipVisible: boolean;
+};
+
+export type UnpinNodeDataEvent = {
+ nodeNames: string[];
+};
+
+export interface DataPinningEventBusEvents {
+ /** Command to show or hide the data pinning discovery tooltip */
+ 'data-pinning-discovery': DataPinningDiscoveryEvent;
+
+ /** Event that data has been pinned for workflow */
+ 'pin-data': IPinData;
+
+ /** Event that data has been unpinned for specific nodes */
+ 'unpin-data': UnpinNodeDataEvent;
+}
+
+export const dataPinningEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/global-link-actions.ts b/packages/editor-ui/src/event-bus/global-link-actions.ts
new file mode 100644
index 0000000000..11e482ffe7
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/global-link-actions.ts
@@ -0,0 +1,16 @@
+import { createEventBus } from 'n8n-design-system/utils';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type LinkActionFn = (...args: any[]) => void;
+
+export type RegisterCustomActionOpts = {
+ key: string;
+ action: LinkActionFn;
+};
+
+export interface GlobalLinkActionsEventBusEvents {
+ /** See useGlobalLinkActions.ts */
+ registerGlobalLinkAction: RegisterCustomActionOpts;
+}
+
+export const globalLinkActionsEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/html-editor.ts b/packages/editor-ui/src/event-bus/html-editor.ts
index 7a53bf86a4..e40e7dd16c 100644
--- a/packages/editor-ui/src/event-bus/html-editor.ts
+++ b/packages/editor-ui/src/event-bus/html-editor.ts
@@ -1,3 +1,8 @@
import { createEventBus } from 'n8n-design-system/utils';
-export const htmlEditorEventBus = createEventBus();
+export interface HtmlEditorEventBusEvents {
+ /** Command to format the content in the HtmlEditor */
+ 'format-html': never;
+}
+
+export const htmlEditorEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/import-curl.ts b/packages/editor-ui/src/event-bus/import-curl.ts
index 7a517bf3f4..3ff4df697b 100644
--- a/packages/editor-ui/src/event-bus/import-curl.ts
+++ b/packages/editor-ui/src/event-bus/import-curl.ts
@@ -1,3 +1,9 @@
+import type { CurlToJSONResponse } from '@/Interface';
import { createEventBus } from 'n8n-design-system/utils';
-export const importCurlEventBus = createEventBus();
+export interface ImportCurlEventBusEvents {
+ /** Command to set the HTTP node parameters based on the curl to JSON response */
+ setHttpNodeParameters: CurlToJSONResponse;
+}
+
+export const importCurlEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/index.ts b/packages/editor-ui/src/event-bus/index.ts
index 91d9a1a542..b094684a94 100644
--- a/packages/editor-ui/src/event-bus/index.ts
+++ b/packages/editor-ui/src/event-bus/index.ts
@@ -1,6 +1,6 @@
export * from './code-node-editor';
export * from './data-pinning';
-export * from './link-actions';
+export * from './global-link-actions';
export * from './html-editor';
export * from './import-curl';
export * from './node-view';
diff --git a/packages/editor-ui/src/event-bus/link-actions.ts b/packages/editor-ui/src/event-bus/link-actions.ts
deleted file mode 100644
index 41386147ea..0000000000
--- a/packages/editor-ui/src/event-bus/link-actions.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { createEventBus } from 'n8n-design-system/utils';
-
-export const globalLinkActionsEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/ndv.ts b/packages/editor-ui/src/event-bus/ndv.ts
index a6d705b4ef..e8c9233c39 100644
--- a/packages/editor-ui/src/event-bus/ndv.ts
+++ b/packages/editor-ui/src/event-bus/ndv.ts
@@ -1,3 +1,21 @@
+import type { IUpdateInformation } from '@/Interface';
import { createEventBus } from 'n8n-design-system/utils';
-export const ndvEventBus = createEventBus();
+export type Position = 'minLeft' | 'maxRight' | 'initial';
+
+export type CreateNewCredentialOpts = {
+ type: string;
+ showAuthOptions: boolean;
+};
+
+export interface NdvEventBusEvents {
+ /** Command to let the user create a new credential by opening the credentials modal */
+ 'credential.createNew': CreateNewCredentialOpts;
+
+ /** Command to set the NDV panels' (input, output, main) positions based on the given value */
+ setPositionByName: Position;
+
+ updateParameterValue: IUpdateInformation;
+}
+
+export const ndvEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/source-control.ts b/packages/editor-ui/src/event-bus/source-control.ts
index 2f79901a1f..17dae99952 100644
--- a/packages/editor-ui/src/event-bus/source-control.ts
+++ b/packages/editor-ui/src/event-bus/source-control.ts
@@ -1,3 +1,8 @@
import { createEventBus } from 'n8n-design-system/utils';
-export const sourceControlEventBus = createEventBus();
+export interface SourceControlEventBusEvents {
+ /** Event when latest changes were pulled from the source control */
+ pull: never;
+}
+
+export const sourceControlEventBus = createEventBus();
diff --git a/packages/editor-ui/src/plugins/directives.ts b/packages/editor-ui/src/plugins/directives.ts
index 8b092b4c4f..c490fa5dab 100644
--- a/packages/editor-ui/src/plugins/directives.ts
+++ b/packages/editor-ui/src/plugins/directives.ts
@@ -1,10 +1,8 @@
import type { Plugin } from 'vue';
import VueTouchEvents from 'vue3-touch-events';
-import { vOnClickOutside } from '@vueuse/components';
export const GlobalDirectivesPlugin: Plugin = {
install(app) {
app.use(VueTouchEvents);
- app.directive('on-click-outside', vOnClickOutside);
},
};
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index b082675d2d..7f94aec41c 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -131,7 +131,7 @@
"auth.signup.setupYourAccount": "Set up your account",
"auth.signup.setupYourAccountError": "Problem setting up your account",
"auth.signup.tokenValidationError": "Issue validating invite token",
- "aiAssistant.name": "Ava",
+ "aiAssistant.name": "Assistant",
"aiAssistant.assistant": "AI Assistant",
"aiAssistant.newSessionModal.title.part1": "Start new",
"aiAssistant.newSessionModal.title.part2": "session",
@@ -139,7 +139,7 @@
"aiAssistant.newSessionModal.question": "Are you sure you want to start a new session?",
"aiAssistant.newSessionModal.confirm": "Start new session",
"aiAssistant.serviceError.message": "Unable to connect to n8n's AI service",
- "aiAssistant.codeUpdated.message.title": "Ava modified workflow",
+ "aiAssistant.codeUpdated.message.title": "Assistant modified workflow",
"aiAssistant.codeUpdated.message.body": "Open the {nodeName} node to see the changes",
"banners.confirmEmail.message.1": "To secure your account and prevent future access issues, please confirm your",
"banners.confirmEmail.message.2": "email address.",
@@ -1491,8 +1491,8 @@
"resourceMapper.fetchingFields.errorMessage": "Can't get {fieldWord}.",
"resourceMapper.fetchingFields.noFieldsFound": "No {fieldWord} found in {serviceName}.",
"resourceMapper.columnsToMatchOn.label": "{fieldWord} to Match On",
- "resourceMapper.columnsToMatchOn.multi.description": "The {fieldWord} that identify the row(s) to modify",
- "resourceMapper.columnsToMatchOn.single.description": "The {fieldWord} that identifies the row(s) to modify",
+ "resourceMapper.columnsToMatchOn.multi.description": "The {fieldWord} to use when matching rows in {nodeDisplayName} to the input items of this node. Usually an ID.",
+ "resourceMapper.columnsToMatchOn.single.description": "The {fieldWord} to use when matching rows in {nodeDisplayName} to the input items of this node. Usually an ID.",
"resourceMapper.columnsToMatchOn.tooltip": "The {fieldWord} to compare when finding the rows to update",
"resourceMapper.columnsToMatchOn.noFieldsFound": "No {fieldWord} that can be used for matching found in {serviceName}.",
"resourceMapper.valuesToSend.label": "Values to Send",
@@ -2202,7 +2202,8 @@
"workflows.empty.description.readOnlyEnv": "No workflows here yet",
"workflows.empty.description.noPermission": "There are currently no workflows to view",
"workflows.empty.startFromScratch": "Start from scratch",
- "workflows.empty.browseTemplates": "Browse {category} templates",
+ "workflows.empty.browseTemplates": "Explore workflow templates",
+ "workflows.empty.learnN8n": "Learn n8n",
"workflows.empty.button.disabled.tooltip": "Your current role in the project does not allow you to create workflows",
"workflows.shareModal.title": "Share '{name}'",
"workflows.shareModal.title.static": "Shared with {projectName}",
diff --git a/packages/editor-ui/src/stores/assistant.store.ts b/packages/editor-ui/src/stores/assistant.store.ts
index 229e2227f5..75ee335cfc 100644
--- a/packages/editor-ui/src/stores/assistant.store.ts
+++ b/packages/editor-ui/src/stores/assistant.store.ts
@@ -245,10 +245,14 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
function onEachStreamingMessage(response: ChatRequest.ResponsePayload, id: string) {
if (response.sessionId && !currentSessionId.value) {
currentSessionId.value = response.sessionId;
- telemetry.track('Assistant session started', {
- chat_session_id: currentSessionId.value,
- task: 'error',
- });
+ telemetry.track(
+ 'Assistant session started',
+ {
+ chat_session_id: currentSessionId.value,
+ task: 'error',
+ },
+ { withPostHog: true },
+ );
} else if (currentSessionId.value !== response.sessionId) {
return;
}
diff --git a/packages/editor-ui/src/stores/ndv.store.ts b/packages/editor-ui/src/stores/ndv.store.ts
index dbaf8c94a1..1e7d5da363 100644
--- a/packages/editor-ui/src/stores/ndv.store.ts
+++ b/packages/editor-ui/src/stores/ndv.store.ts
@@ -177,6 +177,26 @@ export const useNDVStore = defineStore(STORES.NDV, {
isNDVOpen(): boolean {
return this.activeNodeName !== null;
},
+ ndvNodeInputNumber() {
+ const returnData: { [nodeName: string]: number[] } = {};
+ const workflow = useWorkflowsStore().getCurrentWorkflow();
+ const activeNodeConections = (
+ workflow.connectionsByDestinationNode[this.activeNode?.name || ''] ?? {}
+ ).main;
+
+ if (!activeNodeConections || activeNodeConections.length < 2) return returnData;
+
+ for (const [index, connection] of activeNodeConections.entries()) {
+ for (const node of connection) {
+ if (!returnData[node.node]) {
+ returnData[node.node] = [];
+ }
+ returnData[node.node].push(index + 1);
+ }
+ }
+
+ return returnData;
+ },
},
actions: {
setActiveNodeName(nodeName: string | null): void {
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
index 0275a87047..2886aff1ba 100644
--- a/packages/editor-ui/src/stores/settings.store.ts
+++ b/packages/editor-ui/src/stores/settings.store.ts
@@ -1,3 +1,6 @@
+import { computed, ref } from 'vue';
+import Bowser from 'bowser';
+
import * as publicApiApi from '@/api/api-keys';
import * as ldapApi from '@/api/ldap';
import * as settingsApi from '@/api/settings';
@@ -21,7 +24,6 @@ import { makeRestApiRequest } from '@/utils/apiUtils';
import { useTitleChange } from '@/composables/useTitleChange';
import { useToast } from '@/composables/useToast';
import { i18n } from '@/plugins/i18n';
-import { computed, ref } from 'vue';
export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
const initialized = ref(false);
@@ -189,13 +191,15 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
useRootStore().setVersionCli(settings.value.versionCli);
}
- if (
- settings.value.authCookie.secure &&
- location.protocol === 'http:' &&
- !['localhost', '127.0.0.1'].includes(location.hostname)
- ) {
- document.write(INSECURE_CONNECTION_WARNING);
- return;
+ if (settings.value.authCookie.secure) {
+ const { browser } = Bowser.parse(navigator.userAgent);
+ if (
+ location.protocol === 'http:' &&
+ (!['localhost', '127.0.0.1'].includes(location.hostname) || browser.name === 'Safari')
+ ) {
+ document.write(INSECURE_CONNECTION_WARNING);
+ return;
+ }
}
const isV1BannerDismissedPermanently = (settings.value.banners?.dismissed || []).includes('V1');
diff --git a/packages/editor-ui/src/stores/sso.store.ts b/packages/editor-ui/src/stores/sso.store.ts
index 63c71c3899..d9d522274c 100644
--- a/packages/editor-ui/src/stores/sso.store.ts
+++ b/packages/editor-ui/src/stores/sso.store.ts
@@ -70,7 +70,6 @@ export const useSSOStore = defineStore('sso', () => {
const updateUser = async (params: { firstName: string; lastName: string }) =>
await updateCurrentUser(rootStore.restApiContext, {
- id: usersStore.currentUser!.id,
email: usersStore.currentUser!.email!,
...params,
});
diff --git a/packages/editor-ui/src/stores/users.store.ts b/packages/editor-ui/src/stores/users.store.ts
index ef153bb4b7..613d2ea48d 100644
--- a/packages/editor-ui/src/stores/users.store.ts
+++ b/packages/editor-ui/src/stores/users.store.ts
@@ -1,6 +1,6 @@
import type { IUpdateUserSettingsReqPayload, UpdateGlobalRolePayload } from '@/api/users';
import * as usersApi from '@/api/users';
-import { PERSONALIZATION_MODAL_KEY, STORES, ROLE } from '@/constants';
+import { BROWSER_ID_STORAGE_KEY, PERSONALIZATION_MODAL_KEY, STORES, ROLE } from '@/constants';
import type {
Cloud,
IPersonalizationLatestVersion,
@@ -180,6 +180,8 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
postHogStore.reset();
uiStore.clearBannerStack();
npsSurveyStore.resetNpsSurveyOnLogOut();
+
+ localStorage.removeItem(BROWSER_ID_STORAGE_KEY);
};
const createOwner = async (params: {
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index 18fc0261bf..45f8a4c658 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -669,14 +669,14 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
};
}
- function setWorkflowPinData(pinData: IPinData) {
+ function setWorkflowPinData(pinData?: IPinData) {
workflow.value = {
...workflow.value,
- pinData: pinData || {},
+ pinData: pinData ?? {},
};
updateCachedWorkflow();
- dataPinningEventBus.emit('pin-data', pinData || {});
+ dataPinningEventBus.emit('pin-data', pinData ?? {});
}
function setWorkflowTagIds(tags: string[]) {
@@ -699,6 +699,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
};
}
+ function setWorkflowScopes(scopes: IWorkflowDb['scopes']): void {
+ workflow.value.scopes = scopes;
+ }
+
function setWorkflowMetadata(metadata: WorkflowMetadata | undefined): void {
workflow.value.meta = metadata;
}
@@ -764,7 +768,9 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
uiStore.stateIsDirty = true;
updateCachedWorkflow();
- dataPinningEventBus.emit('unpin-data', { [payload.node.name]: undefined });
+ dataPinningEventBus.emit('unpin-data', {
+ nodeNames: [payload.node.name],
+ });
}
function addConnection(data: { connection: IConnection[] }): void {
@@ -1634,6 +1640,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
setWorkflowTagIds,
addWorkflowTagIds,
removeWorkflowTagId,
+ setWorkflowScopes,
setWorkflowMetadata,
addToWorkflowMetadata,
setWorkflow,
diff --git a/packages/editor-ui/src/styles/plugins/_vueflow.scss b/packages/editor-ui/src/styles/plugins/_vueflow.scss
index b10e9f4f9d..3f0eff92a9 100644
--- a/packages/editor-ui/src/styles/plugins/_vueflow.scss
+++ b/packages/editor-ui/src/styles/plugins/_vueflow.scss
@@ -5,3 +5,43 @@
.vue-flow__resize-control.handle {
background-color: transparent;
}
+
+.vue-flow__minimap {
+ height: 120px;
+ overflow: hidden;
+ margin-bottom: calc(48px + 2 * var(--spacing-xs));
+ border: var(--border-base);
+ border-radius: var(--border-radius-base);
+ background: var(--color-background-light);
+
+ .minimap-node-default {
+ fill: var(--color-foreground-dark);
+ }
+
+ .minimap-node-n8n-nodes-base-stickyNote {
+ fill: var(--color-foreground-dark);
+ opacity: 0.2;
+ }
+}
+
+.vue-flow__pane {
+ &,
+ &.draggable {
+ cursor: default;
+ }
+
+ &.dragging {
+ cursor: grabbing;
+ }
+}
+
+.vue-flow__node {
+ &,
+ &.draggable {
+ cursor: pointer;
+ }
+
+ &.dragging {
+ cursor: grabbing;
+ }
+}
diff --git a/packages/editor-ui/src/utils/__tests__/apiUtils.spec.ts b/packages/editor-ui/src/utils/__tests__/apiUtils.spec.ts
new file mode 100644
index 0000000000..cefb6f3389
--- /dev/null
+++ b/packages/editor-ui/src/utils/__tests__/apiUtils.spec.ts
@@ -0,0 +1,112 @@
+import { STREAM_SEPERATOR, streamRequest } from '../apiUtils';
+
+describe('streamRequest', () => {
+ it('should stream data from the API endpoint', async () => {
+ const encoder = new TextEncoder();
+ const mockResponse = new ReadableStream({
+ start(controller) {
+ controller.enqueue(encoder.encode(`${JSON.stringify({ chunk: 1 })}${STREAM_SEPERATOR}`));
+ controller.enqueue(encoder.encode(`${JSON.stringify({ chunk: 2 })}${STREAM_SEPERATOR}`));
+ controller.enqueue(encoder.encode(`${JSON.stringify({ chunk: 3 })}${STREAM_SEPERATOR}`));
+ controller.close();
+ },
+ });
+
+ const mockFetch = vi.fn().mockResolvedValue({
+ ok: true,
+ body: mockResponse,
+ });
+
+ global.fetch = mockFetch;
+
+ const onChunkMock = vi.fn();
+ const onDoneMock = vi.fn();
+ const onErrorMock = vi.fn();
+
+ await streamRequest(
+ {
+ baseUrl: 'https://api.example.com',
+ pushRef: '',
+ },
+ '/data',
+ { key: 'value' },
+ onChunkMock,
+ onDoneMock,
+ onErrorMock,
+ );
+
+ expect(mockFetch).toHaveBeenCalledWith('https://api.example.com/data', {
+ method: 'POST',
+ body: JSON.stringify({ key: 'value' }),
+ credentials: 'include',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'browser-id': expect.stringContaining('-'),
+ },
+ });
+
+ expect(onChunkMock).toHaveBeenCalledTimes(3);
+ expect(onChunkMock).toHaveBeenNthCalledWith(1, { chunk: 1 });
+ expect(onChunkMock).toHaveBeenNthCalledWith(2, { chunk: 2 });
+ expect(onChunkMock).toHaveBeenNthCalledWith(3, { chunk: 3 });
+
+ expect(onDoneMock).toHaveBeenCalledTimes(1);
+ expect(onErrorMock).not.toHaveBeenCalled();
+ });
+
+ it('should handle broken stream data', async () => {
+ const encoder = new TextEncoder();
+ const mockResponse = new ReadableStream({
+ start(controller) {
+ controller.enqueue(
+ encoder.encode(`${JSON.stringify({ chunk: 1 })}${STREAM_SEPERATOR}{"chunk": `),
+ );
+ controller.enqueue(encoder.encode(`2}${STREAM_SEPERATOR}{"ch`));
+ controller.enqueue(encoder.encode('unk":'));
+ controller.enqueue(encoder.encode(`3}${STREAM_SEPERATOR}`));
+ controller.close();
+ },
+ });
+
+ const mockFetch = vi.fn().mockResolvedValue({
+ ok: true,
+ body: mockResponse,
+ });
+
+ global.fetch = mockFetch;
+
+ const onChunkMock = vi.fn();
+ const onDoneMock = vi.fn();
+ const onErrorMock = vi.fn();
+
+ await streamRequest(
+ {
+ baseUrl: 'https://api.example.com',
+ pushRef: '',
+ },
+ '/data',
+ { key: 'value' },
+ onChunkMock,
+ onDoneMock,
+ onErrorMock,
+ );
+
+ expect(mockFetch).toHaveBeenCalledWith('https://api.example.com/data', {
+ method: 'POST',
+ body: JSON.stringify({ key: 'value' }),
+ credentials: 'include',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'browser-id': expect.stringContaining('-'),
+ },
+ });
+
+ expect(onChunkMock).toHaveBeenCalledTimes(3);
+ expect(onChunkMock).toHaveBeenNthCalledWith(1, { chunk: 1 });
+ expect(onChunkMock).toHaveBeenNthCalledWith(2, { chunk: 2 });
+ expect(onChunkMock).toHaveBeenNthCalledWith(3, { chunk: 3 });
+
+ expect(onDoneMock).toHaveBeenCalledTimes(1);
+ expect(onErrorMock).not.toHaveBeenCalled();
+ });
+});
diff --git a/packages/editor-ui/src/utils/apiUtils.ts b/packages/editor-ui/src/utils/apiUtils.ts
index e9201b7c33..fef135769e 100644
--- a/packages/editor-ui/src/utils/apiUtils.ts
+++ b/packages/editor-ui/src/utils/apiUtils.ts
@@ -1,19 +1,23 @@
import type { AxiosRequestConfig, Method, RawAxiosRequestHeaders } from 'axios';
import axios from 'axios';
import { ApplicationError, jsonParse, type GenericValue, type IDataObject } from 'n8n-workflow';
-import type { IExecutionFlattedResponse, IExecutionResponse, IRestApiContext } from '@/Interface';
import { parse } from 'flatted';
-import type { ChatRequest } from '@/types/assistant.types';
import { assert } from '@/utils/assert';
-const BROWSER_ID_STORAGE_KEY = 'n8n-browserId';
-let browserId = localStorage.getItem(BROWSER_ID_STORAGE_KEY);
-if (!browserId && 'randomUUID' in crypto) {
- browserId = crypto.randomUUID();
- localStorage.setItem(BROWSER_ID_STORAGE_KEY, browserId);
-}
+import { BROWSER_ID_STORAGE_KEY } from '@/constants';
+import type { IExecutionFlattedResponse, IExecutionResponse, IRestApiContext } from '@/Interface';
+
+const getBrowserId = () => {
+ let browserId = localStorage.getItem(BROWSER_ID_STORAGE_KEY);
+ if (!browserId && 'randomUUID' in crypto) {
+ browserId = crypto.randomUUID();
+ localStorage.setItem(BROWSER_ID_STORAGE_KEY, browserId);
+ }
+ return browserId!;
+};
export const NO_NETWORK_ERROR_CODE = 999;
+export const STREAM_SEPERATOR = '⧉⇋⇋➽⌑⧉§§\n';
export class ResponseError extends ApplicationError {
// The HTTP status code of response
@@ -82,8 +86,8 @@ export async function request(config: {
baseURL,
headers: headers ?? {},
};
- if (baseURL.startsWith('/') && browserId) {
- options.headers!['browser-id'] = browserId;
+ if (baseURL.startsWith('/')) {
+ options.headers!['browser-id'] = getBrowserId();
}
if (
import.meta.env.NODE_ENV !== 'production' &&
@@ -194,21 +198,19 @@ export function unflattenExecutionData(fullExecutionData: IExecutionFlattedRespo
return returnData;
}
-export const streamRequest = async (
+export async function streamRequest(
context: IRestApiContext,
apiEndpoint: string,
- payload: ChatRequest.RequestPayload,
- onChunk?: (chunk: ChatRequest.ResponsePayload) => void,
+ payload: object,
+ onChunk?: (chunk: T) => void,
onDone?: () => void,
onError?: (e: Error) => void,
- separator = '⧉⇋⇋➽⌑⧉§§\n',
-): Promise => {
+ separator = STREAM_SEPERATOR,
+): Promise {
const headers: Record = {
+ 'browser-id': getBrowserId(),
'Content-Type': 'application/json',
};
- if (browserId) {
- headers['browser-id'] = browserId;
- }
const assistantRequest: RequestInit = {
headers,
method: 'POST',
@@ -223,23 +225,36 @@ export const streamRequest = async (
const reader = response.body.getReader();
const decoder = new TextDecoder('utf-8');
+ let buffer = '';
+
async function readStream() {
const { done, value } = await reader.read();
if (done) {
onDone?.();
return;
}
-
const chunk = decoder.decode(value);
- const splitChunks = chunk.split(separator);
+ buffer += chunk;
+ const splitChunks = buffer.split(separator);
+
+ buffer = '';
for (const splitChunk of splitChunks) {
- if (splitChunk && onChunk) {
+ if (splitChunk) {
+ let data: T;
try {
- onChunk(jsonParse(splitChunk, { errorMessage: 'Invalid json chunk in stream' }));
+ data = jsonParse(splitChunk, { errorMessage: 'Invalid json' });
+ } catch (e) {
+ // incomplete json. append to buffer to complete
+ buffer += splitChunk;
+
+ continue;
+ }
+
+ try {
+ onChunk?.(data);
} catch (e: unknown) {
if (e instanceof Error) {
- console.log(`${e.message}: ${splitChunk}`);
onError?.(e);
}
}
@@ -257,4 +272,4 @@ export const streamRequest = async (
assert(e instanceof Error);
onError?.(e);
}
-};
+}
diff --git a/packages/editor-ui/src/utils/userUtils.ts b/packages/editor-ui/src/utils/userUtils.ts
index 3d8aa21637..ff862ecfd8 100644
--- a/packages/editor-ui/src/utils/userUtils.ts
+++ b/packages/editor-ui/src/utils/userUtils.ts
@@ -65,11 +65,11 @@ import type {
IPersonalizationSurveyAnswersV1,
IPersonalizationSurveyAnswersV2,
IPersonalizationSurveyAnswersV3,
- IPersonalizationSurveyAnswersV4,
IPersonalizationSurveyVersions,
IUser,
ILogInStatus,
} from '@/Interface';
+import type { IPersonalizationSurveyAnswersV4 } from 'n8n-workflow';
/*
Utility functions used to handle users in n8n
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index 465505cc43..bbce98a844 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -3,8 +3,10 @@ import {
computed,
defineAsyncComponent,
nextTick,
+ onActivated,
onBeforeMount,
onBeforeUnmount,
+ onDeactivated,
onMounted,
ref,
useCssModule,
@@ -18,6 +20,7 @@ import CanvasRunWorkflowButton from '@/components/canvas/elements/buttons/Canvas
import { useI18n } from '@/composables/useI18n';
import { useWorkflowsStore } from '@/stores/workflows.store';
import { useRunWorkflow } from '@/composables/useRunWorkflow';
+import { useGlobalLinkActions } from '@/composables/useGlobalLinkActions';
import type {
AddedNodesAndConnections,
IExecutionResponse,
@@ -91,6 +94,7 @@ import { useTemplatesStore } from '@/stores/templates.store';
import { createEventBus } from 'n8n-design-system';
import type { PinDataSource } from '@/composables/usePinnedData';
import { useClipboard } from '@/composables/useClipboard';
+import { useBeforeUnload } from '@/composables/useBeforeUnload';
const LazyNodeCreation = defineAsyncComponent(
async () => await import('@/components/Node/NodeCreation.vue'),
@@ -135,6 +139,10 @@ const templatesStore = useTemplatesStore();
const canvasEventBus = createEventBus();
+const { addBeforeUnloadEventBindings, removeBeforeUnloadEventBindings } = useBeforeUnload({
+ route,
+});
+const { registerCustomAction } = useGlobalLinkActions();
const { runWorkflow, stopCurrentExecution, stopWaitingForWebhook } = useRunWorkflow({ router });
const {
updateNodePosition,
@@ -801,7 +809,7 @@ async function onAddNodesAndConnections(
return;
}
- await addNodes(nodes, { dragAndDrop, position, trackHistory: true });
+ await addNodes(nodes, { dragAndDrop, position, trackHistory: true, telemetry: true });
await nextTick();
const offsetIndex = editableWorkflow.value.nodes.length - nodes.length;
@@ -844,6 +852,10 @@ async function onOpenSelectiveNodeCreator(node: string, connectionType: NodeConn
nodeCreatorStore.openSelectiveNodeCreator({ node, connectionType });
}
+async function onOpenNodeCreatorForTriggerNodes(source: NodeCreatorOpenSource) {
+ nodeCreatorStore.openNodeCreatorForTriggerNodes(source);
+}
+
function onOpenNodeCreatorFromCanvas(source: NodeCreatorOpenSource) {
onOpenNodeCreator({ createNodeActive: true, source });
}
@@ -1347,29 +1359,36 @@ function onClickPane(position: CanvasNode['position']) {
*/
function registerCustomActions() {
- // @TODO Implement these
- // this.registerCustomAction({
- // key: 'openNodeDetail',
- // action: ({ node }: { node: string }) => {
- // this.nodeSelectedByName(node, true);
- // },
- // });
- //
- // this.registerCustomAction({
- // key: 'openSelectiveNodeCreator',
- // action: this.openSelectiveNodeCreator,
- // });
- //
- // this.registerCustomAction({
- // key: 'showNodeCreator',
- // action: () => {
- // this.ndvStore.activeNodeName = null;
- //
- // void this.$nextTick(() => {
- // this.showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.TAB);
- // });
- // },
- // });
+ registerCustomAction({
+ key: 'openNodeDetail',
+ action: ({ node }: { node: string }) => {
+ setNodeActiveByName(node);
+ },
+ });
+
+ registerCustomAction({
+ key: 'openSelectiveNodeCreator',
+ action: ({
+ connectiontype: connectionType,
+ node,
+ }: {
+ connectiontype: NodeConnectionType;
+ node: string;
+ }) => {
+ void onOpenSelectiveNodeCreator(node, connectionType);
+ },
+ });
+
+ registerCustomAction({
+ key: 'showNodeCreator',
+ action: () => {
+ ndvStore.activeNodeName = null;
+
+ void nextTick(() => {
+ void onOpenNodeCreatorForTriggerNodes(NODE_CREATOR_OPEN_SOURCES.TAB);
+ });
+ },
+ });
}
/**
@@ -1432,6 +1451,10 @@ onMounted(async () => {
void externalHooks.run('nodeView.mount').catch(() => {});
});
+onActivated(() => {
+ addBeforeUnloadEventBindings();
+});
+
onBeforeUnmount(() => {
removeUndoRedoEventBindings();
removePostMessageEventBindings();
@@ -1440,6 +1463,10 @@ onBeforeUnmount(() => {
removeExecutionOpenedEventBindings();
removeWorkflowSavedEventBindings();
});
+
+onDeactivated(() => {
+ removeBeforeUnloadEventBindings();
+});
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 4ef91b2b1a..6bcc74bd2b 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -261,7 +261,7 @@ import {
VALID_WORKFLOW_IMPORT_URL_REGEX,
} from '@/constants';
-import useGlobalLinkActions from '@/composables/useGlobalLinkActions';
+import { useGlobalLinkActions } from '@/composables/useGlobalLinkActions';
import { useNodeHelpers } from '@/composables/useNodeHelpers';
import useCanvasMouseSelect from '@/composables/useCanvasMouseSelect';
import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
@@ -327,7 +327,7 @@ import type {
NodeFilterType,
} from '@/Interface';
-import { type RouteLocation, useRouter } from 'vue-router';
+import { type RouteLocation, useRoute, useRouter } from 'vue-router';
import { dataPinningEventBus, nodeViewEventBus } from '@/event-bus';
import { useCanvasStore } from '@/stores/canvas.store';
import { useCredentialsStore } from '@/stores/credentials.store';
@@ -401,6 +401,7 @@ import { isJSPlumbEndpointElement, isJSPlumbConnection } from '@/utils/typeGuard
import { usePostHog } from '@/stores/posthog.store';
import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
import { getResourcePermissions } from '@/permissions';
+import { useBeforeUnload } from '@/composables/useBeforeUnload';
interface AddNodeOptions {
position?: XYPosition;
@@ -437,6 +438,7 @@ export default defineComponent({
const nodeViewRef = ref(null);
const onMouseMoveEnd = ref<((e: MouseEvent | TouchEvent) => void) | null>(null);
const router = useRouter();
+ const route = useRoute();
const ndvStore = useNDVStore();
const externalHooks = useExternalHooks();
@@ -452,6 +454,9 @@ export default defineComponent({
const canvasPanning = useCanvasPanning(nodeViewRootRef, { onMouseMoveEnd });
const workflowHelpers = useWorkflowHelpers({ router });
const { runWorkflow, stopCurrentExecution } = useRunWorkflow({ router });
+ const { addBeforeUnloadEventBindings, removeBeforeUnloadEventBindings } = useBeforeUnload({
+ route,
+ });
return {
locale,
@@ -477,6 +482,8 @@ export default defineComponent({
...useMessage(),
...useUniqueNodeName(),
...useExecutionDebugging(),
+ addBeforeUnloadEventBindings,
+ removeBeforeUnloadEventBindings,
};
},
data() {
@@ -510,7 +517,6 @@ export default defineComponent({
suspendRecordingDetachedConnections: false,
NODE_CREATOR_OPEN_SOURCES,
eventsAttached: false,
- unloadTimeout: undefined as undefined | ReturnType,
canOpenNDV: true,
hideNodeIssues: false,
};
@@ -926,13 +932,14 @@ export default defineComponent({
nodeViewEventBus.on('saveWorkflow', this.saveCurrentWorkflowExternal);
this.canvasStore.isDemo = this.isDemo;
+
+ this.addBeforeUnloadEventBindings();
},
deactivated() {
this.unbindCanvasEvents();
document.removeEventListener('keydown', this.keyDown);
document.removeEventListener('keyup', this.keyUp);
window.removeEventListener('message', this.onPostMessageReceived);
- window.removeEventListener('beforeunload', this.onBeforeUnload);
window.removeEventListener('pageshow', this.onPageShow);
nodeViewEventBus.off('newWorkflow', this.newWorkflow);
@@ -950,6 +957,8 @@ export default defineComponent({
dataPinningEventBus.off('pin-data', this.nodeHelpers.addPinDataConnections);
dataPinningEventBus.off('unpin-data', this.nodeHelpers.removePinDataConnections);
nodeViewEventBus.off('saveWorkflow', this.saveCurrentWorkflowExternal);
+
+ this.removeBeforeUnloadEventBindings();
},
beforeMount() {
if (!this.isDemo) {
@@ -3524,22 +3533,6 @@ export default defineComponent({
this.eventsAttached = false;
},
- onBeforeUnload(e: BeforeUnloadEvent) {
- if (this.isDemo || window.preventNodeViewBeforeUnload) {
- return;
- } else if (this.uiStore.stateIsDirty) {
- e.returnValue = true; //Gecko + IE
- return true; //Gecko + Webkit, Safari, Chrome etc.
- } else {
- this.canvasStore.startLoading(this.$locale.baseText('nodeView.redirecting'));
- return;
- }
- },
- onUnload() {
- // This will fire if users decides to leave the page after prompted
- // Clear the interval to prevent the notification from being sent
- clearTimeout(this.unloadTimeout);
- },
makeNewWorkflowShareable() {
const { currentProject, personalProject } = this.projectsStore;
const homeProject = currentProject ?? personalProject ?? {};
@@ -3674,8 +3667,6 @@ export default defineComponent({
document.addEventListener('keydown', this.keyDown);
document.addEventListener('keyup', this.keyUp);
- window.addEventListener('beforeunload', this.onBeforeUnload);
- window.addEventListener('unload', this.onUnload);
// Once view is initialized, pick up all toast notifications
// waiting in the store and display them
this.showNotificationForViews([VIEWS.WORKFLOW, VIEWS.NEW_WORKFLOW]);
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index 60b40fb686..0ddbe6e5a5 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -173,7 +173,6 @@ async function updateUserBasicInfo(userBasicInfo: UserBasicDetailsWithMfa) {
}
await usersStore.updateUser({
- id: usersStore.currentUserId,
firstName: userBasicInfo.firstName,
lastName: userBasicInfo.lastName,
email: userBasicInfo.email,
diff --git a/packages/editor-ui/src/views/SetupView.vue b/packages/editor-ui/src/views/SetupView.vue
index eb67935bb0..c85735374c 100644
--- a/packages/editor-ui/src/views/SetupView.vue
+++ b/packages/editor-ui/src/views/SetupView.vue
@@ -13,11 +13,12 @@ import { defineComponent } from 'vue';
import { useToast } from '@/composables/useToast';
import type { IFormBoxConfig } from '@/Interface';
-import { VIEWS } from '@/constants';
+import { MORE_ONBOARDING_OPTIONS_EXPERIMENT, VIEWS } from '@/constants';
import { mapStores } from 'pinia';
import { useUIStore } from '@/stores/ui.store';
import { useSettingsStore } from '@/stores/settings.store';
import { useUsersStore } from '@/stores/users.store';
+import { usePostHog } from '@/stores/posthog.store';
export default defineComponent({
name: 'SetupView',
@@ -91,12 +92,15 @@ export default defineComponent({
};
},
computed: {
- ...mapStores(useSettingsStore, useUIStore, useUsersStore),
+ ...mapStores(useSettingsStore, useUIStore, useUsersStore, usePostHog),
},
methods: {
async onSubmit(values: { [key: string]: string | boolean }) {
try {
const forceRedirectedHere = this.settingsStore.showSetupPage;
+ const isPartOfOnboardingExperiment =
+ this.posthogStore.getVariant(MORE_ONBOARDING_OPTIONS_EXPERIMENT.name) ===
+ MORE_ONBOARDING_OPTIONS_EXPERIMENT.variant;
this.loading = true;
await this.usersStore.createOwner(
values as { firstName: string; lastName: string; email: string; password: string },
@@ -109,7 +113,11 @@ export default defineComponent({
}
if (forceRedirectedHere) {
- await this.$router.push({ name: VIEWS.HOMEPAGE });
+ if (isPartOfOnboardingExperiment) {
+ await this.$router.push({ name: VIEWS.WORKFLOWS });
+ } else {
+ await this.$router.push({ name: VIEWS.NEW_WORKFLOW });
+ }
} else {
await this.$router.push({ name: VIEWS.USERS_SETTINGS });
}
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 55e61c4fb1..564ff672a2 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -61,29 +61,14 @@
: $locale.baseText('workflows.empty.heading.userNotSetup')
}}
- {{ emptyListDescription }}
+
+ {{ emptyListDescription }}
+
however you are either visiting this via an insecure URL, or using Safari.
- Setup TLS/HTTPS (recommended), or -
- If you are running this locally, try using localhost instead +
- If you are running this locally, and not using Safari, try using localhost instead
- If you prefer to disable this security feature (not recommended), set the environment variable
N8N_SECURE_COOKIEtofalse
-
-
-
- {{ $locale.baseText('workflows.empty.browseTemplates') }}
-
-
-
+
{{ $locale.baseText('workflows.empty.startFromScratch') }}
+
+
+
+ {{ $locale.baseText('workflows.empty.learnN8n') }}
+
+
+
+
+
+
+ {{ $locale.baseText('workflows.empty.browseTemplates') }}
+
+
+
@@ -144,7 +163,7 @@
import { defineComponent } from 'vue';
import ResourcesListLayout, { type IResource } from '@/components/layouts/ResourcesListLayout.vue';
import WorkflowCard from '@/components/WorkflowCard.vue';
-import { EnterpriseEditionFeature, VIEWS } from '@/constants';
+import { EnterpriseEditionFeature, MORE_ONBOARDING_OPTIONS_EXPERIMENT, VIEWS } from '@/constants';
import type { ITag, IUser, IWorkflowDb } from '@/Interface';
import TagsDropdown from '@/components/TagsDropdown.vue';
import { mapStores } from 'pinia';
@@ -158,6 +177,7 @@ import { useProjectsStore } from '@/stores/projects.store';
import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
import { useTemplatesStore } from '@/stores/templates.store';
import { getResourcePermissions } from '@/permissions';
+import { usePostHog } from '@/stores/posthog.store';
interface Filters {
search: string;
@@ -202,6 +222,7 @@ const WorkflowsView = defineComponent({
useTagsStore,
useProjectsStore,
useTemplatesStore,
+ usePostHog,
),
readOnlyEnv(): boolean {
return this.sourceControlStore.preferences.branchReadOnly;
@@ -245,6 +266,12 @@ const WorkflowsView = defineComponent({
return undefined;
},
+ isOnboardingExperimentEnabled() {
+ return (
+ this.posthogStore.getVariant(MORE_ONBOARDING_OPTIONS_EXPERIMENT.name) ===
+ MORE_ONBOARDING_OPTIONS_EXPERIMENT.variant
+ );
+ },
isSalesUser() {
if (!this.userRole) {
return false;
@@ -312,10 +339,19 @@ const WorkflowsView = defineComponent({
this.$telemetry.track('User clicked add workflow button', {
source: 'Workflows list',
});
+ this.trackEmptyCardClick('blank');
},
getTemplateRepositoryURL() {
return this.templatesStore.websiteTemplateRepositoryURL;
},
+ trackEmptyCardClick(option: 'blank' | 'templates' | 'courses') {
+ this.$telemetry.track('User clicked empty page option', {
+ option,
+ });
+ if (option === 'templates' && this.isSalesUser) {
+ this.trackCategoryLinkClick('Sales');
+ }
+ },
trackCategoryLinkClick(category: string) {
this.$telemetry.track(`User clicked Browse ${category} Templates`, {
role: this.usersStore.currentUserCloudInfo?.role,
diff --git a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
index 163e81c284..aa0a100e4e 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
@@ -105,7 +105,7 @@ describe('SettingsSourceControl', () => {
expect(saveSettingsButton).toBeDisabled();
const branchSelect = getByTestId('source-control-branch-select');
- await userEvent.click(within(branchSelect).getByRole('textbox'));
+ await userEvent.click(within(branchSelect).getByRole('combobox'));
await waitFor(() => expect(getByText('main')).toBeVisible());
await userEvent.click(getByText('main'));
@@ -137,7 +137,7 @@ describe('SettingsSourceControl', () => {
expect(refreshSshKeyButton).toBeVisible();
});
- await userEvent.click(within(sshKeyTypeSelect).getByRole('textbox'));
+ await userEvent.click(within(sshKeyTypeSelect).getByRole('combobox'));
await waitFor(() => expect(getByText('RSA')).toBeVisible());
await userEvent.click(getByText('RSA'));
await userEvent.click(refreshSshKeyButton);
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 87083a81cd..256b992fa2 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
{
"name": "n8n-node-dev",
- "version": "1.55.0",
+ "version": "1.56.0",
"description": "CLI to simplify n8n credentials/node development",
"main": "dist/src/index",
"types": "dist/src/index.d.ts",
diff --git a/packages/nodes-base/credentials/CrateDb.credentials.ts b/packages/nodes-base/credentials/CrateDb.credentials.ts
index 8993f58b76..8b5aa627be 100644
--- a/packages/nodes-base/credentials/CrateDb.credentials.ts
+++ b/packages/nodes-base/credentials/CrateDb.credentials.ts
@@ -52,14 +52,6 @@ export class CrateDb implements ICredentialType {
name: 'Require',
value: 'require',
},
- {
- name: 'Verify (Not Implemented)',
- value: 'verify',
- },
- {
- name: 'Verify-Full (Not Implemented)',
- value: 'verify-full',
- },
],
default: 'disable',
},
diff --git a/packages/nodes-base/credentials/Postgres.credentials.ts b/packages/nodes-base/credentials/Postgres.credentials.ts
index d8916475b3..12eaddd5f4 100644
--- a/packages/nodes-base/credentials/Postgres.credentials.ts
+++ b/packages/nodes-base/credentials/Postgres.credentials.ts
@@ -65,14 +65,6 @@ export class Postgres implements ICredentialType {
name: 'Require',
value: 'require',
},
- {
- name: 'Verify (Not Implemented)',
- value: 'verify',
- },
- {
- name: 'Verify-Full (Not Implemented)',
- value: 'verify-full',
- },
],
default: 'disable',
},
diff --git a/packages/nodes-base/credentials/QuestDb.credentials.ts b/packages/nodes-base/credentials/QuestDb.credentials.ts
index d44ecdaea9..4f763c394f 100644
--- a/packages/nodes-base/credentials/QuestDb.credentials.ts
+++ b/packages/nodes-base/credentials/QuestDb.credentials.ts
@@ -52,14 +52,6 @@ export class QuestDb implements ICredentialType {
name: 'Require',
value: 'require',
},
- {
- name: 'Verify (Not Implemented)',
- value: 'verify',
- },
- {
- name: 'Verify-Full (Not Implemented)',
- value: 'verify-full',
- },
],
default: 'disable',
},
diff --git a/packages/nodes-base/credentials/TimescaleDb.credentials.ts b/packages/nodes-base/credentials/TimescaleDb.credentials.ts
index 5211e942b7..04226a8d04 100644
--- a/packages/nodes-base/credentials/TimescaleDb.credentials.ts
+++ b/packages/nodes-base/credentials/TimescaleDb.credentials.ts
@@ -64,14 +64,6 @@ export class TimescaleDb implements ICredentialType {
name: 'Require',
value: 'require',
},
- {
- name: 'Verify (Not Implemented)',
- value: 'verify',
- },
- {
- name: 'Verify-Full (Not Implemented)',
- value: 'verify-full',
- },
],
default: 'disable',
},
diff --git a/packages/nodes-base/credentials/TogglApi.credentials.ts b/packages/nodes-base/credentials/TogglApi.credentials.ts
index eb4eb5b4a6..30145b168c 100644
--- a/packages/nodes-base/credentials/TogglApi.credentials.ts
+++ b/packages/nodes-base/credentials/TogglApi.credentials.ts
@@ -1,4 +1,9 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+import type {
+ IAuthenticateGeneric,
+ ICredentialTestRequest,
+ ICredentialType,
+ INodeProperties,
+} from 'n8n-workflow';
export class TogglApi implements ICredentialType {
name = 'togglApi';
@@ -9,7 +14,7 @@ export class TogglApi implements ICredentialType {
properties: INodeProperties[] = [
{
- displayName: 'Username',
+ displayName: 'Email Address',
name: 'username',
type: 'string',
default: '',
@@ -22,4 +27,21 @@ export class TogglApi implements ICredentialType {
default: '',
},
];
+
+ authenticate: IAuthenticateGeneric = {
+ type: 'generic',
+ properties: {
+ auth: {
+ username: '={{$credentials.username}}',
+ password: '={{$credentials.password}}',
+ },
+ },
+ };
+
+ test: ICredentialTestRequest = {
+ request: {
+ baseURL: 'https://api.track.toggl.com/api/v9',
+ url: '/me',
+ },
+ };
}
diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
index e272caee93..c6328fa801 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
@@ -116,7 +116,7 @@ export class CalendlyTrigger implements INodeType {
async checkExists(this: IHookFunctions): Promise${convertionFunction}`;
+ return `
+Try either:
+-
+
- Enabling less strict type validation +
- Converting the ${valuePosition} field to ${expectedType}${suggestFunction} +