Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(editor): fix performance issues when opening node or editing code node with a lot of data #4388

Merged
merged 14 commits into from
Oct 20, 2022
17 changes: 14 additions & 3 deletions packages/editor-ui/src/components/NDVDraggablePanels.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
:width="relativeWidthToPx(mainPanelDimensions.relativeWidth)"
:minWidth="MIN_PANEL_WIDTH"
:gridSize="20"
@resize="onResize"
@resize="onResizeDebounced"
@resizestart="onResizeStart"
@resizeend="onResizeEnd"
:supportedDirections="supportedResizeDirections"
Expand Down Expand Up @@ -47,6 +47,8 @@ import {
LOCAL_STORAGE_MAIN_PANEL_RELATIVE_WIDTH,
MAIN_NODE_PANEL_WIDTH,
} from '@/constants';
import mixins from 'vue-typed-mixins';
import { debounceHelper } from './mixins/debounce';


const SIDE_MARGIN = 24;
Expand All @@ -63,7 +65,7 @@ const initialMainPanelWidth:{ [key: string]: number } = {
wide: MAIN_NODE_PANEL_WIDTH * 2,
};

export default Vue.extend({
export default mixins(debounceHelper).extend({
name: 'NDVDraggablePanels',
components: {
PanelDragButton,
Expand All @@ -83,11 +85,12 @@ export default Vue.extend({
default: () => ({}),
},
},
data(): { windowWidth: number, isDragging: boolean, MIN_PANEL_WIDTH: number} {
data(): { windowWidth: number, isDragging: boolean, MIN_PANEL_WIDTH: number, initialized: boolean} {
return {
windowWidth: 1,
isDragging: false,
MIN_PANEL_WIDTH,
initialized: false,
};
},
mounted() {
Expand All @@ -105,6 +108,9 @@ export default Vue.extend({

window.addEventListener('resize', this.setTotalWidth);
this.$emit('init', { position: this.mainPanelDimensions.relativeLeft });
setTimeout(() => {
OlegIvaniv marked this conversation as resolved.
Show resolved Hide resolved
this.initialized = true;
}, 0);
},
destroyed() {
window.removeEventListener('resize', this.setTotalWidth);
Expand Down Expand Up @@ -295,6 +301,11 @@ export default Vue.extend({
onResizeEnd() {
this.storePositionData();
},
onResizeDebounced(data: { direction: string, x: number, width: number}) {
if (this.initialized) {
this.callDebounced('onResize', { debounceTime: 10, trailing: true }, data);
}
},
onResize({ direction, x, width }: { direction: string, x: number, width: number}) {
const relativeDistance = this.pxToRelativeWidth(x);
const relativeWidth = this.pxToRelativeWidth(width);
Expand Down
17 changes: 16 additions & 1 deletion packages/editor-ui/src/components/Node.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="node-wrapper" :style="nodePosition" :id="nodeId">
<div class="select-background" v-show="isSelected"></div>
<div :class="{'node-default': true, 'touch-active': isTouchActive, 'is-touch-device': isTouchDevice}" :data-name="data.name" :ref="data.name">
<div :class="nodeClass" :style="nodeStyle" @dblclick="setNodeActive" @click.left="mouseLeftClick" v-touch:start="touchStart" v-touch:end="touchEnd">
<div :class="nodeClass" :style="nodeStyle" @click.left="onClick" v-touch:start="touchStart" v-touch:end="touchEnd">
<div v-if="!data.disabled" :class="{'node-info-icon': true, 'shift-icon': shiftOutputCount}">
<div v-if="hasIssues" class="node-issues">
<n8n-tooltip placement="bottom" >
Expand Down Expand Up @@ -112,13 +112,15 @@ import mixins from 'vue-typed-mixins';
import { get } from 'lodash';
import { getStyleTokenValue, getTriggerNodeServiceName } from './helpers';
import { INodeUi, XYPosition } from '@/Interface';
import { debounceHelper } from './mixins/debounce';

export default mixins(
externalHooks,
nodeBase,
nodeHelpers,
workflowHelpers,
pinData,
debounceHelper,
).extend({
name: 'Node',
components: {
Expand Down Expand Up @@ -426,6 +428,19 @@ export default mixins(
});
},

onClick(event: MouseEvent) {
this.callDebounced('onClickDebounced', { debounceTime: 250, trailing: true }, event);
},

onClickDebounced(event: MouseEvent) {
const isDoubleClick = event.detail > 2;
if (isDoubleClick) {
this.setNodeActive();
} else {
this.mouseLeftClick(event);
}
},

setNodeActive () {
this.$store.commit('setActiveNode', this.data.name);
this.pinDataDiscoveryTooltipVisible = false;
Expand Down
12 changes: 9 additions & 3 deletions packages/editor-ui/src/components/NodeDetailsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,9 @@ export default mixins(
this.avgOutputRowHeight = 0;
this.avgInputRowHeight = 0;

this.$store.commit('ui/setNDVSessionId');
setTimeout(() => {
OlegIvaniv marked this conversation as resolved.
Show resolved Hide resolved
this.$store.commit('ui/setNDVSessionId');
}, 0);
this.$externalHooks().run('dataDisplay.nodeTypeChanged', {
nodeSubtitle: this.getNodeSubtitle(node, this.activeNodeType, this.getCurrentWorkflow()),
});
Expand Down Expand Up @@ -397,10 +399,14 @@ export default mixins(
this.runInputIndex = -1;
},
inputNodeName(nodeName: string | undefined) {
this.$store.commit('ui/setInputNodeName', nodeName);
setTimeout(() => {
this.$store.commit('ui/setInputNodeName', nodeName);
}, 0);
},
inputRun() {
this.$store.commit('ui/setInputRunIndex', this.inputRun);
setTimeout(() => {
this.$store.commit('ui/setInputRunIndex', this.inputRun);
}, 0);
},
},
methods: {
Expand Down
7 changes: 6 additions & 1 deletion packages/editor-ui/src/components/ParameterInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
:mode="node.parameters.mode"
:jsCode="node.parameters.jsCode"
:isReadOnly="isReadOnly"
@valueChanged="valueChanged"
@valueChanged="valueChangedDebounced"
/>

<div v-else-if="isEditor === true" class="code-edit clickable ph-no-capture" @click="displayEditDialog()">
Expand Down Expand Up @@ -336,12 +336,14 @@ import { CUSTOM_API_CALL_KEY } from '@/constants';
import { mapGetters } from 'vuex';
import { CODE_NODE_TYPE } from '@/constants';
import { PropType } from 'vue';
import { debounceHelper } from './mixins/debounce';

export default mixins(
externalHooks,
nodeHelpers,
showMessage,
workflowHelpers,
debounceHelper,
)
.extend({
name: 'parameter-input',
Expand Down Expand Up @@ -922,6 +924,9 @@ export default mixins(

this.$emit('textInput', parameterData);
},
valueChangedDebounced (value: NodeParameterValueType | {} | Date) {
this.callDebounced('valueChanged', { debounceTime: 100 }, value);
},
valueChanged (value: NodeParameterValueType | {} | Date) {
if (this.parameter.name === 'nodeCredentialType') {
this.activeCredentialType = value as string;
Expand Down
1 change: 1 addition & 0 deletions packages/editor-ui/src/views/NodeView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3041,6 +3041,7 @@ export default mixins(
resetWorkspace() {
// Reset nodes
this.deleteEveryEndpoint();
this.instance.reset();

if (this.executionWaitingForWebhook === true) {
// Make sure that if there is a waiting test-webhook that
Expand Down