mirror of
https://github.com/n8n-io/n8n.git
synced 2024-11-16 01:24:05 -08:00
dd6a4c956a
* 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"
72869c431f
* 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>
314 lines
8.1 KiB
Vue
314 lines
8.1 KiB
Vue
<template>
|
|
<Modal
|
|
:name="INVITE_USER_MODAL_KEY"
|
|
@enter="onSubmit"
|
|
:title="
|
|
$locale.baseText(
|
|
showInviteUrls ? 'settings.users.copyInviteUrls' : 'settings.users.inviteNewUsers',
|
|
)
|
|
"
|
|
:center="true"
|
|
width="460px"
|
|
:eventBus="modalBus"
|
|
>
|
|
<template #content>
|
|
<div v-if="showInviteUrls">
|
|
<n8n-users-list :users="invitedUsers">
|
|
<template #actions="{ user }">
|
|
<n8n-tooltip>
|
|
<template #content>
|
|
{{ $locale.baseText('settings.users.inviteLink.copy') }}
|
|
</template>
|
|
<n8n-icon-button
|
|
icon="link"
|
|
type="tertiary"
|
|
data-test-id="copy-invite-link-button"
|
|
:data-invite-link="user.inviteAcceptUrl"
|
|
@click="onCopyInviteLink(user)"
|
|
></n8n-icon-button>
|
|
</n8n-tooltip>
|
|
</template>
|
|
</n8n-users-list>
|
|
</div>
|
|
<n8n-form-inputs
|
|
v-else
|
|
:inputs="config"
|
|
:eventBus="formBus"
|
|
:columnView="true"
|
|
@update="onInput"
|
|
@submit="onSubmit"
|
|
/>
|
|
</template>
|
|
<template v-if="!showInviteUrls" #footer>
|
|
<n8n-button
|
|
:loading="loading"
|
|
:disabled="!enabledButton"
|
|
:label="buttonLabel"
|
|
@click="onSubmitClick"
|
|
float="right"
|
|
/>
|
|
</template>
|
|
</Modal>
|
|
</template>
|
|
|
|
<script lang="ts">
|
|
import { defineComponent } from 'vue';
|
|
import { mapStores } from 'pinia';
|
|
import { useToast } from '@/composables';
|
|
import { copyPaste } from '@/mixins/copyPaste';
|
|
import Modal from './Modal.vue';
|
|
import type { IFormInputs, IInviteResponse, IUser } from '@/Interface';
|
|
import { VALID_EMAIL_REGEX, INVITE_USER_MODAL_KEY } from '@/constants';
|
|
import { ROLE } from '@/utils';
|
|
import { useUsersStore } from '@/stores/users.store';
|
|
import { useSettingsStore } from '@/stores/settings.store';
|
|
import { createEventBus } from 'n8n-design-system/utils';
|
|
|
|
const NAME_EMAIL_FORMAT_REGEX = /^.* <(.*)>$/;
|
|
|
|
function getEmail(email: string): string {
|
|
let parsed = email.trim();
|
|
if (NAME_EMAIL_FORMAT_REGEX.test(parsed)) {
|
|
const matches = parsed.match(NAME_EMAIL_FORMAT_REGEX);
|
|
if (matches && matches.length === 2) {
|
|
parsed = matches[1];
|
|
}
|
|
}
|
|
return parsed;
|
|
}
|
|
|
|
export default defineComponent({
|
|
name: 'InviteUsersModal',
|
|
mixins: [copyPaste],
|
|
components: { Modal },
|
|
props: {
|
|
modalName: {
|
|
type: String,
|
|
},
|
|
},
|
|
setup() {
|
|
return {
|
|
...useToast(),
|
|
};
|
|
},
|
|
data() {
|
|
return {
|
|
config: null as IFormInputs | null,
|
|
formBus: createEventBus(),
|
|
modalBus: createEventBus(),
|
|
emails: '',
|
|
showInviteUrls: null as IInviteResponse[] | null,
|
|
loading: false,
|
|
INVITE_USER_MODAL_KEY,
|
|
};
|
|
},
|
|
mounted() {
|
|
this.config = [
|
|
{
|
|
name: 'emails',
|
|
properties: {
|
|
label: this.$locale.baseText('settings.users.newEmailsToInvite'),
|
|
required: true,
|
|
validationRules: [{ name: 'VALID_EMAILS' }],
|
|
validators: {
|
|
VALID_EMAILS: {
|
|
validate: this.validateEmails,
|
|
},
|
|
},
|
|
placeholder: 'name1@email.com, name2@email.com, ...',
|
|
capitalize: true,
|
|
focusInitially: true,
|
|
},
|
|
},
|
|
{
|
|
name: 'role',
|
|
initialValue: 'member',
|
|
properties: {
|
|
label: this.$locale.baseText('auth.role'),
|
|
required: true,
|
|
type: 'select',
|
|
options: [
|
|
{
|
|
value: ROLE.Member,
|
|
label: this.$locale.baseText('auth.roles.member'),
|
|
},
|
|
],
|
|
capitalize: true,
|
|
},
|
|
},
|
|
];
|
|
},
|
|
computed: {
|
|
...mapStores(useUsersStore, useSettingsStore),
|
|
emailsCount(): number {
|
|
return this.emails.split(',').filter((email: string) => !!email.trim()).length;
|
|
},
|
|
buttonLabel(): string {
|
|
if (this.emailsCount > 1) {
|
|
return this.$locale.baseText(
|
|
`settings.users.inviteXUser${this.settingsStore.isSmtpSetup ? '' : '.inviteUrl'}`,
|
|
{
|
|
interpolate: { count: this.emailsCount.toString() },
|
|
},
|
|
);
|
|
}
|
|
|
|
return this.$locale.baseText(
|
|
`settings.users.inviteUser${this.settingsStore.isSmtpSetup ? '' : '.inviteUrl'}`,
|
|
);
|
|
},
|
|
enabledButton(): boolean {
|
|
return this.emailsCount >= 1;
|
|
},
|
|
invitedUsers(): IUser[] {
|
|
return this.showInviteUrls
|
|
? this.usersStore.allUsers.filter((user) =>
|
|
this.showInviteUrls!.find((invite) => invite.user.id === user.id),
|
|
)
|
|
: [];
|
|
},
|
|
},
|
|
methods: {
|
|
validateEmails(value: string | number | boolean | null | undefined) {
|
|
if (typeof value !== 'string') {
|
|
return false;
|
|
}
|
|
|
|
const emails = value.split(',');
|
|
for (let i = 0; i < emails.length; i++) {
|
|
const email = emails[i];
|
|
const parsed = getEmail(email);
|
|
|
|
if (!!parsed.trim() && !VALID_EMAIL_REGEX.test(String(parsed).trim().toLowerCase())) {
|
|
return {
|
|
messageKey: 'settings.users.invalidEmailError',
|
|
options: { interpolate: { email: parsed } },
|
|
};
|
|
}
|
|
}
|
|
|
|
return false;
|
|
},
|
|
onInput(e: { name: string; value: string }) {
|
|
if (e.name === 'emails') {
|
|
this.emails = e.value;
|
|
}
|
|
},
|
|
async onSubmit() {
|
|
try {
|
|
this.loading = true;
|
|
|
|
const emails = this.emails
|
|
.split(',')
|
|
.map((email) => ({ email: getEmail(email) }))
|
|
.filter((invite) => !!invite.email);
|
|
|
|
if (emails.length === 0) {
|
|
throw new Error(this.$locale.baseText('settings.users.noUsersToInvite'));
|
|
}
|
|
|
|
const invited: IInviteResponse[] = await this.usersStore.inviteUsers(emails);
|
|
const erroredInvites = invited.filter((invite) => invite.error);
|
|
const successfulEmailInvites = invited.filter(
|
|
(invite) => !invite.error && invite.user.emailSent,
|
|
);
|
|
const successfulUrlInvites = invited.filter(
|
|
(invite) => !invite.error && !invite.user.emailSent,
|
|
);
|
|
|
|
if (successfulEmailInvites.length) {
|
|
this.showMessage({
|
|
type: 'success',
|
|
title: this.$locale.baseText(
|
|
successfulEmailInvites.length > 1
|
|
? 'settings.users.usersInvited'
|
|
: 'settings.users.userInvited',
|
|
),
|
|
message: this.$locale.baseText('settings.users.emailInvitesSent', {
|
|
interpolate: {
|
|
emails: successfulEmailInvites.map(({ user }) => user.email).join(', '),
|
|
},
|
|
}),
|
|
});
|
|
}
|
|
|
|
if (successfulUrlInvites.length) {
|
|
if (successfulUrlInvites.length === 1) {
|
|
this.copyToClipboard(successfulUrlInvites[0].user.inviteAcceptUrl);
|
|
}
|
|
|
|
this.showMessage({
|
|
type: 'success',
|
|
title: this.$locale.baseText(
|
|
successfulUrlInvites.length > 1
|
|
? 'settings.users.multipleInviteUrlsCreated'
|
|
: 'settings.users.inviteUrlCreated',
|
|
),
|
|
message: this.$locale.baseText(
|
|
successfulUrlInvites.length > 1
|
|
? 'settings.users.multipleInviteUrlsCreated.message'
|
|
: 'settings.users.inviteUrlCreated.message',
|
|
{
|
|
interpolate: {
|
|
emails: successfulUrlInvites.map(({ user }) => user.email).join(', '),
|
|
},
|
|
},
|
|
),
|
|
});
|
|
}
|
|
|
|
if (erroredInvites.length) {
|
|
setTimeout(() => {
|
|
this.showMessage({
|
|
type: 'error',
|
|
title: this.$locale.baseText('settings.users.usersEmailedError'),
|
|
message: this.$locale.baseText('settings.users.emailInvitesSentError', {
|
|
interpolate: { emails: erroredInvites.map(({ error }) => error).join(', ') },
|
|
}),
|
|
});
|
|
}, 0); // notifications stack on top of each other otherwise
|
|
}
|
|
|
|
if (successfulUrlInvites.length > 1) {
|
|
this.showInviteUrls = successfulUrlInvites;
|
|
} else {
|
|
this.modalBus.emit('close');
|
|
}
|
|
} catch (error) {
|
|
this.showError(error, this.$locale.baseText('settings.users.usersInvitedError'));
|
|
}
|
|
this.loading = false;
|
|
},
|
|
showCopyInviteLinkToast(successfulUrlInvites: IInviteResponse[]) {
|
|
this.showMessage({
|
|
type: 'success',
|
|
title: this.$locale.baseText(
|
|
successfulUrlInvites.length > 1
|
|
? 'settings.users.multipleInviteUrlsCreated'
|
|
: 'settings.users.inviteUrlCreated',
|
|
),
|
|
message: this.$locale.baseText(
|
|
successfulUrlInvites.length > 1
|
|
? 'settings.users.multipleInviteUrlsCreated.message'
|
|
: 'settings.users.inviteUrlCreated.message',
|
|
{
|
|
interpolate: {
|
|
emails: successfulUrlInvites.map(({ user }) => user.email).join(', '),
|
|
},
|
|
},
|
|
),
|
|
});
|
|
},
|
|
onSubmitClick() {
|
|
this.formBus.emit('submit');
|
|
},
|
|
onCopyInviteLink(user: IUser) {
|
|
if (user.inviteAcceptUrl && this.showInviteUrls) {
|
|
this.copyToClipboard(user.inviteAcceptUrl);
|
|
this.showCopyInviteLinkToast([]);
|
|
}
|
|
},
|
|
},
|
|
});
|
|
</script>
|