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
831c254d
Commit
831c254d
authored
Oct 08, 2024
by
johnnyjoy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: update user fields
parent
310f1479
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
MemoCommentMessage.tsx
web/src/components/Inbox/MemoCommentMessage.tsx
+2
-2
UpdateAccountDialog.tsx
web/src/components/UpdateAccountDialog.tsx
+2
-2
resourceName.ts
web/src/store/v1/resourceName.ts
+2
-2
No files found.
web/src/components/Inbox/MemoCommentMessage.tsx
View file @
831c254d
...
@@ -5,7 +5,7 @@ import { useEffect, useState } from "react";
...
@@ -5,7 +5,7 @@ import { useEffect, useState } from "react";
import
toast
from
"react-hot-toast"
;
import
toast
from
"react-hot-toast"
;
import
{
activityServiceClient
}
from
"@/grpcweb"
;
import
{
activityServiceClient
}
from
"@/grpcweb"
;
import
useNavigateTo
from
"@/hooks/useNavigateTo"
;
import
useNavigateTo
from
"@/hooks/useNavigateTo"
;
import
{
activityNamePrefix
,
M
emoNamePrefix
,
useInboxStore
,
useMemoStore
,
useUserStore
}
from
"@/store/v1"
;
import
{
activityNamePrefix
,
m
emoNamePrefix
,
useInboxStore
,
useMemoStore
,
useUserStore
}
from
"@/store/v1"
;
import
{
Inbox
,
Inbox_Status
}
from
"@/types/proto/api/v1/inbox_service"
;
import
{
Inbox
,
Inbox_Status
}
from
"@/types/proto/api/v1/inbox_service"
;
import
{
Memo
}
from
"@/types/proto/api/v1/memo_service"
;
import
{
Memo
}
from
"@/types/proto/api/v1/memo_service"
;
import
{
User
}
from
"@/types/proto/api/v1/user_service"
;
import
{
User
}
from
"@/types/proto/api/v1/user_service"
;
...
@@ -36,7 +36,7 @@ const MemoCommentMessage = ({ inbox }: Props) => {
...
@@ -36,7 +36,7 @@ const MemoCommentMessage = ({ inbox }: Props) => {
if
(
activity
.
payload
?.
memoComment
)
{
if
(
activity
.
payload
?.
memoComment
)
{
const
memoCommentPayload
=
activity
.
payload
.
memoComment
;
const
memoCommentPayload
=
activity
.
payload
.
memoComment
;
const
relatedMemoId
=
memoCommentPayload
.
relatedMemoId
;
const
relatedMemoId
=
memoCommentPayload
.
relatedMemoId
;
const
memo
=
await
memoStore
.
getOrFetchMemoByName
(
`
${
M
emoNamePrefix
}${
relatedMemoId
}
`
,
{
const
memo
=
await
memoStore
.
getOrFetchMemoByName
(
`
${
m
emoNamePrefix
}${
relatedMemoId
}
`
,
{
skipStore
:
true
,
skipStore
:
true
,
});
});
setRelatedMemo
(
memo
);
setRelatedMemo
(
memo
);
...
...
web/src/components/UpdateAccountDialog.tsx
View file @
831c254d
...
@@ -5,7 +5,7 @@ import { useState } from "react";
...
@@ -5,7 +5,7 @@ import { useState } from "react";
import
{
toast
}
from
"react-hot-toast"
;
import
{
toast
}
from
"react-hot-toast"
;
import
{
convertFileToBase64
}
from
"@/helpers/utils"
;
import
{
convertFileToBase64
}
from
"@/helpers/utils"
;
import
useCurrentUser
from
"@/hooks/useCurrentUser"
;
import
useCurrentUser
from
"@/hooks/useCurrentUser"
;
import
{
use
rNamePrefix
,
use
UserStore
,
useWorkspaceSettingStore
}
from
"@/store/v1"
;
import
{
useUserStore
,
useWorkspaceSettingStore
}
from
"@/store/v1"
;
import
{
User
as
UserPb
}
from
"@/types/proto/api/v1/user_service"
;
import
{
User
as
UserPb
}
from
"@/types/proto/api/v1/user_service"
;
import
{
WorkspaceGeneralSetting
,
WorkspaceSettingKey
}
from
"@/types/proto/store/workspace_setting"
;
import
{
WorkspaceGeneralSetting
,
WorkspaceSettingKey
}
from
"@/types/proto/store/workspace_setting"
;
import
{
useTranslate
}
from
"@/utils/i18n"
;
import
{
useTranslate
}
from
"@/utils/i18n"
;
...
@@ -108,7 +108,7 @@ const UpdateAccountDialog: React.FC<Props> = ({ destroy }: Props) => {
...
@@ -108,7 +108,7 @@ const UpdateAccountDialog: React.FC<Props> = ({ destroy }: Props) => {
try
{
try
{
const
updateMask
=
[];
const
updateMask
=
[];
if
(
!
isEqual
(
currentUser
.
name
.
replace
(
userNamePrefix
,
""
)
,
state
.
username
))
{
if
(
!
isEqual
(
currentUser
.
username
,
state
.
username
))
{
updateMask
.
push
(
"username"
);
updateMask
.
push
(
"username"
);
}
}
if
(
!
isEqual
(
currentUser
.
nickname
,
state
.
nickname
))
{
if
(
!
isEqual
(
currentUser
.
nickname
,
state
.
nickname
))
{
...
...
web/src/store/v1/resourceName.ts
View file @
831c254d
export
const
workspaceSettingNamePrefix
=
"settings/"
;
export
const
workspaceSettingNamePrefix
=
"settings/"
;
export
const
userNamePrefix
=
"users/"
;
export
const
userNamePrefix
=
"users/"
;
export
const
M
emoNamePrefix
=
"memos/"
;
export
const
m
emoNamePrefix
=
"memos/"
;
export
const
identityProviderNamePrefix
=
"identityProviders/"
;
export
const
identityProviderNamePrefix
=
"identityProviders/"
;
export
const
activityNamePrefix
=
"activities/"
;
export
const
activityNamePrefix
=
"activities/"
;
export
const
extractMemoIdFromName
=
(
name
:
string
)
=>
{
export
const
extractMemoIdFromName
=
(
name
:
string
)
=>
{
return
parseInt
(
name
.
split
(
M
emoNamePrefix
).
pop
()
||
""
,
10
);
return
parseInt
(
name
.
split
(
m
emoNamePrefix
).
pop
()
||
""
,
10
);
};
};
export
const
extractIdentityProviderIdFromName
=
(
name
:
string
)
=>
{
export
const
extractIdentityProviderIdFromName
=
(
name
:
string
)
=>
{
...
...
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