diff options
Diffstat (limited to 'app/assets/javascripts/diffs')
11 files changed, 32 insertions, 127 deletions
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index c3436159cea..530f3a3a7f7 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -384,14 +384,26 @@ export default { this.unwatchDiscussions = this.$watch( () => `${this.diffFiles.length}:${this.$store.state.notes.discussions.length}`, - () => this.setDiscussions(), + () => { + this.setDiscussions(); + + if ( + this.$store.state.notes.doneFetchingBatchDiscussions && + window.gon?.features?.paginatedMrDiscussions + ) { + this.unwatchDiscussions(); + } + }, ); this.unwatchRetrievingBatches = this.$watch( () => `${this.retrievingBatches}:${this.$store.state.notes.discussions.length}`, () => { if (!this.retrievingBatches && this.$store.state.notes.discussions.length) { - this.unwatchDiscussions(); + if (!window.gon?.features?.paginatedMrDiscussions) { + this.unwatchDiscussions(); + } + this.unwatchRetrievingBatches(); } }, diff --git a/app/assets/javascripts/diffs/components/collapsed_files_warning.vue b/app/assets/javascripts/diffs/components/collapsed_files_warning.vue index b7eea32e699..ebb6ec1e7c8 100644 --- a/app/assets/javascripts/diffs/components/collapsed_files_warning.vue +++ b/app/assets/javascripts/diffs/components/collapsed_files_warning.vue @@ -55,7 +55,7 @@ export default { {{ __('For a faster browsing experience, some files are collapsed by default.') }} </p> <template #actions> - <gl-button category="secondary" variant="warning" class="gl-alert-action" @click="expand"> + <gl-button class="gl-alert-action" @click="expand"> {{ __('Expand all files') }} </gl-button> </template> diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue index 42f4ea8eb58..54b648e8d03 100644 --- a/app/assets/javascripts/diffs/components/commit_item.vue +++ b/app/assets/javascripts/diffs/components/commit_item.vue @@ -7,8 +7,6 @@ import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import initUserPopovers from '../../user_popovers'; - /** * CommitItem * @@ -82,11 +80,6 @@ export default { return this.commit.description_html.replace(/^
/, ''); }, }, - created() { - this.$nextTick(() => { - initUserPopovers(this.$el.querySelectorAll('.js-user-link')); - }); - }, safeHtmlConfig: { ADD_TAGS: ['gl-emoji'], }, @@ -128,7 +121,7 @@ export default { <div class="d-flex float-left align-items-center align-self-start"> <input v-if="isSelectable" - class="mr-2" + class="gl-mr-3" type="checkbox" :checked="checked" @change="$emit('handleCheckboxChange', $event.target.checked)" diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue index 1eba12a3ae9..bfe35e9346d 100644 --- a/app/assets/javascripts/diffs/components/diff_content.vue +++ b/app/assets/javascripts/diffs/components/diff_content.vue @@ -120,7 +120,7 @@ export default { :help-page-path="helpPagePath" :inline="isInlineView" /> - <gl-loading-icon v-if="diffFile.renderingLines" size="md" class="mt-3" /> + <gl-loading-icon v-if="diffFile.renderingLines" size="lg" class="mt-3" /> </template> <not-diffable-viewer v-else-if="notDiffable" /> <no-preview-viewer v-else-if="noPreview" /> diff --git a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue index 4e7dc578193..fc5766a23ef 100644 --- a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue +++ b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue @@ -3,7 +3,6 @@ import { GlTooltipDirective, GlSafeHtmlDirective, GlIcon, GlLoadingIcon } from ' import { mapActions } from 'vuex'; import createFlash from '~/flash'; import { s__, sprintf } from '~/locale'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { UNFOLD_COUNT, INLINE_DIFF_LINES_KEY } from '../constants'; import * as utils from '../store/utils'; @@ -24,7 +23,6 @@ export default { GlTooltip: GlTooltipDirective, SafeHtml: GlSafeHtmlDirective, }, - mixins: [glFeatureFlagsMixin()], props: { file: { type: Object, @@ -93,25 +91,16 @@ export default { nextLineNumbers = {}, ) { this.loadMoreLines({ endpoint, params, lineNumbers, fileHash, isExpandDown, nextLineNumbers }) - .then(() => { - this.isRequesting = false; - }) .catch(() => { createFlash({ message: s__('Diffs|Something went wrong while fetching diff lines.'), }); - this.isRequesting = false; }) .finally(() => { this.loading = { up: false, down: false, all: false }; }); }, handleExpandLines(type = EXPAND_ALL) { - if (this.isRequesting) { - return; - } - - this.isRequesting = true; const endpoint = this.file.context_lines_path; const oldLineNumber = this.line.meta_data.old_pos || 0; const newLineNumber = this.line.meta_data.new_pos || 0; @@ -228,10 +217,7 @@ export default { </script> <template> - <div - v-if="glFeatures.updatedDiffExpansionButtons" - class="diff-grid-row diff-grid-row-full diff-tr line_holder match expansion" - > + <div class="diff-grid-row diff-grid-row-full diff-tr line_holder match expansion"> <div :class="{ parallel: !inline }" class="diff-grid-left diff-grid-2-col left-side"> <div class="diff-td diff-line-num gl-text-center! gl-p-0! gl-w-full! gl-display-flex gl-flex-direction-column" @@ -240,6 +226,7 @@ export default { v-if="showExpandDown" v-gl-tooltip.left :title="s__('Diffs|Next 20 lines')" + :disabled="loading.down" type="button" class="js-unfold-down gl-rounded-0 gl-border-0 diff-line-expand-button" @click="handleExpandLines($options.EXPAND_DOWN)" @@ -251,6 +238,7 @@ export default { v-if="lineCountBetween !== -1 && lineCountBetween < 20" v-gl-tooltip.left :title="s__('Diffs|Expand all lines')" + :disabled="loading.all" type="button" class="js-unfold-all gl-rounded-0 gl-border-0 diff-line-expand-button" @click="handleExpandLines()" @@ -262,6 +250,7 @@ export default { v-if="showExpandUp" v-gl-tooltip.left :title="s__('Diffs|Previous 20 lines')" + :disabled="loading.up" type="button" class="js-unfold gl-rounded-0 gl-border-0 diff-line-expand-button" @click="handleExpandLines($options.EXPAND_UP)" @@ -276,32 +265,4 @@ export default { ></div> </div> </div> - <div v-else class="content js-line-expansion-content"> - <button - type="button" - :disabled="!canExpandDown" - class="js-unfold-down gl-mx-2 gl-py-4 gl-cursor-pointer" - @click="handleExpandLines($options.EXPAND_DOWN)" - > - <gl-icon :size="12" name="expand-down" /> - <span>{{ $options.i18n.showMore }}</span> - </button> - <button - type="button" - class="js-unfold-all gl-mx-2 gl-py-4 gl-cursor-pointer" - @click="handleExpandLines()" - > - <gl-icon :size="12" name="expand" /> - <span>{{ $options.i18n.showAll }}</span> - </button> - <button - type="button" - :disabled="!canExpandUp" - class="js-unfold gl-mx-2 gl-py-4 gl-cursor-pointer" - @click="handleExpandLines($options.EXPAND_UP)" - > - <gl-icon :size="12" name="expand-up" /> - <span>{{ $options.i18n.showMore }}</span> - </button> - </div> </template> diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 0b82be7140c..aec608007d5 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -456,12 +456,7 @@ export default { <p class="gl-mb-5"> {{ $options.i18n.autoCollapsed }} </p> - <gl-button - data-testid="expand-button" - category="secondary" - variant="warning" - @click.prevent="handleToggle" - > + <gl-button data-testid="expand-button" @click.prevent="handleToggle"> {{ $options.i18n.expand }} </gl-button> </div> diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue index a75262ee303..07316f9433a 100644 --- a/app/assets/javascripts/diffs/components/diff_file_header.vue +++ b/app/assets/javascripts/diffs/components/diff_file_header.vue @@ -19,8 +19,6 @@ import { scrollToElement } from '~/lib/utils/common_utils'; import { truncateSha } from '~/lib/utils/text_utility'; import { __, s__, sprintf } from '~/locale'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import FileIcon from '~/vue_shared/components/file_icon.vue'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { DIFF_FILE_AUTOMATIC_COLLAPSE } from '../constants'; import { DIFF_FILE_HEADER } from '../i18n'; @@ -33,7 +31,6 @@ export default { components: { ClipboardButton, GlIcon, - FileIcon, DiffStats, GlBadge, GlButton, @@ -48,7 +45,7 @@ export default { GlTooltip: GlTooltipDirective, SafeHtml: GlSafeHtmlDirective, }, - mixins: [glFeatureFlagsMixin(), IdState({ idProp: (vm) => vm.diffFile.file_hash })], + mixins: [IdState({ idProp: (vm) => vm.diffFile.file_hash })], i18n: { ...DIFF_FILE_HEADER, compareButtonLabel: __('Compare submodule commit revisions'), @@ -301,14 +298,6 @@ export default { :href="titleLink" @click="handleFileNameClick" > - <file-icon - v-if="!glFeatures.removeDiffHeaderIcons" - :file-name="filePath" - :size="16" - aria-hidden="true" - css-classes="gl-mr-2" - :submodule="diffFile.submodule" - /> <span v-if="isFileRenamed"> <strong v-gl-tooltip 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 a2f0e2c2653..ebc68bafb9a 100644 --- a/app/assets/javascripts/diffs/components/diff_line_note_form.vue +++ b/app/assets/javascripts/diffs/components/diff_line_note_form.vue @@ -3,6 +3,7 @@ import { mapState, mapGetters, mapActions } from 'vuex'; import { s__, __ } from '~/locale'; import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form'; import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; +import { ignoreWhilePending } from '~/lib/utils/ignore_while_pending'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import MultilineCommentForm from '~/notes/components/multiline_comment_form.vue'; import { commentLineOptions, formatLineRange } from '~/notes/components/multiline_comment_utils'; @@ -175,7 +176,10 @@ export default { 'saveDiffDiscussion', 'setSuggestPopoverDismissed', ]), - async handleCancelCommentForm(shouldConfirm, isDirty) { + handleCancelCommentForm: ignoreWhilePending(async function handleCancelCommentForm( + shouldConfirm, + isDirty, + ) { if (shouldConfirm && isDirty) { const msg = s__('Notes|Are you sure you want to cancel creating this comment?'); @@ -195,7 +199,7 @@ export default { this.$nextTick(() => { this.resetAutoSave(); }); - }, + }), handleSaveNote(note) { return this.saveDiffDiscussion({ note, formData: this.formData }).then(() => this.handleCancelCommentForm(), diff --git a/app/assets/javascripts/diffs/components/diff_view.vue b/app/assets/javascripts/diffs/components/diff_view.vue index 529f8e0a2f9..d740d5adcb6 100644 --- a/app/assets/javascripts/diffs/components/diff_view.vue +++ b/app/assets/javascripts/diffs/components/diff_view.vue @@ -6,7 +6,6 @@ import DraftNote from '~/batch_comments/components/draft_note.vue'; import draftCommentsMixin from '~/diffs/mixins/draft_comments'; import { getCommentedLines } from '~/notes/components/multiline_comment_utils'; import { hide } from '~/tooltips'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { pickDirection } from '../utils/diff_line'; import DiffCommentCell from './diff_comment_cell.vue'; import DiffExpansionCell from './diff_expansion_cell.vue'; @@ -23,11 +22,7 @@ export default { directives: { SafeHtml, }, - mixins: [ - draftCommentsMixin, - glFeatureFlagsMixin(), - IdState({ idProp: (vm) => vm.diffFile.file_hash }), - ], + mixins: [draftCommentsMixin, IdState({ idProp: (vm) => vm.diffFile.file_hash })], props: { diffFile: { type: Object, @@ -171,7 +166,6 @@ export default { <template v-for="(line, index) in diffLines"> <template v-if="line.isMatchLineLeft || line.isMatchLineRight"> <diff-expansion-cell - v-if="glFeatures.updatedDiffExpansionButtons" :key="`expand-${index}`" :file="diffFile" :line="line.left" @@ -180,41 +174,6 @@ export default { :inline="inline" :line-count-between="getCountBetweenIndex(index)" /> - <template v-else> - <div :key="`expand-${index}`" class="diff-tr line_expansion old-line_expansion match"> - <div class="diff-td text-center gl-font-regular"> - <diff-expansion-cell - :file="diffFile" - :context-lines-path="diffFile.context_lines_path" - :line="line.left" - :is-top="index === 0" - :is-bottom="index + 1 === diffLinesLength" - :inline="inline" - /> - </div> - </div> - <div - v-if="line.left.rich_text" - :key="`expand-definition-${index}`" - class="diff-grid-row diff-tr line_holder match" - > - <div class="diff-grid-left diff-grid-3-col left-side"> - <div class="diff-td diff-line-num"></div> - <div v-if="inline" class="diff-td diff-line-num"></div> - <div - v-safe-html="line.left.rich_text" - class="diff-td line_content left-side gl-white-space-normal!" - ></div> - </div> - <div v-if="!inline" class="diff-grid-right diff-grid-3-col right-side"> - <div class="diff-td diff-line-num"></div> - <div - v-safe-html="line.left.rich_text" - class="diff-td line_content right-side gl-white-space-normal!" - ></div> - </div> - </div> - </template> </template> <diff-row v-if="!line.isMatchLineLeft && !line.isMatchLineRight" diff --git a/app/assets/javascripts/diffs/components/merge_conflict_warning.vue b/app/assets/javascripts/diffs/components/merge_conflict_warning.vue index 6e1e6f5c2d0..c37a1d75650 100644 --- a/app/assets/javascripts/diffs/components/merge_conflict_warning.vue +++ b/app/assets/javascripts/diffs/components/merge_conflict_warning.vue @@ -44,8 +44,8 @@ export default { <gl-button v-if="resolutionPath" :href="resolutionPath" - variant="info" - class="gl-mr-5 gl-alert-action" + variant="confirm" + class="gl-mr-3 gl-alert-action" > {{ __('Resolve conflicts') }} </gl-button> diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js index 92f3cf83740..cf86ebea4a9 100644 --- a/app/assets/javascripts/diffs/store/utils.js +++ b/app/assets/javascripts/diffs/store/utils.js @@ -126,14 +126,6 @@ export function findDiffFile(files, match, matchKey = 'file_hash') { return files.find((file) => file[matchKey] === match); } -export const getReversePosition = (linePosition) => { - if (linePosition === LINE_POSITION_RIGHT) { - return LINE_POSITION_LEFT; - } - - return LINE_POSITION_RIGHT; -}; - export function getFormData(params) { const { commit, |