BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f22f75b7
Commit
f22f75b7
authored
Sep 22, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rendering double note issue.
parent
92173ac5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
19 deletions
+47
-19
issue_comment_form.vue
...ssets/javascripts/notes/components/issue_comment_form.vue
+5
-0
actions.js
app/assets/javascripts/notes/stores/actions.js
+8
-0
mutations.js
app/assets/javascripts/notes/stores/mutations.js
+13
-9
actions_spec.js
spec/javascripts/notes/stores/actions_spec.js
+0
-1
mutation_spec.js
spec/javascripts/notes/stores/mutation_spec.js
+21
-9
No files found.
app/assets/javascripts/notes/components/issue_comment_form.vue
View file @
f22f75b7
...
...
@@ -97,6 +97,8 @@
methods
:
{
...
mapActions
([
'saveNote'
,
'stopPolling'
,
'restartPolling'
,
'removePlaceholderNotes'
,
]),
setIsSubmitButtonDisabled
(
note
,
isSubmitting
)
{
...
...
@@ -126,10 +128,13 @@
this
.
isSubmitting
=
true
;
this
.
note
=
''
;
// Empty textarea while being requested. Repopulate in catch
this
.
resizeTextarea
();
this
.
stopPolling
();
this
.
saveNote
(
noteData
)
.
then
((
res
)
=>
{
this
.
isSubmitting
=
false
;
this
.
restartPolling
();
if
(
res
.
errors
)
{
if
(
res
.
errors
.
commands_only
)
{
this
.
discard
();
...
...
app/assets/javascripts/notes/stores/actions.js
View file @
f22f75b7
...
...
@@ -187,6 +187,14 @@ export const poll = ({ commit, state, getters }) => {
});
};
export
const
stopPolling
=
()
=>
{
eTagPoll
.
stop
();
};
export
const
restartPolling
=
()
=>
{
eTagPoll
.
restart
();
};
export
const
fetchData
=
({
commit
,
state
,
getters
})
=>
{
const
requestData
=
{
endpoint
:
state
.
notesData
.
notesPath
,
lastFetchedAt
:
state
.
lastFetchedAt
};
...
...
app/assets/javascripts/notes/stores/mutations.js
View file @
f22f75b7
...
...
@@ -5,15 +5,19 @@ import * as constants from '../constants';
export
default
{
[
types
.
ADD_NEW_NOTE
](
state
,
note
)
{
const
{
discussion_id
,
type
}
=
note
;
const
noteData
=
{
expanded
:
true
,
id
:
discussion_id
,
individual_note
:
!
(
type
===
constants
.
DISCUSSION_NOTE
),
notes
:
[
note
],
reply_id
:
discussion_id
,
};
state
.
notes
.
push
(
noteData
);
const
[
exists
]
=
state
.
notes
.
filter
(
n
=>
n
.
id
===
note
.
discussion_id
);
if
(
!
exists
)
{
const
noteData
=
{
expanded
:
true
,
id
:
discussion_id
,
individual_note
:
!
(
type
===
constants
.
DISCUSSION_NOTE
),
notes
:
[
note
],
reply_id
:
discussion_id
,
};
state
.
notes
.
push
(
noteData
);
}
},
[
types
.
ADD_NEW_REPLY_TO_DISCUSSION
](
state
,
note
)
{
...
...
spec/javascripts/notes/stores/actions_spec.js
View file @
f22f75b7
import
*
as
actions
from
'~/notes/stores/actions'
;
import
testAction
from
'./helpers'
;
import
{
discussionMock
,
notesDataMock
,
userDataMock
,
issueDataMock
,
individualNote
}
from
'../mock_data'
;
...
...
spec/javascripts/notes/stores/mutation_spec.js
View file @
f22f75b7
...
...
@@ -3,19 +3,31 @@ import { note, discussionMock, notesDataMock, userDataMock, issueDataMock, indiv
describe
(
'Mutation Notes Store'
,
()
=>
{
describe
(
'ADD_NEW_NOTE'
,
()
=>
{
it
(
'should add a new note to an array of notes'
,
()
=>
{
const
state
=
{
notes
:
[]
};
let
state
;
let
noteData
;
beforeEach
(()
=>
{
state
=
{
notes
:
[]
};
noteData
=
{
expanded
:
true
,
id
:
note
.
discussion_id
,
individual_note
:
true
,
notes
:
[
note
],
reply_id
:
note
.
discussion_id
,
};
mutations
.
ADD_NEW_NOTE
(
state
,
note
);
});
it
(
'should add a new note to an array of notes'
,
()
=>
{
expect
(
state
).
toEqual
({
notes
:
[{
expanded
:
true
,
id
:
note
.
discussion_id
,
individual_note
:
true
,
notes
:
[
note
],
reply_id
:
note
.
discussion_id
,
}],
notes
:
[
noteData
],
});
expect
(
state
.
notes
.
length
).
toBe
(
1
);
});
it
(
'should not add the same note to the notes array'
,
()
=>
{
mutations
.
ADD_NEW_NOTE
(
state
,
note
);
expect
(
state
.
notes
.
length
).
toBe
(
1
);
});
});
...
...
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