mirror of
https://github.com/n8n-io/n8n.git
synced 2024-11-16 01:24:05 -08:00
6b2db8e4f4
* Init unit tests for telemetry * Update telemetry tests * Test Workflow execution errored event * Add new tracking logic in pulse * cleanup * interfaces * Add event_version for Workflow execution count event * add version_cli in all events * add user saved credentials event * update manual wf exec finished, fixes * improve typings, lint * add node_graph_string in User clicked execute workflow button event * add User set node operation or mode event * Add instance started event in FE * Add User clicked retry execution button event * add expression editor event * add input node type to add node event * add User stopped workflow execution wvent * add error message in saved credential event * update stop execution event * add execution preflight event * Remove instance started even tfrom FE, add session started to FE,BE * improve typing * remove node_graph as property from all events * move back from default export * move psl npm package to cli package * cr * update webhook node domain logic * fix is_valid for User saved credentials event * fix Expression Editor variable selector event * add caused_by_credential in preflight event * undo webhook_domain * change node_type to full type * add webhook_domain property in manual execution event (#3680) * add webhook_domain property in manual execution event * lint fix
248 lines
7.2 KiB
Vue
248 lines
7.2 KiB
Vue
<template>
|
|
<div v-if="dialogVisible" @keydown.stop>
|
|
<el-dialog :visible="dialogVisible" custom-class="expression-dialog classic" append-to-body width="80%" :title="$locale.baseText('expressionEdit.editExpression')" :before-close="closeDialog">
|
|
<el-row>
|
|
<el-col :span="8">
|
|
<div class="header-side-menu">
|
|
<div class="headline">
|
|
{{ $locale.baseText('expressionEdit.editExpression') }}
|
|
</div>
|
|
<div class="sub-headline">
|
|
{{ $locale.baseText('expressionEdit.variableSelector') }}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="variable-selector">
|
|
<variable-selector :path="path" @itemSelected="itemSelected"></variable-selector>
|
|
</div>
|
|
</el-col>
|
|
<el-col :span="16" class="right-side">
|
|
<div class="expression-editor-wrapper">
|
|
<div class="editor-description">
|
|
{{ $locale.baseText('expressionEdit.expression') }}
|
|
</div>
|
|
<div class="expression-editor">
|
|
<expression-input :parameter="parameter" ref="inputFieldExpression" rows="8" :value="value" :path="path" @change="valueChanged" @keydown.stop="noOp"></expression-input>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="expression-result-wrapper">
|
|
<div class="editor-description">
|
|
{{ $locale.baseText('expressionEdit.result') }}
|
|
</div>
|
|
<expression-input :parameter="parameter" resolvedValue="true" ref="expressionResult" rows="8" :value="displayValue" :path="path"></expression-input>
|
|
</div>
|
|
|
|
</el-col>
|
|
</el-row>
|
|
|
|
</el-dialog>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts">
|
|
import ExpressionInput from '@/components/ExpressionInput.vue';
|
|
import VariableSelector from '@/components/VariableSelector.vue';
|
|
|
|
import { IVariableItemSelected } from '@/Interface';
|
|
|
|
import { externalHooks } from '@/components/mixins/externalHooks';
|
|
import { genericHelpers } from '@/components/mixins/genericHelpers';
|
|
|
|
import mixins from 'vue-typed-mixins';
|
|
|
|
const MAPPING_PARAMS = [`$evaluateExpression`, `$item`, `$jmespath`, `$node`, `$binary`, `$data`, `$env`, `$json`, `$now`, `$parameters`, `$position`, `$resumeWebhookUrl`, `$runIndex`, `$today`, `$workflow`];
|
|
|
|
export default mixins(
|
|
externalHooks,
|
|
genericHelpers,
|
|
).extend({
|
|
name: 'ExpressionEdit',
|
|
props: [
|
|
'dialogVisible',
|
|
'parameter',
|
|
'path',
|
|
'value',
|
|
'eventSource',
|
|
],
|
|
components: {
|
|
ExpressionInput,
|
|
VariableSelector,
|
|
},
|
|
data () {
|
|
return {
|
|
displayValue: '',
|
|
latestValue: '',
|
|
};
|
|
},
|
|
methods: {
|
|
valueChanged (value: string, forceUpdate = false) {
|
|
this.latestValue = value;
|
|
|
|
if (forceUpdate === true) {
|
|
this.updateDisplayValue();
|
|
this.$emit('valueChanged', this.latestValue);
|
|
} else {
|
|
this.callDebounced('updateDisplayValue', { debounceTime: 500 });
|
|
}
|
|
},
|
|
|
|
updateDisplayValue () {
|
|
this.displayValue = this.latestValue;
|
|
},
|
|
|
|
closeDialog () {
|
|
// Handle the close externally as the visible parameter is an external prop
|
|
// and is so not allowed to be changed here.
|
|
this.$emit('valueChanged', this.latestValue);
|
|
this.$emit('closeDialog');
|
|
return false;
|
|
},
|
|
|
|
itemSelected (eventData: IVariableItemSelected) {
|
|
(this.$refs.inputFieldExpression as any).itemSelected(eventData); // tslint:disable-line:no-any
|
|
this.$externalHooks().run('expressionEdit.itemSelected', { parameter: this.parameter, value: this.value, selectedItem: eventData });
|
|
|
|
const trackProperties: {
|
|
event_version: string;
|
|
node_type_dest: string;
|
|
node_type_source?: string;
|
|
parameter_name_dest: string;
|
|
parameter_name_source?: string;
|
|
variable_type?: string;
|
|
is_immediate_input: boolean;
|
|
variable_expression: string;
|
|
node_name: string;
|
|
} = {
|
|
event_version: '2',
|
|
node_type_dest: this.$store.getters.activeNode.type,
|
|
parameter_name_dest: this.parameter.displayName,
|
|
is_immediate_input: false,
|
|
variable_expression: eventData.variable,
|
|
node_name: this.$store.getters.activeNode.name,
|
|
};
|
|
|
|
if (eventData.variable) {
|
|
let splitVar = eventData.variable.split('.');
|
|
|
|
if (eventData.variable.startsWith('Object.keys')) {
|
|
splitVar = eventData.variable.split('(')[1].split(')')[0].split('.');
|
|
trackProperties.variable_type = 'Keys';
|
|
} else if (eventData.variable.startsWith('Object.values')) {
|
|
splitVar = eventData.variable.split('(')[1].split(')')[0].split('.');
|
|
trackProperties.variable_type = 'Values';
|
|
} else {
|
|
trackProperties.variable_type = 'Raw value';
|
|
}
|
|
|
|
if (splitVar[0].startsWith('$node')) {
|
|
const sourceNodeName = splitVar[0].split('"')[1];
|
|
trackProperties.node_type_source = this.$store.getters.getNodeByName(sourceNodeName).type;
|
|
const nodeConnections: Array<Array<{ node: string }>> = this.$store.getters.outgoingConnectionsByNodeName(sourceNodeName).main;
|
|
trackProperties.is_immediate_input = (nodeConnections && nodeConnections[0] && !!nodeConnections[0].find(({ node }) => node === this.$store.getters.activeNode.name)) ? true : false;
|
|
|
|
if (splitVar[1].startsWith('parameter')) {
|
|
trackProperties.parameter_name_source = splitVar[1].split('"')[1];
|
|
}
|
|
|
|
} else {
|
|
trackProperties.is_immediate_input = true;
|
|
|
|
if(splitVar[0].startsWith('$parameter')) {
|
|
trackProperties.parameter_name_source = splitVar[0].split('"')[1];
|
|
}
|
|
}
|
|
}
|
|
|
|
this.$telemetry.track('User inserted item from Expression Editor variable selector', trackProperties);
|
|
},
|
|
},
|
|
watch: {
|
|
dialogVisible (newValue) {
|
|
this.displayValue = this.value;
|
|
this.latestValue = this.value;
|
|
|
|
const resolvedExpressionValue = this.$refs.expressionResult && (this.$refs.expressionResult as any).getValue() || undefined; // tslint:disable-line:no-any
|
|
this.$externalHooks().run('expressionEdit.dialogVisibleChanged', { dialogVisible: newValue, parameter: this.parameter, value: this.value, resolvedExpressionValue });
|
|
|
|
if (!newValue) {
|
|
this.$telemetry.track('User closed Expression Editor', {
|
|
empty_expression: (this.value === '=') || (this.value === '={{}}') || !this.value,
|
|
workflow_id: this.$store.getters.workflowId,
|
|
source: this.eventSource,
|
|
session_id: this.$store.getters['ui/ndvSessionId'],
|
|
has_parameter: this.value.includes('$parameter'),
|
|
has_mapping: !!MAPPING_PARAMS.find((param) => this.value.includes(param)),
|
|
});
|
|
}
|
|
},
|
|
},
|
|
});
|
|
</script>
|
|
|
|
<style scoped lang="scss">
|
|
.editor-description {
|
|
line-height: 1.5;
|
|
font-weight: bold;
|
|
padding: 0 0 0.5em 0.2em;;
|
|
}
|
|
|
|
.expression-result-wrapper,
|
|
.expression-editor-wrapper {
|
|
padding: 10px;
|
|
}
|
|
|
|
.expression-result-wrapper {
|
|
margin-top: 1em;
|
|
}
|
|
|
|
::v-deep .expression-dialog {
|
|
.el-dialog__header {
|
|
padding: 0;
|
|
}
|
|
.el-dialog__title {
|
|
display: none;
|
|
}
|
|
|
|
.el-dialog__body {
|
|
padding: 0;
|
|
font-size: var(--font-size-s);
|
|
}
|
|
|
|
.right-side {
|
|
background-color: #f9f9f9;
|
|
border-top-right-radius: 8px;
|
|
border-bottom-right-radius: 8px;
|
|
}
|
|
}
|
|
|
|
.header-side-menu {
|
|
padding: 1em 0 0.5em 1.8em;
|
|
border-top-left-radius: 8px;
|
|
|
|
background-color: var(--color-background-base);
|
|
color: #555;
|
|
border-bottom: 1px solid $--color-primary;
|
|
margin-bottom: 1em;
|
|
|
|
.headline {
|
|
font-size: 1.35em;
|
|
font-weight: 600;
|
|
line-height: 1.5;
|
|
}
|
|
|
|
.sub-headline {
|
|
font-weight: 600;
|
|
font-size: 1.1em;
|
|
text-align: center;
|
|
line-height: 1.5;
|
|
padding-top: 1.5em;
|
|
color: $--color-primary;
|
|
}
|
|
}
|
|
|
|
.variable-selector {
|
|
margin: 0 1em;
|
|
}
|
|
</style>
|