Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_view.vue')
-rw-r--r--app/assets/javascripts/diffs/components/diff_view.vue11
1 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_view.vue b/app/assets/javascripts/diffs/components/diff_view.vue
index 7c87ea1cbf2..6bacc6839d8 100644
--- a/app/assets/javascripts/diffs/components/diff_view.vue
+++ b/app/assets/javascripts/diffs/components/diff_view.vue
@@ -57,6 +57,7 @@ export default {
...mapGetters('diffs', ['commitId', 'fileLineCoverage']),
...mapState('diffs', [
'codequalityDiff',
+ 'sastDiff',
'highlightedRow',
'coverageLoaded',
'selectedCommentPosition',
@@ -75,7 +76,10 @@ export default {
);
},
hasCodequalityChanges() {
- return this.codequalityDiff?.files?.[this.diffFile.file_path]?.length > 0;
+ return (
+ this.codequalityDiff?.files?.[this.diffFile.file_path]?.length > 0 ||
+ this.sastDiff?.added?.length > 0
+ );
},
},
created() {
@@ -183,7 +187,10 @@ export default {
);
},
getCodeQualityLine(line) {
- return (line.left ?? line.right)?.codequality?.[0]?.line;
+ return (
+ (line.left ?? line.right)?.codequality?.[0]?.line ||
+ (line.left ?? line.right)?.sast?.[0]?.line
+ );
},
lineDrafts(line, side) {
return (line[side]?.lineDrafts || []).filter((entry) => entry.isDraft);