Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

CHANGELOG.md

@@ -191,7 +191,7 @@ gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.14.3'
 gem 'deckar01-task_list', '2.3.2'
-gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup'
+gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup'
 gem 'commonmarker', '~> 0.23.6'
 gem 'kramdown', '~> 2.3.1'
 gem 'RedCloth', '~> 4.3.2'

Gemfile

@@ -206,7 +206,7 @@
 {"name":"gitlab-labkit","version":"0.30.1","platform":"ruby","checksum":"bdedbd86014c83dfd6a50d20dbc1709697bba2bb9e3666383e5f28cbd312b113"},
 {"name":"gitlab-license","version":"2.2.1","platform":"ruby","checksum":"39fcf6be8b2887df8afe01b5dcbae8d08b7c5d937ff56b0fb40484a8c4f02d30"},
 {"name":"gitlab-mail_room","version":"0.0.9","platform":"ruby","checksum":"6700374b5c0aa9d9ad4e711aeb677f0b7d415a6d01d3baa699efab25349d851c"},
-{"name":"gitlab-markup","version":"1.8.1","platform":"ruby","checksum":"ab1f9fd016977497c2af25b76341dea670533014f406861834a0bd99f646707b"},
+{"name":"gitlab-markup","version":"1.9.0","platform":"ruby","checksum":"7eda045a08ec2d110084252fa13a8c9eac8bdac0e302035ca7db4b82bcbd7ed4"},
 {"name":"gitlab-net-dns","version":"0.9.1","platform":"ruby","checksum":"bcd1a08dcb31b731e8ff602d828de619d2d9f53f5812f6abacf11c720873d4cb"},
 {"name":"gitlab-sidekiq-fetcher","version":"0.9.0","platform":"ruby","checksum":"54041aec059f20c8e6dfce394e1b60e0c0a9c7cef32da912a58abbd333e13897"},
 {"name":"gitlab-styles","version":"10.0.0","platform":"ruby","checksum":"8a1b20f7b5f351605ff4ed4ec648ef37226f2774d1e1377ed99389448d6913f0"},

Gemfile.checksum

@@ -594,7 +594,7 @@ GEM
       redis (> 3.0.0, < 6.0.0)
     gitlab-license (2.2.1)
     gitlab-mail_room (0.0.9)
-    gitlab-markup (1.8.1)
+    gitlab-markup (1.9.0)
     gitlab-net-dns (0.9.1)
     gitlab-sidekiq-fetcher (0.9.0)
       json (>= 2.5)
@@ -1682,7 +1682,7 @@ DEPENDENCIES
   gitlab-labkit (~> 0.30.1)
   gitlab-license (~> 2.2.1)
   gitlab-mail_room (~> 0.0.9)
-  gitlab-markup (~> 1.8.0)
+  gitlab-markup (~> 1.9.0)
   gitlab-net-dns (~> 0.9.1)
   gitlab-sidekiq-fetcher (= 0.9.0)
   gitlab-styles (~> 10.0.0)

Gemfile.lock

@@ -6,7 +6,7 @@ verify_ssl = true
 [dev-packages]
 
 [packages]
-docutils = "==0.13.1"
+docutils = "==0.19"
 
 [requires]
-python_version = "3.4"
+python_version = "3.9.6"

Pipfile

@@ -117,6 +117,7 @@ export default {
     :toggle-text="s__('Boards|Move card')"
     :text-sr-only="true"
     no-caret
+    data-testid="board-move-to-position"
     @action="selectMoveAction"
   />
 </template>

Pipfile.lock

@@ -13,6 +13,7 @@ import {
   toggleFormEventPrefix,
   DraggableItemTypes,
   listIssuablesQueries,
+  ListType,
 } from 'ee_else_ce/boards/constants';
 import eventHub from '../eventhub';
 import BoardCard from './board_card.vue';
@@ -196,6 +197,9 @@ export default {
     disableScrollingWhenMutationInProgress() {
       return this.hasNextPage && this.isUpdateIssueOrderInProgress;
     },
+    showMoveToPosition() {
+      return !this.disabled && this.list.listType !== ListType.closed;
+    },
   },
   watch: {
     boardListItems() {
@@ -382,9 +386,8 @@ export default {
         :data-draggable-item-type="$options.draggableItemTypes.card"
         :show-work-item-type-icon="!isEpicBoard"
       >
-        <!-- TODO: remove the condition when https://gitlab.com/gitlab-org/gitlab/-/issues/377862 is resolved -->
         <board-card-move-to-position
-          v-if="!isEpicBoard && !disabled"
+          v-if="showMoveToPosition"
           :item="item"
           :index="index"
           :list="list"

app/assets/javascripts/boards/components/board_card_move_to_position.vue

@@ -15,9 +15,11 @@ const updateListItemsCount = ({ state, listId, value }) => {
   }
 };
 
-export const removeItemFromList = ({ state, listId, itemId }) => {
+export const removeItemFromList = ({ state, listId, itemId, reordering = false }) => {
   Vue.set(state.boardItemsByListId, listId, pull(state.boardItemsByListId[listId], itemId));
-  updateListItemsCount({ state, listId, value: -1 });
+  if (!reordering) {
+    updateListItemsCount({ state, listId, value: -1 });
+  }
 };
 
 export const addItemToList = ({
@@ -28,6 +30,7 @@ export const addItemToList = ({
   moveAfterId,
   atIndex,
   positionInList,
+  reordering = false,
 }) => {
   const listIssues = state.boardItemsByListId[listId];
   let newIndex = atIndex || 0;
@@ -41,7 +44,9 @@ export const addItemToList = ({
   }
   listIssues.splice(newIndex, 0, itemId);
   Vue.set(state.boardItemsByListId, listId, listIssues);
-  updateListItemsCount({ state, listId, value: moveToStartOrLast ? 0 : 1 });
+  if (!reordering) {
+    updateListItemsCount({ state, listId, value: moveToStartOrLast ? 0 : 1 });
+  }
 };
 
 export default {

app/assets/javascripts/boards/components/board_list.vue

@@ -136,6 +136,7 @@ export default {
         'gl-align-items-flex-start! gl-justify-content-start! mr-compare-dropdown',
         toggleClass,
       ]"
+      :data-qa-selector="qaSelector"
       @shown="fetchData"
       @search="searchData"
       @select="selectItem"

app/assets/javascripts/boards/stores/mutations.js

@@ -1,32 +1,28 @@
 <script>
 import { GlAvatar, GlButton } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
-import { helpPagePath } from '~/helpers/help_page_helper';
-import { getDraft, clearDraft, updateDraft } from '~/lib/utils/autosave';
-import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
-import { __, s__ } from '~/locale';
+import { clearDraft } from '~/lib/utils/autosave';
 import Tracking from '~/tracking';
 import { ASC } from '~/notes/constants';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { updateCommentState } from '~/work_items/graphql/cache_utils';
-import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
-import { getWorkItemQuery } from '../utils';
-import createNoteMutation from '../graphql/notes/create_work_item_note.mutation.graphql';
-import { TRACKING_CATEGORY_SHOW, i18n } from '../constants';
+import { getWorkItemQuery } from '../../utils';
+import createNoteMutation from '../../graphql/notes/create_work_item_note.mutation.graphql';
+import { TRACKING_CATEGORY_SHOW, i18n } from '../../constants';
 import WorkItemNoteSignedOut from './work_item_note_signed_out.vue';
 import WorkItemCommentLocked from './work_item_comment_locked.vue';
+import WorkItemCommentForm from './work_item_comment_form.vue';
 
 export default {
   constantOptions: {
-    markdownDocsPath: helpPagePath('user/markdown'),
     avatarUrl: window.gon.current_user_avatar_url,
   },
   components: {
     GlAvatar,
     GlButton,
-    MarkdownEditor,
     WorkItemNoteSignedOut,
     WorkItemCommentLocked,
+    WorkItemCommentForm,
   },
   mixins: [glFeatureFlagMixin(), Tracking.mixin()],
   props: {
@@ -78,13 +74,6 @@ export default {
       isEditing: false,
       isSubmitting: false,
       isSubmittingWithKeydown: false,
-      commentText: '',
-      formFieldProps: {
-        'aria-label': __('Add a comment'),
-        placeholder: __('Write a comment or drag your files here…'),
-        id: 'work-item-add-comment',
-        name: 'work-item-add-comment',
-      },
     };
   },
   apollo: {
@@ -112,7 +101,7 @@ export default {
     },
     autosaveKey() {
       // eslint-disable-next-line @gitlab/require-i18n-strings
-      return `${this.workItemId}-comment`;
+      return this.discussionId ? `${this.discussionId}-comment` : `${this.workItemId}-comment`;
     },
     tracking() {
       return {
@@ -150,37 +139,9 @@ export default {
     },
   },
   methods: {
-    startEditing() {
-      this.isEditing = true;
-      this.commentText = getDraft(this.autosaveKey) || '';
-    },
-    async cancelEditing() {
-      if (this.commentText) {
-        const msg = s__('WorkItem|Are you sure you want to cancel editing?');
-
-        const confirmed = await confirmAction(msg, {
-          primaryBtnText: __('Discard changes'),
-          cancelBtnText: __('Continue editing'),
-        });
-
-        if (!confirmed) {
-          return;
-        }
-      }
-
-      this.$emit('cancelEditing');
-      this.isEditing = false;
-      clearDraft(this.autosaveKey);
-    },
-    async updateWorkItem(event = {}) {
-      const { key } = event;
-
-      if (key) {
-        this.isSubmittingWithKeydown = true;
-      }
-
+    async updateWorkItem(commentText) {
       this.isSubmitting = true;
-      this.$emit('replying', this.commentText);
+      this.$emit('replying', commentText);
       const { queryVariables, fetchByIid } = this;
 
       try {
@@ -191,7 +152,7 @@ export default {
           variables: {
             input: {
               noteableId: this.workItemId,
-              body: this.commentText,
+              body: commentText,
               discussionId: this.discussionId || null,
             },
           },
@@ -204,17 +165,17 @@ export default {
         });
         clearDraft(this.autosaveKey);
         this.$emit('replied');
-        this.isEditing = false;
+        this.cancelEditing();
       } catch (error) {
         this.$emit('error', error.message);
         Sentry.captureException(error);
       }
 
       this.isSubmitting = false;
     },
-    setCommentText(newText) {
-      this.commentText = newText;
-      updateDraft(this.autosaveKey, this.commentText);
+    cancelEditing() {
+      this.isEditing = false;
+      this.$emit('cancelEditing');
     },
   },
 };
@@ -230,37 +191,19 @@ export default {
     />
     <div v-else class="gl-relative gl-display-flex gl-align-items-flex-start gl-flex-wrap-nowrap">
       <gl-avatar :src="$options.constantOptions.avatarUrl" :size="32" class="gl-mr-3" />
-      <form v-if="isEditing" class="common-note-form gfm-form js-main-target-form gl-flex-grow-1">
-        <markdown-editor
-          class="gl-mb-3"
-          :value="commentText"
-          :render-markdown-path="markdownPreviewPath"
-          :markdown-docs-path="$options.constantOptions.markdownDocsPath"
-          :form-field-props="formFieldProps"
-          data-testid="work-item-add-comment"
-          enable-autocomplete
-          autofocus
-          use-bottom-toolbar
-          @input="setCommentText"
-          @keydown.meta.enter="updateWorkItem"
-          @keydown.ctrl.enter="updateWorkItem"
-          @keydown.esc="cancelEditing"
-        />
-        <gl-button
-          category="primary"
-          variant="confirm"
-          :loading="isSubmitting"
-          @click="updateWorkItem"
-          >{{ __('Comment') }}
-        </gl-button>
-        <gl-button category="primary" class="gl-ml-3" @click="cancelEditing"
-          >{{ __('Cancel') }}
-        </gl-button>
-      </form>
+      <work-item-comment-form
+        v-if="isEditing"
+        :work-item-type="workItemType"
+        :aria-label="__('Add a comment')"
+        :is-submitting="isSubmitting"
+        :autosave-key="autosaveKey"
+        @submitForm="updateWorkItem"
+        @cancelEditing="cancelEditing"
+      />
       <gl-button
         v-else
         class="gl-flex-grow-1 gl-justify-content-start! gl-text-secondary!"
-        @click="startEditing"
+        @click="isEditing = true"
         >{{ __('Add a comment') }}</gl-button
       >
     </div>