Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fix: Recent chats sorting

Blue Mouse29dc6622d36e
diff --git a/backend/apps/cloud/src/ai/ai-chat.service.ts b/backend/apps/cloud/src/ai/ai-chat.service.ts
index 432c11bcb..71d21c932 100644
--- a/backend/apps/cloud/src/ai/ai-chat.service.ts
+++ b/backend/apps/cloud/src/ai/ai-chat.service.ts
@@ -10,6 +10,7 @@ interface ListChatsOptions {
pinned?: boolean
skip?: number
take?: number
+ orderByPinned?: boolean
}
@Injectable()
@@ -56,7 +57,14 @@ export class AiChatService {
return { chats: [], total: 0 }
}
- const { search, tag, pinned, skip = 0, take = 20 } = options
+ const {
+ search,
+ tag,
+ pinned,
+ skip = 0,
+ take = 20,
+ orderByPinned = true,
+ } = options
const baseQuery = () =>
this.aiChatRepository
@@ -77,12 +85,14 @@ export class AiChatService {
return qb
}
- const orderAndPaginate = (qb: ReturnType<typeof baseQuery>) =>
- qb
- .orderBy('chat.pinned', 'DESC')
- .addOrderBy('chat.updated', 'DESC')
- .skip(skip)
- .take(take)
+ const orderAndPaginate = (qb: ReturnType<typeof baseQuery>) => {
+ if (orderByPinned) {
+ qb.orderBy('chat.pinned', 'DESC').addOrderBy('chat.updated', 'DESC')
+ } else {
+ qb.orderBy('chat.updated', 'DESC')
+ }
+ return qb.skip(skip).take(take)
+ }
if (search && search.trim().length > 0) {
const term = `%${search.trim()}%`
diff --git a/backend/apps/cloud/src/ai/ai.controller.ts b/backend/apps/cloud/src/ai/ai.controller.ts
index 52f590a23..535f9dbe2 100644
--- a/backend/apps/cloud/src/ai/ai.controller.ts
+++ b/backend/apps/cloud/src/ai/ai.controller.ts
@@ -508,6 +508,7 @@ export class AiController {
pinned: query.pinned,
skip: query.skip ?? 0,
take,
+ orderByPinned: query.orderByPinned,
})
return {
diff --git a/backend/apps/cloud/src/ai/dto/chat.dto.ts b/backend/apps/cloud/src/ai/dto/chat.dto.ts
index 3e28954e4..3352bf805 100644
--- a/backend/apps/cloud/src/ai/dto/chat.dto.ts
+++ b/backend/apps/cloud/src/ai/dto/chat.dto.ts
@@ -307,6 +307,16 @@ export class GetRecentChatsQueryDto {
@Transform(parseOptionalBool)
@IsBoolean()
pinned?: boolean
+
+ @ApiProperty({
+ required: false,
+ description:
+ 'When false, results are sorted by recency only (ignoring pinned status). Defaults to true.',
+ })
+ @IsOptional()
+ @Transform(parseOptionalBool)
+ @IsBoolean()
+ orderByPinned?: boolean
}
export class UpdateChatMetaDto {
diff --git a/web/app/pages/Project/tabs/AskAI/AskAIView.tsx b/web/app/pages/Project/tabs/AskAI/AskAIView.tsx
index 3798d2e23..7a7cede33 100644
--- a/web/app/pages/Project/tabs/AskAI/AskAIView.tsx
+++ b/web/app/pages/Project/tabs/AskAI/AskAIView.tsx
@@ -1780,6 +1780,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
const formData = new FormData()
formData.append('intent', 'list-ai-chats')
formData.append('take', '3')
+ formData.append('orderByPinned', 'false')
recentChatsFetcher.submit(formData, { method: 'POST' })
// eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/web/app/routes/projects.$id.tsx b/web/app/routes/projects.$id.tsx
index 89248cb3e..126871a1e 100644
--- a/web/app/routes/projects.$id.tsx
+++ b/web/app/routes/projects.$id.tsx
@@ -1120,6 +1120,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
const search = formData.get('search')?.toString().trim()
const tag = formData.get('tag')?.toString()
const pinnedRaw = formData.get('pinned')?.toString()
+ const orderByPinnedRaw = formData.get('orderByPinned')?.toString()
if (limit) params.append('limit', limit)
if (skip) params.append('skip', skip)
@@ -1129,6 +1130,9 @@ export async function action({ request, params }: ActionFunctionArgs) {
if (pinnedRaw === 'true' || pinnedRaw === 'false') {
params.append('pinned', pinnedRaw)
}
+ if (orderByPinnedRaw === 'true' || orderByPinnedRaw === 'false') {
+ params.append('orderByPinned', orderByPinnedRaw)
+ }
const qs = params.toString()
const result = await serverFetch(