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
5172e4df
Commit
5172e4df
authored
Jan 18, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: create memo visibility when creating
parent
893dd2c8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
4 deletions
+31
-4
memo_service.go
api/v2/memo_service.go
+24
-0
Table.tsx
web/src/components/MemoContent/Table.tsx
+1
-1
index.tsx
web/src/components/MemoEditor/index.tsx
+1
-1
Timeline.tsx
web/src/pages/Timeline.tsx
+5
-2
No files found.
api/v2/memo_service.go
View file @
5172e4df
...
...
@@ -53,6 +53,15 @@ func (s *APIV2Service) CreateMemo(ctx context.Context, request *apiv2pb.CreateMe
Content
:
request
.
Content
,
Visibility
:
store
.
Visibility
(
request
.
Visibility
.
String
()),
}
// Find disable public memos system setting.
disablePublicMemosSystem
,
err
:=
s
.
getDisablePublicMemosSystemSettingValue
(
ctx
)
if
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to get system setting"
)
}
if
disablePublicMemosSystem
&&
create
.
Visibility
==
store
.
Public
{
return
nil
,
status
.
Errorf
(
codes
.
PermissionDenied
,
"disable public memos system setting is enabled"
)
}
memo
,
err
:=
s
.
Store
.
CreateMemo
(
ctx
,
create
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -591,6 +600,21 @@ func (s *APIV2Service) getMemoDisplayWithUpdatedTsSettingValue(ctx context.Conte
return
memoDisplayWithUpdatedTs
,
nil
}
func
(
s
*
APIV2Service
)
getDisablePublicMemosSystemSettingValue
(
ctx
context
.
Context
)
(
bool
,
error
)
{
disablePublicMemosSystemSetting
,
err
:=
s
.
Store
.
GetSystemSetting
(
ctx
,
&
store
.
FindSystemSetting
{
Name
:
apiv1
.
SystemSettingDisablePublicMemosName
.
String
(),
})
if
err
!=
nil
{
return
false
,
errors
.
Wrap
(
err
,
"failed to find system setting"
)
}
disablePublicMemos
:=
false
err
=
json
.
Unmarshal
([]
byte
(
disablePublicMemosSystemSetting
.
Value
),
&
disablePublicMemos
)
if
err
!=
nil
{
return
false
,
errors
.
Wrap
(
err
,
"failed to unmarshal system setting value"
)
}
return
disablePublicMemos
,
nil
}
func
convertVisibilityFromStore
(
visibility
store
.
Visibility
)
apiv2pb
.
Visibility
{
switch
visibility
{
case
store
.
Private
:
...
...
web/src/components/MemoContent/Table.tsx
View file @
5172e4df
...
...
@@ -8,7 +8,7 @@ interface Props {
const
Table
=
({
header
,
rows
}:
Props
)
=>
{
return
(
<
table
className=
"w-auto max-w-full border border-gray-300 dark:border-zinc-600 divide-y divide-gray-300 dark:divide-zinc-600"
>
<
thead
className=
"text-sm font-
semibold
leading-5 text-left text-gray-900 dark:text-gray-400"
>
<
thead
className=
"text-sm font-
medium
leading-5 text-left text-gray-900 dark:text-gray-400"
>
<
tr
className=
"divide-x divide-gray-300 dark:divide-zinc-600"
>
{
header
.
map
((
h
,
i
)
=>
(
<
th
key=
{
i
}
className=
"py-1 px-2"
>
...
...
web/src/components/MemoEditor/index.tsx
View file @
5172e4df
...
...
@@ -340,7 +340,7 @@ const MemoEditor = (props: Props) => {
editorRef
.
current
?.
setContent
(
""
);
}
catch
(
error
:
any
)
{
console
.
error
(
error
);
toast
.
error
(
error
.
response
.
data
.
message
);
toast
.
error
(
error
.
details
);
}
setState
((
state
)
=>
{
...
...
web/src/pages/Timeline.tsx
View file @
5172e4df
...
...
@@ -125,10 +125,13 @@ const Timeline = () => {
<
div
className=
"w-full shadow flex flex-col justify-start items-start px-4 py-3 rounded-xl bg-white dark:bg-zinc-800 text-black dark:text-gray-300"
>
<
div
className=
"relative w-full flex flex-row justify-between items-center"
>
<
div
>
<
p
className=
"py-1 flex flex-row justify-start items-center select-none opacity-80"
>
<
div
className=
"py-1 flex flex-row justify-start items-center select-none opacity-80"
onClick=
{
()
=>
setSelectedDay
(
undefined
)
}
>
<
Icon
.
GanttChartSquare
className=
"w-6 h-auto mr-1 opacity-80"
/>
<
span
className=
"text-lg"
>
{
t
(
"timeline.title"
)
}
</
span
>
</
p
>
</
div
>
</
div
>
<
div
className=
"flex justify-end items-center gap-2"
>
<
IconButton
variant=
"outlined"
size=
"sm"
onClick=
{
()
=>
handleNewMemo
()
}
>
...
...
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