mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(editor): Show owner email in the owner badge if the resource owner is a pending user (#9560)

Browse Source
This commit is contained in:
Csaba Tuncsik
2024-05-31 17:50:42 +02:00
committed by GitHub
parent 9419c28ff3
commit 2e9bd6739b
2 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/editor-ui/src/features/projects/components/ProjectCardBadge.vue
View File

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

59
packages/editor-ui/src/features/projects/components/__tests__/ProjectCardBadge.test.ts Normal file
View File

@@ -0,0 +1,59 @@
import { createComponentRenderer } from '@/__tests__/render';
import ProjectCardBadge from '@/features/projects/components/ProjectCardBadge.vue';
const renderComponent = createComponentRenderer(ProjectCardBadge);
describe('ProjectCardBadge', () => {
it('should show "Owned by me" badge if there is no homeProject', () => {
const { getByText } = renderComponent({
props: {
resource: {},
personalProject: {},
},
});
expect(getByText('Owned by me')).toBeVisible();
});
it('should show "Owned by me" badge if homeProject ID equals personalProject ID', () => {
const { getByText } = renderComponent({
props: {
resource: {
homeProject: {
id: '1',
},
},
personalProject: {
id: '1',
},
},
});
expect(getByText('Owned by me')).toBeVisible();
});
test.each([
['First Last <email@domain.com>', 'First Last'],
['First Last Third <email@domain.com>', 'First Last Third'],
['First Last Third Fourth <email@domain.com>', 'First Last Third Fourth'],
['<email@domain.com>', 'email@domain.com'],
[' <email@domain.com>', 'email@domain.com'],
['My project', 'My project'],
['MyProject', 'MyProject'],
])('should show the correct owner badge for project name: "%s"', (name, result) => {
const { getByText } = renderComponent({
props: {
resource: {
homeProject: {
id: '1',
name,
},
},
personalProject: {
id: '2',
},
},
});
expect(getByText(result)).toBeVisible();
});
});