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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
49f58214
Commit
49f58214
authored
May 20, 2021
by
Miranda Fluharty
Committed by
Phil Hughes
May 20, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Inline codequality [RUN ALL RSPEC] [RUN AS-IF-FOSS]
parent
8ea10016
Changes
26
Show whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
452 additions
and
8 deletions
+452
-8
app/assets/javascripts/diffs/components/app.vue
app/assets/javascripts/diffs/components/app.vue
+0
-1
app/assets/javascripts/diffs/components/diff_content.vue
app/assets/javascripts/diffs/components/diff_content.vue
+2
-1
app/assets/javascripts/diffs/components/diff_file_header.vue
app/assets/javascripts/diffs/components/diff_file_header.vue
+4
-1
app/assets/javascripts/diffs/components/diff_row.vue
app/assets/javascripts/diffs/components/diff_row.vue
+40
-0
app/assets/javascripts/diffs/components/diff_view.vue
app/assets/javascripts/diffs/components/diff_view.vue
+5
-1
app/assets/javascripts/diffs/store/getters.js
app/assets/javascripts/diffs/store/getters.js
+5
-0
app/assets/javascripts/diffs/store/modules/index.js
app/assets/javascripts/diffs/store/modules/index.js
+1
-1
app/assets/stylesheets/framework/diffs.scss
app/assets/stylesheets/framework/diffs.scss
+6
-2
app/assets/stylesheets/highlight/themes/dark.scss
app/assets/stylesheets/highlight/themes/dark.scss
+3
-0
app/assets/stylesheets/highlight/themes/monokai.scss
app/assets/stylesheets/highlight/themes/monokai.scss
+3
-0
app/assets/stylesheets/highlight/themes/none.scss
app/assets/stylesheets/highlight/themes/none.scss
+3
-0
app/assets/stylesheets/highlight/themes/solarized-dark.scss
app/assets/stylesheets/highlight/themes/solarized-dark.scss
+3
-0
app/assets/stylesheets/highlight/themes/solarized-light.scss
app/assets/stylesheets/highlight/themes/solarized-light.scss
+3
-0
app/assets/stylesheets/highlight/white_base.scss
app/assets/stylesheets/highlight/white_base.scss
+3
-0
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-0
config/feature_flags/development/codequality_mr_diff_annotations.yml
...ure_flags/development/codequality_mr_diff_annotations.yml
+8
-0
ee/app/assets/javascripts/diffs/components/code_quality_gutter_icon.vue
...javascripts/diffs/components/code_quality_gutter_icon.vue
+40
-0
ee/app/assets/javascripts/diffs/components/diff_row_utils.js
ee/app/assets/javascripts/diffs/components/diff_row_utils.js
+31
-0
ee/app/assets/javascripts/diffs/store/getters.js
ee/app/assets/javascripts/diffs/store/getters.js
+9
-0
ee/app/assets/stylesheets/framework/diffs.scss
ee/app/assets/stylesheets/framework/diffs.scss
+14
-0
ee/spec/frontend/diffs/components/code_quality_gutter_icon_spec.js
...rontend/diffs/components/code_quality_gutter_icon_spec.js
+52
-0
ee/spec/frontend/diffs/components/diff_file_spec.js
ee/spec/frontend/diffs/components/diff_file_spec.js
+15
-1
ee/spec/frontend/diffs/components/diff_row_spec.js
ee/spec/frontend/diffs/components/diff_row_spec.js
+66
-0
ee/spec/frontend/diffs/components/diff_view_spec.js
ee/spec/frontend/diffs/components/diff_view_spec.js
+82
-0
ee/spec/frontend/diffs/store/getters_spec.js
ee/spec/frontend/diffs/store/getters_spec.js
+52
-0
spec/frontend/diffs/components/diff_content_spec.js
spec/frontend/diffs/components/diff_content_spec.js
+1
-0
No files found.
app/assets/javascripts/diffs/components/app.vue
View file @
49f58214
...
@@ -181,7 +181,6 @@ export default {
...
@@ -181,7 +181,6 @@ export default {
plainDiffPath
:
(
state
)
=>
state
.
diffs
.
plainDiffPath
,
plainDiffPath
:
(
state
)
=>
state
.
diffs
.
plainDiffPath
,
emailPatchPath
:
(
state
)
=>
state
.
diffs
.
emailPatchPath
,
emailPatchPath
:
(
state
)
=>
state
.
diffs
.
emailPatchPath
,
retrievingBatches
:
(
state
)
=>
state
.
diffs
.
retrievingBatches
,
retrievingBatches
:
(
state
)
=>
state
.
diffs
.
retrievingBatches
,
codequalityDiff
:
(
state
)
=>
state
.
diffs
.
codequalityDiff
,
}),
}),
...
mapState
(
'
diffs
'
,
[
...
mapState
(
'
diffs
'
,
[
'
showTreeList
'
,
'
showTreeList
'
,
...
...
app/assets/javascripts/diffs/components/diff_content.vue
View file @
49f58214
<
script
>
<
script
>
import
{
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
mapInline
,
mapParallel
}
from
'
ee_else_ce/diffs/components/diff_row_utils
'
;
import
DiffFileDrafts
from
'
~/batch_comments/components/diff_file_drafts.vue
'
;
import
DiffFileDrafts
from
'
~/batch_comments/components/diff_file_drafts.vue
'
;
import
draftCommentsMixin
from
'
~/diffs/mixins/draft_comments
'
;
import
draftCommentsMixin
from
'
~/diffs/mixins/draft_comments
'
;
import
{
diffViewerModes
}
from
'
~/ide/constants
'
;
import
{
diffViewerModes
}
from
'
~/ide/constants
'
;
...
@@ -15,7 +16,6 @@ import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_
...
@@ -15,7 +16,6 @@ import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_
import
{
IMAGE_DIFF_POSITION_TYPE
}
from
'
../constants
'
;
import
{
IMAGE_DIFF_POSITION_TYPE
}
from
'
../constants
'
;
import
{
getDiffMode
}
from
'
../store/utils
'
;
import
{
getDiffMode
}
from
'
../store/utils
'
;
import
DiffDiscussions
from
'
./diff_discussions.vue
'
;
import
DiffDiscussions
from
'
./diff_discussions.vue
'
;
import
{
mapInline
,
mapParallel
}
from
'
./diff_row_utils
'
;
import
DiffView
from
'
./diff_view.vue
'
;
import
DiffView
from
'
./diff_view.vue
'
;
import
ImageDiffOverlay
from
'
./image_diff_overlay.vue
'
;
import
ImageDiffOverlay
from
'
./image_diff_overlay.vue
'
;
import
InlineDiffView
from
'
./inline_diff_view.vue
'
;
import
InlineDiffView
from
'
./inline_diff_view.vue
'
;
...
@@ -55,6 +55,7 @@ export default {
...
@@ -55,6 +55,7 @@ export default {
'
isParallelView
'
,
'
isParallelView
'
,
'
getCommentFormForDiffFile
'
,
'
getCommentFormForDiffFile
'
,
'
diffLines
'
,
'
diffLines
'
,
'
fileLineCodequality
'
,
]),
]),
...
mapGetters
([
'
getNoteableData
'
,
'
noteableType
'
,
'
getUserData
'
]),
...
mapGetters
([
'
getNoteableData
'
,
'
noteableType
'
,
'
getUserData
'
]),
diffMode
()
{
diffMode
()
{
...
...
app/assets/javascripts/diffs/components/diff_file_header.vue
View file @
49f58214
...
@@ -202,6 +202,9 @@ export default {
...
@@ -202,6 +202,9 @@ export default {
externalUrlLabel
()
{
externalUrlLabel
()
{
return
sprintf
(
__
(
'
View on %{url}
'
),
{
url
:
this
.
diffFile
.
formatted_external_url
});
return
sprintf
(
__
(
'
View on %{url}
'
),
{
url
:
this
.
diffFile
.
formatted_external_url
});
},
},
showCodequalityBadge
()
{
return
this
.
codequalityDiff
?.
length
>
0
&&
!
this
.
glFeatures
.
codequalityMrDiffAnnotations
;
},
},
},
methods
:
{
methods
:
{
...
mapActions
(
'
diffs
'
,
[
...
mapActions
(
'
diffs
'
,
[
...
@@ -334,7 +337,7 @@ export default {
...
@@ -334,7 +337,7 @@ export default {
/>
/>
<code-quality-badge
<code-quality-badge
v-if=
"
codequalityDiff.length
"
v-if=
"
showCodequalityBadge
"
:file-name=
"filePath"
:file-name=
"filePath"
:codequality-diff=
"codequalityDiff"
:codequality-diff=
"codequalityDiff"
class=
"gl-mr-2"
class=
"gl-mr-2"
...
...
app/assets/javascripts/diffs/components/diff_row.vue
View file @
49f58214
...
@@ -24,6 +24,8 @@ import * as utils from './diff_row_utils';
...
@@ -24,6 +24,8 @@ import * as utils from './diff_row_utils';
export
default
{
export
default
{
components
:
{
components
:
{
DiffGutterAvatars
,
DiffGutterAvatars
,
CodeQualityGutterIcon
:
()
=>
import
(
'
ee_component/diffs/components/code_quality_gutter_icon.vue
'
),
},
},
directives
:
{
directives
:
{
GlTooltip
:
GlTooltipDirective
,
GlTooltip
:
GlTooltipDirective
,
...
@@ -89,6 +91,20 @@ export default {
...
@@ -89,6 +91,20 @@ export default {
if
(
!
this
.
line
.
right
)
return
{};
if
(
!
this
.
line
.
right
)
return
{};
return
this
.
fileLineCoverage
(
this
.
filePath
,
this
.
line
.
right
.
new_line
);
return
this
.
fileLineCoverage
(
this
.
filePath
,
this
.
line
.
right
.
new_line
);
},
},
showCodequalityLeft
()
{
return
(
this
.
glFeatures
.
codequalityMrDiffAnnotations
&&
this
.
inline
&&
this
.
line
.
left
?.
codequality
?.
length
>
0
);
},
showCodequalityRight
()
{
return
(
this
.
glFeatures
.
codequalityMrDiffAnnotations
&&
!
this
.
inline
&&
this
.
line
.
right
?.
codequality
?.
length
>
0
);
},
classNameMapCellLeft
()
{
classNameMapCellLeft
()
{
return
utils
.
classNameMapCell
({
return
utils
.
classNameMapCell
({
line
:
this
.
line
.
left
,
line
:
this
.
line
.
left
,
...
@@ -269,6 +285,12 @@ export default {
...
@@ -269,6 +285,12 @@ export default {
:class=
"[...parallelViewLeftLineType, coverageStateLeft.class]"
:class=
"[...parallelViewLeftLineType, coverageStateLeft.class]"
class=
"diff-td line-coverage left-side"
class=
"diff-td line-coverage left-side"
></div>
></div>
<div
class=
"diff-td line-codequality left-side"
:class=
"[...parallelViewLeftLineType]"
>
<code-quality-gutter-icon
v-if=
"showCodequalityLeft"
:codequality=
"line.left.codequality"
/>
</div>
<div
<div
:id=
"line.left.line_code"
:id=
"line.left.line_code"
:key=
"line.left.line_code"
:key=
"line.left.line_code"
...
@@ -298,6 +320,11 @@ export default {
...
@@ -298,6 +320,11 @@ export default {
class=
"diff-td line-coverage left-side empty-cell"
class=
"diff-td line-coverage left-side empty-cell"
:class=
"emptyCellLeftClassMap"
:class=
"emptyCellLeftClassMap"
></div>
></div>
<div
v-if=
"inline"
class=
"diff-td line-codequality left-side empty-cell"
:class=
"emptyCellLeftClassMap"
></div>
<div
<div
class=
"diff-td line_content with-coverage left-side empty-cell"
class=
"diff-td line_content with-coverage left-side empty-cell"
:class=
"[emptyCellLeftClassMap,
{ parallel: !inline }]"
:class=
"[emptyCellLeftClassMap,
{ parallel: !inline }]"
...
@@ -370,6 +397,15 @@ export default {
...
@@ -370,6 +397,15 @@ export default {
]"
]"
class=
"diff-td line-coverage right-side"
class=
"diff-td line-coverage right-side"
></div>
></div>
<div
class=
"diff-td line-codequality right-side"
:class=
"[line.right.type, { hll: isHighlighted, hll: isCommented }]"
>
<code-quality-gutter-icon
v-if=
"showCodequalityRight"
:codequality=
"line.right.codequality"
/>
</div>
<div
<div
:id=
"line.right.line_code"
:id=
"line.right.line_code"
:key=
"line.right.rich_text"
:key=
"line.right.rich_text"
...
@@ -405,6 +441,10 @@ export default {
...
@@ -405,6 +441,10 @@ export default {
class=
"diff-td line-coverage right-side empty-cell"
class=
"diff-td line-coverage right-side empty-cell"
:class=
"emptyCellRightClassMap"
:class=
"emptyCellRightClassMap"
></div>
></div>
<div
class=
"diff-td line-codequality right-side empty-cell"
:class=
"emptyCellRightClassMap"
></div>
<div
<div
class=
"diff-td line_content with-coverage right-side empty-cell"
class=
"diff-td line_content with-coverage right-side empty-cell"
:class=
"[emptyCellRightClassMap,
{ parallel: !inline }]"
:class=
"[emptyCellRightClassMap,
{ parallel: !inline }]"
...
...
app/assets/javascripts/diffs/components/diff_view.vue
View file @
49f58214
...
@@ -43,6 +43,7 @@ export default {
...
@@ -43,6 +43,7 @@ export default {
},
},
computed
:
{
computed
:
{
...
mapGetters
(
'
diffs
'
,
[
'
commitId
'
]),
...
mapGetters
(
'
diffs
'
,
[
'
commitId
'
]),
...
mapState
(
'
diffs
'
,
[
'
codequalityDiff
'
]),
...
mapState
({
...
mapState
({
selectedCommentPosition
:
({
notes
})
=>
notes
.
selectedCommentPosition
,
selectedCommentPosition
:
({
notes
})
=>
notes
.
selectedCommentPosition
,
selectedCommentPositionHover
:
({
notes
})
=>
notes
.
selectedCommentPositionHover
,
selectedCommentPositionHover
:
({
notes
})
=>
notes
.
selectedCommentPositionHover
,
...
@@ -56,6 +57,9 @@ export default {
...
@@ -56,6 +57,9 @@ export default {
this
.
diffLines
,
this
.
diffLines
,
);
);
},
},
hasCodequalityChanges
()
{
return
this
.
codequalityDiff
?.
files
?.[
this
.
diffFile
.
file_path
]?.
length
>
0
;
},
},
},
methods
:
{
methods
:
{
...
mapActions
([
'
setSelectedCommentPosition
'
]),
...
mapActions
([
'
setSelectedCommentPosition
'
]),
...
@@ -98,7 +102,7 @@ export default {
...
@@ -98,7 +102,7 @@ export default {
<
template
>
<
template
>
<div
<div
:class=
"[$options.userColorScheme,
{ inline }]"
:class=
"[$options.userColorScheme,
{ inline
, 'with-codequality': hasCodequalityChanges
}]"
:data-commit-id="commitId"
:data-commit-id="commitId"
class="diff-grid diff-table code diff-wrap-lines js-syntax-highlight text-file"
class="diff-grid diff-table code diff-wrap-lines js-syntax-highlight text-file"
>
>
...
...
app/assets/javascripts/diffs/store/getters.js
View file @
49f58214
...
@@ -136,6 +136,11 @@ export const fileLineCoverage = (state) => (file, line) => {
...
@@ -136,6 +136,11 @@ export const fileLineCoverage = (state) => (file, line) => {
return
{};
return
{};
};
};
// This function is overwritten for the inline codequality feature in EE
export
const
fileLineCodequality
=
()
=>
()
=>
{
return
null
;
};
/**
/**
* Returns index of a currently selected diff in diffFiles
* Returns index of a currently selected diff in diffFiles
* @returns {number}
* @returns {number}
...
...
app/assets/javascripts/diffs/store/modules/index.js
View file @
49f58214
import
*
as
actions
from
'
ee_else_ce/diffs/store/actions
'
;
import
*
as
actions
from
'
ee_else_ce/diffs/store/actions
'
;
import
*
as
getters
from
'
ee_else_ce/diffs/store/getters
'
;
import
createState
from
'
ee_else_ce/diffs/store/modules/diff_state
'
;
import
createState
from
'
ee_else_ce/diffs/store/modules/diff_state
'
;
import
mutations
from
'
ee_else_ce/diffs/store/mutations
'
;
import
mutations
from
'
ee_else_ce/diffs/store/mutations
'
;
import
*
as
getters
from
'
../getters
'
;
export
default
()
=>
({
export
default
()
=>
({
namespaced
:
true
,
namespaced
:
true
,
...
...
app/assets/stylesheets/framework/diffs.scss
View file @
49f58214
...
@@ -598,7 +598,9 @@ table.code {
...
@@ -598,7 +598,9 @@ table.code {
.diff-grid-left
,
.diff-grid-left
,
.diff-grid-right
{
.diff-grid-right
{
display
:
grid
;
display
:
grid
;
grid-template-columns
:
50px
8px
1fr
;
// Zero width column is a placeholder for the EE inline code quality diff
// see ee/.../diffs.scss for more details
grid-template-columns
:
50px
8px
0
1fr
;
}
}
.diff-grid-comments
{
.diff-grid-comments
{
...
@@ -628,7 +630,9 @@ table.code {
...
@@ -628,7 +630,9 @@ table.code {
.diff-grid-left
,
.diff-grid-left
,
.diff-grid-right
{
.diff-grid-right
{
grid-template-columns
:
50px
50px
8px
1fr
;
// Zero width column is a placeholder for the EE inline code quality diff
// see ee/../diffs.scss for more details
grid-template-columns
:
50px
50px
8px
0
1fr
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/highlight/themes/dark.scss
View file @
49f58214
...
@@ -131,6 +131,7 @@ $dark-il: #de935f;
...
@@ -131,6 +131,7 @@ $dark-il: #de935f;
.diff-td.diff-line-num.hll
:not
(
.empty-cell
),
.diff-td.diff-line-num.hll
:not
(
.empty-cell
),
.diff-td.line-coverage.hll
:not
(
.empty-cell
),
.diff-td.line-coverage.hll
:not
(
.empty-cell
),
.diff-td.line-codequality.hll
:not
(
.empty-cell
),
.diff-td.line_content.hll
:not
(
.empty-cell
),
.diff-td.line_content.hll
:not
(
.empty-cell
),
td
.diff-line-num.hll
:not
(
.empty-cell
),
td
.diff-line-num.hll
:not
(
.empty-cell
),
td
.line-coverage.hll
:not
(
.empty-cell
),
td
.line-coverage.hll
:not
(
.empty-cell
),
...
@@ -145,6 +146,7 @@ $dark-il: #de935f;
...
@@ -145,6 +146,7 @@ $dark-il: #de935f;
.diff-line-num.new
,
.diff-line-num.new
,
.line-coverage.new
,
.line-coverage.new
,
.line-codequality.new
,
.line_content.new
{
.line_content.new
{
@include
diff-background
(
$dark-new-bg
,
$dark-new-idiff
,
$dark-border
);
@include
diff-background
(
$dark-new-bg
,
$dark-new-idiff
,
$dark-border
);
...
@@ -156,6 +158,7 @@ $dark-il: #de935f;
...
@@ -156,6 +158,7 @@ $dark-il: #de935f;
.diff-line-num.old
,
.diff-line-num.old
,
.line-coverage.old
,
.line-coverage.old
,
.line-codequality.old
,
.line_content.old
{
.line_content.old
{
@include
diff-background
(
$dark-old-bg
,
$dark-old-idiff
,
$dark-border
);
@include
diff-background
(
$dark-old-bg
,
$dark-old-idiff
,
$dark-border
);
...
...
app/assets/stylesheets/highlight/themes/monokai.scss
View file @
49f58214
...
@@ -132,6 +132,7 @@ $monokai-gh: #75715e;
...
@@ -132,6 +132,7 @@ $monokai-gh: #75715e;
.diff-td.diff-line-num.hll
:not
(
.empty-cell
),
.diff-td.diff-line-num.hll
:not
(
.empty-cell
),
.diff-td.line-coverage.hll
:not
(
.empty-cell
),
.diff-td.line-coverage.hll
:not
(
.empty-cell
),
.diff-td.line-codequality.hll
:not
(
.empty-cell
),
.diff-td.line_content.hll
:not
(
.empty-cell
),
.diff-td.line_content.hll
:not
(
.empty-cell
),
td
.diff-line-num.hll
:not
(
.empty-cell
),
td
.diff-line-num.hll
:not
(
.empty-cell
),
td
.line-coverage.hll
:not
(
.empty-cell
),
td
.line-coverage.hll
:not
(
.empty-cell
),
...
@@ -146,6 +147,7 @@ $monokai-gh: #75715e;
...
@@ -146,6 +147,7 @@ $monokai-gh: #75715e;
.diff-line-num.new
,
.diff-line-num.new
,
.line-coverage.new
,
.line-coverage.new
,
.line-codequality.new
,
.line_content.new
{
.line_content.new
{
@include
diff-background
(
$monokai-new-bg
,
$monokai-new-idiff
,
$monokai-diff-border
);
@include
diff-background
(
$monokai-new-bg
,
$monokai-new-idiff
,
$monokai-diff-border
);
...
@@ -157,6 +159,7 @@ $monokai-gh: #75715e;
...
@@ -157,6 +159,7 @@ $monokai-gh: #75715e;
.diff-line-num.old
,
.diff-line-num.old
,
.line-coverage.old
,
.line-coverage.old
,
.line-codequality.old
,
.line_content.old
{
.line_content.old
{
@include
diff-background
(
$monokai-old-bg
,
$monokai-old-idiff
,
$monokai-diff-border
);
@include
diff-background
(
$monokai-old-bg
,
$monokai-old-idiff
,
$monokai-diff-border
);
...
...
app/assets/stylesheets/highlight/themes/none.scss
View file @
49f58214
...
@@ -56,7 +56,10 @@
...
@@ -56,7 +56,10 @@
.line-coverage
{
.line-coverage
{
@include
line-coverage-border-color
(
$green-500
,
$orange-500
);
@include
line-coverage-border-color
(
$green-500
,
$orange-500
);
}
.line-coverage
,
.line-codequality
{
&
.old
,
&
.old
,
&
.new
{
&
.new
{
background-color
:
$white-normal
;
background-color
:
$white-normal
;
...
...
app/assets/stylesheets/highlight/themes/solarized-dark.scss
View file @
49f58214
...
@@ -135,6 +135,7 @@ $solarized-dark-il: #2aa198;
...
@@ -135,6 +135,7 @@ $solarized-dark-il: #2aa198;
.diff-td.diff-line-num.hll
:not
(
.empty-cell
),
.diff-td.diff-line-num.hll
:not
(
.empty-cell
),
.diff-td.line-coverage.hll
:not
(
.empty-cell
),
.diff-td.line-coverage.hll
:not
(
.empty-cell
),
.diff-td.line-codequality.hll
:not
(
.empty-cell
),
.diff-td.line_content.hll
:not
(
.empty-cell
),
.diff-td.line_content.hll
:not
(
.empty-cell
),
td
.diff-line-num.hll
:not
(
.empty-cell
),
td
.diff-line-num.hll
:not
(
.empty-cell
),
td
.line-coverage.hll
:not
(
.empty-cell
),
td
.line-coverage.hll
:not
(
.empty-cell
),
...
@@ -156,6 +157,7 @@ $solarized-dark-il: #2aa198;
...
@@ -156,6 +157,7 @@ $solarized-dark-il: #2aa198;
.diff-line-num.new
,
.diff-line-num.new
,
.line-coverage.new
,
.line-coverage.new
,
.line-codequality.new
,
.line_content.new
{
.line_content.new
{
@include
diff-background
(
$solarized-dark-new-bg
,
$solarized-dark-new-idiff
,
$solarized-dark-border
);
@include
diff-background
(
$solarized-dark-new-bg
,
$solarized-dark-new-idiff
,
$solarized-dark-border
);
...
@@ -167,6 +169,7 @@ $solarized-dark-il: #2aa198;
...
@@ -167,6 +169,7 @@ $solarized-dark-il: #2aa198;
.diff-line-num.old
,
.diff-line-num.old
,
.line-coverage.old
,
.line-coverage.old
,
.line-codequality.old
,
.line_content.old
{
.line_content.old
{
@include
diff-background
(
$solarized-dark-old-bg
,
$solarized-dark-old-idiff
,
$solarized-dark-border
);
@include
diff-background
(
$solarized-dark-old-bg
,
$solarized-dark-old-idiff
,
$solarized-dark-border
);
...
...
app/assets/stylesheets/highlight/themes/solarized-light.scss
View file @
49f58214
...
@@ -142,6 +142,7 @@ $solarized-light-il: #2aa198;
...
@@ -142,6 +142,7 @@ $solarized-light-il: #2aa198;
.diff-td.diff-line-num.hll
:not
(
.empty-cell
),
.diff-td.diff-line-num.hll
:not
(
.empty-cell
),
.diff-td.line-coverage.hll
:not
(
.empty-cell
),
.diff-td.line-coverage.hll
:not
(
.empty-cell
),
.diff-td.line-codequality.hll
:not
(
.empty-cell
),
.diff-td.line_content.hll
:not
(
.empty-cell
),
.diff-td.line_content.hll
:not
(
.empty-cell
),
td
.diff-line-num.hll
:not
(
.empty-cell
),
td
.diff-line-num.hll
:not
(
.empty-cell
),
td
.line-coverage.hll
:not
(
.empty-cell
),
td
.line-coverage.hll
:not
(
.empty-cell
),
...
@@ -156,6 +157,7 @@ $solarized-light-il: #2aa198;
...
@@ -156,6 +157,7 @@ $solarized-light-il: #2aa198;
.diff-line-num.new
,
.diff-line-num.new
,
.line-coverage.new
,
.line-coverage.new
,
.line-codequality.new
,
.line_content.new
{
.line_content.new
{
@include
diff-background
(
$solarized-light-new-bg
,
@include
diff-background
(
$solarized-light-new-bg
,
$solarized-light-new-idiff
,
$solarized-light-border
);
$solarized-light-new-idiff
,
$solarized-light-border
);
...
@@ -175,6 +177,7 @@ $solarized-light-il: #2aa198;
...
@@ -175,6 +177,7 @@ $solarized-light-il: #2aa198;
.diff-line-num.old
,
.diff-line-num.old
,
.line-coverage.old
,
.line-coverage.old
,
.line-codequality.old
,
.line_content.old
{
.line_content.old
{
@include
diff-background
(
$solarized-light-old-bg
,
$solarized-light-old-idiff
,
$solarized-light-border
);
@include
diff-background
(
$solarized-light-old-bg
,
$solarized-light-old-idiff
,
$solarized-light-border
);
...
...
app/assets/stylesheets/highlight/white_base.scss
View file @
49f58214
...
@@ -219,7 +219,10 @@ pre.code,
...
@@ -219,7 +219,10 @@ pre.code,
.line-coverage
{
.line-coverage
{
@include
line-coverage-border-color
(
$green-400
,
$red-400
);
@include
line-coverage-border-color
(
$green-400
,
$red-400
);
}
.line-coverage
,
.line-codequality
{
&
.old
{
&
.old
{
background-color
:
$line-removed
;
background-color
:
$line-removed
;
}
}
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
49f58214
...
@@ -43,6 +43,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
...
@@ -43,6 +43,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
push_frontend_feature_flag
(
:usage_data_i_testing_summary_widget_total
,
@project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:usage_data_i_testing_summary_widget_total
,
@project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:improved_emoji_picker
,
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:improved_emoji_picker
,
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:diffs_virtual_scrolling
,
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:diffs_virtual_scrolling
,
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:codequality_mr_diff_annotations
,
project
,
default_enabled: :yaml
)
# Usage data feature flags
# Usage data feature flags
push_frontend_feature_flag
(
:users_expanding_widgets_usage_data
,
@project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:users_expanding_widgets_usage_data
,
@project
,
default_enabled: :yaml
)
...
...
config/feature_flags/development/codequality_mr_diff_annotations.yml
0 → 100644
View file @
49f58214
---
name
:
codequality_mr_diff_annotations
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57926
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/330909
milestone
:
'
14.0'
type
:
development
group
:
group::testing
default_enabled
:
false
ee/app/assets/javascripts/diffs/components/code_quality_gutter_icon.vue
0 → 100644
View file @
49f58214
<
script
>
import
{
GlTooltipDirective
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
SEVERITY_CLASSES
,
SEVERITY_ICONS
}
from
'
~/reports/codequality_report/constants
'
;
export
default
{
components
:
{
GlIcon
,
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
props
:
{
codequality
:
{
type
:
Array
,
required
:
false
,
default
:
()
=>
[],
},
},
computed
:
{
description
()
{
return
this
.
codequality
[
0
].
description
;
},
severity
()
{
return
this
.
codequality
[
0
].
severity
;
},
severityClass
()
{
return
SEVERITY_CLASSES
[
this
.
severity
]
||
SEVERITY_CLASSES
.
unknown
;
},
severityIcon
()
{
return
SEVERITY_ICONS
[
this
.
severity
]
||
SEVERITY_ICONS
.
unknown
;
},
},
};
</
script
>
<
template
>
<div
v-gl-tooltip
.
hover
:title=
"description"
>
<gl-icon
:size=
"12"
:name=
"severityIcon"
:class=
"severityClass"
/>
</div>
</
template
>
ee/app/assets/javascripts/diffs/components/diff_row_utils.js
0 → 100644
View file @
49f58214
import
{
mapParallel
as
CEMapParallel
,
mapInline
as
CEMapInline
,
}
from
'
~/diffs/components/diff_row_utils
'
;
export
const
mapParallel
=
(
content
)
=>
(
line
)
=>
{
let
{
left
,
right
}
=
line
;
if
(
left
)
{
left
=
{
...
left
,
codequality
:
content
.
fileLineCodequality
(
content
.
diffFile
.
file_path
,
left
.
new_line
),
};
}
if
(
right
)
{
right
=
{
...
right
,
codequality
:
content
.
fileLineCodequality
(
content
.
diffFile
.
file_path
,
right
.
new_line
),
};
}
return
{
...
CEMapParallel
(
content
)({
...
line
,
left
,
right
,
}),
};
};
export
const
mapInline
=
CEMapInline
;
ee/app/assets/javascripts/diffs/store/getters.js
0 → 100644
View file @
49f58214
/* eslint-disable import/export */
export
*
from
'
~/diffs/store/getters
'
;
// Returns the code quality degradations for a specific line of a given file
export
const
fileLineCodequality
=
(
state
)
=>
(
file
,
line
)
=>
{
const
fileDiff
=
state
.
codequalityDiff
.
files
?.[
file
]
||
[];
const
lineDiff
=
fileDiff
.
filter
((
violation
)
=>
violation
.
line
===
line
);
return
lineDiff
;
};
ee/app/assets/stylesheets/framework/diffs.scss
0 → 100644
View file @
49f58214
// Merge request diff grid layout modifications for inline code quality diff
// These grid templates build off of their equivalents in app/.../diffs.scss
// to expand the column only when the .with-codequality class is applied
.diff-grid.with-codequality
{
.diff-grid-right
{
grid-template-columns
:
50px
8px
20px
1fr
;
}
&
.inline
{
.diff-grid-left
{
grid-template-columns
:
50px
50px
8px
20px
1fr
;
}
}
}
ee/spec/frontend/diffs/components/code_quality_gutter_icon_spec.js
0 → 100644
View file @
49f58214
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
Vue
from
'
vue
'
;
import
Vuex
from
'
vuex
'
;
import
CodeQualityGutterIcon
from
'
ee/diffs/components/code_quality_gutter_icon.vue
'
;
import
createDiffsStore
from
'
jest/diffs/create_diffs_store
'
;
import
{
SEVERITY_CLASSES
,
SEVERITY_ICONS
}
from
'
~/reports/codequality_report/constants
'
;
Vue
.
use
(
Vuex
);
describe
(
'
EE CodeQualityGutterIcon
'
,
()
=>
{
let
store
;
let
wrapper
;
let
codequalityDiff
;
const
findIcon
=
()
=>
wrapper
.
findComponent
(
GlIcon
);
const
createComponent
=
(
props
=
{},
extendStore
=
()
=>
{})
=>
{
store
=
createDiffsStore
();
store
.
state
.
diffs
.
codequalityDiff
=
codequalityDiff
;
extendStore
(
store
);
wrapper
=
shallowMount
(
CodeQualityGutterIcon
,
{
propsData
:
{
...
props
},
store
,
});
};
afterEach
(()
=>
{
wrapper
.
destroy
();
});
it
.
each
`
severity
${
'
info
'
}
${
'
minor
'
}
${
'
major
'
}
${
'
critical
'
}
${
'
blocker
'
}
${
'
unknown
'
}
`
(
'
shows icon for $severity degradation
'
,
({
severity
})
=>
{
createComponent
({
codequality
:
[{
severity
}]
});
expect
(
findIcon
().
exists
()).
toBe
(
true
);
expect
(
findIcon
().
attributes
()).
toEqual
({
class
:
SEVERITY_CLASSES
[
severity
],
name
:
SEVERITY_ICONS
[
severity
],
size
:
'
12
'
,
});
});
});
ee/spec/frontend/diffs/components/diff_file_spec.js
View file @
49f58214
...
@@ -9,7 +9,7 @@ import createDiffsStore from '~/diffs/store/modules';
...
@@ -9,7 +9,7 @@ import createDiffsStore from '~/diffs/store/modules';
const
getReadableFile
=
()
=>
JSON
.
parse
(
JSON
.
stringify
(
diffFileMockDataReadable
));
const
getReadableFile
=
()
=>
JSON
.
parse
(
JSON
.
stringify
(
diffFileMockDataReadable
));
function
createComponent
({
withCodequality
=
true
})
{
function
createComponent
({
withCodequality
=
true
,
provide
=
{}
})
{
const
file
=
getReadableFile
();
const
file
=
getReadableFile
();
const
localVue
=
createLocalVue
();
const
localVue
=
createLocalVue
();
...
@@ -48,6 +48,7 @@ function createComponent({ withCodequality = true }) {
...
@@ -48,6 +48,7 @@ function createComponent({ withCodequality = true }) {
isFirstFile
:
false
,
isFirstFile
:
false
,
isLastFile
:
false
,
isLastFile
:
false
,
},
},
provide
,
});
});
return
{
return
{
...
@@ -75,6 +76,19 @@ describe('EE DiffFile', () => {
...
@@ -75,6 +76,19 @@ describe('EE DiffFile', () => {
});
});
});
});
describe
(
'
when the feature flag for the next iteration is enabled
'
,
()
=>
{
beforeEach
(()
=>
{
({
wrapper
}
=
createComponent
({
withCodequality
:
true
,
provide
:
{
glFeatures
:
{
codequalityMrDiffAnnotations
:
true
}
},
}));
});
it
(
'
does not show the code quality badge
'
,
()
=>
{
expect
(
wrapper
.
find
(
CodeQualityBadge
).
exists
()).
toBe
(
false
);
});
});
describe
(
'
when there is no diff data for the file
'
,
()
=>
{
describe
(
'
when there is no diff data for the file
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
({
wrapper
}
=
createComponent
({
withCodequality
:
false
}));
({
wrapper
}
=
createComponent
({
withCodequality
:
false
}));
...
...
ee/spec/frontend/diffs/components/diff_row_spec.js
0 → 100644
View file @
49f58214
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
Vue
from
'
vue
'
;
import
Vuex
from
'
vuex
'
;
import
CodeQualityGutterIcon
from
'
ee/diffs/components/code_quality_gutter_icon.vue
'
;
import
DiffRow
from
'
~/diffs/components/diff_row.vue
'
;
import
diffsModule
from
'
~/diffs/store/modules
'
;
Vue
.
use
(
Vuex
);
describe
(
'
EE DiffRow
'
,
()
=>
{
let
wrapper
;
const
findIcon
=
()
=>
wrapper
.
findComponent
(
CodeQualityGutterIcon
);
const
defaultProps
=
{
fileHash
:
'
abc
'
,
filePath
:
'
abc
'
,
line
:
{},
index
:
0
,
};
const
createComponent
=
({
props
,
state
,
actions
,
isLoggedIn
=
true
,
provide
})
=>
{
const
diffs
=
diffsModule
();
diffs
.
state
=
{
...
diffs
.
state
,
...
state
};
diffs
.
actions
=
{
...
diffs
.
actions
,
...
actions
};
const
getters
=
{
isLoggedIn
:
()
=>
isLoggedIn
};
const
store
=
new
Vuex
.
Store
({
modules
:
{
diffs
},
getters
,
});
wrapper
=
shallowMount
(
DiffRow
,
{
propsData
:
{
...
defaultProps
,
...
props
},
store
,
provide
});
};
afterEach
(()
=>
{
wrapper
.
destroy
();
});
describe
(
'
with feature flag enabled
'
,
()
=>
{
beforeEach
(()
=>
{
createComponent
({
props
:
{
line
:
{
right
:
{
codequality
:
[{
severity
:
'
critical
'
}]
}
}
},
provide
:
{
glFeatures
:
{
codequalityMrDiffAnnotations
:
true
}
},
});
});
it
(
'
shows code quality gutter icon
'
,
()
=>
{
expect
(
findIcon
().
exists
()).
toBe
(
true
);
});
});
describe
(
'
without feature flag enabled
'
,
()
=>
{
beforeEach
(()
=>
{
createComponent
({
props
:
{
line
:
{
right
:
{
codequality
:
[{
severity
:
'
critical
'
}]
}
}
},
provide
:
{
glFeatures
:
{
codequalityMrDiffAnnotations
:
false
}
},
});
});
it
(
'
does not code quality gutter icon
'
,
()
=>
{
expect
(
findIcon
().
exists
()).
toBe
(
false
);
});
});
});
ee/spec/frontend/diffs/components/diff_view_spec.js
0 → 100644
View file @
49f58214
import
{
mount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
Vuex
from
'
vuex
'
;
import
diffFileMockDataReadable
from
'
jest/diffs/mock_data/diff_file
'
;
import
DiffViewComponent
from
'
~/diffs/components/diff_view.vue
'
;
import
createDiffsStore
from
'
~/diffs/store/modules
'
;
const
getReadableFile
=
()
=>
JSON
.
parse
(
JSON
.
stringify
(
diffFileMockDataReadable
));
function
createComponent
({
withCodequality
=
true
})
{
const
diffFile
=
getReadableFile
();
const
localVue
=
createLocalVue
();
localVue
.
use
(
Vuex
);
const
store
=
new
Vuex
.
Store
({
modules
:
{
diffs
:
createDiffsStore
(),
},
});
store
.
state
.
diffs
.
diffFiles
=
[
diffFile
];
if
(
withCodequality
)
{
store
.
state
.
diffs
.
codequalityDiff
=
{
files
:
{
[
diffFile
.
file_path
]:
[
{
line
:
1
,
description
:
'
Unexpected alert.
'
,
severity
:
'
minor
'
},
{
line
:
3
,
description
:
'
Arrow function has too many statements (52). Maximum allowed is 30.
'
,
severity
:
'
minor
'
,
},
],
},
};
}
const
wrapper
=
mount
(
DiffViewComponent
,
{
store
,
localVue
,
propsData
:
{
diffFile
,
diffLines
:
[],
},
});
return
{
localVue
,
wrapper
,
store
,
};
}
describe
(
'
EE DiffView
'
,
()
=>
{
let
wrapper
;
afterEach
(()
=>
{
wrapper
.
destroy
();
});
describe
(
'
when there is diff data for the file
'
,
()
=>
{
beforeEach
(()
=>
{
({
wrapper
}
=
createComponent
({
withCodequality
:
true
}));
});
it
(
'
has the with-codequality class
'
,
()
=>
{
expect
(
wrapper
.
classes
(
'
with-codequality
'
)).
toBe
(
true
);
});
});
describe
(
'
when there is no diff data for the file
'
,
()
=>
{
beforeEach
(()
=>
{
({
wrapper
}
=
createComponent
({
withCodequality
:
false
}));
});
it
(
'
does not have the with-codequality class
'
,
()
=>
{
expect
(
wrapper
.
classes
(
'
with-codequality
'
)).
toBe
(
false
);
});
});
});
ee/spec/frontend/diffs/store/getters_spec.js
0 → 100644
View file @
49f58214
import
*
as
getters
from
'
ee/diffs/store/getters
'
;
import
state
from
'
ee/diffs/store/modules/diff_state
'
;
describe
(
'
EE Diffs Module Getters
'
,
()
=>
{
let
localState
;
beforeEach
(()
=>
{
localState
=
state
();
localState
.
codequalityDiff
=
{
files
:
{
'
index.js
'
:
[
{
severity
:
'
minor
'
,
description
:
'
Unexpected alert.
'
,
line
:
1
,
},
{
severity
:
'
major
'
,
description
:
'
Function `aVeryLongFunction` has 52 lines of code (exceeds 25 allowed). Consider refactoring.
'
,
line
:
3
,
},
{
severity
:
'
minor
'
,
description
:
'
Arrow function has too many statements (52). Maximum allowed is 30.
'
,
line
:
3
,
},
],
},
};
});
describe
(
'
fileLineCodequality
'
,
()
=>
{
it
.
each
`
line | severity
${
1
}
|
${
'
minor
'
}
${
2
}
|
${
'
no
'
}
${
3
}
|
${
'
major
'
}
${
4
}
|
${
'
no
'
}
`
(
'
finds $severity degradation on line $line
'
,
({
line
,
severity
})
=>
{
if
(
severity
===
'
no
'
)
{
expect
(
getters
.
fileLineCodequality
(
localState
)(
'
index.js
'
,
line
)).
toEqual
([]);
}
else
{
expect
(
getters
.
fileLineCodequality
(
localState
)(
'
index.js
'
,
line
)[
0
]).
toMatchObject
({
line
,
severity
,
});
}
});
});
});
spec/frontend/diffs/components/diff_content_spec.js
View file @
49f58214
...
@@ -73,6 +73,7 @@ describe('DiffContent', () => {
...
@@ -73,6 +73,7 @@ describe('DiffContent', () => {
isParallelView
:
isParallelViewGetterMock
,
isParallelView
:
isParallelViewGetterMock
,
getCommentFormForDiffFile
:
getCommentFormForDiffFileGetterMock
,
getCommentFormForDiffFile
:
getCommentFormForDiffFileGetterMock
,
diffLines
:
()
=>
()
=>
[...
diffFileMockData
.
parallel_diff_lines
],
diffLines
:
()
=>
()
=>
[...
diffFileMockData
.
parallel_diff_lines
],
fileLineCodequality
:
()
=>
()
=>
[],
},
},
actions
:
{
actions
:
{
saveDiffDiscussion
:
saveDiffDiscussionMock
,
saveDiffDiscussion
:
saveDiffDiscussionMock
,
...
...
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