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

show trigger warning tooltip

Browse source
This commit is contained in:
Mutasem 2022-04-06 08:54:32 +02:00
parent cf563e567d
commit f783eb35d4
3 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
packages/editor-ui/src/components/DataDisplay.vue
View file

@ -7,7 +7,7 @@
width="85%" width="85%"
append-to-body append-to-body
> >
<n8n-tooltip placement="bottom-start" :disabled="!triggerWaitingWarningEnabled"> <n8n-tooltip placement="bottom-start" :value="showTriggerWaitingWarning" :disabled="!showTriggerWaitingWarning" :manual="true">
<div slot="content" :class="$style.triggerWarning">{{ $locale.baseText('node.backToCanvas.waitingForTriggerWarning') }}</div> <div slot="content" :class="$style.triggerWarning">{{ $locale.baseText('node.backToCanvas.waitingForTriggerWarning') }}</div>
<div :class="$style.backToCanvas" @click="close"> <div :class="$style.backToCanvas" @click="close">
<n8n-icon icon="arrow-left" color="text-xlight" size="small" /> <n8n-icon icon="arrow-left" color="text-xlight" size="small" />
@ -16,7 +16,7 @@
</n8n-tooltip> </n8n-tooltip>
<div class="data-display" v-if="node" > <div class="data-display" v-if="node" >
<NodeSettings :eventBus="settingsEventBus" @valueChanged="valueChanged" /> <NodeSettings :eventBus="settingsEventBus" @valueChanged="valueChanged" @execute="onNodeExecute" />
<RunData @openSettings="openSettings" /> <RunData @openSettings="openSettings" />
</div> </div>
</el-dialog> </el-dialog>
@ -40,6 +40,7 @@ import RunData from '@/components/RunData.vue';
import mixins from 'vue-typed-mixins'; import mixins from 'vue-typed-mixins';
import Vue from 'vue'; import Vue from 'vue';
import { mapGetters } from 'vuex';
export default mixins(externalHooks, nodeHelpers, workflowHelpers).extend({ export default mixins(externalHooks, nodeHelpers, workflowHelpers).extend({
name: 'DataDisplay', name: 'DataDisplay',
@ -54,6 +55,13 @@ export default mixins(externalHooks, nodeHelpers, workflowHelpers).extend({
}; };
}, },
computed: { computed: {
...mapGetters(['executionWaitingForWebhook']),
workflowRunning (): boolean {
return this.$store.getters.isActionActive('workflowRunning');
},
showTriggerWaitingWarning(): boolean {
return this.triggerWaitingWarningEnabled && !!this.nodeType && !this.nodeType.group.includes('trigger') && this.workflowRunning && this.executionWaitingForWebhook;
},
node (): INodeUi { node (): INodeUi {
return this.$store.getters.activeNode; return this.$store.getters.activeNode;
}, },
@ -67,6 +75,7 @@ export default mixins(externalHooks, nodeHelpers, workflowHelpers).extend({
watch: { watch: {
node (node, oldNode) { node (node, oldNode) {
if(node && !oldNode) { if(node && !oldNode) {
this.triggerWaitingWarningEnabled = false;
this.$externalHooks().run('dataDisplay.nodeTypeChanged', { nodeSubtitle: this.getNodeSubtitle(node, this.nodeType, this.getWorkflow()) }); this.$externalHooks().run('dataDisplay.nodeTypeChanged', { nodeSubtitle: this.getNodeSubtitle(node, this.nodeType, this.getWorkflow()) });
this.$telemetry.track('User opened node modal', { node_type: this.nodeType ? this.nodeType.name : '', workflow_id: this.$store.getters.workflowId }); this.$telemetry.track('User opened node modal', { node_type: this.nodeType ? this.nodeType.name : '', workflow_id: this.$store.getters.workflowId });
} }
@ -76,6 +85,14 @@ export default mixins(externalHooks, nodeHelpers, workflowHelpers).extend({
}, },
}, },
methods: { methods: {
onNodeExecute() {
setTimeout(() => {
if (!this.node || !this.workflowRunning) {
return;
}
this.triggerWaitingWarningEnabled = true;
}, 1000);
},
openSettings() { openSettings() {
this.settingsEventBus.$emit('openSettings'); this.settingsEventBus.$emit('openSettings');
}, },

8
packages/editor-ui/src/components/NodeExecuteButton.vue
View file

@ -3,7 +3,7 @@
:title="$locale.baseText('node.execute.hint', { interpolate: { nodeName } })" :title="$locale.baseText('node.execute.hint', { interpolate: { nodeName } })"
:loading="workflowRunning" :loading="workflowRunning"
:label="workflowRunning? $locale.baseText('node.execute.executing') : $locale.baseText('node.execute.executeNode')" :label="workflowRunning? $locale.baseText('node.execute.executing') : $locale.baseText('node.execute.executeNode')"
@click.stop="runWorkflow(nodeName, 'RunData.ExecuteNodeButton')" @click="onClick"
/> />
</template> </template>
@ -24,5 +24,11 @@ export default mixins(
return this.$store.getters.isActionActive('workflowRunning'); return this.$store.getters.isActionActive('workflowRunning');
}, },
}, },
methods: {
onClick() {
this.runWorkflow(this.nodeName, 'RunData.ExecuteNodeButton');
this.$emit('execute');
},
},
}); });
</script> </script>

6
packages/editor-ui/src/components/NodeSettings.vue
View file

@ -6,7 +6,7 @@
<div <div
v-if="!isReadOnly" v-if="!isReadOnly"
> >
<NodeExecuteButton :nodeName="node.name" /> <NodeExecuteButton :nodeName="node.name" @execute="onNodeExecute" />
</div> </div>
</div> </div>
<NodeTabs v-model="openPanel" :nodeType="nodeType" /> <NodeTabs v-model="openPanel" :nodeType="nodeType" />
@ -270,7 +270,9 @@ export default mixins(
}, },
}, },
methods: { methods: {
noOp () {}, onNodeExecute () {
this.$emit('execute');
},
setValue (name: string, value: NodeParameterValue) { setValue (name: string, value: NodeParameterValue) {
const nameParts = name.split('.'); const nameParts = name.split('.');
let lastNamePart: string | undefined = nameParts.pop(); let lastNamePart: string | undefined = nameParts.pop();