diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-04 01:23:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-04 01:23:33 +0300 |
commit | 6c3124c854cbeef391a38b5ae8330174d78348bf (patch) | |
tree | af77629bc34ccc517ed24d9db35895be5d02d23d /app/assets/javascripts | |
parent | 9a8ae3b4e90e56f71bb770463b943512efdcd1d1 (diff) |
Add latest changes from gitlab-org/gitlab@15-0-stable-ee
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/issues/show/components/description.vue | 22 | ||||
-rw-r--r-- | app/assets/javascripts/issues/show/utils.js | 50 | ||||
-rw-r--r-- | app/assets/javascripts/notes/components/comment_form.vue | 5 |
3 files changed, 44 insertions, 33 deletions
diff --git a/app/assets/javascripts/issues/show/components/description.vue b/app/assets/javascripts/issues/show/components/description.vue index 4f97458dcd1..daa1632c4aa 100644 --- a/app/assets/javascripts/issues/show/components/description.vue +++ b/app/assets/javascripts/issues/show/components/description.vue @@ -12,6 +12,7 @@ import Vue from 'vue'; import { getIdFromGraphQLId, convertToGraphQLId } from '~/graphql_shared/utils'; import { TYPE_WORK_ITEM } from '~/graphql_shared/constants'; import createFlash from '~/flash'; +import { IssuableType } from '~/issues/constants'; import { isPositiveInteger } from '~/lib/utils/number_utils'; import { getParameterByName, setUrlParams, updateHistory } from '~/lib/utils/url_utility'; import { __, s__, sprintf } from '~/locale'; @@ -66,7 +67,7 @@ export default { issuableType: { type: String, required: false, - default: 'issue', + default: IssuableType.Issue, }, updateUrl: { type: String, @@ -177,7 +178,9 @@ export default { onError: this.taskListUpdateError.bind(this), }); - this.renderSortableLists(); + if (this.issuableType === IssuableType.Issue) { + this.renderSortableLists(); + } } }, renderSortableLists() { @@ -185,6 +188,10 @@ export default { const lists = document.querySelectorAll('.description ul, .description ol'); lists.forEach((list) => { + if (list.children.length <= 1) { + return; + } + Array.from(list.children).forEach((listItem) => { listItem.prepend(this.createDragIconElement()); this.addPointerEventListeners(listItem); @@ -211,13 +218,18 @@ export default { }, addPointerEventListeners(listItem) { const pointeroverListener = (event) => { - if (isDragging() || this.isUpdating) { + const dragIcon = event.target.closest('li').querySelector('.drag-icon'); + if (!dragIcon || isDragging() || this.isUpdating) { return; } - event.target.closest('li').querySelector('.drag-icon').style.visibility = 'visible'; // eslint-disable-line no-param-reassign + dragIcon.style.visibility = 'visible'; }; const pointeroutListener = (event) => { - event.target.closest('li').querySelector('.drag-icon').style.visibility = 'hidden'; // eslint-disable-line no-param-reassign + const dragIcon = event.target.closest('li').querySelector('.drag-icon'); + if (!dragIcon) { + return; + } + dragIcon.style.visibility = 'hidden'; }; // We use pointerover/pointerout instead of CSS so that when we hover over a diff --git a/app/assets/javascripts/issues/show/utils.js b/app/assets/javascripts/issues/show/utils.js index 60e66f59f92..05b06586362 100644 --- a/app/assets/javascripts/issues/show/utils.js +++ b/app/assets/javascripts/issues/show/utils.js @@ -1,39 +1,35 @@ import { COLON, HYPHEN, NEWLINE } from '~/lib/utils/text_utility'; /** - * Get the index from sourcepos that represents the line of - * the description when the description is split by newline. + * Returns the start and end `sourcepos` rows, converted to zero-based numbering. * * @param {String} sourcepos Source position in format `23:3-23:14` - * @returns {Number} Index of description split by newline + * @returns {Array<Number>} Start and end `sourcepos` rows, zero-based numbered */ -const getDescriptionIndex = (sourcepos) => { - const [startRange] = sourcepos.split(HYPHEN); +const getSourceposRows = (sourcepos) => { + const [startRange, endRange] = sourcepos.split(HYPHEN); const [startRow] = startRange.split(COLON); - return startRow - 1; + const [endRow] = endRange.split(COLON); + return [startRow - 1, endRow - 1]; }; /** - * Given a `ul` or `ol` element containing a new sort order, this function performs - * a depth-first search to get the new sort order in the form of sourcepos indices. + * Given a `ul` or `ol` element containing a new sort order, this function returns + * an array of this new order which is derived from its list items' sourcepos values. * * @param {HTMLElement} list A `ul` or `ol` element containing a new sort order - * @returns {Array<Number>} An array representing the new order of the list + * @returns {Array<Number>} A numerical array representing the new order of the list. + * The numbers represent the rows of the original markdown source. */ const getNewSourcePositions = (list) => { const newSourcePositions = []; - function pushPositionOfChildListItems(el) { - if (!el) { - return; + Array.from(list.children).forEach((listItem) => { + const [start, end] = getSourceposRows(listItem.dataset.sourcepos); + for (let i = start; i <= end; i += 1) { + newSourcePositions.push(i); } - if (el.tagName === 'LI') { - newSourcePositions.push(getDescriptionIndex(el.dataset.sourcepos)); - } - Array.from(el.children).forEach(pushPositionOfChildListItems); - } - - pushPositionOfChildListItems(list); + }); return newSourcePositions; }; @@ -56,17 +52,17 @@ const getNewSourcePositions = (list) => { * And a reordered list (due to dragging Item 2 into Item 1's position) like: * * <pre> - * <ul data-sourcepos="3:1-8:0"> - * <li data-sourcepos="4:1-4:8"> + * <ul data-sourcepos="3:1-7:8"> + * <li data-sourcepos="4:1-6:10"> * Item 2 - * <ul data-sourcepos="5:1-6:10"> - * <li data-sourcepos="5:1-5:10">Item 3</li> - * <li data-sourcepos="6:1-6:10">Item 4</li> + * <ul data-sourcepos="5:3-6:10"> + * <li data-sourcepos="5:3-5:10">Item 3</li> + * <li data-sourcepos="6:3-6:10">Item 4</li> * </ul> * </li> * <li data-sourcepos="3:1-3:8">Item 1</li> - * <li data-sourcepos="7:1-8:0">Item 5</li> - * <ul> + * <li data-sourcepos="7:1-7:8">Item 5</li> + * </ul> * </pre> * * This function returns: @@ -87,7 +83,7 @@ const getNewSourcePositions = (list) => { */ export const convertDescriptionWithNewSort = (description, list) => { const descriptionLines = description.split(NEWLINE); - const startIndexOfList = getDescriptionIndex(list.dataset.sourcepos); + const [startIndexOfList] = getSourceposRows(list.dataset.sourcepos); getNewSourcePositions(list) .map((lineIndex) => descriptionLines[lineIndex]) diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index 4e03bed8737..8ef071034e5 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -111,7 +111,7 @@ export default { return this.getNoteableData.current_user.can_create_note; }, canSetConfidential() { - return this.getNoteableData.current_user.can_update; + return this.getNoteableData.current_user.can_update && (this.isIssue || this.isEpic); }, issueActionButtonTitle() { const openOrClose = this.isOpen ? 'close' : 'reopen'; @@ -166,6 +166,9 @@ export default { isIssue() { return constants.NOTEABLE_TYPE_MAPPING[this.noteableType] === constants.ISSUE_NOTEABLE_TYPE; }, + isEpic() { + return constants.NOTEABLE_TYPE_MAPPING[this.noteableType] === constants.EPIC_NOTEABLE_TYPE; + }, trackingLabel() { return slugifyWithUnderscore(`${this.commentButtonTitle} button`); }, |