Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
fdc9ae2e
Commit
fdc9ae2e
authored
Mar 16, 2018
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prettify notes.
parent
2c792c75
Changes
26
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
2149 additions
and
1792 deletions
+2149
-1792
app/assets/javascripts/mr_notes/index.js
app/assets/javascripts/mr_notes/index.js
+6
-3
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+460
-204
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+279
-273
app/assets/javascripts/notes/components/diff_file_header.vue
app/assets/javascripts/notes/components/diff_file_header.vue
+17
-17
app/assets/javascripts/notes/components/diff_with_note.vue
app/assets/javascripts/notes/components/diff_with_note.vue
+50
-46
app/assets/javascripts/notes/components/discussion_counter.vue
...ssets/javascripts/notes/components/discussion_counter.vue
+58
-56
app/assets/javascripts/notes/components/discussion_locked_widget.vue
...javascripts/notes/components/discussion_locked_widget.vue
+8
-10
app/assets/javascripts/notes/components/note_actions.vue
app/assets/javascripts/notes/components/note_actions.vue
+112
-114
app/assets/javascripts/notes/components/note_attachment.vue
app/assets/javascripts/notes/components/note_attachment.vue
+8
-8
app/assets/javascripts/notes/components/note_awards_list.vue
app/assets/javascripts/notes/components/note_awards_list.vue
+181
-168
app/assets/javascripts/notes/components/note_body.vue
app/assets/javascripts/notes/components/note_body.vue
+66
-68
app/assets/javascripts/notes/components/note_edited_text.vue
app/assets/javascripts/notes/components/note_edited_text.vue
+25
-25
app/assets/javascripts/notes/components/note_form.vue
app/assets/javascripts/notes/components/note_form.vue
+116
-108
app/assets/javascripts/notes/components/note_header.vue
app/assets/javascripts/notes/components/note_header.vue
+54
-56
app/assets/javascripts/notes/components/note_signed_out_widget.vue
...s/javascripts/notes/components/note_signed_out_widget.vue
+11
-13
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+180
-180
app/assets/javascripts/notes/components/noteable_note.vue
app/assets/javascripts/notes/components/noteable_note.vue
+130
-130
app/assets/javascripts/notes/components/notes_app.vue
app/assets/javascripts/notes/components/notes_app.vue
+142
-140
app/assets/javascripts/notes/index.js
app/assets/javascripts/notes/index.js
+38
-30
app/assets/javascripts/notes/mixins/autosave.js
app/assets/javascripts/notes/mixins/autosave.js
+5
-1
app/assets/javascripts/notes/mixins/resolvable.js
app/assets/javascripts/notes/mixins/resolvable.js
+8
-3
app/assets/javascripts/notes/services/notes_service.js
app/assets/javascripts/notes/services/notes_service.js
+3
-1
app/assets/javascripts/notes/stores/actions.js
app/assets/javascripts/notes/stores/actions.js
+147
-108
app/assets/javascripts/notes/stores/getters.js
app/assets/javascripts/notes/stores/getters.js
+19
-15
app/assets/javascripts/notes/stores/mutations.js
app/assets/javascripts/notes/stores/mutations.js
+18
-10
app/assets/javascripts/notes/stores/utils.js
app/assets/javascripts/notes/stores/utils.js
+8
-5
No files found.
app/assets/javascripts/mr_notes/index.js
View file @
fdc9ae2e
...
@@ -4,13 +4,15 @@ import discussionCounter from '../notes/components/discussion_counter.vue';
...
@@ -4,13 +4,15 @@ import discussionCounter from '../notes/components/discussion_counter.vue';
import
store
from
'
../notes/stores
'
;
import
store
from
'
../notes/stores
'
;
export
default
function
initMrNotes
()
{
export
default
function
initMrNotes
()
{
new
Vue
({
// eslint-disable-line
// eslint-disable-next-line no-new
new
Vue
({
el
:
'
#js-vue-mr-discussions
'
,
el
:
'
#js-vue-mr-discussions
'
,
components
:
{
components
:
{
notesApp
,
notesApp
,
},
},
data
()
{
data
()
{
const
notesDataset
=
document
.
getElementById
(
'
js-vue-mr-discussions
'
).
dataset
;
const
notesDataset
=
document
.
getElementById
(
'
js-vue-mr-discussions
'
)
.
dataset
;
return
{
return
{
noteableData
:
JSON
.
parse
(
notesDataset
.
noteableData
),
noteableData
:
JSON
.
parse
(
notesDataset
.
noteableData
),
currentUserData
:
JSON
.
parse
(
notesDataset
.
currentUserData
),
currentUserData
:
JSON
.
parse
(
notesDataset
.
currentUserData
),
...
@@ -28,7 +30,8 @@ export default function initMrNotes() {
...
@@ -28,7 +30,8 @@ export default function initMrNotes() {
},
},
});
});
new
Vue
({
// eslint-disable-line
// eslint-disable-next-line no-new
new
Vue
({
el
:
'
#js-vue-discussion-counter
'
,
el
:
'
#js-vue-discussion-counter
'
,
components
:
{
components
:
{
discussionCounter
,
discussionCounter
,
...
...
app/assets/javascripts/notes.js
View file @
fdc9ae2e
This diff is collapsed.
Click to expand it.
app/assets/javascripts/notes/components/comment_form.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
Autosize
from
'
autosize
'
;
import
Autosize
from
'
autosize
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
import
Flash
from
'
../../flash
'
;
import
Flash
from
'
../../flash
'
;
import
Autosave
from
'
../../autosave
'
;
import
Autosave
from
'
../../autosave
'
;
import
TaskList
from
'
../../task_list
'
;
import
TaskList
from
'
../../task_list
'
;
import
{
capitalizeFirstCharacter
,
convertToCamelCase
}
from
'
../../lib/utils/text_utility
'
;
import
{
import
*
as
constants
from
'
../constants
'
;
capitalizeFirstCharacter
,
import
eventHub
from
'
../event_hub
'
;
convertToCamelCase
,
import
issueWarning
from
'
../../vue_shared/components/issue/issue_warning.vue
'
;
}
from
'
../../lib/utils/text_utility
'
;
import
markdownField
from
'
../../vue_shared/components/markdown/field.vue
'
;
import
*
as
constants
from
'
../constants
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
loadingButton
from
'
../../vue_shared/components/loading_button.vue
'
;
import
issueWarning
from
'
../../vue_shared/components/issue/issue_warning.vue
'
;
import
noteSignedOutWidget
from
'
./note_signed_out_widget.vue
'
;
import
markdownField
from
'
../../vue_shared/components/markdown/field.vue
'
;
import
discussionLockedWidget
from
'
./discussion_locked_widget.vue
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
issuableStateMixin
from
'
../mixins/issuable_state
'
;
import
loadingButton
from
'
../../vue_shared/components/loading_button.vue
'
;
import
noteSignedOutWidget
from
'
./note_signed_out_widget.vue
'
;
import
discussionLockedWidget
from
'
./discussion_locked_widget.vue
'
;
import
issuableStateMixin
from
'
../mixins/issuable_state
'
;
export
default
{
export
default
{
name
:
'
CommentForm
'
,
name
:
'
CommentForm
'
,
components
:
{
components
:
{
issueWarning
,
issueWarning
,
...
@@ -28,9 +31,7 @@
...
@@ -28,9 +31,7 @@
userAvatarLink
,
userAvatarLink
,
loadingButton
,
loadingButton
,
},
},
mixins
:
[
mixins
:
[
issuableStateMixin
],
issuableStateMixin
,
],
props
:
{
props
:
{
noteableType
:
{
noteableType
:
{
type
:
String
,
type
:
String
,
...
@@ -53,9 +54,7 @@
...
@@ -53,9 +54,7 @@
'
getNotesData
'
,
'
getNotesData
'
,
'
openState
'
,
'
openState
'
,
]),
]),
...
mapState
([
...
mapState
([
'
isToggleStateButtonLoading
'
]),
'
isToggleStateButtonLoading
'
,
]),
noteableDisplayName
()
{
noteableDisplayName
()
{
return
this
.
noteableType
.
replace
(
/_/g
,
'
'
);
return
this
.
noteableType
.
replace
(
/_/g
,
'
'
);
},
},
...
@@ -63,10 +62,15 @@
...
@@ -63,10 +62,15 @@
return
this
.
getUserData
.
id
;
return
this
.
getUserData
.
id
;
},
},
commentButtonTitle
()
{
commentButtonTitle
()
{
return
this
.
noteType
===
constants
.
COMMENT
?
'
Comment
'
:
'
Start discussion
'
;
return
this
.
noteType
===
constants
.
COMMENT
?
'
Comment
'
:
'
Start discussion
'
;
},
},
isOpen
()
{
isOpen
()
{
return
this
.
openState
===
constants
.
OPENED
||
this
.
openState
===
constants
.
REOPENED
;
return
(
this
.
openState
===
constants
.
OPENED
||
this
.
openState
===
constants
.
REOPENED
);
},
},
canCreateNote
()
{
canCreateNote
()
{
return
this
.
getNoteableData
.
current_user
.
can_create_note
;
return
this
.
getNoteableData
.
current_user
.
can_create_note
;
...
@@ -75,23 +79,17 @@
...
@@ -75,23 +79,17 @@
const
openOrClose
=
this
.
isOpen
?
'
close
'
:
'
reopen
'
;
const
openOrClose
=
this
.
isOpen
?
'
close
'
:
'
reopen
'
;
if
(
this
.
note
.
length
)
{
if
(
this
.
note
.
length
)
{
return
sprintf
(
return
sprintf
(
__
(
'
%{actionText} & %{openOrClose} %{noteable}
'
),
{
__
(
'
%{actionText} & %{openOrClose} %{noteable}
'
),
{
actionText
:
this
.
commentButtonTitle
,
actionText
:
this
.
commentButtonTitle
,
openOrClose
,
openOrClose
,
noteable
:
this
.
noteableDisplayName
,
noteable
:
this
.
noteableDisplayName
,
},
});
);
}
}
return
sprintf
(
return
sprintf
(
__
(
'
%{openOrClose} %{noteable}
'
),
{
__
(
'
%{openOrClose} %{noteable}
'
),
{
openOrClose
:
capitalizeFirstCharacter
(
openOrClose
),
openOrClose
:
capitalizeFirstCharacter
(
openOrClose
),
noteable
:
this
.
noteableDisplayName
,
noteable
:
this
.
noteableDisplayName
,
},
});
);
},
},
actionButtonClassNames
()
{
actionButtonClassNames
()
{
return
{
return
{
...
@@ -131,7 +129,9 @@
...
@@ -131,7 +129,9 @@
mounted
()
{
mounted
()
{
// jQuery is needed here because it is a custom event being dispatched with jQuery.
// jQuery is needed here because it is a custom event being dispatched with jQuery.
$
(
document
).
on
(
'
issuable:change
'
,
(
e
,
isClosed
)
=>
{
$
(
document
).
on
(
'
issuable:change
'
,
(
e
,
isClosed
)
=>
{
this
.
toggleIssueLocalState
(
isClosed
?
constants
.
CLOSED
:
constants
.
REOPENED
);
this
.
toggleIssueLocalState
(
isClosed
?
constants
.
CLOSED
:
constants
.
REOPENED
,
);
});
});
this
.
initAutoSave
();
this
.
initAutoSave
();
...
@@ -180,7 +180,7 @@
...
@@ -180,7 +180,7 @@
this
.
stopPolling
();
this
.
stopPolling
();
this
.
saveNote
(
noteData
)
this
.
saveNote
(
noteData
)
.
then
((
res
)
=>
{
.
then
(
res
=>
{
this
.
enableButton
();
this
.
enableButton
();
this
.
restartPolling
();
this
.
restartPolling
();
...
@@ -205,8 +205,7 @@
...
@@ -205,8 +205,7 @@
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
enableButton
();
this
.
enableButton
();
this
.
discard
(
false
);
this
.
discard
(
false
);
const
msg
=
const
msg
=
`Your comment could not be submitted!
`Your comment could not be submitted!
Please check your network connection and try again.`
;
Please check your network connection and try again.`
;
Flash
(
msg
,
'
alert
'
,
this
.
$el
);
Flash
(
msg
,
'
alert
'
,
this
.
$el
);
this
.
note
=
noteData
.
data
.
note
.
note
;
// Restore textarea content.
this
.
note
=
noteData
.
data
.
note
.
note
;
// Restore textarea content.
...
@@ -228,7 +227,9 @@ Please check your network connection and try again.`;
...
@@ -228,7 +227,9 @@ Please check your network connection and try again.`;
this
.
toggleStateButtonLoading
(
false
);
this
.
toggleStateButtonLoading
(
false
);
Flash
(
Flash
(
sprintf
(
sprintf
(
__
(
'
Something went wrong while closing the %{issuable}. Please try again later
'
),
__
(
'
Something went wrong while closing the %{issuable}. Please try again later
'
,
),
{
issuable
:
this
.
noteableDisplayName
},
{
issuable
:
this
.
noteableDisplayName
},
),
),
);
);
...
@@ -241,7 +242,9 @@ Please check your network connection and try again.`;
...
@@ -241,7 +242,9 @@ Please check your network connection and try again.`;
this
.
toggleStateButtonLoading
(
false
);
this
.
toggleStateButtonLoading
(
false
);
Flash
(
Flash
(
sprintf
(
sprintf
(
__
(
'
Something went wrong while reopening the %{issuable}. Please try again later
'
),
__
(
'
Something went wrong while reopening the %{issuable}. Please try again later
'
,
),
{
issuable
:
this
.
noteableDisplayName
},
{
issuable
:
this
.
noteableDisplayName
},
),
),
);
);
...
@@ -278,12 +281,15 @@ Please check your network connection and try again.`;
...
@@ -278,12 +281,15 @@ Please check your network connection and try again.`;
},
},
initAutoSave
()
{
initAutoSave
()
{
if
(
this
.
isLoggedIn
)
{
if
(
this
.
isLoggedIn
)
{
const
noteableType
=
capitalizeFirstCharacter
(
convertToCamelCase
(
this
.
noteableType
));
const
noteableType
=
capitalizeFirstCharacter
(
convertToCamelCase
(
this
.
noteableType
),
this
.
autosave
=
new
Autosave
(
$
(
this
.
$refs
.
textarea
),
[
'
Note
'
,
noteableType
,
this
.
getNoteableData
.
id
],
);
);
this
.
autosave
=
new
Autosave
(
$
(
this
.
$refs
.
textarea
),
[
'
Note
'
,
noteableType
,
this
.
getNoteableData
.
id
,
]);
}
}
},
},
initTaskList
()
{
initTaskList
()
{
...
@@ -299,7 +305,7 @@ Please check your network connection and try again.`;
...
@@ -299,7 +305,7 @@ Please check your network connection and try again.`;
});
});
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/diff_file_header.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
ClipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
ClipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
ClipboardButton
,
ClipboardButton
,
Icon
,
Icon
,
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
return
this
.
diffFile
.
discussionPath
?
'
a
'
:
'
span
'
;
return
this
.
diffFile
.
discussionPath
?
'
a
'
:
'
span
'
;
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/diff_with_note.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
syntaxHighlight
from
'
~/syntax_highlight
'
;
import
syntaxHighlight
from
'
~/syntax_highlight
'
;
import
imageDiffHelper
from
'
~/image_diff/helpers/index
'
;
import
imageDiffHelper
from
'
~/image_diff/helpers/index
'
;
import
{
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
import
{
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
import
DiffFileHeader
from
'
./diff_file_header.vue
'
;
import
DiffFileHeader
from
'
./diff_file_header.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
DiffFileHeader
,
DiffFileHeader
,
},
},
...
@@ -37,7 +37,11 @@
...
@@ -37,7 +37,11 @@
if
(
this
.
isImageDiff
)
{
if
(
this
.
isImageDiff
)
{
const
canCreateNote
=
false
;
const
canCreateNote
=
false
;
const
renderCommentBadge
=
true
;
const
renderCommentBadge
=
true
;
imageDiffHelper
.
initImageDiff
(
this
.
$refs
.
fileHolder
,
canCreateNote
,
renderCommentBadge
);
imageDiffHelper
.
initImageDiff
(
this
.
$refs
.
fileHolder
,
canCreateNote
,
renderCommentBadge
,
);
}
else
{
}
else
{
const
fileHolder
=
$
(
this
.
$refs
.
fileHolder
);
const
fileHolder
=
$
(
this
.
$refs
.
fileHolder
);
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
...
@@ -50,7 +54,7 @@
...
@@ -50,7 +54,7 @@
return
html
.
outerHTML
?
'
tr
'
:
'
template
'
;
return
html
.
outerHTML
?
'
tr
'
:
'
template
'
;
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/discussion_counter.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
{
mapGetters
}
from
'
vuex
'
;
import
{
mapGetters
}
from
'
vuex
'
;
import
resolveSvg
from
'
icons/_icon_resolve_discussion.svg
'
;
import
resolveSvg
from
'
icons/_icon_resolve_discussion.svg
'
;
import
resolvedSvg
from
'
icons/_icon_status_success_solid.svg
'
;
import
resolvedSvg
from
'
icons/_icon_status_success_solid.svg
'
;
import
mrIssueSvg
from
'
icons/_icon_mr_issue.svg
'
;
import
mrIssueSvg
from
'
icons/_icon_mr_issue.svg
'
;
import
nextDiscussionSvg
from
'
icons/_next_discussion.svg
'
;
import
nextDiscussionSvg
from
'
icons/_next_discussion.svg
'
;
import
{
pluralize
}
from
'
../../lib/utils/text_utility
'
;
import
{
pluralize
}
from
'
../../lib/utils/text_utility
'
;
import
{
scrollToElement
}
from
'
../../lib/utils/common_utils
'
;
import
{
scrollToElement
}
from
'
../../lib/utils/common_utils
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
export
default
{
export
default
{
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
...
@@ -49,7 +49,9 @@
...
@@ -49,7 +49,9 @@
},
},
methods
:
{
methods
:
{
jumpToFirstDiscussion
()
{
jumpToFirstDiscussion
()
{
const
el
=
document
.
querySelector
(
`[data-discussion-id="
${
this
.
firstUnresolvedDiscussionId
}
"]`
);
const
el
=
document
.
querySelector
(
`[data-discussion-id="
${
this
.
firstUnresolvedDiscussionId
}
"]`
,
);
const
activeTab
=
window
.
mrTabs
.
currentAction
;
const
activeTab
=
window
.
mrTabs
.
currentAction
;
if
(
activeTab
===
'
commits
'
||
activeTab
===
'
pipelines
'
)
{
if
(
activeTab
===
'
commits
'
||
activeTab
===
'
pipelines
'
)
{
...
@@ -61,7 +63,7 @@
...
@@ -61,7 +63,7 @@
}
}
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/discussion_locked_widget.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Issuable
from
'
~/vue_shared/mixins/issuable
'
;
import
Issuable
from
'
~/vue_shared/mixins/issuable
'
;
export
default
{
export
default
{
components
:
{
components
:
{
Icon
,
Icon
,
},
},
mixins
:
[
mixins
:
[
Issuable
],
Issuable
,
};
],
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/note_actions.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
{
mapGetters
}
from
'
vuex
'
;
import
{
mapGetters
}
from
'
vuex
'
;
import
emojiSmiling
from
'
icons/_emoji_slightly_smiling_face.svg
'
;
import
emojiSmiling
from
'
icons/_emoji_slightly_smiling_face.svg
'
;
import
emojiSmile
from
'
icons/_emoji_smile.svg
'
;
import
emojiSmile
from
'
icons/_emoji_smile.svg
'
;
import
emojiSmiley
from
'
icons/_emoji_smiley.svg
'
;
import
emojiSmiley
from
'
icons/_emoji_smiley.svg
'
;
import
editSvg
from
'
icons/_icon_pencil.svg
'
;
import
editSvg
from
'
icons/_icon_pencil.svg
'
;
import
resolveDiscussionSvg
from
'
icons/_icon_resolve_discussion.svg
'
;
import
resolveDiscussionSvg
from
'
icons/_icon_resolve_discussion.svg
'
;
import
resolvedDiscussionSvg
from
'
icons/_icon_status_success_solid.svg
'
;
import
resolvedDiscussionSvg
from
'
icons/_icon_status_success_solid.svg
'
;
import
ellipsisSvg
from
'
icons/_ellipsis_v.svg
'
;
import
ellipsisSvg
from
'
icons/_ellipsis_v.svg
'
;
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
export
default
{
export
default
{
name
:
'
NoteActions
'
,
name
:
'
NoteActions
'
,
directives
:
{
directives
:
{
tooltip
,
tooltip
,
...
@@ -70,9 +70,7 @@
...
@@ -70,9 +70,7 @@
},
},
},
},
computed
:
{
computed
:
{
...
mapGetters
([
...
mapGetters
([
'
getUserDataByProp
'
]),
'
getUserDataByProp
'
,
]),
shouldShowActionsDropdown
()
{
shouldShowActionsDropdown
()
{
return
this
.
currentUserId
&&
(
this
.
canEdit
||
this
.
canReportAsAbuse
);
return
this
.
currentUserId
&&
(
this
.
canEdit
||
this
.
canReportAsAbuse
);
},
},
...
@@ -115,7 +113,7 @@
...
@@ -115,7 +113,7 @@
this
.
$emit
(
'
handleResolve
'
);
this
.
$emit
(
'
handleResolve
'
);
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/note_attachment.vue
View file @
fdc9ae2e
<
script
>
<
script
>
export
default
{
export
default
{
name
:
'
NoteAttachment
'
,
name
:
'
NoteAttachment
'
,
props
:
{
props
:
{
attachment
:
{
attachment
:
{
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
required
:
true
,
required
:
true
,
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/note_awards_list.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
emojiSmiling
from
'
icons/_emoji_slightly_smiling_face.svg
'
;
import
emojiSmiling
from
'
icons/_emoji_slightly_smiling_face.svg
'
;
import
emojiSmile
from
'
icons/_emoji_smile.svg
'
;
import
emojiSmile
from
'
icons/_emoji_smile.svg
'
;
import
emojiSmiley
from
'
icons/_emoji_smiley.svg
'
;
import
emojiSmiley
from
'
icons/_emoji_smiley.svg
'
;
import
Flash
from
'
../../flash
'
;
import
Flash
from
'
../../flash
'
;
import
{
glEmojiTag
}
from
'
../../emoji
'
;
import
{
glEmojiTag
}
from
'
../../emoji
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
export
default
{
export
default
{
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
...
@@ -30,9 +30,7 @@
...
@@ -30,9 +30,7 @@
},
},
},
},
computed
:
{
computed
:
{
...
mapGetters
([
...
mapGetters
([
'
getUserData
'
]),
'
getUserData
'
,
]),
// `this.awards` is an array with emojis but they are not grouped by emoji name. See below.
// `this.awards` is an array with emojis but they are not grouped by emoji name. See below.
// [ { name: foo, user: user1 }, { name: bar, user: user1 }, { name: foo, user: user2 } ]
// [ { name: foo, user: user1 }, { name: bar, user: user1 }, { name: foo, user: user2 } ]
// This method will group emojis by their name as an Object. See below.
// This method will group emojis by their name as an Object. See below.
...
@@ -79,9 +77,7 @@
...
@@ -79,9 +77,7 @@
this
.
emojiSmiley
=
emojiSmiley
;
this
.
emojiSmiley
=
emojiSmiley
;
},
},
methods
:
{
methods
:
{
...
mapActions
([
...
mapActions
([
'
toggleAwardRequest
'
]),
'
toggleAwardRequest
'
,
]),
getAwardHTML
(
name
)
{
getAwardHTML
(
name
)
{
return
glEmojiTag
(
name
);
return
glEmojiTag
(
name
);
},
},
...
@@ -96,30 +92,43 @@
...
@@ -96,30 +92,43 @@
const
restrictedEmojis
=
[
'
thumbsup
'
,
'
thumbsdown
'
];
const
restrictedEmojis
=
[
'
thumbsup
'
,
'
thumbsdown
'
];
// Users can not add :+1: and :-1: to their own notes
// Users can not add :+1: and :-1: to their own notes
if
(
this
.
getUserData
.
id
===
this
.
noteAuthorId
&&
restrictedEmojis
.
indexOf
(
awardName
)
>
-
1
)
{
if
(
this
.
getUserData
.
id
===
this
.
noteAuthorId
&&
restrictedEmojis
.
indexOf
(
awardName
)
>
-
1
)
{
isAllowed
=
false
;
isAllowed
=
false
;
}
}
return
this
.
getUserData
.
id
&&
isAllowed
;
return
this
.
getUserData
.
id
&&
isAllowed
;
},
},
hasReactionByCurrentUser
(
awardList
)
{
hasReactionByCurrentUser
(
awardList
)
{
return
awardList
.
filter
(
award
=>
award
.
user
.
id
===
this
.
getUserData
.
id
).
length
;
return
awardList
.
filter
(
award
=>
award
.
user
.
id
===
this
.
getUserData
.
id
)
.
length
;
},
},
awardTitle
(
awardsList
)
{
awardTitle
(
awardsList
)
{
const
hasReactionByCurrentUser
=
this
.
hasReactionByCurrentUser
(
awardsList
);
const
hasReactionByCurrentUser
=
this
.
hasReactionByCurrentUser
(
awardsList
,
);
const
TOOLTIP_NAME_COUNT
=
hasReactionByCurrentUser
?
9
:
10
;
const
TOOLTIP_NAME_COUNT
=
hasReactionByCurrentUser
?
9
:
10
;
let
awardList
=
awardsList
;
let
awardList
=
awardsList
;
// Filter myself from list if I am awarded.
// Filter myself from list if I am awarded.
if
(
hasReactionByCurrentUser
)
{
if
(
hasReactionByCurrentUser
)
{
awardList
=
awardList
.
filter
(
award
=>
award
.
user
.
id
!==
this
.
getUserData
.
id
);
awardList
=
awardList
.
filter
(
award
=>
award
.
user
.
id
!==
this
.
getUserData
.
id
,
);
}
}
// Get only 9-10 usernames to show in tooltip text.
// Get only 9-10 usernames to show in tooltip text.
const
namesToShow
=
awardList
.
slice
(
0
,
TOOLTIP_NAME_COUNT
).
map
(
award
=>
award
.
user
.
name
);
const
namesToShow
=
awardList
.
slice
(
0
,
TOOLTIP_NAME_COUNT
)
.
map
(
award
=>
award
.
user
.
name
);
// Get the remaining list to use in `and x more` text.
// Get the remaining list to use in `and x more` text.
const
remainingAwardList
=
awardList
.
slice
(
TOOLTIP_NAME_COUNT
,
awardList
.
length
);
const
remainingAwardList
=
awardList
.
slice
(
TOOLTIP_NAME_COUNT
,
awardList
.
length
,
);
// Add myself to the begining of the list so title will start with You.
// Add myself to the begining of the list so title will start with You.
if
(
hasReactionByCurrentUser
)
{
if
(
hasReactionByCurrentUser
)
{
...
@@ -130,14 +139,17 @@
...
@@ -130,14 +139,17 @@
// We have 10+ awarded user, join them with comma and add `and x more`.
// We have 10+ awarded user, join them with comma and add `and x more`.
if
(
remainingAwardList
.
length
)
{
if
(
remainingAwardList
.
length
)
{
title
=
`
${
namesToShow
.
join
(
'
,
'
)}
, and
${
remainingAwardList
.
length
}
more.`
;
title
=
`
${
namesToShow
.
join
(
'
,
'
)}
, and
${
remainingAwardList
.
length
}
more.`
;
}
else
if
(
namesToShow
.
length
>
1
)
{
}
else
if
(
namesToShow
.
length
>
1
)
{
// Join all names with comma but not the last one, it will be added with and text.
// Join all names with comma but not the last one, it will be added with and text.
title
=
namesToShow
.
slice
(
0
,
namesToShow
.
length
-
1
).
join
(
'
,
'
);
title
=
namesToShow
.
slice
(
0
,
namesToShow
.
length
-
1
).
join
(
'
,
'
);
// If we have more than 2 users we need an extra comma before and text.
// If we have more than 2 users we need an extra comma before and text.
title
+=
namesToShow
.
length
>
2
?
'
,
'
:
''
;
title
+=
namesToShow
.
length
>
2
?
'
,
'
:
''
;
title
+=
` and
${
namesToShow
.
slice
(
-
1
)}
`
;
// Append and text
title
+=
` and
${
namesToShow
.
slice
(
-
1
)}
`
;
// Append and text
}
else
{
// We have only 2 users so join them with and.
}
else
{
// We have only 2 users so join them with and.
title
=
namesToShow
.
join
(
'
and
'
);
title
=
namesToShow
.
join
(
'
and
'
);
}
}
...
@@ -169,11 +181,12 @@
...
@@ -169,11 +181,12 @@
awardName
:
parsedName
,
awardName
:
parsedName
,
};
};
this
.
toggleAwardRequest
(
data
)
this
.
toggleAwardRequest
(
data
).
catch
(()
=>
.
catch
(()
=>
Flash
(
'
Something went wrong on our end.
'
));
Flash
(
'
Something went wrong on our end.
'
),
);
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/note_body.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
noteAwardsList
from
'
./note_awards_list.vue
'
;
import
noteAwardsList
from
'
./note_awards_list.vue
'
;
import
noteAttachment
from
'
./note_attachment.vue
'
;
import
noteAttachment
from
'
./note_attachment.vue
'
;
import
noteForm
from
'
./note_form.vue
'
;
import
noteForm
from
'
./note_form.vue
'
;
import
TaskList
from
'
../../task_list
'
;
import
TaskList
from
'
../../task_list
'
;
import
autosave
from
'
../mixins/autosave
'
;
import
autosave
from
'
../mixins/autosave
'
;
export
default
{
export
default
{
components
:
{
components
:
{
noteEditedText
,
noteEditedText
,
noteAwardsList
,
noteAwardsList
,
noteAttachment
,
noteAttachment
,
noteForm
,
noteForm
,
},
},
mixins
:
[
mixins
:
[
autosave
],
autosave
,
],
props
:
{
props
:
{
note
:
{
note
:
{
type
:
Object
,
type
:
Object
,
...
@@ -77,7 +75,7 @@
...
@@ -77,7 +75,7 @@
this
.
$emit
(
'
cancelFormEdition
'
,
shouldConfirm
,
isDirty
);
this
.
$emit
(
'
cancelFormEdition
'
,
shouldConfirm
,
isDirty
);
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/note_edited_text.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
timeAgoTooltip
from
'
../../vue_shared/components/time_ago_tooltip.vue
'
;
import
timeAgoTooltip
from
'
../../vue_shared/components/time_ago_tooltip.vue
'
;
export
default
{
export
default
{
name
:
'
EditedNoteText
'
,
name
:
'
EditedNoteText
'
,
components
:
{
components
:
{
timeAgoTooltip
,
timeAgoTooltip
,
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
default
:
'
edited-text
'
,
default
:
'
edited-text
'
,
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/note_form.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
eventHub
from
'
../event_hub
'
;
import
eventHub
from
'
../event_hub
'
;
import
issueWarning
from
'
../../vue_shared/components/issue/issue_warning.vue
'
;
import
issueWarning
from
'
../../vue_shared/components/issue/issue_warning.vue
'
;
import
markdownField
from
'
../../vue_shared/components/markdown/field.vue
'
;
import
markdownField
from
'
../../vue_shared/components/markdown/field.vue
'
;
import
issuableStateMixin
from
'
../mixins/issuable_state
'
;
import
issuableStateMixin
from
'
../mixins/issuable_state
'
;
import
resolvable
from
'
../mixins/resolvable
'
;
import
resolvable
from
'
../mixins/resolvable
'
;
export
default
{
export
default
{
name
:
'
IssueNoteForm
'
,
name
:
'
IssueNoteForm
'
,
components
:
{
components
:
{
issueWarning
,
issueWarning
,
markdownField
,
markdownField
,
},
},
mixins
:
[
mixins
:
[
issuableStateMixin
,
resolvable
],
issuableStateMixin
,
resolvable
,
],
props
:
{
props
:
{
noteBody
:
{
noteBody
:
{
type
:
String
,
type
:
String
,
...
@@ -69,7 +66,9 @@
...
@@ -69,7 +66,9 @@
return
this
.
getNotesDataByProp
(
'
markdownDocsPath
'
);
return
this
.
getNotesDataByProp
(
'
markdownDocsPath
'
);
},
},
quickActionsDocsPath
()
{
quickActionsDocsPath
()
{
return
!
this
.
isEditing
?
this
.
getNotesDataByProp
(
'
quickActionsDocsPath
'
)
:
undefined
;
return
!
this
.
isEditing
?
this
.
getNotesDataByProp
(
'
quickActionsDocsPath
'
)
:
undefined
;
},
},
currentUserId
()
{
currentUserId
()
{
return
this
.
getUserDataByProp
(
'
id
'
);
return
this
.
getUserDataByProp
(
'
id
'
);
...
@@ -91,24 +90,29 @@
...
@@ -91,24 +90,29 @@
this
.
$refs
.
textarea
.
focus
();
this
.
$refs
.
textarea
.
focus
();
},
},
methods
:
{
methods
:
{
...
mapActions
([
...
mapActions
([
'
toggleResolveNote
'
]),
'
toggleResolveNote
'
,
]),
handleUpdate
(
shouldResolve
)
{
handleUpdate
(
shouldResolve
)
{
const
beforeSubmitDiscussionState
=
this
.
discussionResolved
;
const
beforeSubmitDiscussionState
=
this
.
discussionResolved
;
this
.
isSubmitting
=
true
;
this
.
isSubmitting
=
true
;
this
.
$emit
(
'
handleFormUpdate
'
,
this
.
updatedNoteBody
,
this
.
$refs
.
editNoteForm
,
()
=>
{
this
.
$emit
(
'
handleFormUpdate
'
,
this
.
updatedNoteBody
,
this
.
$refs
.
editNoteForm
,
()
=>
{
this
.
isSubmitting
=
false
;
this
.
isSubmitting
=
false
;
if
(
shouldResolve
)
{
if
(
shouldResolve
)
{
this
.
resolveHandler
(
beforeSubmitDiscussionState
);
this
.
resolveHandler
(
beforeSubmitDiscussionState
);
}
}
});
},
);
},
},
editMyLastNote
()
{
editMyLastNote
()
{
if
(
this
.
updatedNoteBody
===
''
)
{
if
(
this
.
updatedNoteBody
===
''
)
{
const
lastNoteInDiscussion
=
this
.
getDiscussionLastNote
(
this
.
updatedNoteBody
);
const
lastNoteInDiscussion
=
this
.
getDiscussionLastNote
(
this
.
updatedNoteBody
,
);
if
(
lastNoteInDiscussion
)
{
if
(
lastNoteInDiscussion
)
{
eventHub
.
$emit
(
'
enterEditMode
'
,
{
eventHub
.
$emit
(
'
enterEditMode
'
,
{
...
@@ -119,10 +123,14 @@
...
@@ -119,10 +123,14 @@
},
},
cancelHandler
(
shouldConfirm
=
false
)
{
cancelHandler
(
shouldConfirm
=
false
)
{
// Sends information about confirm message and if the textarea has changed
// Sends information about confirm message and if the textarea has changed
this
.
$emit
(
'
cancelFormEdition
'
,
shouldConfirm
,
this
.
noteBody
!==
this
.
updatedNoteBody
);
this
.
$emit
(
'
cancelFormEdition
'
,
shouldConfirm
,
this
.
noteBody
!==
this
.
updatedNoteBody
,
);
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/note_header.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
timeAgoTooltip
from
'
../../vue_shared/components/time_ago_tooltip.vue
'
;
import
timeAgoTooltip
from
'
../../vue_shared/components/time_ago_tooltip.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
timeAgoTooltip
,
timeAgoTooltip
,
},
},
...
@@ -49,9 +49,7 @@
...
@@ -49,9 +49,7 @@
},
},
},
},
methods
:
{
methods
:
{
...
mapActions
([
...
mapActions
([
'
setTargetNoteHash
'
]),
'
setTargetNoteHash
'
,
]),
handleToggle
()
{
handleToggle
()
{
this
.
$emit
(
'
toggleHandler
'
);
this
.
$emit
(
'
toggleHandler
'
);
},
},
...
@@ -59,7 +57,7 @@
...
@@ -59,7 +57,7 @@
this
.
setTargetNoteHash
(
this
.
noteTimestampLink
);
this
.
setTargetNoteHash
(
this
.
noteTimestampLink
);
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/note_signed_out_widget.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
{
mapGetters
}
from
'
vuex
'
;
import
{
mapGetters
}
from
'
vuex
'
;
export
default
{
export
default
{
computed
:
{
computed
:
{
...
mapGetters
([
...
mapGetters
([
'
getNotesDataByProp
'
]),
'
getNotesDataByProp
'
,
]),
registerLink
()
{
registerLink
()
{
return
this
.
getNotesDataByProp
(
'
registerPath
'
);
return
this
.
getNotesDataByProp
(
'
registerPath
'
);
},
},
...
@@ -13,7 +11,7 @@
...
@@ -13,7 +11,7 @@
return
this
.
getNotesDataByProp
(
'
newSessionPath
'
);
return
this
.
getNotesDataByProp
(
'
newSessionPath
'
);
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
resolveDiscussionsSvg
from
'
icons/_icon_mr_issue.svg
'
;
import
resolveDiscussionsSvg
from
'
icons/_icon_mr_issue.svg
'
;
import
nextDiscussionsSvg
from
'
icons/_next_discussion.svg
'
;
import
nextDiscussionsSvg
from
'
icons/_next_discussion.svg
'
;
import
Flash
from
'
../../flash
'
;
import
Flash
from
'
../../flash
'
;
import
{
SYSTEM_NOTE
}
from
'
../constants
'
;
import
{
SYSTEM_NOTE
}
from
'
../constants
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
noteableNote
from
'
./noteable_note.vue
'
;
import
noteableNote
from
'
./noteable_note.vue
'
;
import
noteHeader
from
'
./note_header.vue
'
;
import
noteHeader
from
'
./note_header.vue
'
;
import
noteSignedOutWidget
from
'
./note_signed_out_widget.vue
'
;
import
noteSignedOutWidget
from
'
./note_signed_out_widget.vue
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
noteForm
from
'
./note_form.vue
'
;
import
noteForm
from
'
./note_form.vue
'
;
import
diffWithNote
from
'
./diff_with_note.vue
'
;
import
diffWithNote
from
'
./diff_with_note.vue
'
;
import
placeholderNote
from
'
../../vue_shared/components/notes/placeholder_note.vue
'
;
import
placeholderNote
from
'
../../vue_shared/components/notes/placeholder_note.vue
'
;
import
placeholderSystemNote
from
'
../../vue_shared/components/notes/placeholder_system_note.vue
'
;
import
placeholderSystemNote
from
'
../../vue_shared/components/notes/placeholder_system_note.vue
'
;
import
autosave
from
'
../mixins/autosave
'
;
import
autosave
from
'
../mixins/autosave
'
;
import
noteable
from
'
../mixins/noteable
'
;
import
noteable
from
'
../mixins/noteable
'
;
import
resolvable
from
'
../mixins/resolvable
'
;
import
resolvable
from
'
../mixins/resolvable
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
{
scrollToElement
}
from
'
../../lib/utils/common_utils
'
;
import
{
scrollToElement
}
from
'
../../lib/utils/common_utils
'
;
export
default
{
export
default
{
components
:
{
components
:
{
noteableNote
,
noteableNote
,
diffWithNote
,
diffWithNote
,
...
@@ -34,11 +34,7 @@
...
@@ -34,11 +34,7 @@
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
mixins
:
[
mixins
:
[
autosave
,
noteable
,
resolvable
],
autosave
,
noteable
,
resolvable
,
],
props
:
{
props
:
{
note
:
{
note
:
{
type
:
Object
,
type
:
Object
,
...
@@ -99,7 +95,9 @@
...
@@ -99,7 +95,9 @@
return
this
.
unresolvedDiscussions
.
length
>
0
;
return
this
.
unresolvedDiscussions
.
length
>
0
;
},
},
wrapperComponent
()
{
wrapperComponent
()
{
return
(
this
.
discussion
.
diffDiscussion
&&
this
.
discussion
.
diffFile
)
?
diffWithNote
:
'
div
'
;
return
this
.
discussion
.
diffDiscussion
&&
this
.
discussion
.
diffFile
?
diffWithNote
:
'
div
'
;
},
},
wrapperClass
()
{
wrapperClass
()
{
return
this
.
isDiffDiscussion
?
''
:
'
panel panel-default
'
;
return
this
.
isDiffDiscussion
?
''
:
'
panel panel-default
'
;
...
@@ -151,8 +149,10 @@
...
@@ -151,8 +149,10 @@
},
},
cancelReplyForm
(
shouldConfirm
)
{
cancelReplyForm
(
shouldConfirm
)
{
if
(
shouldConfirm
&&
this
.
$refs
.
noteForm
.
isDirty
)
{
if
(
shouldConfirm
&&
this
.
$refs
.
noteForm
.
isDirty
)
{
const
msg
=
'
Are you sure you want to cancel creating this comment?
'
;
// eslint-disable-next-line no-alert
// eslint-disable-next-line no-alert
if
(
!
confirm
(
'
Are you sure you want to cancel creating this comment?
'
))
{
if
(
!
confirm
(
msg
))
{
return
;
return
;
}
}
}
}
...
@@ -178,7 +178,7 @@
...
@@ -178,7 +178,7 @@
this
.
resetAutoSave
();
this
.
resetAutoSave
();
callback
();
callback
();
})
})
.
catch
((
err
)
=>
{
.
catch
(
err
=>
{
this
.
removePlaceholderNotes
();
this
.
removePlaceholderNotes
();
this
.
isReplying
=
true
;
this
.
isReplying
=
true
;
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
...
@@ -204,7 +204,7 @@ Please check your network connection and try again.`;
...
@@ -204,7 +204,7 @@ Please check your network connection and try again.`;
}
}
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/noteable_note.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
escape
}
from
'
underscore
'
;
import
{
escape
}
from
'
underscore
'
;
import
Flash
from
'
../../flash
'
;
import
Flash
from
'
../../flash
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
noteHeader
from
'
./note_header.vue
'
;
import
noteHeader
from
'
./note_header.vue
'
;
import
noteActions
from
'
./note_actions.vue
'
;
import
noteActions
from
'
./note_actions.vue
'
;
import
noteBody
from
'
./note_body.vue
'
;
import
noteBody
from
'
./note_body.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
eventHub
from
'
../event_hub
'
;
import
noteable
from
'
../mixins/noteable
'
;
import
noteable
from
'
../mixins/noteable
'
;
import
resolvable
from
'
../mixins/resolvable
'
;
import
resolvable
from
'
../mixins/resolvable
'
;
export
default
{
export
default
{
components
:
{
components
:
{
userAvatarLink
,
userAvatarLink
,
noteHeader
,
noteHeader
,
noteActions
,
noteActions
,
noteBody
,
noteBody
,
},
},
mixins
:
[
mixins
:
[
noteable
,
resolvable
],
noteable
,
resolvable
,
],
props
:
{
props
:
{
note
:
{
note
:
{
type
:
Object
,
type
:
Object
,
...
@@ -37,10 +34,7 @@
...
@@ -37,10 +34,7 @@
};
};
},
},
computed
:
{
computed
:
{
...
mapGetters
([
...
mapGetters
([
'
targetNoteHash
'
,
'
getUserData
'
]),
'
targetNoteHash
'
,
'
getUserData
'
,
]),
author
()
{
author
()
{
return
this
.
note
.
author
;
return
this
.
note
.
author
;
},
},
...
@@ -53,7 +47,9 @@
...
@@ -53,7 +47,9 @@
};
};
},
},
canReportAsAbuse
()
{
canReportAsAbuse
()
{
return
this
.
note
.
report_abuse_path
&&
this
.
author
.
id
!==
this
.
getUserData
.
id
;
return
(
this
.
note
.
report_abuse_path
&&
this
.
author
.
id
!==
this
.
getUserData
.
id
);
},
},
noteAnchorId
()
{
noteAnchorId
()
{
return
`note_
${
this
.
note
.
id
}
`
;
return
`note_
${
this
.
note
.
id
}
`
;
...
@@ -89,7 +85,9 @@
...
@@ -89,7 +85,9 @@
this
.
isDeleting
=
false
;
this
.
isDeleting
=
false
;
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
Flash
(
'
Something went wrong while deleting your note. Please try again.
'
);
Flash
(
'
Something went wrong while deleting your note. Please try again.
'
,
);
this
.
isDeleting
=
false
;
this
.
isDeleting
=
false
;
});
});
}
}
...
@@ -120,7 +118,8 @@
...
@@ -120,7 +118,8 @@
this
.
isRequesting
=
false
;
this
.
isRequesting
=
false
;
this
.
isEditing
=
true
;
this
.
isEditing
=
true
;
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
const
msg
=
'
Something went wrong while editing your comment. Please try again.
'
;
const
msg
=
'
Something went wrong while editing your comment. Please try again.
'
;
Flash
(
msg
,
'
alert
'
,
this
.
$el
);
Flash
(
msg
,
'
alert
'
,
this
.
$el
);
this
.
recoverNoteContent
(
noteText
);
this
.
recoverNoteContent
(
noteText
);
callback
();
callback
();
...
@@ -130,7 +129,8 @@
...
@@ -130,7 +129,8 @@
formCancelHandler
(
shouldConfirm
,
isDirty
)
{
formCancelHandler
(
shouldConfirm
,
isDirty
)
{
if
(
shouldConfirm
&&
isDirty
)
{
if
(
shouldConfirm
&&
isDirty
)
{
// eslint-disable-next-line no-alert
// eslint-disable-next-line no-alert
if
(
!
confirm
(
'
Are you sure you want to cancel editing this comment?
'
))
return
;
if
(
!
confirm
(
'
Are you sure you want to cancel editing this comment?
'
))
return
;
}
}
this
.
$refs
.
noteBody
.
resetAutoSave
();
this
.
$refs
.
noteBody
.
resetAutoSave
();
if
(
this
.
oldContent
)
{
if
(
this
.
oldContent
)
{
...
@@ -146,7 +146,7 @@
...
@@ -146,7 +146,7 @@
this
.
$refs
.
noteBody
.
$refs
.
noteForm
.
note
.
note
=
noteText
;
this
.
$refs
.
noteBody
.
$refs
.
noteForm
.
note
.
note
=
noteText
;
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/components/notes_app.vue
View file @
fdc9ae2e
<
script
>
<
script
>
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
getLocationHash
}
from
'
../../lib/utils/url_utility
'
;
import
{
getLocationHash
}
from
'
../../lib/utils/url_utility
'
;
import
Flash
from
'
../../flash
'
;
import
Flash
from
'
../../flash
'
;
import
store
from
'
../stores/
'
;
import
store
from
'
../stores/
'
;
import
*
as
constants
from
'
../constants
'
;
import
*
as
constants
from
'
../constants
'
;
import
noteableNote
from
'
./noteable_note.vue
'
;
import
noteableNote
from
'
./noteable_note.vue
'
;
import
noteableDiscussion
from
'
./noteable_discussion.vue
'
;
import
noteableDiscussion
from
'
./noteable_discussion.vue
'
;
import
systemNote
from
'
../../vue_shared/components/notes/system_note.vue
'
;
import
systemNote
from
'
../../vue_shared/components/notes/system_note.vue
'
;
import
commentForm
from
'
./comment_form.vue
'
;
import
commentForm
from
'
./comment_form.vue
'
;
import
placeholderNote
from
'
../../vue_shared/components/notes/placeholder_note.vue
'
;
import
placeholderNote
from
'
../../vue_shared/components/notes/placeholder_note.vue
'
;
import
placeholderSystemNote
from
'
../../vue_shared/components/notes/placeholder_system_note.vue
'
;
import
placeholderSystemNote
from
'
../../vue_shared/components/notes/placeholder_system_note.vue
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
skeletonLoadingContainer
from
'
../../vue_shared/components/notes/skeleton_note.vue
'
;
import
skeletonLoadingContainer
from
'
../../vue_shared/components/notes/skeleton_note.vue
'
;
export
default
{
export
default
{
name
:
'
NotesApp
'
,
name
:
'
NotesApp
'
,
components
:
{
components
:
{
noteableNote
,
noteableNote
,
...
@@ -47,16 +47,14 @@
...
@@ -47,16 +47,14 @@
};
};
},
},
computed
:
{
computed
:
{
...
mapGetters
([
...
mapGetters
([
'
notes
'
,
'
getNotesDataByProp
'
,
'
discussionCount
'
]),
'
notes
'
,
'
getNotesDataByProp
'
,
'
discussionCount
'
,
]),
noteableType
()
{
noteableType
()
{
// FIXME -- @fatihacet Get this from JSON data.
// FIXME -- @fatihacet Get this from JSON data.
const
{
ISSUE_NOTEABLE_TYPE
,
MERGE_REQUEST_NOTEABLE_TYPE
}
=
constants
;
const
{
ISSUE_NOTEABLE_TYPE
,
MERGE_REQUEST_NOTEABLE_TYPE
}
=
constants
;
return
this
.
noteableData
.
merge_params
?
MERGE_REQUEST_NOTEABLE_TYPE
:
ISSUE_NOTEABLE_TYPE
;
return
this
.
noteableData
.
merge_params
?
MERGE_REQUEST_NOTEABLE_TYPE
:
ISSUE_NOTEABLE_TYPE
;
},
},
allNotes
()
{
allNotes
()
{
if
(
this
.
isLoading
)
{
if
(
this
.
isLoading
)
{
...
@@ -79,9 +77,11 @@
...
@@ -79,9 +77,11 @@
const
parentElement
=
this
.
$el
.
parentElement
;
const
parentElement
=
this
.
$el
.
parentElement
;
if
(
parentElement
&&
if
(
parentElement
.
classList
.
contains
(
'
js-vue-notes-event
'
))
{
parentElement
&&
parentElement
.
addEventListener
(
'
toggleAward
'
,
(
event
)
=>
{
parentElement
.
classList
.
contains
(
'
js-vue-notes-event
'
)
)
{
parentElement
.
addEventListener
(
'
toggleAward
'
,
event
=>
{
const
{
awardName
,
noteId
}
=
event
.
detail
;
const
{
awardName
,
noteId
}
=
event
.
detail
;
this
.
actionToggleAward
({
awardName
,
noteId
});
this
.
actionToggleAward
({
awardName
,
noteId
});
});
});
...
@@ -131,7 +131,9 @@
...
@@ -131,7 +131,9 @@
.
then
(()
=>
this
.
checkLocationHash
())
.
then
(()
=>
this
.
checkLocationHash
())
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
Flash
(
'
Something went wrong while fetching comments. Please try again.
'
);
Flash
(
'
Something went wrong while fetching comments. Please try again.
'
,
);
});
});
},
},
initPolling
()
{
initPolling
()
{
...
@@ -154,7 +156,7 @@
...
@@ -154,7 +156,7 @@
}
}
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/javascripts/notes/index.js
View file @
fdc9ae2e
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
notesApp
from
'
./components/notes_app.vue
'
;
import
notesApp
from
'
./components/notes_app.vue
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Vue
({
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Vue
({
el
:
'
#js-vue-notes
'
,
el
:
'
#js-vue-notes
'
,
components
:
{
components
:
{
notesApp
,
notesApp
,
...
@@ -9,13 +12,17 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
...
@@ -9,13 +12,17 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
data
()
{
data
()
{
const
notesDataset
=
document
.
getElementById
(
'
js-vue-notes
'
).
dataset
;
const
notesDataset
=
document
.
getElementById
(
'
js-vue-notes
'
).
dataset
;
const
parsedUserData
=
JSON
.
parse
(
notesDataset
.
currentUserData
);
const
parsedUserData
=
JSON
.
parse
(
notesDataset
.
currentUserData
);
const
currentUserData
=
parsedUserData
?
{
let
currentUserData
=
{};
if
(
parsedUserData
)
{
currentUserData
=
{
id
:
parsedUserData
.
id
,
id
:
parsedUserData
.
id
,
name
:
parsedUserData
.
name
,
name
:
parsedUserData
.
name
,
username
:
parsedUserData
.
username
,
username
:
parsedUserData
.
username
,
avatar_url
:
parsedUserData
.
avatar_path
||
parsedUserData
.
avatar_url
,
avatar_url
:
parsedUserData
.
avatar_path
||
parsedUserData
.
avatar_url
,
path
:
parsedUserData
.
path
,
path
:
parsedUserData
.
path
,
}
:
{};
};
}
return
{
return
{
noteableData
:
JSON
.
parse
(
notesDataset
.
noteableData
),
noteableData
:
JSON
.
parse
(
notesDataset
.
noteableData
),
...
@@ -32,4 +39,5 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
...
@@ -32,4 +39,5 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
},
},
});
});
},
},
}));
}),
);
app/assets/javascripts/notes/mixins/autosave.js
View file @
fdc9ae2e
...
@@ -5,7 +5,11 @@ import { capitalizeFirstCharacter } from '../../lib/utils/text_utility';
...
@@ -5,7 +5,11 @@ import { capitalizeFirstCharacter } from '../../lib/utils/text_utility';
export
default
{
export
default
{
methods
:
{
methods
:
{
initAutoSave
(
noteableType
)
{
initAutoSave
(
noteableType
)
{
this
.
autosave
=
new
Autosave
(
$
(
this
.
$refs
.
noteForm
.
$refs
.
textarea
),
[
'
Note
'
,
capitalizeFirstCharacter
(
noteableType
),
this
.
note
.
id
]);
this
.
autosave
=
new
Autosave
(
$
(
this
.
$refs
.
noteForm
.
$refs
.
textarea
),
[
'
Note
'
,
capitalizeFirstCharacter
(
noteableType
),
this
.
note
.
id
,
]);
},
},
resetAutoSave
()
{
resetAutoSave
()
{
this
.
autosave
.
reset
();
this
.
autosave
.
reset
();
...
...
app/assets/javascripts/notes/mixins/resolvable.js
View file @
fdc9ae2e
...
@@ -12,7 +12,8 @@ export default {
...
@@ -12,7 +12,8 @@ export default {
discussionResolved
()
{
discussionResolved
()
{
const
{
notes
,
resolved
}
=
this
.
note
;
const
{
notes
,
resolved
}
=
this
.
note
;
if
(
notes
)
{
// Decide resolved state using store. Only valid for discussions.
if
(
notes
)
{
// Decide resolved state using store. Only valid for discussions.
return
notes
.
every
(
note
=>
note
.
resolved
&&
!
note
.
system
);
return
notes
.
every
(
note
=>
note
.
resolved
&&
!
note
.
system
);
}
}
...
@@ -26,7 +27,9 @@ export default {
...
@@ -26,7 +27,9 @@ export default {
return
__
(
'
Comment and resolve discussion
'
);
return
__
(
'
Comment and resolve discussion
'
);
}
}
return
this
.
discussionResolved
?
__
(
'
Unresolve discussion
'
)
:
__
(
'
Resolve discussion
'
);
return
this
.
discussionResolved
?
__
(
'
Unresolve discussion
'
)
:
__
(
'
Resolve discussion
'
);
},
},
},
},
methods
:
{
methods
:
{
...
@@ -42,7 +45,9 @@ export default {
...
@@ -42,7 +45,9 @@ export default {
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
isResolving
=
false
;
this
.
isResolving
=
false
;
const
msg
=
__
(
'
Something went wrong while resolving this discussion. Please try again.
'
);
const
msg
=
__
(
'
Something went wrong while resolving this discussion. Please try again.
'
,
);
Flash
(
msg
,
'
alert
'
,
this
.
$el
);
Flash
(
msg
,
'
alert
'
,
this
.
$el
);
});
});
},
},
...
...
app/assets/javascripts/notes/services/notes_service.js
View file @
fdc9ae2e
...
@@ -22,7 +22,9 @@ export default {
...
@@ -22,7 +22,9 @@ export default {
},
},
toggleResolveNote
(
endpoint
,
isResolved
)
{
toggleResolveNote
(
endpoint
,
isResolved
)
{
const
{
RESOLVE_NOTE_METHOD_NAME
,
UNRESOLVE_NOTE_METHOD_NAME
}
=
constants
;
const
{
RESOLVE_NOTE_METHOD_NAME
,
UNRESOLVE_NOTE_METHOD_NAME
}
=
constants
;
const
method
=
isResolved
?
UNRESOLVE_NOTE_METHOD_NAME
:
RESOLVE_NOTE_METHOD_NAME
;
const
method
=
isResolved
?
UNRESOLVE_NOTE_METHOD_NAME
:
RESOLVE_NOTE_METHOD_NAME
;
return
Vue
.
http
[
method
](
endpoint
);
return
Vue
.
http
[
method
](
endpoint
);
},
},
...
...
app/assets/javascripts/notes/stores/actions.js
View file @
fdc9ae2e
...
@@ -12,47 +12,57 @@ import { isInViewport, scrollToElement } from '../../lib/utils/common_utils';
...
@@ -12,47 +12,57 @@ import { isInViewport, scrollToElement } from '../../lib/utils/common_utils';
let
eTagPoll
;
let
eTagPoll
;
export
const
setNotesData
=
({
commit
},
data
)
=>
commit
(
types
.
SET_NOTES_DATA
,
data
);
export
const
setNotesData
=
({
commit
},
data
)
=>
export
const
setNoteableData
=
({
commit
},
data
)
=>
commit
(
types
.
SET_NOTEABLE_DATA
,
data
);
commit
(
types
.
SET_NOTES_DATA
,
data
);
export
const
setUserData
=
({
commit
},
data
)
=>
commit
(
types
.
SET_USER_DATA
,
data
);
export
const
setNoteableData
=
({
commit
},
data
)
=>
export
const
setLastFetchedAt
=
({
commit
},
data
)
=>
commit
(
types
.
SET_LAST_FETCHED_AT
,
data
);
commit
(
types
.
SET_NOTEABLE_DATA
,
data
);
export
const
setInitialNotes
=
({
commit
},
data
)
=>
commit
(
types
.
SET_INITIAL_NOTES
,
data
);
export
const
setUserData
=
({
commit
},
data
)
=>
export
const
setTargetNoteHash
=
({
commit
},
data
)
=>
commit
(
types
.
SET_TARGET_NOTE_HASH
,
data
);
commit
(
types
.
SET_USER_DATA
,
data
);
export
const
toggleDiscussion
=
({
commit
},
data
)
=>
commit
(
types
.
TOGGLE_DISCUSSION
,
data
);
export
const
setLastFetchedAt
=
({
commit
},
data
)
=>
commit
(
types
.
SET_LAST_FETCHED_AT
,
data
);
export
const
fetchNotes
=
({
commit
},
path
)
=>
service
export
const
setInitialNotes
=
({
commit
},
data
)
=>
commit
(
types
.
SET_INITIAL_NOTES
,
data
);
export
const
setTargetNoteHash
=
({
commit
},
data
)
=>
commit
(
types
.
SET_TARGET_NOTE_HASH
,
data
);
export
const
toggleDiscussion
=
({
commit
},
data
)
=>
commit
(
types
.
TOGGLE_DISCUSSION
,
data
);
export
const
fetchNotes
=
({
commit
},
path
)
=>
service
.
fetchNotes
(
path
)
.
fetchNotes
(
path
)
.
then
(
res
=>
res
.
json
())
.
then
(
res
=>
res
.
json
())
.
then
((
res
)
=>
{
.
then
(
res
=>
{
commit
(
types
.
SET_INITIAL_NOTES
,
res
);
commit
(
types
.
SET_INITIAL_NOTES
,
res
);
});
});
export
const
deleteNote
=
({
commit
},
note
)
=>
service
export
const
deleteNote
=
({
commit
},
note
)
=>
.
deleteNote
(
note
.
path
)
service
.
deleteNote
(
note
.
path
).
then
(()
=>
{
.
then
(()
=>
{
commit
(
types
.
DELETE_NOTE
,
note
);
commit
(
types
.
DELETE_NOTE
,
note
);
});
});
export
const
updateNote
=
({
commit
},
{
endpoint
,
note
})
=>
service
export
const
updateNote
=
({
commit
},
{
endpoint
,
note
})
=>
service
.
updateNote
(
endpoint
,
note
)
.
updateNote
(
endpoint
,
note
)
.
then
(
res
=>
res
.
json
())
.
then
(
res
=>
res
.
json
())
.
then
((
res
)
=>
{
.
then
(
res
=>
{
commit
(
types
.
UPDATE_NOTE
,
res
);
commit
(
types
.
UPDATE_NOTE
,
res
);
});
});
export
const
replyToDiscussion
=
({
commit
},
{
endpoint
,
data
})
=>
service
export
const
replyToDiscussion
=
({
commit
},
{
endpoint
,
data
})
=>
service
.
replyToDiscussion
(
endpoint
,
data
)
.
replyToDiscussion
(
endpoint
,
data
)
.
then
(
res
=>
res
.
json
())
.
then
(
res
=>
res
.
json
())
.
then
((
res
)
=>
{
.
then
(
res
=>
{
commit
(
types
.
ADD_NEW_REPLY_TO_DISCUSSION
,
res
);
commit
(
types
.
ADD_NEW_REPLY_TO_DISCUSSION
,
res
);
return
res
;
return
res
;
});
});
export
const
createNewNote
=
({
commit
},
{
endpoint
,
data
})
=>
service
export
const
createNewNote
=
({
commit
},
{
endpoint
,
data
})
=>
service
.
createNewNote
(
endpoint
,
data
)
.
createNewNote
(
endpoint
,
data
)
.
then
(
res
=>
res
.
json
())
.
then
(
res
=>
res
.
json
())
.
then
((
res
)
=>
{
.
then
(
res
=>
{
if
(
!
res
.
errors
)
{
if
(
!
res
.
errors
)
{
commit
(
types
.
ADD_NEW_NOTE
,
res
);
commit
(
types
.
ADD_NEW_NOTE
,
res
);
}
}
...
@@ -62,11 +72,17 @@ export const createNewNote = ({ commit }, { endpoint, data }) => service
...
@@ -62,11 +72,17 @@ export const createNewNote = ({ commit }, { endpoint, data }) => service
export
const
removePlaceholderNotes
=
({
commit
})
=>
export
const
removePlaceholderNotes
=
({
commit
})
=>
commit
(
types
.
REMOVE_PLACEHOLDER_NOTES
);
commit
(
types
.
REMOVE_PLACEHOLDER_NOTES
);
export
const
toggleResolveNote
=
({
commit
},
{
endpoint
,
isResolved
,
discussion
})
=>
service
export
const
toggleResolveNote
=
(
{
commit
},
{
endpoint
,
isResolved
,
discussion
},
)
=>
service
.
toggleResolveNote
(
endpoint
,
isResolved
)
.
toggleResolveNote
(
endpoint
,
isResolved
)
.
then
(
res
=>
res
.
json
())
.
then
(
res
=>
res
.
json
())
.
then
((
res
)
=>
{
.
then
(
res
=>
{
const
mutationType
=
discussion
?
types
.
UPDATE_DISCUSSION
:
types
.
UPDATE_NOTE
;
const
mutationType
=
discussion
?
types
.
UPDATE_DISCUSSION
:
types
.
UPDATE_NOTE
;
commit
(
mutationType
,
res
);
commit
(
mutationType
,
res
);
});
});
...
@@ -76,7 +92,7 @@ export const closeIssue = ({ commit, dispatch, state }) => {
...
@@ -76,7 +92,7 @@ export const closeIssue = ({ commit, dispatch, state }) => {
return
service
return
service
.
toggleIssueState
(
state
.
notesData
.
closePath
)
.
toggleIssueState
(
state
.
notesData
.
closePath
)
.
then
(
res
=>
res
.
json
())
.
then
(
res
=>
res
.
json
())
.
then
((
data
)
=>
{
.
then
(
data
=>
{
commit
(
types
.
CLOSE_ISSUE
);
commit
(
types
.
CLOSE_ISSUE
);
dispatch
(
'
emitStateChangedEvent
'
,
data
);
dispatch
(
'
emitStateChangedEvent
'
,
data
);
dispatch
(
'
toggleStateButtonLoading
'
,
false
);
dispatch
(
'
toggleStateButtonLoading
'
,
false
);
...
@@ -88,7 +104,7 @@ export const reopenIssue = ({ commit, dispatch, state }) => {
...
@@ -88,7 +104,7 @@ export const reopenIssue = ({ commit, dispatch, state }) => {
return
service
return
service
.
toggleIssueState
(
state
.
notesData
.
reopenPath
)
.
toggleIssueState
(
state
.
notesData
.
reopenPath
)
.
then
(
res
=>
res
.
json
())
.
then
(
res
=>
res
.
json
())
.
then
((
data
)
=>
{
.
then
(
data
=>
{
commit
(
types
.
REOPEN_ISSUE
);
commit
(
types
.
REOPEN_ISSUE
);
dispatch
(
'
emitStateChangedEvent
'
,
data
);
dispatch
(
'
emitStateChangedEvent
'
,
data
);
dispatch
(
'
toggleStateButtonLoading
'
,
false
);
dispatch
(
'
toggleStateButtonLoading
'
,
false
);
...
@@ -99,10 +115,12 @@ export const toggleStateButtonLoading = ({ commit }, value) =>
...
@@ -99,10 +115,12 @@ export const toggleStateButtonLoading = ({ commit }, value) =>
commit
(
types
.
TOGGLE_STATE_BUTTON_LOADING
,
value
);
commit
(
types
.
TOGGLE_STATE_BUTTON_LOADING
,
value
);
export
const
emitStateChangedEvent
=
({
commit
,
getters
},
data
)
=>
{
export
const
emitStateChangedEvent
=
({
commit
,
getters
},
data
)
=>
{
const
event
=
new
CustomEvent
(
'
issuable_vue_app:change
'
,
{
detail
:
{
const
event
=
new
CustomEvent
(
'
issuable_vue_app:change
'
,
{
detail
:
{
data
,
data
,
isClosed
:
getters
.
openState
===
constants
.
CLOSED
,
isClosed
:
getters
.
openState
===
constants
.
CLOSED
,
}
});
},
});
document
.
dispatchEvent
(
event
);
document
.
dispatchEvent
(
event
);
};
};
...
@@ -144,8 +162,7 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
...
@@ -144,8 +162,7 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
});
});
}
}
return
dispatch
(
methodToDispatch
,
noteData
)
return
dispatch
(
methodToDispatch
,
noteData
).
then
(
res
=>
{
.
then
((
res
)
=>
{
const
{
errors
}
=
res
;
const
{
errors
}
=
res
;
const
commandsChanges
=
res
.
commands_changes
;
const
commandsChanges
=
res
.
commands_changes
;
...
@@ -161,8 +178,11 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
...
@@ -161,8 +178,11 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
const
votesBlock
=
$
(
'
.js-awards-block
'
).
eq
(
0
);
const
votesBlock
=
$
(
'
.js-awards-block
'
).
eq
(
0
);
loadAwardsHandler
()
loadAwardsHandler
()
.
then
((
awardsHandler
)
=>
{
.
then
(
awardsHandler
=>
{
awardsHandler
.
addAwardToEmojiBar
(
votesBlock
,
commandsChanges
.
emoji_award
);
awardsHandler
.
addAwardToEmojiBar
(
votesBlock
,
commandsChanges
.
emoji_award
,
);
awardsHandler
.
scrollToAwards
();
awardsHandler
.
scrollToAwards
();
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
...
@@ -174,7 +194,10 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
...
@@ -174,7 +194,10 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
});
});
}
}
if
(
commandsChanges
.
spend_time
!=
null
||
commandsChanges
.
time_estimate
!=
null
)
{
if
(
commandsChanges
.
spend_time
!=
null
||
commandsChanges
.
time_estimate
!=
null
)
{
sidebarTimeTrackingEventHub
.
$emit
(
'
timeTrackingUpdated
'
,
res
);
sidebarTimeTrackingEventHub
.
$emit
(
'
timeTrackingUpdated
'
,
res
);
}
}
}
}
...
@@ -192,11 +215,17 @@ const pollSuccessCallBack = (resp, commit, state, getters) => {
...
@@ -192,11 +215,17 @@ const pollSuccessCallBack = (resp, commit, state, getters) => {
if
(
resp
.
notes
&&
resp
.
notes
.
length
)
{
if
(
resp
.
notes
&&
resp
.
notes
.
length
)
{
const
{
notesById
}
=
getters
;
const
{
notesById
}
=
getters
;
resp
.
notes
.
forEach
(
(
note
)
=>
{
resp
.
notes
.
forEach
(
note
=>
{
if
(
notesById
[
note
.
id
])
{
if
(
notesById
[
note
.
id
])
{
commit
(
types
.
UPDATE_NOTE
,
note
);
commit
(
types
.
UPDATE_NOTE
,
note
);
}
else
if
(
note
.
type
===
constants
.
DISCUSSION_NOTE
||
note
.
type
===
constants
.
DIFF_NOTE
)
{
}
else
if
(
const
discussion
=
utils
.
findNoteObjectById
(
state
.
notes
,
note
.
discussion_id
);
note
.
type
===
constants
.
DISCUSSION_NOTE
||
note
.
type
===
constants
.
DIFF_NOTE
)
{
const
discussion
=
utils
.
findNoteObjectById
(
state
.
notes
,
note
.
discussion_id
,
);
if
(
discussion
)
{
if
(
discussion
)
{
commit
(
types
.
ADD_NEW_REPLY_TO_DISCUSSION
,
note
);
commit
(
types
.
ADD_NEW_REPLY_TO_DISCUSSION
,
note
);
...
@@ -219,9 +248,12 @@ export const poll = ({ commit, state, getters }) => {
...
@@ -219,9 +248,12 @@ export const poll = ({ commit, state, getters }) => {
resource
:
service
,
resource
:
service
,
method
:
'
poll
'
,
method
:
'
poll
'
,
data
:
state
,
data
:
state
,
successCallback
:
resp
=>
resp
.
json
()
successCallback
:
resp
=>
resp
.
json
()
.
then
(
data
=>
pollSuccessCallBack
(
data
,
commit
,
state
,
getters
)),
.
then
(
data
=>
pollSuccessCallBack
(
data
,
commit
,
state
,
getters
)),
errorCallback
:
()
=>
Flash
(
'
Something went wrong while fetching latest comments.
'
),
errorCallback
:
()
=>
Flash
(
'
Something went wrong while fetching latest comments.
'
),
});
});
if
(
!
Visibility
.
hidden
())
{
if
(
!
Visibility
.
hidden
())
{
...
@@ -248,15 +280,22 @@ export const restartPolling = () => {
...
@@ -248,15 +280,22 @@ export const restartPolling = () => {
};
};
export
const
fetchData
=
({
commit
,
state
,
getters
})
=>
{
export
const
fetchData
=
({
commit
,
state
,
getters
})
=>
{
const
requestData
=
{
endpoint
:
state
.
notesData
.
notesPath
,
lastFetchedAt
:
state
.
lastFetchedAt
};
const
requestData
=
{
endpoint
:
state
.
notesData
.
notesPath
,
lastFetchedAt
:
state
.
lastFetchedAt
,
};
service
.
poll
(
requestData
)
service
.
poll
(
requestData
)
.
then
(
resp
=>
resp
.
json
)
.
then
(
resp
=>
resp
.
json
)
.
then
(
data
=>
pollSuccessCallBack
(
data
,
commit
,
state
,
getters
))
.
then
(
data
=>
pollSuccessCallBack
(
data
,
commit
,
state
,
getters
))
.
catch
(()
=>
Flash
(
'
Something went wrong while fetching latest comments.
'
));
.
catch
(()
=>
Flash
(
'
Something went wrong while fetching latest comments.
'
));
};
};
export
const
toggleAward
=
({
commit
,
state
,
getters
,
dispatch
},
{
awardName
,
noteId
})
=>
{
export
const
toggleAward
=
(
{
commit
,
state
,
getters
,
dispatch
},
{
awardName
,
noteId
},
)
=>
{
commit
(
types
.
TOGGLE_AWARD
,
{
awardName
,
note
:
getters
.
notesById
[
noteId
]
});
commit
(
types
.
TOGGLE_AWARD
,
{
awardName
,
note
:
getters
.
notesById
[
noteId
]
});
};
};
...
...
app/assets/javascripts/notes/stores/getters.js
View file @
fdc9ae2e
...
@@ -11,27 +11,31 @@ export const getNoteableDataByProp = state => prop => state.noteableData[prop];
...
@@ -11,27 +11,31 @@ export const getNoteableDataByProp = state => prop => state.noteableData[prop];
export
const
openState
=
state
=>
state
.
noteableData
.
state
;
export
const
openState
=
state
=>
state
.
noteableData
.
state
;
export
const
getUserData
=
state
=>
state
.
userData
||
{};
export
const
getUserData
=
state
=>
state
.
userData
||
{};
export
const
getUserDataByProp
=
state
=>
prop
=>
state
.
userData
&&
state
.
userData
[
prop
];
export
const
getUserDataByProp
=
state
=>
prop
=>
state
.
userData
&&
state
.
userData
[
prop
];
export
const
notesById
=
state
=>
state
.
notes
.
reduce
((
acc
,
note
)
=>
{
export
const
notesById
=
state
=>
state
.
notes
.
reduce
((
acc
,
note
)
=>
{
note
.
notes
.
every
(
n
=>
Object
.
assign
(
acc
,
{
[
n
.
id
]:
n
}));
note
.
notes
.
every
(
n
=>
Object
.
assign
(
acc
,
{
[
n
.
id
]:
n
}));
return
acc
;
return
acc
;
},
{});
},
{});
const
reverseNotes
=
array
=>
array
.
slice
(
0
).
reverse
();
const
reverseNotes
=
array
=>
array
.
slice
(
0
).
reverse
();
const
isLastNote
=
(
note
,
state
)
=>
!
note
.
system
&&
const
isLastNote
=
(
note
,
state
)
=>
state
.
userData
&&
note
.
author
&&
!
note
.
system
&&
state
.
userData
&&
note
.
author
&&
note
.
author
.
id
===
state
.
userData
.
id
;
note
.
author
.
id
===
state
.
userData
.
id
;
export
const
getCurrentUserLastNote
=
state
=>
_
.
flatten
(
export
const
getCurrentUserLastNote
=
state
=>
reverseNotes
(
state
.
notes
)
_
.
flatten
(
.
map
(
note
=>
reverseNotes
(
note
.
notes
)),
reverseNotes
(
state
.
notes
)
.
map
(
note
=>
reverseNotes
(
note
.
notes
)),
).
find
(
el
=>
isLastNote
(
el
,
state
));
).
find
(
el
=>
isLastNote
(
el
,
state
));
export
const
getDiscussionLastNote
=
state
=>
discussion
=>
reverseNotes
(
discussion
.
notes
)
export
const
getDiscussionLastNote
=
state
=>
discussion
=>
.
find
(
el
=>
isLastNote
(
el
,
state
));
reverseNotes
(
discussion
.
notes
)
.
find
(
el
=>
isLastNote
(
el
,
state
));
export
const
discussionCount
=
(
state
)
=>
{
export
const
discussionCount
=
state
=>
{
const
discussions
=
state
.
notes
.
filter
(
n
=>
!
n
.
individual_note
);
const
discussions
=
state
.
notes
.
filter
(
n
=>
!
n
.
individual_note
);
return
discussions
.
length
;
return
discussions
.
length
;
...
@@ -43,10 +47,10 @@ export const unresolvedDiscussions = (state, getters) => {
...
@@ -43,10 +47,10 @@ export const unresolvedDiscussions = (state, getters) => {
return
state
.
notes
.
filter
(
n
=>
!
n
.
individual_note
&&
!
resolvedMap
[
n
.
id
]);
return
state
.
notes
.
filter
(
n
=>
!
n
.
individual_note
&&
!
resolvedMap
[
n
.
id
]);
};
};
export
const
resolvedDiscussionsById
=
(
state
)
=>
{
export
const
resolvedDiscussionsById
=
state
=>
{
const
map
=
{};
const
map
=
{};
state
.
notes
.
forEach
(
(
n
)
=>
{
state
.
notes
.
forEach
(
n
=>
{
if
(
n
.
notes
)
{
if
(
n
.
notes
)
{
const
resolved
=
n
.
notes
.
every
(
note
=>
note
.
resolved
&&
!
note
.
system
);
const
resolved
=
n
.
notes
.
every
(
note
=>
note
.
resolved
&&
!
note
.
system
);
...
...
app/assets/javascripts/notes/stores/mutations.js
View file @
fdc9ae2e
...
@@ -7,7 +7,7 @@ export default {
...
@@ -7,7 +7,7 @@ export default {
[
types
.
ADD_NEW_NOTE
](
state
,
note
)
{
[
types
.
ADD_NEW_NOTE
](
state
,
note
)
{
const
{
discussion_id
,
type
}
=
note
;
const
{
discussion_id
,
type
}
=
note
;
const
[
exists
]
=
state
.
notes
.
filter
(
n
=>
n
.
id
===
note
.
discussion_id
);
const
[
exists
]
=
state
.
notes
.
filter
(
n
=>
n
.
id
===
note
.
discussion_id
);
const
isDiscussion
=
(
type
===
constants
.
DISCUSSION_NOTE
)
;
const
isDiscussion
=
type
===
constants
.
DISCUSSION_NOTE
;
if
(
!
exists
)
{
if
(
!
exists
)
{
const
noteData
=
{
const
noteData
=
{
...
@@ -63,13 +63,15 @@ export default {
...
@@ -63,13 +63,15 @@ export default {
const
note
=
notes
[
i
];
const
note
=
notes
[
i
];
const
children
=
note
.
notes
;
const
children
=
note
.
notes
;
if
(
children
.
length
&&
!
note
.
individual_note
)
{
// remove placeholder from discussions
if
(
children
.
length
&&
!
note
.
individual_note
)
{
// remove placeholder from discussions
for
(
let
j
=
children
.
length
-
1
;
j
>=
0
;
j
-=
1
)
{
for
(
let
j
=
children
.
length
-
1
;
j
>=
0
;
j
-=
1
)
{
if
(
children
[
j
].
isPlaceholderNote
)
{
if
(
children
[
j
].
isPlaceholderNote
)
{
children
.
splice
(
j
,
1
);
children
.
splice
(
j
,
1
);
}
}
}
}
}
else
if
(
note
.
isPlaceholderNote
)
{
// remove placeholders from state root
}
else
if
(
note
.
isPlaceholderNote
)
{
// remove placeholders from state root
notes
.
splice
(
i
,
1
);
notes
.
splice
(
i
,
1
);
}
}
}
}
...
@@ -89,10 +91,10 @@ export default {
...
@@ -89,10 +91,10 @@ export default {
[
types
.
SET_INITIAL_NOTES
](
state
,
notesData
)
{
[
types
.
SET_INITIAL_NOTES
](
state
,
notesData
)
{
const
notes
=
[];
const
notes
=
[];
notesData
.
forEach
(
(
note
)
=>
{
notesData
.
forEach
(
note
=>
{
// To support legacy notes, should be very rare case.
// To support legacy notes, should be very rare case.
if
(
note
.
individual_note
&&
note
.
notes
.
length
>
1
)
{
if
(
note
.
individual_note
&&
note
.
notes
.
length
>
1
)
{
note
.
notes
.
forEach
(
(
n
)
=>
{
note
.
notes
.
forEach
(
n
=>
{
notes
.
push
({
notes
.
push
({
...
note
,
...
note
,
notes
:
[
n
],
// override notes array to only have one item to mimick individual_note
notes
:
[
n
],
// override notes array to only have one item to mimick individual_note
...
@@ -103,7 +105,7 @@ export default {
...
@@ -103,7 +105,7 @@ export default {
notes
.
push
({
notes
.
push
({
...
note
,
...
note
,
expanded
:
(
oldNote
?
oldNote
.
expanded
:
note
.
expanded
)
,
expanded
:
oldNote
?
oldNote
.
expanded
:
note
.
expanded
,
});
});
}
}
});
});
...
@@ -128,7 +130,9 @@ export default {
...
@@ -128,7 +130,9 @@ export default {
notesArr
.
push
({
notesArr
.
push
({
individual_note
:
true
,
individual_note
:
true
,
isPlaceholderNote
:
true
,
isPlaceholderNote
:
true
,
placeholderType
:
data
.
isSystemNote
?
constants
.
SYSTEM_NOTE
:
constants
.
NOTE
,
placeholderType
:
data
.
isSystemNote
?
constants
.
SYSTEM_NOTE
:
constants
.
NOTE
,
notes
:
[
notes
:
[
{
{
body
:
data
.
noteBody
,
body
:
data
.
noteBody
,
...
@@ -141,12 +145,16 @@ export default {
...
@@ -141,12 +145,16 @@ export default {
const
{
awardName
,
note
}
=
data
;
const
{
awardName
,
note
}
=
data
;
const
{
id
,
name
,
username
}
=
state
.
userData
;
const
{
id
,
name
,
username
}
=
state
.
userData
;
const
hasEmojiAwardedByCurrentUser
=
note
.
award_emoji
const
hasEmojiAwardedByCurrentUser
=
note
.
award_emoji
.
filter
(
.
filter
(
emoji
=>
emoji
.
name
===
data
.
awardName
&&
emoji
.
user
.
id
===
id
);
emoji
=>
emoji
.
name
===
data
.
awardName
&&
emoji
.
user
.
id
===
id
,
);
if
(
hasEmojiAwardedByCurrentUser
.
length
)
{
if
(
hasEmojiAwardedByCurrentUser
.
length
)
{
// If current user has awarded this emoji, remove it.
// If current user has awarded this emoji, remove it.
note
.
award_emoji
.
splice
(
note
.
award_emoji
.
indexOf
(
hasEmojiAwardedByCurrentUser
[
0
]),
1
);
note
.
award_emoji
.
splice
(
note
.
award_emoji
.
indexOf
(
hasEmojiAwardedByCurrentUser
[
0
]),
1
,
);
}
else
{
}
else
{
note
.
award_emoji
.
push
({
note
.
award_emoji
.
push
({
name
:
awardName
,
name
:
awardName
,
...
...
app/assets/javascripts/notes/stores/utils.js
View file @
fdc9ae2e
...
@@ -2,13 +2,15 @@ import AjaxCache from '~/lib/utils/ajax_cache';
...
@@ -2,13 +2,15 @@ import AjaxCache from '~/lib/utils/ajax_cache';
const
REGEX_QUICK_ACTIONS
=
/^
\/\w
+.*$/gm
;
const
REGEX_QUICK_ACTIONS
=
/^
\/\w
+.*$/gm
;
export
const
findNoteObjectById
=
(
notes
,
id
)
=>
notes
.
filter
(
n
=>
n
.
id
===
id
)[
0
];
export
const
findNoteObjectById
=
(
notes
,
id
)
=>
notes
.
filter
(
n
=>
n
.
id
===
id
)[
0
];
export
const
getQuickActionText
=
(
note
)
=>
{
export
const
getQuickActionText
=
note
=>
{
let
text
=
'
Applying command
'
;
let
text
=
'
Applying command
'
;
const
quickActions
=
AjaxCache
.
get
(
gl
.
GfmAutoComplete
.
dataSources
.
commands
)
||
[];
const
quickActions
=
AjaxCache
.
get
(
gl
.
GfmAutoComplete
.
dataSources
.
commands
)
||
[];
const
executedCommands
=
quickActions
.
filter
(
(
command
)
=>
{
const
executedCommands
=
quickActions
.
filter
(
command
=>
{
const
commandRegex
=
new
RegExp
(
`/
${
command
.
name
}
`
);
const
commandRegex
=
new
RegExp
(
`/
${
command
.
name
}
`
);
return
commandRegex
.
test
(
note
);
return
commandRegex
.
test
(
note
);
});
});
...
@@ -27,4 +29,5 @@ export const getQuickActionText = (note) => {
...
@@ -27,4 +29,5 @@ export const getQuickActionText = (note) => {
export
const
hasQuickActions
=
note
=>
REGEX_QUICK_ACTIONS
.
test
(
note
);
export
const
hasQuickActions
=
note
=>
REGEX_QUICK_ACTIONS
.
test
(
note
);
export
const
stripQuickActions
=
note
=>
note
.
replace
(
REGEX_QUICK_ACTIONS
,
''
).
trim
();
export
const
stripQuickActions
=
note
=>
note
.
replace
(
REGEX_QUICK_ACTIONS
,
''
).
trim
();
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