chore: remove order by pinned
This commit is contained in:
parent
71181b1640
commit
7481fe10bf
8 changed files with 1 additions and 15 deletions
|
|
@ -112,7 +112,6 @@ func (s *APIV1Service) ListMemos(ctx context.Context, request *v1pb.ListMemosReq
|
||||||
return nil, status.Errorf(codes.InvalidArgument, "invalid parent: %v", err)
|
return nil, status.Errorf(codes.InvalidArgument, "invalid parent: %v", err)
|
||||||
}
|
}
|
||||||
memoFind.CreatorID = &userID
|
memoFind.CreatorID = &userID
|
||||||
memoFind.OrderByPinned = true
|
|
||||||
}
|
}
|
||||||
if request.State == v1pb.State_ARCHIVED {
|
if request.State == v1pb.State_ARCHIVED {
|
||||||
state := store.Archived
|
state := store.Archived
|
||||||
|
|
|
||||||
|
|
@ -139,9 +139,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
|
||||||
order = "ASC"
|
order = "ASC"
|
||||||
}
|
}
|
||||||
orderBy := []string{}
|
orderBy := []string{}
|
||||||
if find.OrderByPinned {
|
|
||||||
orderBy = append(orderBy, "`pinned` DESC")
|
|
||||||
}
|
|
||||||
if find.OrderByUpdatedTs {
|
if find.OrderByUpdatedTs {
|
||||||
orderBy = append(orderBy, "`updated_ts` "+order)
|
orderBy = append(orderBy, "`updated_ts` "+order)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -131,9 +131,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
|
||||||
order = "ASC"
|
order = "ASC"
|
||||||
}
|
}
|
||||||
orderBy := []string{}
|
orderBy := []string{}
|
||||||
if find.OrderByPinned {
|
|
||||||
orderBy = append(orderBy, "pinned DESC")
|
|
||||||
}
|
|
||||||
if find.OrderByUpdatedTs {
|
if find.OrderByUpdatedTs {
|
||||||
orderBy = append(orderBy, "updated_ts "+order)
|
orderBy = append(orderBy, "updated_ts "+order)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -131,9 +131,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
|
||||||
order = "ASC"
|
order = "ASC"
|
||||||
}
|
}
|
||||||
orderBy := []string{}
|
orderBy := []string{}
|
||||||
if find.OrderByPinned {
|
|
||||||
orderBy = append(orderBy, "`pinned` DESC")
|
|
||||||
}
|
|
||||||
if find.OrderByUpdatedTs {
|
if find.OrderByUpdatedTs {
|
||||||
orderBy = append(orderBy, "`updated_ts` "+order)
|
orderBy = append(orderBy, "`updated_ts` "+order)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,6 @@ type FindMemo struct {
|
||||||
|
|
||||||
// Ordering
|
// Ordering
|
||||||
OrderByUpdatedTs bool
|
OrderByUpdatedTs bool
|
||||||
OrderByPinned bool
|
|
||||||
OrderByTimeAsc bool
|
OrderByTimeAsc bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -136,8 +136,7 @@ const MemoView: React.FC<Props> = observer((props: Props) => {
|
||||||
) : (
|
) : (
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
"group relative flex flex-col justify-start items-start w-full px-4 py-3 mb-2 gap-2 text-card-foreground rounded-lg border border-border transition-colors",
|
"group relative flex flex-col justify-start items-start bg-card w-full px-4 py-3 mb-2 gap-2 text-card-foreground rounded-lg border border-border transition-colors",
|
||||||
props.showPinned && memo.pinned ? "bg-accent" : "bg-card",
|
|
||||||
className,
|
className,
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,6 @@ const Home = observer(() => {
|
||||||
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
|
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
|
||||||
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
|
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
|
||||||
)
|
)
|
||||||
.sort((a, b) => Number(b.pinned) - Number(a.pinned))
|
|
||||||
}
|
}
|
||||||
owner={user.name}
|
owner={user.name}
|
||||||
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
|
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,6 @@ const UserProfile = observer(() => {
|
||||||
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
|
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
|
||||||
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
|
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
|
||||||
)
|
)
|
||||||
.sort((a, b) => Number(b.pinned) - Number(a.pinned))
|
|
||||||
}
|
}
|
||||||
owner={user.name}
|
owner={user.name}
|
||||||
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
|
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue