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
49828db5
Commit
49828db5
authored
Jul 05, 2018
by
Filipa Lacerda
Committed by
Phil Hughes
Jul 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improves performance on MR refactor and adds specs
parent
8b0e2628
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
143 additions
and
94 deletions
+143
-94
app/assets/javascripts/diffs/components/parallel_diff_view.vue
...ssets/javascripts/diffs/components/parallel_diff_view.vue
+7
-5
app/assets/javascripts/diffs/store/utils.js
app/assets/javascripts/diffs/store/utils.js
+15
-12
app/assets/javascripts/notes/components/diff_with_note.vue
app/assets/javascripts/notes/components/diff_with_note.vue
+82
-77
changelogs/unreleased/48825-performance.yml
changelogs/unreleased/48825-performance.yml
+8
-0
spec/javascripts/diffs/store/utils_spec.js
spec/javascripts/diffs/store/utils_spec.js
+31
-0
No files found.
app/assets/javascripts/diffs/components/parallel_diff_view.vue
View file @
49828db5
...
@@ -24,19 +24,21 @@ export default {
...
@@ -24,19 +24,21 @@ export default {
...
mapGetters
([
'
commit
'
]),
...
mapGetters
([
'
commit
'
]),
parallelDiffLines
()
{
parallelDiffLines
()
{
return
this
.
diffLines
.
map
(
line
=>
{
return
this
.
diffLines
.
map
(
line
=>
{
const
parallelLine
=
Object
.
assign
({},
line
);
if
(
line
.
left
)
{
if
(
line
.
left
)
{
Object
.
assign
(
line
,
{
left
:
trimFirstCharOfLineContent
(
line
.
left
)
}
);
parallelLine
.
left
=
trimFirstCharOfLineContent
(
line
.
left
);
}
else
{
}
else
{
Object
.
assign
(
line
,
{
left
:
{
type
:
EMPTY_CELL_TYPE
}
})
;
parallelLine
.
left
=
{
type
:
EMPTY_CELL_TYPE
}
;
}
}
if
(
line
.
right
)
{
if
(
line
.
right
)
{
Object
.
assign
(
line
,
{
right
:
trimFirstCharOfLineContent
(
line
.
right
)
}
);
parallelLine
.
right
=
trimFirstCharOfLineContent
(
line
.
right
);
}
else
{
}
else
{
Object
.
assign
(
line
,
{
right
:
{
type
:
EMPTY_CELL_TYPE
}
})
;
parallelLine
.
right
=
{
type
:
EMPTY_CELL_TYPE
}
;
}
}
return
l
ine
;
return
parallelL
ine
;
});
});
},
},
diffLinesLength
()
{
diffLinesLength
()
{
...
...
app/assets/javascripts/diffs/store/utils.js
View file @
49828db5
...
@@ -155,18 +155,21 @@ export function addContextLines(options) {
...
@@ -155,18 +155,21 @@ export function addContextLines(options) {
}
}
}
}
export
function
trimFirstCharOfLineContent
(
line
)
{
/**
if
(
!
line
.
richText
)
{
* Trims the first char of the `richText` property when it's either a space or a diff symbol.
return
line
;
* @param {Object} line
}
* @returns {Object}
*/
export
function
trimFirstCharOfLineContent
(
line
=
{})
{
const
parsedLine
=
Object
.
assign
({},
line
);
const
firstChar
=
line
.
richText
.
charAt
(
0
);
if
(
line
.
richText
)
{
const
firstChar
=
parsedLine
.
richText
.
charAt
(
0
);
if
(
firstChar
===
'
'
||
firstChar
===
'
+
'
||
firstChar
===
'
-
'
)
{
if
(
firstChar
===
'
'
||
firstChar
===
'
+
'
||
firstChar
===
'
-
'
)
{
Object
.
assign
(
line
,
{
parsedLine
.
richText
=
line
.
richText
.
substring
(
1
);
richText
:
line
.
richText
.
substring
(
1
),
}
});
}
}
return
l
ine
;
return
parsedL
ine
;
}
}
app/assets/javascripts/notes/components/diff_with_note.vue
View file @
49828db5
<
script
>
<
script
>
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
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
'
~/diffs/components/diff_file_header.vue
'
;
import
DiffFileHeader
from
'
~/diffs/components/diff_file_header.vue
'
;
import
SkeletonLoadingContainer
from
'
~/vue_shared/components/skeleton_loading_container.vue
'
;
import
SkeletonLoadingContainer
from
'
~/vue_shared/components/skeleton_loading_container.vue
'
;
import
{
trimFirstCharOfLineContent
}
from
'
~/diffs/store/utils
'
;
import
{
trimFirstCharOfLineContent
}
from
'
~/diffs/store/utils
'
;
export
default
{
export
default
{
components
:
{
components
:
{
DiffFileHeader
,
DiffFileHeader
,
SkeletonLoadingContainer
,
SkeletonLoadingContainer
,
...
@@ -27,7 +27,8 @@ export default {
...
@@ -27,7 +27,8 @@ export default {
noteableData
:
state
=>
state
.
notes
.
noteableData
,
noteableData
:
state
=>
state
.
notes
.
noteableData
,
}),
}),
hasTruncatedDiffLines
()
{
hasTruncatedDiffLines
()
{
return
this
.
discussion
.
truncatedDiffLines
&&
this
.
discussion
.
truncatedDiffLines
.
length
!==
0
;
return
this
.
discussion
.
truncatedDiffLines
&&
this
.
discussion
.
truncatedDiffLines
.
length
!==
0
;
},
},
isDiscussionsExpanded
()
{
isDiscussionsExpanded
()
{
return
true
;
// TODO: @fatihacet - Fix this.
return
true
;
// TODO: @fatihacet - Fix this.
...
@@ -55,9 +56,13 @@ export default {
...
@@ -55,9 +56,13 @@ export default {
return
window
.
gon
.
user_color_scheme
;
return
window
.
gon
.
user_color_scheme
;
},
},
normalizedDiffLines
()
{
normalizedDiffLines
()
{
const
lines
=
this
.
discussion
.
truncatedDiffLines
||
[];
if
(
this
.
discussion
.
truncatedDiffLines
)
{
return
this
.
discussion
.
truncatedDiffLines
.
map
(
line
=>
trimFirstCharOfLineContent
(
convertObjectPropsToCamelCase
(
line
)),
);
}
return
lines
.
map
(
line
=>
trimFirstCharOfLineContent
(
convertObjectPropsToCamelCase
(
line
)))
;
return
[]
;
},
},
},
},
mounted
()
{
mounted
()
{
...
@@ -83,7 +88,7 @@ export default {
...
@@ -83,7 +88,7 @@ export default {
});
});
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
changelogs/unreleased/48825-performance.yml
0 → 100644
View file @
49828db5
---
title
:
Improves performance of mr code, by fixing the state being mutated outside
of the store in the util function trimFirstCharOfLineContent and in map operations.
Avoids map operation in an empty array. Adds specs to the trimFirstCharOfLineContent
function
merge_request
:
20380
author
:
filipa
type
:
performance
spec/javascripts/diffs/store/utils_spec.js
View file @
49828db5
...
@@ -176,4 +176,35 @@ describe('DiffsStoreUtils', () => {
...
@@ -176,4 +176,35 @@ describe('DiffsStoreUtils', () => {
expect
(
linesWithReferences
[
1
].
metaData
.
newPos
).
toEqual
(
3
);
expect
(
linesWithReferences
[
1
].
metaData
.
newPos
).
toEqual
(
3
);
});
});
});
});
describe
(
'
trimFirstCharOfLineContent
'
,
()
=>
{
it
(
'
trims the line when it starts with a space
'
,
()
=>
{
expect
(
utils
.
trimFirstCharOfLineContent
({
richText
:
'
diff
'
})).
toEqual
({
richText
:
'
diff
'
});
});
it
(
'
trims the line when it starts with a +
'
,
()
=>
{
expect
(
utils
.
trimFirstCharOfLineContent
({
richText
:
'
+diff
'
})).
toEqual
({
richText
:
'
diff
'
});
});
it
(
'
trims the line when it starts with a -
'
,
()
=>
{
expect
(
utils
.
trimFirstCharOfLineContent
({
richText
:
'
-diff
'
})).
toEqual
({
richText
:
'
diff
'
});
});
it
(
'
does not trims the line when it starts with a letter
'
,
()
=>
{
expect
(
utils
.
trimFirstCharOfLineContent
({
richText
:
'
diff
'
})).
toEqual
({
richText
:
'
diff
'
});
});
it
(
'
does not modify the provided object
'
,
()
=>
{
const
lineObj
=
{
richText
:
'
diff
'
,
};
utils
.
trimFirstCharOfLineContent
(
lineObj
);
expect
(
lineObj
).
toEqual
({
richText
:
'
diff
'
});
});
it
(
'
handles a undefined or null parameter
'
,
()
=>
{
expect
(
utils
.
trimFirstCharOfLineContent
()).
toEqual
({});
});
});
});
});
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