diff options
Diffstat (limited to 'app/assets/javascripts/sidebar/components/assignees')
5 files changed, 14 insertions, 5 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue index ef40de82d01..c20dd3b677d 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue @@ -1,6 +1,7 @@ <script> import { GlTooltipDirective, GlLink } from '@gitlab/ui'; import { IssuableType } from '~/issues/constants'; +import { isGid, getIdFromGraphQLId } from '~/graphql_shared/utils'; import { __ } from '~/locale'; import { isUserBusy } from '~/set_status_modal/utils'; import AssigneeAvatar from './assignee_avatar.vue'; @@ -94,6 +95,9 @@ export default { assigneeUrl() { return this.user.web_url || this.user.webUrl; }, + assigneeId() { + return isGid(this.user.id) ? getIdFromGraphQLId(this.user.id) : this.user.id; + }, }, }; </script> @@ -103,7 +107,7 @@ export default { <gl-link :href="assigneeUrl" :title="tooltipTitle" - :data-user-id="user.id" + :data-user-id="assigneeId" data-placement="left" class="gl-display-inline-block js-user-link" > diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees.vue b/app/assets/javascripts/sidebar/components/assignees/assignees.vue index bdd014163a0..3602b5ec4f6 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignees.vue @@ -55,7 +55,12 @@ export default { {{ __('None') }} <template v-if="editable"> - - <button type="button" class="btn-link" data-testid="assign-yourself" @click="assignSelf"> + <button + type="button" + class="gl-button btn-link gl-reset-color!" + data-testid="assign-yourself" + @click="assignSelf" + > {{ __('assign yourself') }} </button> </template> diff --git a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee.vue b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee.vue index af4227fa48d..46bda26c327 100644 --- a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee.vue +++ b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee.vue @@ -26,7 +26,7 @@ export default { }; </script> <template> - <button type="button" class="btn-link"> + <button type="button" class="gl-button btn-link"> <assignee-avatar :user="user" :img-size="24" :issuable-type="issuableType" /> <user-name-with-status :name="user.name" diff --git a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue index 50b1955abcc..f894ef0c42d 100644 --- a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue +++ b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue @@ -123,7 +123,7 @@ export default { :user="user" :issuable-type="issuableType" /> - <button v-if="hasMoreThanTwoAssignees" class="btn-link" type="button"> + <button v-if="hasMoreThanTwoAssignees" class="btn-link gl-button" type="button"> <span class="avatar-counter sidebar-avatar-counter gl-display-flex gl-align-items-center gl-pl-3" > diff --git a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue index 01d29da5486..b6260418837 100644 --- a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue +++ b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue @@ -120,7 +120,7 @@ export default { <div v-if="renderShowMoreSection" class="user-list-more gl-hover-text-blue-800"> <button type="button" - class="btn-link" + class="btn-link gl-button gl-reset-color!" data-qa-selector="more_assignees_link" @click="toggleShowLess" > |