mirror of
https://github.com/n8n-io/n8n.git
synced 2025-03-05 20:50:17 -08:00
fix(editor): Change tooltip for workflow with execute workflow trigger (#11374)
This commit is contained in:
parent
60cdf0ba44
commit
dcd6038c30
82
packages/editor-ui/src/components/WorkflowActivator.test.ts
Normal file
82
packages/editor-ui/src/components/WorkflowActivator.test.ts
Normal file
|
@ -0,0 +1,82 @@
|
||||||
|
import { describe, it, expect, vi } from 'vitest';
|
||||||
|
import WorkflowActivator from '@/components/WorkflowActivator.vue';
|
||||||
|
import userEvent from '@testing-library/user-event';
|
||||||
|
|
||||||
|
import { useWorkflowsStore } from '@/stores/workflows.store';
|
||||||
|
|
||||||
|
import { createTestingPinia } from '@pinia/testing';
|
||||||
|
import { createComponentRenderer } from '@/__tests__/render';
|
||||||
|
import { mockedStore } from '@/__tests__/utils';
|
||||||
|
import { EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE } from '@/constants';
|
||||||
|
|
||||||
|
const renderComponent = createComponentRenderer(WorkflowActivator);
|
||||||
|
let mockWorkflowsStore: ReturnType<typeof mockedStore<typeof useWorkflowsStore>>;
|
||||||
|
|
||||||
|
describe('WorkflowActivator', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
createTestingPinia();
|
||||||
|
|
||||||
|
mockWorkflowsStore = mockedStore(useWorkflowsStore);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders correctly', () => {
|
||||||
|
const renderOptions = {
|
||||||
|
props: {
|
||||||
|
workflowActive: false,
|
||||||
|
workflowId: '1',
|
||||||
|
workflowPermissions: { update: true },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const { getByTestId, getByRole } = renderComponent(renderOptions);
|
||||||
|
expect(getByTestId('workflow-activator-status')).toBeInTheDocument();
|
||||||
|
expect(getByRole('switch')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('display an inactive tooltip when there are no nodes available', async () => {
|
||||||
|
mockWorkflowsStore.workflowId = '1';
|
||||||
|
|
||||||
|
const { getByTestId, getByRole } = renderComponent({
|
||||||
|
props: {
|
||||||
|
workflowActive: false,
|
||||||
|
workflowId: '1',
|
||||||
|
workflowPermissions: { update: true },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await userEvent.hover(getByRole('switch'));
|
||||||
|
expect(getByRole('tooltip')).toBeInTheDocument();
|
||||||
|
|
||||||
|
expect(getByRole('tooltip')).toHaveTextContent(
|
||||||
|
'This workflow has no trigger nodes that require activation',
|
||||||
|
);
|
||||||
|
expect(getByTestId('workflow-activator-status')).toHaveTextContent('Inactive');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('display an inactive tooltip when only execute workflow trigger is available', async () => {
|
||||||
|
mockWorkflowsStore.workflowId = '1';
|
||||||
|
mockWorkflowsStore.workflowTriggerNodes = [
|
||||||
|
{ type: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE, disabled: false } as never,
|
||||||
|
];
|
||||||
|
|
||||||
|
const { getByTestId, getByRole } = renderComponent({
|
||||||
|
props: {
|
||||||
|
workflowActive: false,
|
||||||
|
workflowId: '1',
|
||||||
|
workflowPermissions: { update: true },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await userEvent.hover(getByRole('switch'));
|
||||||
|
expect(getByRole('tooltip')).toBeInTheDocument();
|
||||||
|
|
||||||
|
expect(getByRole('tooltip')).toHaveTextContent(
|
||||||
|
"Execute Workflow Trigger' doesn't require activation as it is triggered by another workflow",
|
||||||
|
);
|
||||||
|
expect(getByTestId('workflow-activator-status')).toHaveTextContent('Inactive');
|
||||||
|
});
|
||||||
|
});
|
|
@ -7,7 +7,7 @@ import type { VNode } from 'vue';
|
||||||
import { computed, h } from 'vue';
|
import { computed, h } from 'vue';
|
||||||
import { useI18n } from '@/composables/useI18n';
|
import { useI18n } from '@/composables/useI18n';
|
||||||
import type { PermissionsRecord } from '@/permissions';
|
import type { PermissionsRecord } from '@/permissions';
|
||||||
import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
|
import { EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
|
||||||
import WorkflowActivationErrorMessage from './WorkflowActivationErrorMessage.vue';
|
import WorkflowActivationErrorMessage from './WorkflowActivationErrorMessage.vue';
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
|
@ -43,6 +43,17 @@ const containsTrigger = computed((): boolean => {
|
||||||
return foundTriggers.length > 0;
|
return foundTriggers.length > 0;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const containsOnlyExecuteWorkflowTrigger = computed((): boolean => {
|
||||||
|
const foundActiveTriggers = workflowsStore.workflowTriggerNodes.filter(
|
||||||
|
(trigger) => !trigger.disabled,
|
||||||
|
);
|
||||||
|
const foundTriggers = foundActiveTriggers.filter(
|
||||||
|
(trigger) => trigger.type === EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
|
||||||
|
);
|
||||||
|
|
||||||
|
return foundTriggers.length > 0 && foundTriggers.length === foundActiveTriggers.length;
|
||||||
|
});
|
||||||
|
|
||||||
const isNewWorkflow = computed(
|
const isNewWorkflow = computed(
|
||||||
() =>
|
() =>
|
||||||
!props.workflowId ||
|
!props.workflowId ||
|
||||||
|
@ -109,7 +120,13 @@ async function displayActivationError() {
|
||||||
<n8n-tooltip :disabled="!disabled" placement="bottom">
|
<n8n-tooltip :disabled="!disabled" placement="bottom">
|
||||||
<template #content>
|
<template #content>
|
||||||
<div>
|
<div>
|
||||||
{{ i18n.baseText('workflowActivator.thisWorkflowHasNoTriggerNodes') }}
|
{{
|
||||||
|
i18n.baseText(
|
||||||
|
containsOnlyExecuteWorkflowTrigger
|
||||||
|
? 'workflowActivator.thisWorkflowHasOnlyOneExecuteWorkflowTriggerNode'
|
||||||
|
: 'workflowActivator.thisWorkflowHasNoTriggerNodes',
|
||||||
|
)
|
||||||
|
}}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<el-switch
|
<el-switch
|
||||||
|
|
|
@ -2101,6 +2101,7 @@
|
||||||
"workflowActivator.showMessage.displayActivationError.title": "Problem activating workflow",
|
"workflowActivator.showMessage.displayActivationError.title": "Problem activating workflow",
|
||||||
"workflowActivator.theWorkflowIsSetToBeActiveBut": "The workflow is activated but could not be started.<br />Click to display error message.",
|
"workflowActivator.theWorkflowIsSetToBeActiveBut": "The workflow is activated but could not be started.<br />Click to display error message.",
|
||||||
"workflowActivator.thisWorkflowHasNoTriggerNodes": "This workflow has no trigger nodes that require activation",
|
"workflowActivator.thisWorkflowHasNoTriggerNodes": "This workflow has no trigger nodes that require activation",
|
||||||
|
"workflowActivator.thisWorkflowHasOnlyOneExecuteWorkflowTriggerNode": "'Execute Workflow Trigger' doesn't require activation as it is triggered by another workflow",
|
||||||
"workflowDetails.share": "Share",
|
"workflowDetails.share": "Share",
|
||||||
"workflowDetails.active": "Active",
|
"workflowDetails.active": "Active",
|
||||||
"workflowDetails.addTag": "Add tag",
|
"workflowDetails.addTag": "Add tag",
|
||||||
|
|
Loading…
Reference in a new issue