mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-02 07:01:30 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up subworkflow code

Browse source
This commit is contained in:
Elias Meire 2024-10-30 13:10:28 +01:00
parent b6c6b4a7a0
commit 72a5ad370f
No known key found for this signature in database
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
packages/editor-ui/src/views/NodeView.v2.vue
View file

@ -13,7 +13,7 @@ import {
h, h,
onBeforeUnmount, onBeforeUnmount,
} from 'vue'; } from 'vue';
import { RouteLocationRaw, useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import WorkflowCanvas from '@/components/canvas/WorkflowCanvas.vue'; import WorkflowCanvas from '@/components/canvas/WorkflowCanvas.vue';
import { useNodeTypesStore } from '@/stores/nodeTypes.store'; import { useNodeTypesStore } from '@/stores/nodeTypes.store';
import { useUIStore } from '@/stores/ui.store'; import { useUIStore } from '@/stores/ui.store';
@ -67,14 +67,7 @@ import { useSourceControlStore } from '@/stores/sourceControl.store';
import { useNodeCreatorStore } from '@/stores/nodeCreator.store'; import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
import { useExternalHooks } from '@/composables/useExternalHooks'; import { useExternalHooks } from '@/composables/useExternalHooks';
import { TelemetryHelpers, NodeConnectionType, jsonParse } from 'n8n-workflow'; import { TelemetryHelpers, NodeConnectionType, jsonParse } from 'n8n-workflow';
import type { import type { IDataObject, ExecutionSummary, IConnection, IWorkflowBase } from 'n8n-workflow';
IDataObject,
ExecutionSummary,
IConnection,
IWorkflowBase,
IResourceLocatorResult,
INodeParameterResourceLocator,
} from 'n8n-workflow';
import { useToast } from '@/composables/useToast'; import { useToast } from '@/composables/useToast';
import { useSettingsStore } from '@/stores/settings.store'; import { useSettingsStore } from '@/stores/settings.store';
import { useCredentialsStore } from '@/stores/credentials.store'; import { useCredentialsStore } from '@/stores/credentials.store';
@ -114,7 +107,7 @@ import { useBeforeUnload } from '@/composables/useBeforeUnload';
import { getResourcePermissions } from '@/permissions'; import { getResourcePermissions } from '@/permissions';
import NodeViewUnfinishedWorkflowMessage from '@/components/NodeViewUnfinishedWorkflowMessage.vue'; import NodeViewUnfinishedWorkflowMessage from '@/components/NodeViewUnfinishedWorkflowMessage.vue';
import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2'; import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
import { isValidNodeConnectionType } from '@/utils/typeGuards'; import { isResourceLocatorValue, isValidNodeConnectionType } from '@/utils/typeGuards';
import 'ninja-keys'; import 'ninja-keys';
import { useActionsGenerator } from '@/components/Node/NodeCreator/composables/useActionsGeneration'; import { useActionsGenerator } from '@/components/Node/NodeCreator/composables/useActionsGeneration';
import { get } from 'lodash-es'; import { get } from 'lodash-es';
@ -1682,7 +1675,14 @@ const allTemplateCommand = computed<NinjaKeysCommand[]>(() => {
const subworkflowCommands = computed<NinjaKeysCommand[]>(() => { const subworkflowCommands = computed<NinjaKeysCommand[]>(() => {
const subworkflows = editableWorkflow.value.nodes const subworkflows = editableWorkflow.value.nodes
.filter((node) => node.type === EXECUTE_WORKFLOW_NODE_TYPE) .filter((node) => node.type === EXECUTE_WORKFLOW_NODE_TYPE)
.map((node) => get(node, 'parameters.workflowId') as INodeParameterResourceLocator); .map((node) => get(node, 'parameters.workflowId'))
.filter(
(rlValue): rlValue is { value: string; cachedResultName: string } =>
isResourceLocatorValue(rlValue) &&
typeof rlValue.value === 'string' &&
typeof rlValue.cachedResultName === 'string',
)
.map(({ value, cachedResultName }) => ({ id: value, name: cachedResultName }));
if (subworkflows.length === 0) { if (subworkflows.length === 0) {
return []; return [];
@ -1692,16 +1692,16 @@ const subworkflowCommands = computed<NinjaKeysCommand[]>(() => {
{ {
id: 'Open subworkflow', id: 'Open subworkflow',
title: 'Open subworkflow', title: 'Open subworkflow',
children: subworkflows.map((workflow) => workflow.value as string), children: subworkflows.map((workflow) => workflow.id),
}, },
...subworkflows.map((workflow) => ({ ...subworkflows.map((workflow) => ({
id: workflow.value as string, id: workflow.id,
title: workflow.cachedResultName as string, title: workflow.name,
parent: 'Open subworkflow', parent: 'Open subworkflow',
handler: () => { handler: () => {
const { href } = router.resolve({ const { href } = router.resolve({
name: VIEWS.WORKFLOW, name: VIEWS.WORKFLOW,
params: { name: workflow.value as string }, params: { name: workflow.id },
}); });
window.open(href, '_blank', 'noreferrer'); window.open(href, '_blank', 'noreferrer');
}, },