Skip to content

Commit

Permalink
feat: last project events ui polishing (#8298)
Browse files Browse the repository at this point in the history
  • Loading branch information
kwasniew authored Sep 30, 2024
1 parent 1ea63a8 commit 751c2fa
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export const ContentGridNoProjects: React.FC<Props> = ({ owners, admins }) => {
</p>
<AdminList>
{admins.map((admin) => (
<AdminListItem>
<AdminListItem key={admin.name}>
<UserAvatar
sx={{
margin: 0,
Expand Down
29 changes: 24 additions & 5 deletions frontend/src/component/personalDashboard/LatestProjectEvents.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,41 @@
import type { FC } from 'react';
import type { PersonalDashboardProjectDetailsSchema } from '../../openapi';
import { Markdown } from '../common/Markdown/Markdown';
import type { PersonalDashboardProjectDetailsSchema } from '../../openapi';
import { UserAvatar } from '../common/UserAvatar/UserAvatar';
import { styled } from '@mui/material';

const Events = styled('ul')(({ theme }) => ({
padding: 0,
alignItems: 'flex-start',
}));

const Event = styled('li')(({ theme }) => ({
display: 'flex',
gap: theme.spacing(2),
listStyleType: 'none',
padding: 0,
marginBottom: theme.spacing(4),
}));

export const LatestProjectEvents: FC<{
latestEvents: PersonalDashboardProjectDetailsSchema['latestEvents'];
}> = ({ latestEvents }) => {
return (
<ul>
<Events>
{latestEvents.map((event) => {
return (
<li key={event.summary}>
<Event key={event.id}>
<UserAvatar
src={event.createdByImageUrl}
sx={{ mt: 1 }}
/>
<Markdown>
{event.summary ||
'No preview available for this event'}
</Markdown>
</li>
</Event>
);
})}
</ul>
</Events>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ export type PersonalDashboardProjectDetailsSchemaLatestEventsItem = {
* @nullable
*/
summary: string | null;
id: number;
createdByImageUrl: string;
};
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ import type { IProjectReadModel } from '../project/project-read-model-type';
import type { IPrivateProjectChecker } from '../private-project/privateProjectCheckerType';
import type { IEventStore } from '../../types';
import type { FeatureEventFormatter } from '../../addons/feature-event-formatter-md';
import { generateImageUrl } from '../../util';

type PersonalProjectDetails = {
latestEvents: { summary: string; createdBy: string }[];
latestEvents: {
summary: string;
createdBy: string;
id: number;
createdByImageUrl: string;
}[];
};

export class PersonalDashboardService {
Expand Down Expand Up @@ -93,6 +99,8 @@ export class PersonalDashboardService {
const formattedEvents = recentEvents.map((event) => ({
summary: this.featureEventFormatter.format(event).text,
createdBy: event.createdBy,
id: event.id,
createdByImageUrl: generateImageUrl({ email: event.createdBy }),
}));

return { latestEvents: formattedEvents };
Expand Down
10 changes: 10 additions & 0 deletions src/lib/openapi/spec/personal-dashboard-project-details-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ export const personalDashboardProjectDetailsSchema = {
additionalProperties: false,
required: ['summary', 'createdBy'],
properties: {
id: {
type: 'integer',
minimum: 1,
description: 'The ID of the event.',
},
summary: {
type: 'string',
nullable: true,
Expand All @@ -28,6 +33,11 @@ export const personalDashboardProjectDetailsSchema = {
description: 'Which user created this event',
example: 'johndoe',
},
createdByImageUrl: {
type: 'string',
description: `URL used for the user profile image of the event author`,
example: 'https://example.com/242x200.png',
},
},
},
},
Expand Down

0 comments on commit 751c2fa

Please sign in to comment.