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
77d3853f
Unverified
Commit
77d3853f
authored
May 28, 2025
by
Maximilian Krauß
Committed by
GitHub
May 28, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: inherits memo visibility for default comment visibility (#4728)
parent
a317f9e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
index.tsx
web/src/components/MemoEditor/index.tsx
+6
-4
MemoDetail.tsx
web/src/pages/MemoDetail.tsx
+1
-0
No files found.
web/src/components/MemoEditor/index.tsx
View file @
77d3853f
...
...
@@ -40,6 +40,8 @@ export interface Props {
memoName
?:
string
;
// The name of the parent memo if the memo is a comment.
parentMemoName
?:
string
;
// The visibility of the parent memo for preset when commenting
parentMemoVisibility
?:
Visibility
;
autoFocus
?:
boolean
;
onConfirm
?:
(
memoName
:
string
)
=>
void
;
onCancel
?:
()
=>
void
;
...
...
@@ -57,12 +59,12 @@ interface State {
}
const
MemoEditor
=
observer
((
props
:
Props
)
=>
{
const
{
className
,
cacheKey
,
memoName
,
parentMemoName
,
autoFocus
,
onConfirm
,
onCancel
}
=
props
;
const
{
className
,
cacheKey
,
memoName
,
parentMemoName
,
parentMemoVisibility
,
autoFocus
,
onConfirm
,
onCancel
}
=
props
;
const
t
=
useTranslate
();
const
{
i18n
}
=
useTranslation
();
const
currentUser
=
useCurrentUser
();
const
[
state
,
setState
]
=
useState
<
State
>
({
memoVisibility
:
Visibility
.
PRIVATE
,
memoVisibility
:
parentMemoVisibility
??
Visibility
.
PRIVATE
,
resourceList
:
[],
relationList
:
[],
location
:
undefined
,
...
...
@@ -96,7 +98,7 @@ const MemoEditor = observer((props: Props) => {
},
[
autoFocus
]);
useEffect
(()
=>
{
let
visibility
=
userSetting
.
memoVisibility
;
let
visibility
=
parentMemoVisibility
??
userSetting
.
memoVisibility
;
if
(
workspaceMemoRelatedSetting
.
disallowPublicVisibility
&&
visibility
===
"PUBLIC"
)
{
visibility
=
"PRIVATE"
;
}
...
...
@@ -104,7 +106,7 @@ const MemoEditor = observer((props: Props) => {
...
prevState
,
memoVisibility
:
convertVisibilityFromString
(
visibility
),
}));
},
[
userSetting
.
memoVisibility
,
workspaceMemoRelatedSetting
.
disallowPublicVisibility
]);
},
[
parentMemoVisibility
,
userSetting
.
memoVisibility
,
workspaceMemoRelatedSetting
.
disallowPublicVisibility
]);
useAsyncEffect
(
async
()
=>
{
if
(
!
memoName
)
{
...
...
web/src/pages/MemoDetail.tsx
View file @
77d3853f
...
...
@@ -160,6 +160,7 @@ const MemoDetail = observer(() => {
cacheKey=
{
`${memo.name}-${memo.updateTime}-comment`
}
placeholder=
{
t
(
"editor.add-your-comment-here"
)
}
parentMemoName=
{
memo
.
name
}
parentMemoVisibility=
{
memo
.
visibility
}
autoFocus
onConfirm=
{
handleCommentCreated
}
onCancel=
{
()
=>
setShowCommentEditor
(
false
)
}
...
...
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