mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-09-19 22:37:31 -07:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

refactor(editor): Refactor project utils splitName (no-changelog) (#10669)

Browse source
This commit is contained in:
Csaba Tuncsik 2024-09-05 09:17:46 +02:00 committed by GitHub
parent 7da234d8b1
commit e318a6323a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 59 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
View file

@ -45,8 +45,8 @@ const isSharingEnabled = computed(
() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing],
);
const credentialOwnerName = computed(() => {
const { firstName, lastName, email } = splitName(props.credential?.homeProject?.name ?? '');
return firstName || lastName ? `${firstName}${lastName ? ' ' + lastName : ''}` : email ?? '';
const { name, email } = splitName(props.credential?.homeProject?.name ?? '');
return name ?? email ?? '';
});
const credentialDataHomeProject = computed<ProjectSharingData | undefined>(() => {

4
packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
View file

@ -59,8 +59,8 @@ const badgeText = computed(() => {
) {
return i18n.baseText('generic.ownedByMe');
} else {
const { firstName, lastName, email } = splitName(props.resource.homeProject?.name ?? '');
return (!firstName ? email : `${firstName}${lastName ? ' ' + lastName : ''}`) ?? '';
const { name, email } = splitName(props.resource.homeProject?.name ?? '');
return name ?? email ?? '';
}
});
const badgeIcon = computed(() => {

4
packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
View file

@ -26,8 +26,8 @@ const telemetry = useTelemetry();
const projectId = ref<string | null>(null);
const processedName = computed(() => {
const { firstName, lastName, email } = splitName(props.data.resource.homeProject?.name ?? '');
return !firstName ? email : `${firstName}${lastName ? ' ' + lastName : ''}`;
const { name, email } = splitName(props.data.resource.homeProject?.name ?? '');
return name ?? email;
});
const availableProjects = computed(() => {
return projectsStore.teamProjects.filter((p) => p.id !== props.data.resource.homeProject?.id);

11
packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
View file

@ -9,7 +9,16 @@ type Props = {
const props = defineProps<Props>();
const processedName = computed(() => splitName(props.project.name ?? ''));
const processedName = computed(() => {
const { name, email } = splitName(props.project.name ?? '');
const nameArray = name?.split(' ');
const lastName = nameArray?.pop() ?? '';
return {
firstName: nameArray?.join(' ') ?? '',
lastName,
email,
};
});
</script>
<template>
<div :class="$style.projectInfo" data-test-id="project-sharing-info">

16
packages/editor-ui/src/stores/credentials.store.ts
View file

@ -183,17 +183,13 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
const getCredentialOwnerName = computed(() => {
return (credential: ICredentialsResponse | IUsedCredential | undefined): string => {
const { firstName, lastName, email } = splitName(credential?.homeProject?.name ?? '');
const { name, email } = splitName(credential?.homeProject?.name ?? '');
if (credential?.homeProject?.name) {
if (lastName && email) {
return `${firstName} ${lastName} (${email})`;
} else {
return firstName;
}
} else {
return i18n.baseText('credentialEdit.credentialSharing.info.sharee.fallback');
}
return name
? email
? `${name} (${email})`
: name
: email ?? i18n.baseText('credentialEdit.credentialSharing.info.sharee.fallback');
};
});

6
packages/editor-ui/src/stores/workflows.ee.store.ts
View file

@ -19,11 +19,9 @@ export const useWorkflowsEEStore = defineStore(STORES.WORKFLOWS_EE, {
fallback = i18n.baseText('workflows.shareModal.info.sharee.fallback'),
): string => {
const workflow = useWorkflowsStore().getWorkflowById(workflowId);
const { firstName, lastName, email } = splitName(workflow?.homeProject?.name ?? '');
const { name, email } = splitName(workflow?.homeProject?.name ?? '');
return workflow?.homeProject?.name
? `${firstName} ${lastName ?? ''} ${email ? `(${email})` : ''}`
: fallback;
return name ? (email ? `${name} (${email})` : name) : email ?? fallback;
};
},
},

43
packages/editor-ui/src/utils/__tests__/projects.utils.test.ts → packages/editor-ui/src/utils/projects.utils.test.ts
View file

@ -5,54 +5,71 @@ describe('splitName', () => {
[
'First Last <email@domain.com>',
{
firstName: 'First',
lastName: 'Last',
name: 'First Last',
email: 'email@domain.com',
},
],
[
'First Last Third <email@domain.com>',
{
firstName: 'First Last',
lastName: 'Third',
name: 'First Last Third',
email: 'email@domain.com',
},
],
[
'First Last Third Fourth <email@domain.com>',
{
firstName: 'First Last Third',
lastName: 'Fourth',
name: 'First Last Third Fourth',
email: 'email@domain.com',
},
],
[
' First Last Third Fourth <email@domain.com>',
{
name: 'First Last Third Fourth',
email: 'email@domain.com',
},
],
[
'<email@domain.com>',
{
firstName: undefined,
lastName: undefined,
name: undefined,
email: 'email@domain.com',
},
],
[
' <email@domain.com>',
{
firstName: '',
lastName: '',
name: undefined,
email: 'email@domain.com',
},
],
[
'My project',
{
firstName: 'My',
lastName: 'project',
name: 'My project',
email: undefined,
},
],
[
' My project ',
{
name: 'My project',
email: undefined,
},
],
[
'MyProject',
{
firstName: 'MyProject',
name: 'MyProject',
email: undefined,
},
],
[
undefined,
{
name: undefined,
email: undefined,
},
],
])('should split a name in the format "First Last <email@domain.com>"', (input, result) => {

26
packages/editor-ui/src/utils/projects.utils.ts
View file

@ -1,30 +1,14 @@
// Splits a project name into first name, last name, and email when it is in the format "First Last <email@domain.com>"
export const splitName = (
projectName: string,
projectName = '',
): {
firstName: string;
lastName?: string;
name?: string;
email?: string;
} => {
const regex = /^(.+)?\s?<([^>]+)>$/;
const regex = /^(.*?)(?:\s*<([^>]+)>)?$/;
const match = projectName.match(regex);
if (match) {
const [_, fullName, email] = match;
const nameParts = fullName?.trim().split(/\s+/);
const lastName = nameParts?.pop();
const firstName = nameParts?.join(' ');
return { firstName, lastName, email };
} else {
const nameParts = projectName.split(/\s+/) ?? [];
if (nameParts.length < 2) {
return { firstName: projectName };
} else {
const lastName = nameParts.pop();
const firstName = nameParts.join(' ');
return { firstName, lastName };
}
}
const [, name, email] = match ?? [];
return { name: name.trim() || undefined, email };
};
export const enum ResourceType {