+
+
+
+
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
new file mode 100644
index 0000000000..33a966b4b7
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+ {{ locale.baseText('testDefinition.edit.step.intro') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
new file mode 100644
index 0000000000..9aeb70679b
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
@@ -0,0 +1,208 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import TestDefinitionEditView from '@/views/TestDefinition/TestDefinitionEditView.vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useToast } from '@/composables/useToast';
+import { useTestDefinitionForm } from '@/components/TestDefinition/composables/useTestDefinitionForm';
+import { useAnnotationTagsStore } from '@/stores/tags.store';
+import { ref, nextTick } from 'vue';
+
+vi.mock('vue-router');
+vi.mock('@/composables/useToast');
+vi.mock('@/components/TestDefinition/composables/useTestDefinitionForm');
+vi.mock('@/stores/tags.store');
+vi.mock('@/stores/projects.store');
+
+describe('TestDefinitionEditView', () => {
+ const renderComponent = createComponentRenderer(TestDefinitionEditView);
+
+ beforeEach(() => {
+ setActivePinia(createPinia());
+
+ vi.mocked(useRoute).mockReturnValue({
+ params: {},
+ path: '/test-path',
+ name: 'test-route',
+ } as ReturnType
+
+
+
+
- {{ i18n.baseText('menuActions.badge.alpha') }}
+ {{ i18n.baseText('menuActions.badge.beta') }}
- {{ i18n.baseText('menuActions.nodeViewDiscovery.tooltip') }}
+ {{ i18n.baseText('menuActions.nodeViewDiscovery.tooltip') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/editor-ui/src/components/VirtualSchemaHeader.vue b/packages/editor-ui/src/components/VirtualSchemaHeader.vue
new file mode 100644
index 0000000000..677f88ba5c
--- /dev/null
+++ b/packages/editor-ui/src/components/VirtualSchemaHeader.vue
@@ -0,0 +1,104 @@
+
+
+
+
+ {{ i18n.baseText('ndv.search.noNodeMatch.title') }}
+
+
+
+
+ {{ i18n.baseText('ndv.search.noMatch.description.link') }}
+
+
+
+
+
+
+ {{ i18n.baseText('ndv.search.noMatchSchema.description') }}
+
+
+
+
+
+
+
+
diff --git a/packages/editor-ui/src/components/VirtualSchemaItem.vue b/packages/editor-ui/src/components/VirtualSchemaItem.vue
new file mode 100644
index 0000000000..84e9a49b8c
--- /dev/null
+++ b/packages/editor-ui/src/components/VirtualSchemaItem.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+ {{ title }}
+ {{ info }}
+
+
+ {{ i18n.baseText('ndv.output.items', { interpolate: { count: itemCount } }) }}
+
+
+
+
+
+
diff --git a/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
new file mode 100644
index 0000000000..7c1fa63139
--- /dev/null
+++ b/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
@@ -0,0 +1,1256 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`RunDataSchema.vue > renders previous nodes schema for AI tools 1`] = `
+
+
+
+
+
+
+
+
+`;
+
+exports[`RunDataSchema.vue > renders schema for correct output branch 1`] = `
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ If
+
+
+
+
+ 2 items
+
+
+
+`;
+
+exports[`RunDataSchema.vue > renders schema in output pane 1`] = `
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ If
+
+
+
+
+ 2 items
+
+
+
+`;
+
+exports[`RunDataSchema.vue > renders schema with spaces and dots 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ John
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 22
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ surfing
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ traveling
+
+
+
+
+
+`;
diff --git a/packages/editor-ui/src/composables/useDataSchema.test.ts b/packages/editor-ui/src/composables/useDataSchema.test.ts
index 3c685550c7..212f767675 100644
--- a/packages/editor-ui/src/composables/useDataSchema.test.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.test.ts
@@ -1,5 +1,5 @@
import jp from 'jsonpath';
-import { useDataSchema } from '@/composables/useDataSchema';
+import { useDataSchema, useFlattenSchema } from '@/composables/useDataSchema';
import type { IExecutionResponse, INodeUi, Schema } from '@/Interface';
import { setActivePinia } from 'pinia';
import { createTestingPinia } from '@pinia/testing';
@@ -649,3 +649,39 @@ describe('useDataSchema', () => {
);
});
});
+
+describe('useFlattenSchema', () => {
+ it('flattens a schema', () => {
+ const schema: Schema = {
+ path: '',
+ type: 'object',
+ value: [
+ {
+ key: 'obj',
+ path: '.obj',
+ type: 'object',
+ value: [
+ {
+ key: 'foo',
+ path: '.obj.foo',
+ type: 'object',
+ value: [
+ {
+ key: 'nested',
+ path: '.obj.foo.nested',
+ type: 'string',
+ value: 'bar',
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ };
+ expect(
+ useFlattenSchema().flattenSchema({
+ schema,
+ }).length,
+ ).toBe(3);
+ });
+});
diff --git a/packages/editor-ui/src/composables/useDataSchema.ts b/packages/editor-ui/src/composables/useDataSchema.ts
index 8b20ab93fc..8896f8dd7e 100644
--- a/packages/editor-ui/src/composables/useDataSchema.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.ts
@@ -1,15 +1,18 @@
+import { ref } from 'vue';
import type { Optional, Primitives, Schema, INodeUi } from '@/Interface';
import {
type ITaskDataConnections,
type IDataObject,
type INodeExecutionData,
+ type INodeTypeDescription,
NodeConnectionType,
} from 'n8n-workflow';
import { merge } from 'lodash-es';
-import { generatePath } from '@/utils/mappingUtils';
+import { generatePath, getMappedExpression } from '@/utils/mappingUtils';
import { isObj } from '@/utils/typeGuards';
import { useWorkflowsStore } from '@/stores/workflows.store';
-import { isPresent } from '@/utils/typesUtils';
+import { isPresent, shorten } from '@/utils/typesUtils';
+import { useI18n } from '@/composables/useI18n';
export function useDataSchema() {
function getSchema(
@@ -166,3 +169,208 @@ export function useDataSchema() {
filterSchema,
};
}
+
+export type SchemaNode = {
+ node: INodeUi;
+ nodeType: INodeTypeDescription;
+ depth: number;
+ connectedOutputIndexes: number[];
+ itemsCount: number;
+ schema: Schema;
+};
+
+export type RenderItem = {
+ title?: string;
+ path?: string;
+ level?: number;
+ depth?: number;
+ expression?: string;
+ value?: string;
+ id: string;
+ icon: string;
+ collapsable?: boolean;
+ nodeType?: INodeUi['type'];
+ type: 'item';
+};
+
+export type RenderHeader = {
+ id: string;
+ title: string;
+ info?: string;
+ collapsable: boolean;
+ nodeType: INodeTypeDescription;
+ itemCount: number | null;
+ type: 'header';
+};
+
+type Renders = RenderHeader | RenderItem;
+
+const icons = {
+ object: 'cube',
+ array: 'list',
+ ['string']: 'font',
+ null: 'font',
+ ['number']: 'hashtag',
+ ['boolean']: 'check-square',
+ function: 'code',
+ bigint: 'calculator',
+ symbol: 'sun',
+ ['undefined']: 'ban',
+} as const;
+
+const getIconBySchemaType = (type: Schema['type']): string => icons[type];
+
+const emptyItem = (): RenderItem => ({
+ id: `empty-${window.crypto.randomUUID()}`,
+ icon: '',
+ value: useI18n().baseText('dataMapping.schemaView.emptyData'),
+ type: 'item',
+});
+
+const isDataEmpty = (schema: Schema) => {
+ // Utilize the generated schema instead of looping over the entire data again
+ // The schema for empty data is { type: 'object', value: [] }
+ const isObjectOrArray = schema.type === 'object';
+ const isEmpty = Array.isArray(schema.value) && schema.value.length === 0;
+
+ return isObjectOrArray && isEmpty;
+};
+
+const prefixTitle = (title: string, prefix?: string) => (prefix ? `${prefix}[${title}]` : title);
+
+export const useFlattenSchema = () => {
+ const closedNodes = ref
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ Manual Trigger
+
+
+
+ 1 item
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ignore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ Set2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No fields - item(s) exist, but they're empty
+
+
+
+
+
+
+
+ {{ headerText }}
+
+
+
+
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
index f1aa96ebaa..cefaee033a 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
@@ -6,9 +6,16 @@ import { faker } from '@faker-js/faker';
import { STORES, VIEWS } from '@/constants';
import ExecutionsList from '@/components/executions/global/GlobalExecutionsList.vue';
import { randomInt, type ExecutionSummary } from 'n8n-workflow';
-import { retry, SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
+import type { MockedStore } from '@/__tests__/utils';
+import {
+ mockedStore,
+ retry,
+ SETTINGS_STORE_DEFAULT_STATE,
+ waitAllPromises,
+} from '@/__tests__/utils';
import { createComponentRenderer } from '@/__tests__/render';
import { waitFor } from '@testing-library/vue';
+import { useSettingsStore } from '@/stores/settings.store';
vi.mock('vue-router', () => ({
useRoute: vi.fn().mockReturnValue({
@@ -18,7 +25,7 @@ vi.mock('vue-router', () => ({
RouterLink: vi.fn(),
}));
-let pinia: ReturnType
+ {{ tooltipText }}
+
+ {{ i18n.baseText('generic.upgradeNow') }}
+
+
+
+
+ (),
{
selected: false,
@@ -42,6 +43,10 @@ const isRunning = computed(() => {
return props.execution.status === 'running';
});
+const isQueued = computed(() => {
+ return props.execution.status === 'new';
+});
+
const isWaitTillIndefinite = computed(() => {
if (!props.execution.waitTill) {
return false;
@@ -80,6 +85,12 @@ const formattedStoppedAtDate = computed(() => {
});
const statusTooltipText = computed(() => {
+ if (isQueued.value) {
+ return i18n.baseText('executionsList.statusTooltipText.waitingForConcurrencyCapacity', {
+ interpolate: { concurrencyCap: props.concurrencyCap },
+ });
+ }
+
if (props.execution.status === 'waiting' && isWaitTillIndefinite.value) {
return i18n.baseText('executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely');
}
@@ -178,7 +189,7 @@ async function handleActionItemClick(commandData: Command) {
{
+ const location = {};
+ return {
+ useRouter: vi.fn(),
+ useRoute: () => ({
+ location,
+ }),
+ RouterLink: {
+ template: ';
+
+describe('WorkflowExecutionsSidebar', () => {
+ beforeEach(() => {
+ settingsStore = mockedStore(useSettingsStore);
+ });
+
+ it('should not throw error when opened', async () => {
+ expect(() =>
+ renderComponent({
+ props: {
+ loading: false,
+ loadingMore: false,
+ executions: [],
+ },
+ }),
+ ).not.toThrow();
+ });
+
+ it('should render concurrent executions header if the feature is enabled', async () => {
+ settingsStore.concurrency = 5;
+ const { getByTestId } = renderComponent({
+ props: {
+ loading: false,
+ loadingMore: false,
+ executions: [],
+ },
+ });
+
+ expect(getByTestId('concurrent-executions-header')).toBeVisible();
+ });
+});
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
index 6dc874d9b9..443a3d0f5d 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
@@ -13,6 +13,8 @@ import type { ExecutionFilterType, IWorkflowDb } from '@/Interface';
import { isComponentPublicInstance } from '@/utils/typeGuards';
import { getResourcePermissions } from '@/permissions';
import { useI18n } from '@/composables/useI18n';
+import { useSettingsStore } from '@/stores/settings.store';
+import ConcurrentExecutionsHeader from '@/components/executions/ConcurrentExecutionsHeader.vue';
type AutoScrollDeps = { activeExecutionSet: boolean; cardsMounted: boolean; scroll: boolean };
@@ -36,6 +38,7 @@ const router = useRouter();
const i18n = useI18n();
const executionsStore = useExecutionsStore();
+const settingsStore = useSettingsStore();
const mountedItems = ref([]);
const autoScrollDeps = ref({
@@ -49,6 +52,10 @@ const executionListRef = ref(null);
const workflowPermissions = computed(() => getResourcePermissions(props.workflow?.scopes).workflow);
+const runningExecutionsCount = computed(() => {
+ return props.executions.filter((execution) => execution.status === 'running').length;
+});
+
watch(
() => route,
(to: RouteLocationNormalizedLoaded, from: RouteLocationNormalizedLoaded) => {
@@ -174,6 +181,12 @@ function scrollToActiveCard(): void {
{{ i18n.baseText('generic.executions') }}
+
+