mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-19 02:51:14 +00:00
feat(editor): Migrate Design System and Editor UI to Vue 3 (#6476)
* 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>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div :class="['n8n-menu-item', $style.item]">
|
||||
<el-submenu
|
||||
<el-sub-menu
|
||||
v-if="item.children?.length"
|
||||
:id="item.id"
|
||||
:class="{
|
||||
@@ -9,8 +9,8 @@
|
||||
[$style.active]: mode === 'router' && isItemActive(item),
|
||||
}"
|
||||
:index="item.id"
|
||||
popper-append-to-body
|
||||
:popper-class="`${$style.submenuPopper} ${popperClass}`"
|
||||
teleported
|
||||
:popper-class="submenuPopperClass"
|
||||
>
|
||||
<template #title>
|
||||
<n8n-icon
|
||||
@@ -22,16 +22,17 @@
|
||||
<span :class="$style.label">{{ item.label }}</span>
|
||||
</template>
|
||||
<n8n-menu-item
|
||||
v-for="item in availableChildren"
|
||||
:key="item.id"
|
||||
:item="item"
|
||||
v-for="child in availableChildren"
|
||||
:key="child.id"
|
||||
:item="child"
|
||||
:compact="compact"
|
||||
:tooltipDelay="tooltipDelay"
|
||||
:popperClass="popperClass"
|
||||
:mode="mode"
|
||||
:activeTab="activeTab"
|
||||
:handle-select="handleSelect"
|
||||
/>
|
||||
</el-submenu>
|
||||
</el-sub-menu>
|
||||
<n8n-tooltip
|
||||
v-else
|
||||
placement="right"
|
||||
@@ -50,7 +51,7 @@
|
||||
}"
|
||||
data-test-id="menu-item"
|
||||
:index="item.id"
|
||||
@click="onItemClick(item, $event)"
|
||||
@click="handleSelect(item)"
|
||||
>
|
||||
<n8n-icon
|
||||
v-if="item.icon"
|
||||
@@ -75,7 +76,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { Submenu as ElSubmenu, MenuItem as ElMenuItem } from 'element-ui';
|
||||
import { ElSubMenu, ElMenuItem } from 'element-plus';
|
||||
import N8nTooltip from '../N8nTooltip';
|
||||
import N8nIcon from '../N8nIcon';
|
||||
import type { PropType } from 'vue';
|
||||
@@ -85,7 +86,7 @@ import type { IMenuItem, RouteObject } from '../../types';
|
||||
export default defineComponent({
|
||||
name: 'n8n-menu-item',
|
||||
components: {
|
||||
ElSubmenu,
|
||||
ElSubMenu,
|
||||
ElMenuItem,
|
||||
N8nIcon,
|
||||
N8nTooltip,
|
||||
@@ -115,6 +116,9 @@ export default defineComponent({
|
||||
activeTab: {
|
||||
type: String,
|
||||
},
|
||||
handleSelect: {
|
||||
type: Function as PropType<(item: IMenuItem) => void>,
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
availableChildren(): IMenuItem[] {
|
||||
@@ -130,6 +134,13 @@ export default defineComponent({
|
||||
}
|
||||
);
|
||||
},
|
||||
submenuPopperClass(): string {
|
||||
const popperClass = [this.$style.submenuPopper, this.popperClass];
|
||||
if (this.compact) {
|
||||
popperClass.push(this.$style.compact);
|
||||
}
|
||||
return popperClass.join(' ');
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
isItemActive(item: IMenuItem): boolean {
|
||||
@@ -156,21 +167,6 @@ export default defineComponent({
|
||||
return item.id === this.activeTab;
|
||||
}
|
||||
},
|
||||
onItemClick(item: IMenuItem, event: MouseEvent) {
|
||||
if (item && item.type === 'link' && item.properties) {
|
||||
const href: string = item.properties.href;
|
||||
if (!href) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (item.properties.newWindow) {
|
||||
window.open(href);
|
||||
} else {
|
||||
window.location.assign(item.properties.href);
|
||||
}
|
||||
}
|
||||
this.$emit('click', event, item.id);
|
||||
},
|
||||
},
|
||||
});
|
||||
</script>
|
||||
@@ -178,26 +174,42 @@ export default defineComponent({
|
||||
<style module lang="scss">
|
||||
// Element menu-item overrides
|
||||
:global(.el-menu-item),
|
||||
:global(.el-submenu__title) {
|
||||
:global(.el-sub-menu__title) {
|
||||
--menu-font-color: var(--color-text-base);
|
||||
--menu-item-active-background-color: var(--color-foreground-base);
|
||||
--menu-item-active-font-color: var(--color-text-dark);
|
||||
--menu-item-hover-fill: var(--color-foreground-base);
|
||||
--menu-item-hover-font-color: var(--color-text-dark);
|
||||
--menu-item-height: 35px;
|
||||
--submenu-item-height: 27px;
|
||||
--sub-menu-item-height: 27px;
|
||||
}
|
||||
|
||||
@mixin compact() {
|
||||
.icon {
|
||||
margin: 0;
|
||||
overflow: visible !important;
|
||||
visibility: visible !important;
|
||||
width: initial !important;
|
||||
height: initial !important;
|
||||
}
|
||||
.label {
|
||||
display: none;
|
||||
}
|
||||
.secondaryIcon {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.submenu {
|
||||
background: none !important;
|
||||
|
||||
&.compact :global(.el-submenu__title) {
|
||||
&.compact :global(.el-sub-menu__title) {
|
||||
i {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
:global(.el-submenu__title) {
|
||||
:global(.el-sub-menu__title) {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
border-radius: var(--border-radius-base) !important;
|
||||
@@ -219,7 +231,7 @@ export default defineComponent({
|
||||
}
|
||||
|
||||
.menuItem {
|
||||
height: var(--submenu-item-height) !important;
|
||||
height: var(--sub-menu-item-height) !important;
|
||||
min-width: auto !important;
|
||||
margin: var(--spacing-2xs) 0 !important;
|
||||
padding-left: var(--spacing-l) !important;
|
||||
@@ -246,7 +258,7 @@ export default defineComponent({
|
||||
svg {
|
||||
color: var(--color-text-dark) !important;
|
||||
}
|
||||
&:global(.el-submenu) {
|
||||
&:global(.el-sub-menu) {
|
||||
background-color: unset !important;
|
||||
}
|
||||
}
|
||||
@@ -254,7 +266,7 @@ export default defineComponent({
|
||||
|
||||
.active {
|
||||
&,
|
||||
& :global(.el-submenu__title) {
|
||||
& :global(.el-sub-menu__title) {
|
||||
background-color: var(--color-foreground-base);
|
||||
border-radius: var(--border-radius-base);
|
||||
.icon {
|
||||
@@ -295,20 +307,7 @@ export default defineComponent({
|
||||
}
|
||||
|
||||
.compact {
|
||||
width: 40px;
|
||||
.icon {
|
||||
margin: 0;
|
||||
overflow: visible !important;
|
||||
visibility: visible !important;
|
||||
width: initial !important;
|
||||
height: initial !important;
|
||||
}
|
||||
.label {
|
||||
display: none;
|
||||
}
|
||||
.secondaryIcon {
|
||||
display: none;
|
||||
}
|
||||
@include compact();
|
||||
}
|
||||
|
||||
.submenuPopper {
|
||||
@@ -327,8 +326,11 @@ export default defineComponent({
|
||||
margin-right: var(--spacing-xs);
|
||||
}
|
||||
|
||||
.label {
|
||||
display: block;
|
||||
&.compact {
|
||||
:global(.el-menu--popup) {
|
||||
min-width: auto;
|
||||
@include compact();
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user