Use prop to set component order

This commit is contained in:
Iván Ovejero 2022-05-02 10:34:59 +02:00
parent 59cb1a25c6
commit ca0f0df635
2 changed files with 8 additions and 6 deletions

View file

@ -31,6 +31,7 @@
:parameters="parametersNoneSetting" :parameters="parametersNoneSetting"
:hideDelete="true" :hideDelete="true"
:nodeValues="nodeValues" path="parameters" @valueChanged="valueChanged" :nodeValues="nodeValues" path="parameters" @valueChanged="valueChanged"
:showCredentialsAfter="showCredentialsAfter"
> >
<node-credentials <node-credentials
:node="node" :node="node"
@ -81,6 +82,8 @@ import { nodeHelpers } from '@/components/mixins/nodeHelpers';
import mixins from 'vue-typed-mixins'; import mixins from 'vue-typed-mixins';
import NodeExecuteButton from './NodeExecuteButton.vue'; import NodeExecuteButton from './NodeExecuteButton.vue';
import { HTTP_REQUEST_NODE_TYPE } from '@/constants';
export default mixins( export default mixins(
externalHooks, externalHooks,
genericHelpers, genericHelpers,
@ -158,6 +161,9 @@ export default mixins(
return this.nodeType.properties; return this.nodeType.properties;
}, },
showCredentialsAfter (): boolean {
return this.node.type === HTTP_REQUEST_NODE_TYPE && this.node.typeVersion === 2;
},
}, },
props: { props: {
eventBus: { eventBus: {

View file

@ -1,5 +1,5 @@
<template> <template>
<div class="parameter-input-list-wrapper" :class="{ 'has-reordered-credentials-input': hasReorderedCredentialsInput }"> <div class="parameter-input-list-wrapper" :class="{ 'has-reordered-credentials-input': showCredentialsAfter }">
<slot /> <slot />
<div v-for="parameter in filteredParameters" :key="parameter.name" :class="{indent}"> <div v-for="parameter in filteredParameters" :key="parameter.name" :class="{indent}">
<div <div
@ -118,6 +118,7 @@ export default mixins(
'path', // string 'path', // string
'hideDelete', // boolean 'hideDelete', // boolean
'indent', 'indent',
'showCredentialsAfter', // boolean
], ],
computed: { computed: {
filteredParameters (): INodeProperties[] { filteredParameters (): INodeProperties[] {
@ -126,11 +127,6 @@ export default mixins(
filteredParameterNames (): string[] { filteredParameterNames (): string[] {
return this.filteredParameters.map(parameter => parameter.name); return this.filteredParameters.map(parameter => parameter.name);
}, },
hasReorderedCredentialsInput(): boolean {
const node: INode = this.$store.getters.activeNode;
return ["n8n-nodes-base.httpRequest"].includes(node.type);
},
node (): INodeUi { node (): INodeUi {
return this.$store.getters.activeNode; return this.$store.getters.activeNode;
}, },