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
bcd8a5a7
Commit
bcd8a5a7
authored
Nov 22, 2023
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: migrate get tag suggestions
parent
0cf280fa
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
461 additions
and
75 deletions
+461
-75
tag_service.go
api/v2/tag_service.go
+77
-1
tag_service.proto
proto/api/v2/tag_service.proto
+14
-1
README.md
proto/gen/api/v2/README.md
+34
-1
tag_service.pb.go
proto/gen/api/v2/tag_service.pb.go
+197
-59
tag_service.pb.gw.go
proto/gen/api/v2/tag_service.pb.gw.go
+87
-0
tag_service_grpc.pb.go
proto/gen/api/v2/tag_service_grpc.pb.go
+40
-3
CreateTagDialog.tsx
web/src/components/CreateTagDialog.tsx
+11
-5
api.ts
web/src/helpers/api.ts
+0
-4
tag.ts
web/src/store/module/tag.ts
+1
-1
No files found.
api/v2/tag_service.go
View file @
bcd8a5a7
...
@@ -3,8 +3,11 @@ package v2
...
@@ -3,8 +3,11 @@ package v2
import
(
import
(
"context"
"context"
"fmt"
"fmt"
"regexp"
"sort"
"github.com/pkg/errors"
"github.com/pkg/errors"
"golang.org/x/exp/slices"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/grpc/status"
...
@@ -36,7 +39,7 @@ func (s *APIV2Service) UpsertTag(ctx context.Context, request *apiv2pb.UpsertTag
...
@@ -36,7 +39,7 @@ func (s *APIV2Service) UpsertTag(ctx context.Context, request *apiv2pb.UpsertTag
}
}
func
(
s
*
APIV2Service
)
ListTags
(
ctx
context
.
Context
,
request
*
apiv2pb
.
ListTagsRequest
)
(
*
apiv2pb
.
ListTagsResponse
,
error
)
{
func
(
s
*
APIV2Service
)
ListTags
(
ctx
context
.
Context
,
request
*
apiv2pb
.
ListTagsRequest
)
(
*
apiv2pb
.
ListTagsResponse
,
error
)
{
username
,
err
:=
ExtractUsernameFromName
(
request
.
Creato
r
)
username
,
err
:=
ExtractUsernameFromName
(
request
.
Use
r
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
InvalidArgument
,
"invalid username: %v"
,
err
)
return
nil
,
status
.
Errorf
(
codes
.
InvalidArgument
,
"invalid username: %v"
,
err
)
}
}
...
@@ -91,6 +94,61 @@ func (s *APIV2Service) DeleteTag(ctx context.Context, request *apiv2pb.DeleteTag
...
@@ -91,6 +94,61 @@ func (s *APIV2Service) DeleteTag(ctx context.Context, request *apiv2pb.DeleteTag
return
&
apiv2pb
.
DeleteTagResponse
{},
nil
return
&
apiv2pb
.
DeleteTagResponse
{},
nil
}
}
func
(
s
*
APIV2Service
)
GetTagSuggestions
(
ctx
context
.
Context
,
request
*
apiv2pb
.
GetTagSuggestionsRequest
)
(
*
apiv2pb
.
GetTagSuggestionsResponse
,
error
)
{
username
,
err
:=
ExtractUsernameFromName
(
request
.
User
)
if
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
InvalidArgument
,
"invalid username: %v"
,
err
)
}
user
,
err
:=
s
.
Store
.
GetUser
(
ctx
,
&
store
.
FindUser
{
Username
:
&
username
,
})
if
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to get user: %v"
,
err
)
}
if
user
==
nil
{
return
nil
,
status
.
Errorf
(
codes
.
NotFound
,
"user not found"
)
}
normalRowStatus
:=
store
.
Normal
memoFind
:=
&
store
.
FindMemo
{
CreatorID
:
&
user
.
ID
,
ContentSearch
:
[]
string
{
"#"
},
RowStatus
:
&
normalRowStatus
,
}
memoList
,
err
:=
s
.
Store
.
ListMemos
(
ctx
,
memoFind
)
if
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to list memos: %v"
,
err
)
}
tagList
,
err
:=
s
.
Store
.
ListTags
(
ctx
,
&
store
.
FindTag
{
CreatorID
:
user
.
ID
,
})
if
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to list tags: %v"
,
err
)
}
tagNameList
:=
[]
string
{}
for
_
,
tag
:=
range
tagList
{
tagNameList
=
append
(
tagNameList
,
tag
.
Name
)
}
tagMapSet
:=
make
(
map
[
string
]
bool
)
for
_
,
memo
:=
range
memoList
{
for
_
,
tag
:=
range
findTagListFromMemoContent
(
memo
.
Content
)
{
if
!
slices
.
Contains
(
tagNameList
,
tag
)
{
tagMapSet
[
tag
]
=
true
}
}
}
suggestions
:=
[]
string
{}
for
tag
:=
range
tagMapSet
{
suggestions
=
append
(
suggestions
,
tag
)
}
sort
.
Strings
(
suggestions
)
return
&
apiv2pb
.
GetTagSuggestionsResponse
{
Tags
:
suggestions
,
},
nil
}
func
(
s
*
APIV2Service
)
convertTagFromStore
(
ctx
context
.
Context
,
tag
*
store
.
Tag
)
(
*
apiv2pb
.
Tag
,
error
)
{
func
(
s
*
APIV2Service
)
convertTagFromStore
(
ctx
context
.
Context
,
tag
*
store
.
Tag
)
(
*
apiv2pb
.
Tag
,
error
)
{
user
,
err
:=
s
.
Store
.
GetUser
(
ctx
,
&
store
.
FindUser
{
user
,
err
:=
s
.
Store
.
GetUser
(
ctx
,
&
store
.
FindUser
{
ID
:
&
tag
.
CreatorID
,
ID
:
&
tag
.
CreatorID
,
...
@@ -103,3 +161,21 @@ func (s *APIV2Service) convertTagFromStore(ctx context.Context, tag *store.Tag)
...
@@ -103,3 +161,21 @@ func (s *APIV2Service) convertTagFromStore(ctx context.Context, tag *store.Tag)
Creator
:
fmt
.
Sprintf
(
"%s%s"
,
UserNamePrefix
,
user
.
Username
),
Creator
:
fmt
.
Sprintf
(
"%s%s"
,
UserNamePrefix
,
user
.
Username
),
},
nil
},
nil
}
}
var
tagRegexp
=
regexp
.
MustCompile
(
`#([^\s#,]+)`
)
func
findTagListFromMemoContent
(
memoContent
string
)
[]
string
{
tagMapSet
:=
make
(
map
[
string
]
bool
)
matches
:=
tagRegexp
.
FindAllStringSubmatch
(
memoContent
,
-
1
)
for
_
,
v
:=
range
matches
{
tagName
:=
v
[
1
]
tagMapSet
[
tagName
]
=
true
}
tagList
:=
[]
string
{}
for
tag
:=
range
tagMapSet
{
tagList
=
append
(
tagList
,
tag
)
}
sort
.
Strings
(
tagList
)
return
tagList
}
proto/api/v2/tag_service.proto
View file @
bcd8a5a7
...
@@ -16,6 +16,9 @@ service TagService {
...
@@ -16,6 +16,9 @@ service TagService {
rpc
DeleteTag
(
DeleteTagRequest
)
returns
(
DeleteTagResponse
)
{
rpc
DeleteTag
(
DeleteTagRequest
)
returns
(
DeleteTagResponse
)
{
option
(
google.api.http
)
=
{
delete
:
"/api/v2/tags"
};
option
(
google.api.http
)
=
{
delete
:
"/api/v2/tags"
};
}
}
rpc
GetTagSuggestions
(
GetTagSuggestionsRequest
)
returns
(
GetTagSuggestionsResponse
)
{
option
(
google.api.http
)
=
{
get
:
"/api/v2/tags/suggestion"
};
}
}
}
message
Tag
{
message
Tag
{
...
@@ -36,7 +39,7 @@ message UpsertTagResponse {
...
@@ -36,7 +39,7 @@ message UpsertTagResponse {
message
ListTagsRequest
{
message
ListTagsRequest
{
// The creator of tags.
// The creator of tags.
// Format: users/{username}
// Format: users/{username}
string
creato
r
=
1
;
string
use
r
=
1
;
}
}
message
ListTagsResponse
{
message
ListTagsResponse
{
...
@@ -48,3 +51,13 @@ message DeleteTagRequest {
...
@@ -48,3 +51,13 @@ message DeleteTagRequest {
}
}
message
DeleteTagResponse
{}
message
DeleteTagResponse
{}
message
GetTagSuggestionsRequest
{
// The creator of tags.
// Format: users/{username}
string
user
=
1
;
}
message
GetTagSuggestionsResponse
{
repeated
string
tags
=
1
;
}
proto/gen/api/v2/README.md
View file @
bcd8a5a7
...
@@ -72,6 +72,8 @@
...
@@ -72,6 +72,8 @@
-
[
api/v2/tag_service.proto
](
#api_v2_tag_service-proto
)
-
[
api/v2/tag_service.proto
](
#api_v2_tag_service-proto
)
-
[
DeleteTagRequest
](
#memos-api-v2-DeleteTagRequest
)
-
[
DeleteTagRequest
](
#memos-api-v2-DeleteTagRequest
)
-
[
DeleteTagResponse
](
#memos-api-v2-DeleteTagResponse
)
-
[
DeleteTagResponse
](
#memos-api-v2-DeleteTagResponse
)
-
[
GetTagSuggestionsRequest
](
#memos-api-v2-GetTagSuggestionsRequest
)
-
[
GetTagSuggestionsResponse
](
#memos-api-v2-GetTagSuggestionsResponse
)
-
[
ListTagsRequest
](
#memos-api-v2-ListTagsRequest
)
-
[
ListTagsRequest
](
#memos-api-v2-ListTagsRequest
)
-
[
ListTagsResponse
](
#memos-api-v2-ListTagsResponse
)
-
[
ListTagsResponse
](
#memos-api-v2-ListTagsResponse
)
-
[
Tag
](
#memos-api-v2-Tag
)
-
[
Tag
](
#memos-api-v2-Tag
)
...
@@ -938,6 +940,36 @@
...
@@ -938,6 +940,36 @@
<a
name=
"memos-api-v2-GetTagSuggestionsRequest"
></a>
### GetTagSuggestionsRequest
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| user |
[
string
](
#string
)
| | The creator of tags. Format: users/{username} |
<a
name=
"memos-api-v2-GetTagSuggestionsResponse"
></a>
### GetTagSuggestionsResponse
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| tags |
[
string
](
#string
)
| repeated | |
<a
name=
"memos-api-v2-ListTagsRequest"
></a>
<a
name=
"memos-api-v2-ListTagsRequest"
></a>
### ListTagsRequest
### ListTagsRequest
...
@@ -946,7 +978,7 @@
...
@@ -946,7 +978,7 @@
| Field | Type | Label | Description |
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| ----- | ---- | ----- | ----------- |
|
creato
r |
[
string
](
#string
)
| | The creator of tags. Format: users/{username} |
|
use
r |
[
string
](
#string
)
| | The creator of tags. Format: users/{username} |
...
@@ -1030,6 +1062,7 @@
...
@@ -1030,6 +1062,7 @@
| UpsertTag |
[
UpsertTagRequest
](
#memos-api-v2-UpsertTagRequest
)
|
[
UpsertTagResponse
](
#memos-api-v2-UpsertTagResponse
)
| |
| UpsertTag |
[
UpsertTagRequest
](
#memos-api-v2-UpsertTagRequest
)
|
[
UpsertTagResponse
](
#memos-api-v2-UpsertTagResponse
)
| |
| ListTags |
[
ListTagsRequest
](
#memos-api-v2-ListTagsRequest
)
|
[
ListTagsResponse
](
#memos-api-v2-ListTagsResponse
)
| |
| ListTags |
[
ListTagsRequest
](
#memos-api-v2-ListTagsRequest
)
|
[
ListTagsResponse
](
#memos-api-v2-ListTagsResponse
)
| |
| DeleteTag |
[
DeleteTagRequest
](
#memos-api-v2-DeleteTagRequest
)
|
[
DeleteTagResponse
](
#memos-api-v2-DeleteTagResponse
)
| |
| DeleteTag |
[
DeleteTagRequest
](
#memos-api-v2-DeleteTagRequest
)
|
[
DeleteTagResponse
](
#memos-api-v2-DeleteTagResponse
)
| |
| GetTagSuggestions |
[
GetTagSuggestionsRequest
](
#memos-api-v2-GetTagSuggestionsRequest
)
|
[
GetTagSuggestionsResponse
](
#memos-api-v2-GetTagSuggestionsResponse
)
| |
...
...
proto/gen/api/v2/tag_service.pb.go
View file @
bcd8a5a7
This diff is collapsed.
Click to expand it.
proto/gen/api/v2/tag_service.pb.gw.go
View file @
bcd8a5a7
...
@@ -139,6 +139,42 @@ func local_request_TagService_DeleteTag_0(ctx context.Context, marshaler runtime
...
@@ -139,6 +139,42 @@ func local_request_TagService_DeleteTag_0(ctx context.Context, marshaler runtime
}
}
var
(
filter_TagService_GetTagSuggestions_0
=
&
utilities
.
DoubleArray
{
Encoding
:
map
[
string
]
int
{},
Base
:
[]
int
(
nil
),
Check
:
[]
int
(
nil
)}
)
func
request_TagService_GetTagSuggestions_0
(
ctx
context
.
Context
,
marshaler
runtime
.
Marshaler
,
client
TagServiceClient
,
req
*
http
.
Request
,
pathParams
map
[
string
]
string
)
(
proto
.
Message
,
runtime
.
ServerMetadata
,
error
)
{
var
protoReq
GetTagSuggestionsRequest
var
metadata
runtime
.
ServerMetadata
if
err
:=
req
.
ParseForm
();
err
!=
nil
{
return
nil
,
metadata
,
status
.
Errorf
(
codes
.
InvalidArgument
,
"%v"
,
err
)
}
if
err
:=
runtime
.
PopulateQueryParameters
(
&
protoReq
,
req
.
Form
,
filter_TagService_GetTagSuggestions_0
);
err
!=
nil
{
return
nil
,
metadata
,
status
.
Errorf
(
codes
.
InvalidArgument
,
"%v"
,
err
)
}
msg
,
err
:=
client
.
GetTagSuggestions
(
ctx
,
&
protoReq
,
grpc
.
Header
(
&
metadata
.
HeaderMD
),
grpc
.
Trailer
(
&
metadata
.
TrailerMD
))
return
msg
,
metadata
,
err
}
func
local_request_TagService_GetTagSuggestions_0
(
ctx
context
.
Context
,
marshaler
runtime
.
Marshaler
,
server
TagServiceServer
,
req
*
http
.
Request
,
pathParams
map
[
string
]
string
)
(
proto
.
Message
,
runtime
.
ServerMetadata
,
error
)
{
var
protoReq
GetTagSuggestionsRequest
var
metadata
runtime
.
ServerMetadata
if
err
:=
req
.
ParseForm
();
err
!=
nil
{
return
nil
,
metadata
,
status
.
Errorf
(
codes
.
InvalidArgument
,
"%v"
,
err
)
}
if
err
:=
runtime
.
PopulateQueryParameters
(
&
protoReq
,
req
.
Form
,
filter_TagService_GetTagSuggestions_0
);
err
!=
nil
{
return
nil
,
metadata
,
status
.
Errorf
(
codes
.
InvalidArgument
,
"%v"
,
err
)
}
msg
,
err
:=
server
.
GetTagSuggestions
(
ctx
,
&
protoReq
)
return
msg
,
metadata
,
err
}
// RegisterTagServiceHandlerServer registers the http handlers for service TagService to "mux".
// RegisterTagServiceHandlerServer registers the http handlers for service TagService to "mux".
// UnaryRPC :call TagServiceServer directly.
// UnaryRPC :call TagServiceServer directly.
// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
...
@@ -220,6 +256,31 @@ func RegisterTagServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
...
@@ -220,6 +256,31 @@ func RegisterTagServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
})
})
mux
.
Handle
(
"GET"
,
pattern_TagService_GetTagSuggestions_0
,
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
,
pathParams
map
[
string
]
string
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
req
.
Context
())
defer
cancel
()
var
stream
runtime
.
ServerTransportStream
ctx
=
grpc
.
NewContextWithServerTransportStream
(
ctx
,
&
stream
)
inboundMarshaler
,
outboundMarshaler
:=
runtime
.
MarshalerForRequest
(
mux
,
req
)
var
err
error
var
annotatedContext
context
.
Context
annotatedContext
,
err
=
runtime
.
AnnotateIncomingContext
(
ctx
,
mux
,
req
,
"/memos.api.v2.TagService/GetTagSuggestions"
,
runtime
.
WithHTTPPathPattern
(
"/api/v2/tags/suggestion"
))
if
err
!=
nil
{
runtime
.
HTTPError
(
ctx
,
mux
,
outboundMarshaler
,
w
,
req
,
err
)
return
}
resp
,
md
,
err
:=
local_request_TagService_GetTagSuggestions_0
(
annotatedContext
,
inboundMarshaler
,
server
,
req
,
pathParams
)
md
.
HeaderMD
,
md
.
TrailerMD
=
metadata
.
Join
(
md
.
HeaderMD
,
stream
.
Header
()),
metadata
.
Join
(
md
.
TrailerMD
,
stream
.
Trailer
())
annotatedContext
=
runtime
.
NewServerMetadataContext
(
annotatedContext
,
md
)
if
err
!=
nil
{
runtime
.
HTTPError
(
annotatedContext
,
mux
,
outboundMarshaler
,
w
,
req
,
err
)
return
}
forward_TagService_GetTagSuggestions_0
(
annotatedContext
,
mux
,
outboundMarshaler
,
w
,
req
,
resp
,
mux
.
GetForwardResponseOptions
()
...
)
})
return
nil
return
nil
}
}
...
@@ -327,6 +388,28 @@ func RegisterTagServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
...
@@ -327,6 +388,28 @@ func RegisterTagServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
})
})
mux
.
Handle
(
"GET"
,
pattern_TagService_GetTagSuggestions_0
,
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
,
pathParams
map
[
string
]
string
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
req
.
Context
())
defer
cancel
()
inboundMarshaler
,
outboundMarshaler
:=
runtime
.
MarshalerForRequest
(
mux
,
req
)
var
err
error
var
annotatedContext
context
.
Context
annotatedContext
,
err
=
runtime
.
AnnotateContext
(
ctx
,
mux
,
req
,
"/memos.api.v2.TagService/GetTagSuggestions"
,
runtime
.
WithHTTPPathPattern
(
"/api/v2/tags/suggestion"
))
if
err
!=
nil
{
runtime
.
HTTPError
(
ctx
,
mux
,
outboundMarshaler
,
w
,
req
,
err
)
return
}
resp
,
md
,
err
:=
request_TagService_GetTagSuggestions_0
(
annotatedContext
,
inboundMarshaler
,
client
,
req
,
pathParams
)
annotatedContext
=
runtime
.
NewServerMetadataContext
(
annotatedContext
,
md
)
if
err
!=
nil
{
runtime
.
HTTPError
(
annotatedContext
,
mux
,
outboundMarshaler
,
w
,
req
,
err
)
return
}
forward_TagService_GetTagSuggestions_0
(
annotatedContext
,
mux
,
outboundMarshaler
,
w
,
req
,
resp
,
mux
.
GetForwardResponseOptions
()
...
)
})
return
nil
return
nil
}
}
...
@@ -336,6 +419,8 @@ var (
...
@@ -336,6 +419,8 @@ var (
pattern_TagService_ListTags_0
=
runtime
.
MustPattern
(
runtime
.
NewPattern
(
1
,
[]
int
{
2
,
0
,
2
,
1
,
2
,
2
},
[]
string
{
"api"
,
"v2"
,
"tags"
},
""
))
pattern_TagService_ListTags_0
=
runtime
.
MustPattern
(
runtime
.
NewPattern
(
1
,
[]
int
{
2
,
0
,
2
,
1
,
2
,
2
},
[]
string
{
"api"
,
"v2"
,
"tags"
},
""
))
pattern_TagService_DeleteTag_0
=
runtime
.
MustPattern
(
runtime
.
NewPattern
(
1
,
[]
int
{
2
,
0
,
2
,
1
,
2
,
2
},
[]
string
{
"api"
,
"v2"
,
"tags"
},
""
))
pattern_TagService_DeleteTag_0
=
runtime
.
MustPattern
(
runtime
.
NewPattern
(
1
,
[]
int
{
2
,
0
,
2
,
1
,
2
,
2
},
[]
string
{
"api"
,
"v2"
,
"tags"
},
""
))
pattern_TagService_GetTagSuggestions_0
=
runtime
.
MustPattern
(
runtime
.
NewPattern
(
1
,
[]
int
{
2
,
0
,
2
,
1
,
2
,
2
,
2
,
3
},
[]
string
{
"api"
,
"v2"
,
"tags"
,
"suggestion"
},
""
))
)
)
var
(
var
(
...
@@ -344,4 +429,6 @@ var (
...
@@ -344,4 +429,6 @@ var (
forward_TagService_ListTags_0
=
runtime
.
ForwardResponseMessage
forward_TagService_ListTags_0
=
runtime
.
ForwardResponseMessage
forward_TagService_DeleteTag_0
=
runtime
.
ForwardResponseMessage
forward_TagService_DeleteTag_0
=
runtime
.
ForwardResponseMessage
forward_TagService_GetTagSuggestions_0
=
runtime
.
ForwardResponseMessage
)
)
proto/gen/api/v2/tag_service_grpc.pb.go
View file @
bcd8a5a7
...
@@ -19,9 +19,10 @@ import (
...
@@ -19,9 +19,10 @@ import (
const
_
=
grpc
.
SupportPackageIsVersion7
const
_
=
grpc
.
SupportPackageIsVersion7
const
(
const
(
TagService_UpsertTag_FullMethodName
=
"/memos.api.v2.TagService/UpsertTag"
TagService_UpsertTag_FullMethodName
=
"/memos.api.v2.TagService/UpsertTag"
TagService_ListTags_FullMethodName
=
"/memos.api.v2.TagService/ListTags"
TagService_ListTags_FullMethodName
=
"/memos.api.v2.TagService/ListTags"
TagService_DeleteTag_FullMethodName
=
"/memos.api.v2.TagService/DeleteTag"
TagService_DeleteTag_FullMethodName
=
"/memos.api.v2.TagService/DeleteTag"
TagService_GetTagSuggestions_FullMethodName
=
"/memos.api.v2.TagService/GetTagSuggestions"
)
)
// TagServiceClient is the client API for TagService service.
// TagServiceClient is the client API for TagService service.
...
@@ -31,6 +32,7 @@ type TagServiceClient interface {
...
@@ -31,6 +32,7 @@ type TagServiceClient interface {
UpsertTag
(
ctx
context
.
Context
,
in
*
UpsertTagRequest
,
opts
...
grpc
.
CallOption
)
(
*
UpsertTagResponse
,
error
)
UpsertTag
(
ctx
context
.
Context
,
in
*
UpsertTagRequest
,
opts
...
grpc
.
CallOption
)
(
*
UpsertTagResponse
,
error
)
ListTags
(
ctx
context
.
Context
,
in
*
ListTagsRequest
,
opts
...
grpc
.
CallOption
)
(
*
ListTagsResponse
,
error
)
ListTags
(
ctx
context
.
Context
,
in
*
ListTagsRequest
,
opts
...
grpc
.
CallOption
)
(
*
ListTagsResponse
,
error
)
DeleteTag
(
ctx
context
.
Context
,
in
*
DeleteTagRequest
,
opts
...
grpc
.
CallOption
)
(
*
DeleteTagResponse
,
error
)
DeleteTag
(
ctx
context
.
Context
,
in
*
DeleteTagRequest
,
opts
...
grpc
.
CallOption
)
(
*
DeleteTagResponse
,
error
)
GetTagSuggestions
(
ctx
context
.
Context
,
in
*
GetTagSuggestionsRequest
,
opts
...
grpc
.
CallOption
)
(
*
GetTagSuggestionsResponse
,
error
)
}
}
type
tagServiceClient
struct
{
type
tagServiceClient
struct
{
...
@@ -68,6 +70,15 @@ func (c *tagServiceClient) DeleteTag(ctx context.Context, in *DeleteTagRequest,
...
@@ -68,6 +70,15 @@ func (c *tagServiceClient) DeleteTag(ctx context.Context, in *DeleteTagRequest,
return
out
,
nil
return
out
,
nil
}
}
func
(
c
*
tagServiceClient
)
GetTagSuggestions
(
ctx
context
.
Context
,
in
*
GetTagSuggestionsRequest
,
opts
...
grpc
.
CallOption
)
(
*
GetTagSuggestionsResponse
,
error
)
{
out
:=
new
(
GetTagSuggestionsResponse
)
err
:=
c
.
cc
.
Invoke
(
ctx
,
TagService_GetTagSuggestions_FullMethodName
,
in
,
out
,
opts
...
)
if
err
!=
nil
{
return
nil
,
err
}
return
out
,
nil
}
// TagServiceServer is the server API for TagService service.
// TagServiceServer is the server API for TagService service.
// All implementations must embed UnimplementedTagServiceServer
// All implementations must embed UnimplementedTagServiceServer
// for forward compatibility
// for forward compatibility
...
@@ -75,6 +86,7 @@ type TagServiceServer interface {
...
@@ -75,6 +86,7 @@ type TagServiceServer interface {
UpsertTag
(
context
.
Context
,
*
UpsertTagRequest
)
(
*
UpsertTagResponse
,
error
)
UpsertTag
(
context
.
Context
,
*
UpsertTagRequest
)
(
*
UpsertTagResponse
,
error
)
ListTags
(
context
.
Context
,
*
ListTagsRequest
)
(
*
ListTagsResponse
,
error
)
ListTags
(
context
.
Context
,
*
ListTagsRequest
)
(
*
ListTagsResponse
,
error
)
DeleteTag
(
context
.
Context
,
*
DeleteTagRequest
)
(
*
DeleteTagResponse
,
error
)
DeleteTag
(
context
.
Context
,
*
DeleteTagRequest
)
(
*
DeleteTagResponse
,
error
)
GetTagSuggestions
(
context
.
Context
,
*
GetTagSuggestionsRequest
)
(
*
GetTagSuggestionsResponse
,
error
)
mustEmbedUnimplementedTagServiceServer
()
mustEmbedUnimplementedTagServiceServer
()
}
}
...
@@ -91,6 +103,9 @@ func (UnimplementedTagServiceServer) ListTags(context.Context, *ListTagsRequest)
...
@@ -91,6 +103,9 @@ func (UnimplementedTagServiceServer) ListTags(context.Context, *ListTagsRequest)
func
(
UnimplementedTagServiceServer
)
DeleteTag
(
context
.
Context
,
*
DeleteTagRequest
)
(
*
DeleteTagResponse
,
error
)
{
func
(
UnimplementedTagServiceServer
)
DeleteTag
(
context
.
Context
,
*
DeleteTagRequest
)
(
*
DeleteTagResponse
,
error
)
{
return
nil
,
status
.
Errorf
(
codes
.
Unimplemented
,
"method DeleteTag not implemented"
)
return
nil
,
status
.
Errorf
(
codes
.
Unimplemented
,
"method DeleteTag not implemented"
)
}
}
func
(
UnimplementedTagServiceServer
)
GetTagSuggestions
(
context
.
Context
,
*
GetTagSuggestionsRequest
)
(
*
GetTagSuggestionsResponse
,
error
)
{
return
nil
,
status
.
Errorf
(
codes
.
Unimplemented
,
"method GetTagSuggestions not implemented"
)
}
func
(
UnimplementedTagServiceServer
)
mustEmbedUnimplementedTagServiceServer
()
{}
func
(
UnimplementedTagServiceServer
)
mustEmbedUnimplementedTagServiceServer
()
{}
// UnsafeTagServiceServer may be embedded to opt out of forward compatibility for this service.
// UnsafeTagServiceServer may be embedded to opt out of forward compatibility for this service.
...
@@ -158,6 +173,24 @@ func _TagService_DeleteTag_Handler(srv interface{}, ctx context.Context, dec fun
...
@@ -158,6 +173,24 @@ func _TagService_DeleteTag_Handler(srv interface{}, ctx context.Context, dec fun
return
interceptor
(
ctx
,
in
,
info
,
handler
)
return
interceptor
(
ctx
,
in
,
info
,
handler
)
}
}
func
_TagService_GetTagSuggestions_Handler
(
srv
interface
{},
ctx
context
.
Context
,
dec
func
(
interface
{})
error
,
interceptor
grpc
.
UnaryServerInterceptor
)
(
interface
{},
error
)
{
in
:=
new
(
GetTagSuggestionsRequest
)
if
err
:=
dec
(
in
);
err
!=
nil
{
return
nil
,
err
}
if
interceptor
==
nil
{
return
srv
.
(
TagServiceServer
)
.
GetTagSuggestions
(
ctx
,
in
)
}
info
:=
&
grpc
.
UnaryServerInfo
{
Server
:
srv
,
FullMethod
:
TagService_GetTagSuggestions_FullMethodName
,
}
handler
:=
func
(
ctx
context
.
Context
,
req
interface
{})
(
interface
{},
error
)
{
return
srv
.
(
TagServiceServer
)
.
GetTagSuggestions
(
ctx
,
req
.
(
*
GetTagSuggestionsRequest
))
}
return
interceptor
(
ctx
,
in
,
info
,
handler
)
}
// TagService_ServiceDesc is the grpc.ServiceDesc for TagService service.
// TagService_ServiceDesc is the grpc.ServiceDesc for TagService service.
// It's only intended for direct use with grpc.RegisterService,
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
// and not to be introspected or modified (even as a copy)
...
@@ -177,6 +210,10 @@ var TagService_ServiceDesc = grpc.ServiceDesc{
...
@@ -177,6 +210,10 @@ var TagService_ServiceDesc = grpc.ServiceDesc{
MethodName
:
"DeleteTag"
,
MethodName
:
"DeleteTag"
,
Handler
:
_TagService_DeleteTag_Handler
,
Handler
:
_TagService_DeleteTag_Handler
,
},
},
{
MethodName
:
"GetTagSuggestions"
,
Handler
:
_TagService_GetTagSuggestions_Handler
,
},
},
},
Streams
:
[]
grpc
.
StreamDesc
{},
Streams
:
[]
grpc
.
StreamDesc
{},
Metadata
:
"api/v2/tag_service.proto"
,
Metadata
:
"api/v2/tag_service.proto"
,
...
...
web/src/components/CreateTagDialog.tsx
View file @
bcd8a5a7
import
{
Button
,
Input
}
from
"@mui/joy"
;
import
{
Button
,
Input
}
from
"@mui/joy"
;
import
React
,
{
useEffect
,
useState
}
from
"react"
;
import
React
,
{
useEffect
,
useState
}
from
"react"
;
import
{
toast
}
from
"react-hot-toast"
;
import
{
toast
}
from
"react-hot-toast"
;
import
{
getTagSuggestionList
}
from
"@/helpers/api"
;
import
{
tagServiceClient
}
from
"@/grpcweb"
;
import
useCurrentUser
from
"@/hooks/useCurrentUser"
;
import
{
matcher
}
from
"@/labs/marked/matcher"
;
import
{
matcher
}
from
"@/labs/marked/matcher"
;
import
Tag
from
"@/labs/marked/parser/Tag"
;
import
Tag
from
"@/labs/marked/parser/Tag"
;
import
{
useTagStore
}
from
"@/store/module"
;
import
{
useTagStore
}
from
"@/store/module"
;
...
@@ -22,8 +23,9 @@ const validateTagName = (tagName: string): boolean => {
...
@@ -22,8 +23,9 @@ const validateTagName = (tagName: string): boolean => {
const
CreateTagDialog
:
React
.
FC
<
Props
>
=
(
props
:
Props
)
=>
{
const
CreateTagDialog
:
React
.
FC
<
Props
>
=
(
props
:
Props
)
=>
{
const
{
destroy
}
=
props
;
const
{
destroy
}
=
props
;
const
tagStore
=
useTagStore
();
const
t
=
useTranslate
();
const
t
=
useTranslate
();
const
currentUser
=
useCurrentUser
();
const
tagStore
=
useTagStore
();
const
[
tagName
,
setTagName
]
=
useState
<
string
>
(
""
);
const
[
tagName
,
setTagName
]
=
useState
<
string
>
(
""
);
const
[
suggestTagNameList
,
setSuggestTagNameList
]
=
useState
<
string
[]
>
([]);
const
[
suggestTagNameList
,
setSuggestTagNameList
]
=
useState
<
string
[]
>
([]);
const
[
showTagSuggestions
,
setShowTagSuggestions
]
=
useState
<
boolean
>
(
false
);
const
[
showTagSuggestions
,
setShowTagSuggestions
]
=
useState
<
boolean
>
(
false
);
...
@@ -31,9 +33,13 @@ const CreateTagDialog: React.FC<Props> = (props: Props) => {
...
@@ -31,9 +33,13 @@ const CreateTagDialog: React.FC<Props> = (props: Props) => {
const
shownSuggestTagNameList
=
suggestTagNameList
.
filter
((
tag
)
=>
!
tagNameList
.
includes
(
tag
));
const
shownSuggestTagNameList
=
suggestTagNameList
.
filter
((
tag
)
=>
!
tagNameList
.
includes
(
tag
));
useEffect
(()
=>
{
useEffect
(()
=>
{
getTagSuggestionList
().
then
(({
data
})
=>
{
tagServiceClient
setSuggestTagNameList
(
data
.
filter
((
tag
)
=>
validateTagName
(
tag
)));
.
getTagSuggestions
({
});
user
:
currentUser
.
name
,
})
.
then
(({
tags
})
=>
{
setSuggestTagNameList
(
tags
.
filter
((
tag
)
=>
validateTagName
(
tag
)));
});
},
[
tagNameList
]);
},
[
tagNameList
]);
const
handleTagNameInputKeyDown
=
(
event
:
React
.
KeyboardEvent
)
=>
{
const
handleTagNameInputKeyDown
=
(
event
:
React
.
KeyboardEvent
)
=>
{
...
...
web/src/helpers/api.ts
View file @
bcd8a5a7
...
@@ -144,10 +144,6 @@ export function createResourceWithBlob(formData: FormData) {
...
@@ -144,10 +144,6 @@ export function createResourceWithBlob(formData: FormData) {
return
axios
.
post
<
Resource
>
(
"/api/v1/resource/blob"
,
formData
);
return
axios
.
post
<
Resource
>
(
"/api/v1/resource/blob"
,
formData
);
}
}
export
function
getTagSuggestionList
()
{
return
axios
.
get
<
string
[]
>
(
`/api/v1/tag/suggestion`
);
}
export
function
getStorageList
()
{
export
function
getStorageList
()
{
return
axios
.
get
<
ObjectStorage
[]
>
(
`/api/v1/storage`
);
return
axios
.
get
<
ObjectStorage
[]
>
(
`/api/v1/storage`
);
}
}
...
...
web/src/store/module/tag.ts
View file @
bcd8a5a7
...
@@ -13,7 +13,7 @@ export const useTagStore = () => {
...
@@ -13,7 +13,7 @@ export const useTagStore = () => {
const
fetchTags
=
async
()
=>
{
const
fetchTags
=
async
()
=>
{
const
{
tags
}
=
await
tagServiceClient
.
listTags
({
const
{
tags
}
=
await
tagServiceClient
.
listTags
({
creato
r
:
currentUser
.
name
,
use
r
:
currentUser
.
name
,
});
});
store
.
dispatch
(
setTags
(
tags
.
map
((
tag
)
=>
tag
.
name
)));
store
.
dispatch
(
setTags
(
tags
.
map
((
tag
)
=>
tag
.
name
)));
};
};
...
...
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