diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/diffs/components | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/diffs/components')
7 files changed, 59 insertions, 29 deletions
diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue index ee93ca020e8..99bc1b5c040 100644 --- a/app/assets/javascripts/diffs/components/commit_item.vue +++ b/app/assets/javascripts/diffs/components/commit_item.vue @@ -144,7 +144,7 @@ export default { <pre v-if="commit.description_html" - class="commit-row-description js-toggle-content append-bottom-8" + class="commit-row-description js-toggle-content gl-mb-3" v-html="commit.description_html" ></pre> </div> diff --git a/app/assets/javascripts/diffs/components/compare_versions.vue b/app/assets/javascripts/diffs/components/compare_versions.vue index c680c3f4600..6f6fa312865 100644 --- a/app/assets/javascripts/diffs/components/compare_versions.vue +++ b/app/assets/javascripts/diffs/components/compare_versions.vue @@ -86,7 +86,7 @@ export default { <button v-gl-tooltip.hover type="button" - class="btn btn-default append-right-8 js-toggle-tree-list" + class="btn btn-default gl-mr-3 js-toggle-tree-list" :class="{ active: showTreeList, }" @@ -98,20 +98,20 @@ export default { <gl-sprintf v-if="showDropdowns" class="d-flex align-items-center compare-versions-container" - :message="s__('MergeRequest|Compare %{source} and %{target}')" + :message="s__('MergeRequest|Compare %{target} and %{source}')" > - <template #source> - <compare-dropdown-layout - :versions="diffCompareDropdownSourceVersions" - class="mr-version-dropdown" - /> - </template> <template #target> <compare-dropdown-layout :versions="diffCompareDropdownTargetVersions" class="mr-version-compare-dropdown" /> </template> + <template #source> + <compare-dropdown-layout + :versions="diffCompareDropdownSourceVersions" + class="mr-version-dropdown" + /> + </template> </gl-sprintf> <div v-else-if="commit"> {{ __('Viewing commit') }} @@ -126,15 +126,11 @@ export default { <gl-deprecated-button v-if="commit || startVersion" :href="latestVersionPath" - class="append-right-8 js-latest-version" + class="gl-mr-3 js-latest-version" > {{ __('Show latest version') }} </gl-deprecated-button> - <gl-deprecated-button - v-show="hasCollapsedFile" - class="append-right-8" - @click="expandAllFiles" - > + <gl-deprecated-button v-show="hasCollapsedFile" class="gl-mr-3" @click="expandAllFiles"> {{ __('Expand all') }} </gl-deprecated-button> <settings-dropdown /> diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue index 5656bfc4707..741462a849c 100644 --- a/app/assets/javascripts/diffs/components/diff_content.vue +++ b/app/assets/javascripts/diffs/components/diff_content.vue @@ -1,11 +1,12 @@ <script> import { mapActions, mapGetters, mapState } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; -import diffLineNoteFormMixin from 'ee_else_ce/notes/mixins/diff_line_note_form'; -import draftCommentsMixin from 'ee_else_ce/diffs/mixins/draft_comments'; +import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form'; +import draftCommentsMixin from '~/diffs/mixins/draft_comments'; import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue'; import NotDiffableViewer from '~/vue_shared/components/diff_viewer/viewers/not_diffable.vue'; import NoPreviewViewer from '~/vue_shared/components/diff_viewer/viewers/no_preview.vue'; +import DiffFileDrafts from '~/batch_comments/components/diff_file_drafts.vue'; import InlineDiffView from './inline_diff_view.vue'; import ParallelDiffView from './parallel_diff_view.vue'; import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; @@ -29,7 +30,7 @@ export default { NotDiffableViewer, NoPreviewViewer, userAvatarLink, - DiffFileDrafts: () => import('ee_component/batch_comments/components/diff_file_drafts.vue'), + DiffFileDrafts, }, mixins: [diffLineNoteFormMixin, draftCommentsMixin], props: { @@ -128,6 +129,7 @@ export default { <no-preview-viewer v-else-if="noPreview" /> <diff-viewer v-else + :diff-file="diffFile" :diff-mode="diffMode" :diff-viewer-mode="diffViewerMode" :new-path="diffFile.new_path" diff --git a/app/assets/javascripts/diffs/components/diff_line_note_form.vue b/app/assets/javascripts/diffs/components/diff_line_note_form.vue index f81f50f8490..74305ee69bc 100644 --- a/app/assets/javascripts/diffs/components/diff_line_note_form.vue +++ b/app/assets/javascripts/diffs/components/diff_line_note_form.vue @@ -1,18 +1,22 @@ <script> import { mapState, mapGetters, mapActions } from 'vuex'; -import diffLineNoteFormMixin from 'ee_else_ce/notes/mixins/diff_line_note_form'; +import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { s__ } from '~/locale'; import noteForm from '../../notes/components/note_form.vue'; +import MultilineCommentForm from '../../notes/components/multiline_comment_form.vue'; import autosave from '../../notes/mixins/autosave'; import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import { DIFF_NOTE_TYPE } from '../constants'; +import { commentLineOptions } from '../../notes/components/multiline_comment_utils'; export default { components: { noteForm, userAvatarLink, + MultilineCommentForm, }, - mixins: [autosave, diffLineNoteFormMixin], + mixins: [autosave, diffLineNoteFormMixin, glFeatureFlagsMixin()], props: { diffFileHash: { type: String, @@ -37,6 +41,14 @@ export default { default: '', }, }, + data() { + return { + commentLineStart: { + lineCode: this.line.line_code, + type: this.line.type, + }, + }; + }, computed: { ...mapState({ noteableData: state => state.notes.noteableData, @@ -62,11 +74,20 @@ export default { diffViewType: this.diffViewType, diffFile: this.diffFile, linePosition: this.linePosition, + lineRange: { + start_line_code: this.commentLineStart.lineCode, + start_line_type: this.commentLineStart.type, + end_line_code: this.line.line_code, + end_line_type: this.line.type, + }, }; }, diffFile() { return this.getDiffFileByHash(this.diffFileHash); }, + commentLineOptions() { + return commentLineOptions(this.diffFile.highlighted_diff_lines, this.line.line_code); + }, }, mounted() { if (this.isLoggedIn) { @@ -83,7 +104,6 @@ export default { methods: { ...mapActions('diffs', [ 'cancelCommentForm', - 'assignDiscussionsToDiff', 'saveDiffDiscussion', 'setSuggestPopoverDismissed', ]), @@ -116,6 +136,16 @@ export default { <template> <div class="content discussion-form discussion-form-container discussion-notes"> + <div + v-if="glFeatures.multilineComments" + class="gl-mb-3 gl-text-gray-700 gl-border-gray-200 gl-border-b-solid gl-border-b-1 gl-pb-3" + > + <multiline-comment-form + v-model="commentLineStart" + :line="line" + :comment-line-options="commentLineOptions" + /> + </div> <user-avatar-link v-if="author" :link-href="author.path" @@ -133,7 +163,7 @@ export default { :diff-file="diffFile" :show-suggest-popover="showSuggestPopover" save-button-title="Comment" - class="diff-comment-form" + class="diff-comment-form prepend-top-10" @handleFormUpdateAddToReview="addToReview" @cancelForm="handleCancelCommentForm" @handleFormUpdate="handleSaveNote" diff --git a/app/assets/javascripts/diffs/components/inline_diff_view.vue b/app/assets/javascripts/diffs/components/inline_diff_view.vue index 8b25cdc2887..ad72016f03b 100644 --- a/app/assets/javascripts/diffs/components/inline_diff_view.vue +++ b/app/assets/javascripts/diffs/components/inline_diff_view.vue @@ -1,6 +1,7 @@ <script> import { mapGetters } from 'vuex'; -import draftCommentsMixin from 'ee_else_ce/diffs/mixins/draft_comments'; +import draftCommentsMixin from '~/diffs/mixins/draft_comments'; +import InlineDraftCommentRow from '~/batch_comments/components/inline_draft_comment_row.vue'; import inlineDiffTableRow from './inline_diff_table_row.vue'; import inlineDiffCommentRow from './inline_diff_comment_row.vue'; import inlineDiffExpansionRow from './inline_diff_expansion_row.vue'; @@ -9,8 +10,7 @@ export default { components: { inlineDiffCommentRow, inlineDiffTableRow, - InlineDraftCommentRow: () => - import('ee_component/batch_comments/components/inline_draft_comment_row.vue'), + InlineDraftCommentRow, inlineDiffExpansionRow, }, mixins: [draftCommentsMixin], @@ -80,6 +80,8 @@ export default { v-if="shouldRenderDraftRow(diffFile.file_hash, line)" :key="`draft_${index}`" :draft="draftForLine(diffFile.file_hash, line)" + :diff-file="diffFile" + :line="line" /> </template> </tbody> diff --git a/app/assets/javascripts/diffs/components/parallel_diff_view.vue b/app/assets/javascripts/diffs/components/parallel_diff_view.vue index d796aad9d06..b5fcc50ce26 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue @@ -1,6 +1,7 @@ <script> import { mapGetters } from 'vuex'; -import draftCommentsMixin from 'ee_else_ce/diffs/mixins/draft_comments'; +import draftCommentsMixin from '~/diffs/mixins/draft_comments'; +import ParallelDraftCommentRow from '~/batch_comments/components/parallel_draft_comment_row.vue'; import parallelDiffTableRow from './parallel_diff_table_row.vue'; import parallelDiffCommentRow from './parallel_diff_comment_row.vue'; import parallelDiffExpansionRow from './parallel_diff_expansion_row.vue'; @@ -10,8 +11,7 @@ export default { parallelDiffExpansionRow, parallelDiffTableRow, parallelDiffCommentRow, - ParallelDraftCommentRow: () => - import('ee_component/batch_comments/components/parallel_draft_comment_row.vue'), + ParallelDraftCommentRow, }, mixins: [draftCommentsMixin], props: { diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue index eca9091f92f..52611f3c82a 100644 --- a/app/assets/javascripts/diffs/components/tree_list.vue +++ b/app/assets/javascripts/diffs/components/tree_list.vue @@ -64,7 +64,7 @@ export default { <template> <div class="tree-list-holder d-flex flex-column"> - <div class="append-bottom-8 position-relative tree-list-search d-flex"> + <div class="gl-mb-3 position-relative tree-list-search d-flex"> <div class="flex-fill d-flex"> <icon name="search" class="position-absolute tree-list-icon" /> <label for="diff-tree-search" class="sr-only">{{ $options.searchPlaceholder }}</label> |