diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/diffs/components/diff_content.vue | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_content.vue')
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_content.vue | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue index cb74c7dc7cd..858d9e221ae 100644 --- a/app/assets/javascripts/diffs/components/diff_content.vue +++ b/app/assets/javascripts/diffs/components/diff_content.vue @@ -1,7 +1,7 @@ <script> import { GlLoadingIcon } from '@gitlab/ui'; import { mapActions, mapGetters, mapState } from 'vuex'; -import { mapInline, mapParallel } from 'ee_else_ce/diffs/components/diff_row_utils'; +import { mapParallel } from 'ee_else_ce/diffs/components/diff_row_utils'; import DiffFileDrafts from '~/batch_comments/components/diff_file_drafts.vue'; import draftCommentsMixin from '~/diffs/mixins/draft_comments'; import { diffViewerModes } from '~/ide/constants'; @@ -9,7 +9,6 @@ import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form'; import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue'; import NoPreviewViewer from '~/vue_shared/components/diff_viewer/viewers/no_preview.vue'; import NotDiffableViewer from '~/vue_shared/components/diff_viewer/viewers/not_diffable.vue'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import NoteForm from '../../notes/components/note_form.vue'; import eventHub from '../../notes/event_hub'; import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; @@ -18,14 +17,10 @@ import { getDiffMode } from '../store/utils'; import DiffDiscussions from './diff_discussions.vue'; import DiffView from './diff_view.vue'; import ImageDiffOverlay from './image_diff_overlay.vue'; -import InlineDiffView from './inline_diff_view.vue'; -import ParallelDiffView from './parallel_diff_view.vue'; export default { components: { GlLoadingIcon, - InlineDiffView, - ParallelDiffView, DiffView, DiffViewer, NoteForm, @@ -36,7 +31,7 @@ export default { userAvatarLink, DiffFileDrafts, }, - mixins: [diffLineNoteFormMixin, draftCommentsMixin, glFeatureFlagsMixin()], + mixins: [diffLineNoteFormMixin, draftCommentsMixin], props: { diffFile: { type: Object, @@ -52,7 +47,6 @@ export default { ...mapState('diffs', ['projectPath']), ...mapGetters('diffs', [ 'isInlineView', - 'isParallelView', 'getCommentFormForDiffFile', 'diffLines', 'fileLineCodequality', @@ -86,15 +80,8 @@ export default { return this.getUserData; }, mappedLines() { - if (this.glFeatures.unifiedDiffComponents) { - return this.diffLines(this.diffFile, true).map(mapParallel(this)) || []; - } - - // TODO: Everything below this line can be deleted when unifiedDiffComponents FF is removed - if (this.isInlineView) { - return this.diffFile.highlighted_diff_lines.map(mapInline(this)); - } - return this.diffLines(this.diffFile).map(mapParallel(this)); + // TODO: Do this data generation when we recieve a response to save a computed property being created + return this.diffLines(this.diffFile).map(mapParallel(this)) || []; }, }, updated() { @@ -126,7 +113,7 @@ export default { <template> <div class="diff-content"> <div class="diff-viewer"> - <template v-if="isTextFile && glFeatures.unifiedDiffComponents"> + <template v-if="isTextFile"> <diff-view :diff-file="diffFile" :diff-lines="mappedLines" @@ -135,21 +122,6 @@ export default { /> <gl-loading-icon v-if="diffFile.renderingLines" size="md" class="mt-3" /> </template> - <template v-else-if="isTextFile"> - <inline-diff-view - v-if="isInlineView" - :diff-file="diffFile" - :diff-lines="mappedLines" - :help-page-path="helpPagePath" - /> - <parallel-diff-view - v-else-if="isParallelView" - :diff-file="diffFile" - :diff-lines="mappedLines" - :help-page-path="helpPagePath" - /> - <gl-loading-icon v-if="diffFile.renderingLines" size="md" class="mt-3" /> - </template> <not-diffable-viewer v-else-if="notDiffable" /> <no-preview-viewer v-else-if="noPreview" /> <diff-viewer |