Skip to content

Commit cc0c5ab

Browse files
committed
feat: add lastModifiedTime and createdUser details to service responses
1 parent 7266ac7 commit cc0c5ab

File tree

6 files changed

+21
-9
lines changed

6 files changed

+21
-9
lines changed

apps/nestjs-backend/src/features/base/base.service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ export class BaseService {
140140
return {
141141
...base,
142142
role,
143+
lastModifiedTime: base.lastModifiedTime?.toISOString(),
143144
createdUser: {
144145
...createUser,
145146
avatar: createUser?.avatar && getPublicFullStorageUrl(createUser.avatar),

apps/nestjs-backend/src/features/collaborator/collaborator.service.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,13 @@ export class CollaboratorService {
838838
spaceId: base.spaceId,
839839
spaceName: base.space?.name,
840840
collaboratorType: CollaboratorType.Base,
841+
lastModifiedTime: base.lastModifiedTime?.toISOString(),
842+
createdBy: base.createdBy,
843+
createdUser: {
844+
id: base.createdBy,
845+
name: base.createdBy,
846+
avatar: base.createdBy ? getPublicFullStorageUrl(base.createdBy) : null,
847+
},
841848
}));
842849
}
843850

apps/nestjs-backend/src/features/space/space.service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ export class SpaceService {
291291
return {
292292
...base,
293293
role,
294+
lastModifiedTime: base.lastModifiedTime?.toISOString(),
294295
createdUser: {
295296
...createUser,
296297
avatar: createUser?.avatar && getPublicFullStorageUrl(createUser.avatar),

apps/nextjs-app/src/features/app/blocks/base/base-side-bar/BaseNodeTree.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ export const BaseNodeTree = (props: IBaseNodeTreeProps) => {
560560
);
561561
} else if (emptyText) {
562562
return (
563-
<div className="flex w-full flex-col gap-2 px-2">
563+
<div className="flex w-full flex-col gap-2 px-2 ">
564564
<p className="text-sm text-muted-foreground">{emptyText}</p>
565565
</div>
566566
);

apps/nextjs-app/src/features/app/blocks/space/BaseItem.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,12 @@ export const BaseItem: FC<IBaseItemProps> = (props) => {
148148
/>
149149
) : (
150150
<>
151-
<p className="min-w-0 flex-1 truncate text-sm font-medium" title={base.name}>
151+
{/* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */}
152+
<p
153+
className="min-w-0 flex-1 cursor-pointer truncate text-sm font-medium"
154+
title={base.name}
155+
onClick={() => onToggleExpand?.()}
156+
>
152157
{base.name}
153158
</p>
154159
<StarButton

apps/nextjs-app/src/features/app/blocks/space/BaseList.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,11 @@ export const BaseList = (props: IBaseListProps) => {
108108
dragHandleProps={dragHandleProps}
109109
/>
110110
<CollapsibleContent>
111-
<div className="p-2 text-sm">
112-
<AnchorContext.Provider value={{ baseId: base.id }}>
113-
<BaseNodeProvider>
114-
<BaseNodeTree mode="view" emptyText={t('space:baseList.empty')} />
115-
</BaseNodeProvider>
116-
</AnchorContext.Provider>
117-
</div>
111+
<AnchorContext.Provider value={{ baseId: base.id }}>
112+
<BaseNodeProvider>
113+
<BaseNodeTree mode="view" emptyText={t('space:baseList.empty')} />
114+
</BaseNodeProvider>
115+
</AnchorContext.Provider>
118116
</CollapsibleContent>
119117
</Collapsible>
120118
);

0 commit comments

Comments
 (0)