Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
7481fe10
Commit
7481fe10
authored
Jul 21, 2025
by
johnnyjoy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: remove order by pinned
parent
71181b16
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1 addition
and
15 deletions
+1
-15
memo_service.go
server/router/api/v1/memo_service.go
+0
-1
memo.go
store/db/mysql/memo.go
+0
-3
memo.go
store/db/postgres/memo.go
+0
-3
memo.go
store/db/sqlite/memo.go
+0
-3
memo.go
store/memo.go
+0
-1
MemoView.tsx
web/src/components/MemoView.tsx
+1
-2
Home.tsx
web/src/pages/Home.tsx
+0
-1
UserProfile.tsx
web/src/pages/UserProfile.tsx
+0
-1
No files found.
server/router/api/v1/memo_service.go
View file @
7481fe10
...
@@ -112,7 +112,6 @@ func (s *APIV1Service) ListMemos(ctx context.Context, request *v1pb.ListMemosReq
...
@@ -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
...
...
store/db/mysql/memo.go
View file @
7481fe10
...
@@ -139,9 +139,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
...
@@ -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
{
...
...
store/db/postgres/memo.go
View file @
7481fe10
...
@@ -131,9 +131,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
...
@@ -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
{
...
...
store/db/sqlite/memo.go
View file @
7481fe10
...
@@ -131,9 +131,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
...
@@ -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
{
...
...
store/memo.go
View file @
7481fe10
...
@@ -82,7 +82,6 @@ type FindMemo struct {
...
@@ -82,7 +82,6 @@ type FindMemo struct {
// Ordering
// Ordering
OrderByUpdatedTs
bool
OrderByUpdatedTs
bool
OrderByPinned
bool
OrderByTimeAsc
bool
OrderByTimeAsc
bool
}
}
...
...
web/src/components/MemoView.tsx
View file @
7481fe10
...
@@ -136,8 +136,7 @@ const MemoView: React.FC<Props> = observer((props: Props) => {
...
@@ -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
,
)
}
)
}
>
>
...
...
web/src/pages/Home.tsx
View file @
7481fe10
...
@@ -66,7 +66,6 @@ const Home = observer(() => {
...
@@ -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"
}
...
...
web/src/pages/UserProfile.tsx
View file @
7481fe10
...
@@ -107,7 +107,6 @@ const UserProfile = observer(() => {
...
@@ -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"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment