diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/assets/javascripts/notes | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/notes')
4 files changed, 12 insertions, 6 deletions
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index 2ccb9a0b514..c6e7117cf2e 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -312,7 +312,7 @@ export default { if (this.isLoggedIn) { const noteableType = capitalizeFirstCharacter(convertToCamelCase(this.noteableType)); - this.autosave = new Autosave($(this.$refs.textarea), [ + this.autosave = new Autosave(this.$refs.textarea, [ this.$options.i18n.note, noteableType, this.getNoteableData.id, diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index 36f7d720e48..79b6139d4b1 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -1,6 +1,7 @@ <script> import { GlIcon, GlBadge, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui'; import { mapActions } from 'vuex'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { __, s__ } from '~/locale'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; @@ -74,6 +75,12 @@ export default { }; }, computed: { + authorId() { + return getIdFromGraphQLId(this.author.id); + }, + authorHref() { + return this.author.path || this.author.webUrl; + }, toggleChevronIconName() { return this.expanded ? 'chevron-up' : 'chevron-down'; }, @@ -145,9 +152,9 @@ export default { <template v-if="hasAuthor"> <a ref="authorNameLink" - :href="author.path" + :href="authorHref" :class="authorLinkClasses" - :data-user-id="author.id" + :data-user-id="authorId" :data-username="author.username" > <span class="note-header-author-name gl-font-weight-bold"> diff --git a/app/assets/javascripts/notes/mixins/autosave.js b/app/assets/javascripts/notes/mixins/autosave.js index 61cb4ab2a10..17272d5abef 100644 --- a/app/assets/javascripts/notes/mixins/autosave.js +++ b/app/assets/javascripts/notes/mixins/autosave.js @@ -1,4 +1,3 @@ -import $ from 'jquery'; import { s__ } from '~/locale'; import Autosave from '~/autosave'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; @@ -16,7 +15,7 @@ export default { keys = keys.concat(extraKeys); } - this.autosave = new Autosave($(this.$refs.noteForm.$refs.textarea), keys); + this.autosave = new Autosave(this.$refs.noteForm.$refs.textarea, keys); }, resetAutoSave() { this.autosave.reset(); diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js index d290a8ccb84..5cad091ce2c 100644 --- a/app/assets/javascripts/notes/stores/actions.js +++ b/app/assets/javascripts/notes/stores/actions.js @@ -101,7 +101,7 @@ export const fetchDiscussions = ( if ( getters.noteableType === constants.ISSUE_NOTEABLE_TYPE || - window.gon?.features?.paginatedMrDiscussions + getters.noteableType === constants.MERGE_REQUEST_NOTEABLE_TYPE ) { return dispatch('fetchDiscussionsBatch', { path, config, perPage: 20 }); } |