* feat: remove vue-fragment (no-changelog) * feat: partial design-system migration * feat: migrate info-accordion and info-tip components * feat: migrate several components to vue 3 * feat: migrated several components * feat: migrate several components * feat: migrate several components * feat: migrate several components * feat: re-exported all design system components * fix: fix design for popper components * fix: editor kind of working, lots of issues to fix * fix: fix several vue 3 migration issues * fix: replace @change with @update:modelValue in several places * fix: fix translation linking * fix: fix inline-edit input * fix: fix ndv and dialog design * fix: update parameter input event bindings * fix: rename deprecated lifecycle methods * fix: fix json view mapping * build: update lock file * fix(editor): revisit last conflict with master and fix issues * fix(editor): revisit last conflict with master and fix issues * fix: fix expression editor bug causing code mirror to no longer be reactive * fix: fix resource locator bug * fix: fix vue-agile integration * fix: remove global import for vue-agile * fix: replace element-plus buttons with n8n-buttons everywhere * fix(editor): Fix various element-plus styles (#6571) * fix(editor): Fix various element-plus styles Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * Remove debugging code Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * Address PR comments Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> --------- Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * fix(editor): Fix loading in production mode [Vue 3] (#6578) Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * fix(editor): First round of e2e tests fixes with Vue 3 (#6579) * fix(editor): Fix broken smoke and workflow list e2e tests * ✔️ Fix failing canvas action tests. Updating some selectors used in credentials and workflow tests * feat: add vue 3 eslint rules and fix issues * fix: fix tags-dropdown * fix: fix white-space issues caused by i18n-t * fix: rename non-generic click events * fix: fix search in resources list layout * fix: fix datatable paginator * fix: fix popper select caret and dropdown size * fix: add width to action-dropdown * fix: fix workflow settings icon not being hidden * fix: refactor newly added code * fix: fix merge issue * fix: fix ndv credentials watcher * fix: fix workflow saving and grabber notch * fix: fix nodes list panel transition * fix: fix node title visibility * fix: fix data unpinning * fix: fix value access * fix: show input panel only if trigger panel enabled or not trigger node * fix: fix tags dropdown and executions status spcing * fix(editor): Prevent execution list to load back when leaving the route (#6697) fix(editor): prevent execution list to load back when leaving the route * fix: fix drawer visibility * fix: fix expression toggle padding * fix: fix expressions editor styling * chore: prepare for testing * fix: fix styling for el-button without patching * test: fix unit tests in design-system * test: fix most unit tests * fix: remove import cycle. * fix: fix personalization modal tests * fix further resource mapper test adjustments * fix: fix multiple tests and n8n-route attr duplication * fix: fix source control tets * fix: fixed remaining unit tests * fix: fix workflows and credentials e2e tests * fix: fix localizeNodeNames * fix: update ndv e2e tests * fix: fix popper left placement arrow * fix: fix 5-ndv e2e tests * fix: fix 6-code-node e2e tests * fix(editor): Drop click outside directive from NodeCreator (#6716) * fix(editor): Drop click outside directive from NodeCreator * fix(editor): make sure mouseup outside is unbound at least before the component is unmounted * fix: fix 10-settings-log-streaming e2e tests * fix: fix node redrawing * fix: fix tooltip buttons styling * fix: fix varous e2e suites * fix: fix 15-scheduler-node e2e suite * fix: fix route watcher * fix: fixed param name update and credential edit * feat: update event names * refactor: Remove deprecated `$data` (#6576) Co-authored-by: Alex Grozav <alex@grozav.com> * fix: fix 17-sharing e2e suite * fix: fix tags dropdown * fix: fix tags manager * fix(editor): move :deep selectors to a separate scoped style block * fix: fix sticky component and inline text edit * fix: update e2e tests * fix: remove button override references * fix(editor): Adjust spacing in templates for Vue 3 (#6744) * fix(editor): Adjust spacing in templates * fix: Undo unneeded change * fix: Undo unneeded change * fix(editor): Adjust NDV height for Vue 3 (#6742) fix(editor): Adjust NDV height * fix(editor): Restore collapsed sidebar items for Vue 3 (#6743) fix(editor): Restore collapsed sidebar items * fix: fix linting issues * fix: fix design-system deps * fix: post-merge fixes * fix: update tests * fix: increase timeout for executionslist tets * chore: fix linting issue * fix: fix 14-mapping e2e tests in ci * fix: re-enable tests * fix: fix workflow duplication e2e tests after tags update * fix(editor): Change component prop to be typed * fix: fix tags dropdown in duplicate wf modal * fix: fix focus behaviour in tags selector * fix: fix tag creation * fix: fix log streaming e2e race condition * fix(editor): Fix Vue 3 linting issues (#6748) * fix(editor): Fix Vue 3 linting issues Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * fix MainSidebar linter issues * revert pnpm lock * update pnpm lock file --------- Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> Co-authored-by: Alex Grozav <alex@grozav.com> * fix(editor): Some css fixes for vue3 branch (#6749) * ✨ Fixing filter button height * ✨ Update input modal button position * ✨ Updating tags styling * ✨ Fix event logging settings spacing * 👕 Fixing lint errors * fix: fix linting issues * Revert to `// eslint-disable-next-line @typescript-eslint/no-misused-promises` disabling of mixins init Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * fix: fix css issue * fix(editor): Lint fix * fix(editor): Fix settings initialisation (#6750) Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * fix: fix initial settings loading * fix: replace realClick with click force * fix: fix randomly failing mapping e2e tests * fix(editor): Fix menu item event handling * fix: fix resource filters dropdown events (#6752) * fix: fix resource filters dropdown events * fix: remove teleported:false * fix: fix event selection event naming (#6753) * fix: removed console.log (#6754) * fix: rever await nextTick changes * fix: redo linting changes * fix(editor): Redraw node connections if adding more than one node to canvas (#6755) * fix(editor): Redraw node connections if adding more than one node to canvas Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * Update position before connection two nodes * Lint fix --------- Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> Co-authored-by: Alex Grozav <alex@grozav.com> * fix(editor): Fix `ResourceMapper` unit tests (#6758) * ✔️ Fix matching columns test * ✔️ Fix multiple matching columns test * ✔️ Removing `skip` from the last test * fix: Allow pasting a big workflow (#6760) * fix: pasting a big workflow * chore: update comment * refactor: move try/catch to function * refactor: move try/catch to function * fix(editor): Fix modal layer width * fix: fix position changes * fix: undo it.only * fix: make undo/redo multiple steps more verbose * fix: Fix value survey styles (#6764) * fix: fix value survey styles * fix: lint * Revert "fix: lint" 72869c431f1448861df021be041b61c62f1e3118 * fix: lint * fix(editor): Fix collapsed sub menu * fix: Fix drawer animation (#6767) fix: drawer animation * fix(editor): Fix source control buttons (#6769) * fix(editor): Fix App loading & auth (#6768) * fix(editor): Fix App loading & auth Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * Await promises Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * Fix eslint error Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> --------- Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> --------- Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> Co-authored-by: Csaba Tuncsik <csaba@n8n.io> Co-authored-by: OlegIvaniv <me@olegivaniv.com> Co-authored-by: Milorad FIlipović <milorad@n8n.io> Co-authored-by: Iván Ovejero <ivov.src@gmail.com> Co-authored-by: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
398 lines
10 KiB
Vue
398 lines
10 KiB
Vue
<template>
|
|
<div @keydown.stop class="fixed-collection-parameter">
|
|
<div v-if="getProperties.length === 0" class="no-items-exist">
|
|
<n8n-text size="small">{{
|
|
$locale.baseText('fixedCollectionParameter.currentlyNoItemsExist')
|
|
}}</n8n-text>
|
|
</div>
|
|
|
|
<div
|
|
v-for="property in getProperties"
|
|
:key="property.name"
|
|
class="fixed-collection-parameter-property"
|
|
>
|
|
<n8n-input-label
|
|
v-if="property.displayName !== '' && parameter.options && parameter.options.length !== 1"
|
|
:label="$locale.nodeText().inputLabelDisplayName(property, path)"
|
|
:underline="true"
|
|
size="small"
|
|
color="text-dark"
|
|
/>
|
|
<div v-if="multipleValues">
|
|
<div
|
|
v-for="(value, index) in mutableValues[property.name]"
|
|
:key="property.name + index"
|
|
class="parameter-item"
|
|
>
|
|
<div class="parameter-item-wrapper">
|
|
<div class="delete-option" v-if="!isReadOnly">
|
|
<font-awesome-icon
|
|
icon="trash"
|
|
class="reset-icon clickable"
|
|
:title="$locale.baseText('fixedCollectionParameter.deleteItem')"
|
|
@click="deleteOption(property.name, index)"
|
|
/>
|
|
<div v-if="sortable" class="sort-icon">
|
|
<font-awesome-icon
|
|
v-if="index !== 0"
|
|
icon="angle-up"
|
|
class="clickable"
|
|
:title="$locale.baseText('fixedCollectionParameter.moveUp')"
|
|
@click="moveOptionUp(property.name, index)"
|
|
/>
|
|
<font-awesome-icon
|
|
v-if="index !== mutableValues[property.name].length - 1"
|
|
icon="angle-down"
|
|
class="clickable"
|
|
:title="$locale.baseText('fixedCollectionParameter.moveDown')"
|
|
@click="moveOptionDown(property.name, index)"
|
|
/>
|
|
</div>
|
|
</div>
|
|
<Suspense>
|
|
<parameter-input-list
|
|
:parameters="property.values"
|
|
:nodeValues="nodeValues"
|
|
:path="getPropertyPath(property.name, index)"
|
|
:hideDelete="true"
|
|
:isReadOnly="isReadOnly"
|
|
@valueChanged="valueChanged"
|
|
/>
|
|
</Suspense>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div v-else class="parameter-item">
|
|
<div class="parameter-item-wrapper">
|
|
<div class="delete-option" v-if="!isReadOnly">
|
|
<font-awesome-icon
|
|
icon="trash"
|
|
class="reset-icon clickable"
|
|
:title="$locale.baseText('fixedCollectionParameter.deleteItem')"
|
|
@click="deleteOption(property.name)"
|
|
/>
|
|
</div>
|
|
<parameter-input-list
|
|
:parameters="property.values"
|
|
:nodeValues="nodeValues"
|
|
:path="getPropertyPath(property.name)"
|
|
:isReadOnly="isReadOnly"
|
|
class="parameter-item"
|
|
@valueChanged="valueChanged"
|
|
:hideDelete="true"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div v-if="parameterOptions.length > 0 && !isReadOnly">
|
|
<n8n-button
|
|
v-if="parameter.options.length === 1"
|
|
type="tertiary"
|
|
block
|
|
@click="optionSelected(parameter.options[0].name)"
|
|
:label="getPlaceholderText"
|
|
/>
|
|
<div v-else class="add-option">
|
|
<n8n-select
|
|
v-model="selectedOption"
|
|
:placeholder="getPlaceholderText"
|
|
size="small"
|
|
@update:modelValue="optionSelected"
|
|
filterable
|
|
>
|
|
<n8n-option
|
|
v-for="item in parameterOptions"
|
|
:key="item.name"
|
|
:label="$locale.nodeText().collectionOptionDisplayName(parameter, item, path)"
|
|
:value="item.name"
|
|
></n8n-option>
|
|
</n8n-select>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts">
|
|
import { defineAsyncComponent, defineComponent } from 'vue';
|
|
import type { PropType } from 'vue';
|
|
import type { IUpdateInformation } from '@/Interface';
|
|
|
|
import type {
|
|
INodeParameters,
|
|
INodeProperties,
|
|
INodePropertyCollection,
|
|
NodeParameterValue,
|
|
} from 'n8n-workflow';
|
|
import { deepCopy, isINodePropertyCollectionList } from 'n8n-workflow';
|
|
|
|
import { get } from 'lodash-es';
|
|
|
|
const ParameterInputList = defineAsyncComponent(async () => import('./ParameterInputList.vue'));
|
|
|
|
export default defineComponent({
|
|
name: 'FixedCollectionParameter',
|
|
props: {
|
|
nodeValues: {
|
|
type: Object as PropType<Record<string, INodeParameters[]>>,
|
|
required: true,
|
|
},
|
|
parameter: {
|
|
type: Object as PropType<INodeProperties>,
|
|
required: true,
|
|
},
|
|
path: {
|
|
type: String,
|
|
required: true,
|
|
},
|
|
values: {
|
|
type: Object as PropType<Record<string, INodeParameters[]>>,
|
|
default: () => ({}),
|
|
},
|
|
isReadOnly: {
|
|
type: Boolean,
|
|
default: false,
|
|
},
|
|
},
|
|
components: {
|
|
ParameterInputList,
|
|
},
|
|
data() {
|
|
return {
|
|
selectedOption: undefined,
|
|
mutableValues: {} as Record<string, INodeParameters[]>,
|
|
};
|
|
},
|
|
watch: {
|
|
values: {
|
|
handler(newValues: Record<string, INodeParameters[]>) {
|
|
this.mutableValues = deepCopy(newValues);
|
|
},
|
|
deep: true,
|
|
},
|
|
},
|
|
created() {
|
|
this.mutableValues = deepCopy(this.values);
|
|
},
|
|
computed: {
|
|
getPlaceholderText(): string {
|
|
const placeholder = this.$locale.nodeText().placeholder(this.parameter, this.path);
|
|
return placeholder ? placeholder : this.$locale.baseText('fixedCollectionParameter.choose');
|
|
},
|
|
getProperties(): INodePropertyCollection[] {
|
|
const returnProperties = [];
|
|
let tempProperties;
|
|
for (const name of this.propertyNames) {
|
|
tempProperties = this.getOptionProperties(name);
|
|
if (tempProperties !== undefined) {
|
|
returnProperties.push(tempProperties);
|
|
}
|
|
}
|
|
return returnProperties;
|
|
},
|
|
multipleValues(): boolean {
|
|
return !!this.parameter.typeOptions?.multipleValues;
|
|
},
|
|
|
|
parameterOptions(): INodePropertyCollection[] {
|
|
if (this.multipleValues && isINodePropertyCollectionList(this.parameter.options)) {
|
|
return this.parameter.options;
|
|
}
|
|
|
|
return (this.parameter.options as INodePropertyCollection[]).filter((option) => {
|
|
return !this.propertyNames.includes(option.name);
|
|
});
|
|
},
|
|
propertyNames(): string[] {
|
|
return Object.keys(this.mutableValues || {});
|
|
},
|
|
sortable(): boolean {
|
|
return !!this.parameter.typeOptions?.sortable;
|
|
},
|
|
},
|
|
methods: {
|
|
deleteOption(optionName: string, index?: number) {
|
|
const currentOptionsOfSameType = this.mutableValues[optionName];
|
|
if (!currentOptionsOfSameType || currentOptionsOfSameType.length > 1) {
|
|
// it's not the only option of this type, so just remove it.
|
|
this.$emit('valueChanged', {
|
|
name: this.getPropertyPath(optionName, index),
|
|
value: undefined,
|
|
});
|
|
} else {
|
|
// it's the only option, so remove the whole type
|
|
this.$emit('valueChanged', {
|
|
name: this.getPropertyPath(optionName),
|
|
value: undefined,
|
|
});
|
|
}
|
|
},
|
|
getPropertyPath(name: string, index?: number) {
|
|
return `${this.path}.${name}` + (index !== undefined ? `[${index}]` : '');
|
|
},
|
|
getOptionProperties(optionName: string): INodePropertyCollection | undefined {
|
|
if (isINodePropertyCollectionList(this.parameter.options)) {
|
|
for (const option of this.parameter.options) {
|
|
if (option.name === optionName) {
|
|
return option;
|
|
}
|
|
}
|
|
}
|
|
return undefined;
|
|
},
|
|
moveOptionDown(optionName: string, index: number) {
|
|
if (Array.isArray(this.mutableValues[optionName])) {
|
|
this.mutableValues[optionName].splice(
|
|
index + 1,
|
|
0,
|
|
this.mutableValues[optionName].splice(index, 1)[0],
|
|
);
|
|
}
|
|
|
|
const parameterData = {
|
|
name: this.getPropertyPath(optionName),
|
|
value: this.mutableValues[optionName],
|
|
};
|
|
|
|
this.$emit('valueChanged', parameterData);
|
|
},
|
|
moveOptionUp(optionName: string, index: number) {
|
|
if (Array.isArray(this.mutableValues[optionName])) {
|
|
this.mutableValues?.[optionName].splice(
|
|
index - 1,
|
|
0,
|
|
this.mutableValues[optionName].splice(index, 1)[0],
|
|
);
|
|
}
|
|
|
|
const parameterData = {
|
|
name: this.getPropertyPath(optionName),
|
|
value: this.mutableValues[optionName],
|
|
};
|
|
|
|
this.$emit('valueChanged', parameterData);
|
|
},
|
|
optionSelected(optionName: string) {
|
|
const option = this.getOptionProperties(optionName);
|
|
if (option === undefined) {
|
|
return;
|
|
}
|
|
const name = `${this.path}.${option.name}`;
|
|
|
|
const newParameterValue: INodeParameters = {};
|
|
|
|
for (const optionParameter of option.values) {
|
|
if (
|
|
optionParameter.type === 'fixedCollection' &&
|
|
optionParameter.typeOptions !== undefined &&
|
|
optionParameter.typeOptions.multipleValues === true
|
|
) {
|
|
newParameterValue[optionParameter.name] = {};
|
|
} else if (
|
|
optionParameter.typeOptions !== undefined &&
|
|
optionParameter.typeOptions.multipleValues === true
|
|
) {
|
|
// Multiple values are allowed so append option to array
|
|
newParameterValue[optionParameter.name] = get(
|
|
this.nodeValues,
|
|
`${this.path}.${optionParameter.name}`,
|
|
[],
|
|
);
|
|
if (Array.isArray(optionParameter.default)) {
|
|
(newParameterValue[optionParameter.name] as INodeParameters[]).push(
|
|
...deepCopy(optionParameter.default as INodeParameters[]),
|
|
);
|
|
} else if (
|
|
optionParameter.default !== '' &&
|
|
typeof optionParameter.default !== 'object'
|
|
) {
|
|
(newParameterValue[optionParameter.name] as NodeParameterValue[]).push(
|
|
deepCopy(optionParameter.default),
|
|
);
|
|
}
|
|
} else {
|
|
// Add a new option
|
|
newParameterValue[optionParameter.name] = deepCopy(optionParameter.default);
|
|
}
|
|
}
|
|
|
|
let newValue;
|
|
if (this.multipleValues) {
|
|
newValue = get(this.nodeValues, name, [] as INodeParameters[]);
|
|
|
|
newValue.push(newParameterValue);
|
|
} else {
|
|
newValue = newParameterValue;
|
|
}
|
|
|
|
const parameterData = {
|
|
name,
|
|
value: newValue,
|
|
};
|
|
|
|
this.$emit('valueChanged', parameterData);
|
|
this.selectedOption = undefined;
|
|
},
|
|
valueChanged(parameterData: IUpdateInformation) {
|
|
this.$emit('valueChanged', parameterData);
|
|
},
|
|
},
|
|
});
|
|
</script>
|
|
|
|
<style scoped lang="scss">
|
|
.fixed-collection-parameter {
|
|
padding-left: var(--spacing-s);
|
|
|
|
:deep(.button) {
|
|
--button-background-color: var(--color-background-base);
|
|
--button-border-color: var(--color-foreground-base);
|
|
}
|
|
}
|
|
|
|
.fixed-collection-parameter-property {
|
|
margin: var(--spacing-xs) 0;
|
|
}
|
|
|
|
.delete-option {
|
|
display: none;
|
|
position: absolute;
|
|
z-index: 999;
|
|
color: #f56c6c;
|
|
left: 0;
|
|
top: 0.5em;
|
|
width: 15px;
|
|
height: 100%;
|
|
}
|
|
|
|
.parameter-item:hover > .parameter-item-wrapper > .delete-option {
|
|
display: block;
|
|
}
|
|
|
|
.parameter-item {
|
|
position: relative;
|
|
padding: 0 0 0 1em;
|
|
|
|
+ .parameter-item {
|
|
.parameter-item-wrapper {
|
|
border-top: 1px dashed #999;
|
|
|
|
.delete-option {
|
|
top: 14px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
.no-items-exist {
|
|
margin: var(--spacing-xs) 0;
|
|
}
|
|
|
|
.sort-icon {
|
|
display: flex;
|
|
flex-direction: column;
|
|
margin-left: 1px;
|
|
margin-top: 0.5em;
|
|
}
|
|
</style>
|