diff options
Diffstat (limited to 'app/assets/javascripts/members/components')
6 files changed, 44 insertions, 3 deletions
diff --git a/app/assets/javascripts/members/components/action_buttons/access_request_action_buttons.vue b/app/assets/javascripts/members/components/action_buttons/access_request_action_buttons.vue index 35966be7363..d092283338c 100644 --- a/app/assets/javascripts/members/components/action_buttons/access_request_action_buttons.vue +++ b/app/assets/javascripts/members/components/action_buttons/access_request_action_buttons.vue @@ -53,6 +53,7 @@ export default { :title="s__('Member|Deny access')" :is-access-request="true" icon="close" + button-category="primary" /> </div> </action-button-group> diff --git a/app/assets/javascripts/members/components/action_buttons/invite_action_buttons.vue b/app/assets/javascripts/members/components/action_buttons/invite_action_buttons.vue index 91062c222f4..ab9abfd38c6 100644 --- a/app/assets/javascripts/members/components/action_buttons/invite_action_buttons.vue +++ b/app/assets/javascripts/members/components/action_buttons/invite_action_buttons.vue @@ -41,6 +41,8 @@ export default { <remove-member-button :member-id="member.id" :message="message" + icon="remove" + button-category="primary" :title="s__('Member|Revoke invite')" is-invite /> diff --git a/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue b/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue index 69137ce615b..01606d07554 100644 --- a/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue +++ b/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue @@ -30,7 +30,17 @@ export default { icon: { type: String, required: false, - default: 'remove', + default: undefined, + }, + buttonText: { + type: String, + required: false, + default: '', + }, + buttonCategory: { + type: String, + required: false, + default: 'secondary', }, isAccessRequest: { type: Boolean, @@ -79,10 +89,12 @@ export default { <gl-button v-gl-tooltip variant="danger" + :category="buttonCategory" :title="title" :aria-label="title" :icon="icon" data-qa-selector="delete_member_button" @click="showRemoveMemberModal(modalData)" - /> + ><template v-if="buttonText">{{ buttonText }}</template></gl-button + > </template> diff --git a/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue b/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue index 44d658c90a0..594da7f68cc 100644 --- a/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue +++ b/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue @@ -1,5 +1,5 @@ <script> -import { s__, sprintf } from '~/locale'; +import { __, s__, sprintf } from '~/locale'; import { parseUserDeletionObstacles } from '~/vue_shared/components/user_deletion_obstacles/utils'; import ActionButtonGroup from './action_button_group.vue'; import LeaveButton from './leave_button.vue'; @@ -23,6 +23,10 @@ export default { type: Boolean, required: true, }, + isInvitedUser: { + type: Boolean, + required: true, + }, permissions: { type: Object, required: true, @@ -56,6 +60,15 @@ export default { obstacles: parseUserDeletionObstacles(this.member.user), }; }, + removeMemberButtonText() { + return this.isInvitedUser ? null : __('Remove user'); + }, + removeMemberButtonIcon() { + return this.isInvitedUser ? 'remove' : ''; + }, + removeMemberButtonCategory() { + return this.isInvitedUser ? 'primary' : 'secondary'; + }, }, }; </script> @@ -70,6 +83,9 @@ export default { :member-type="member.type" :user-deletion-obstacles="userDeletionObstaclesUserData" :message="message" + :icon="removeMemberButtonIcon" + :button-text="removeMemberButtonText" + :button-category="removeMemberButtonCategory" :title="s__('Member|Remove member')" /> </div> diff --git a/app/assets/javascripts/members/components/table/member_action_buttons.vue b/app/assets/javascripts/members/components/table/member_action_buttons.vue index 6f15f079d2d..971b1a8435e 100644 --- a/app/assets/javascripts/members/components/table/member_action_buttons.vue +++ b/app/assets/javascripts/members/components/table/member_action_buttons.vue @@ -30,6 +30,10 @@ export default { type: Boolean, required: true, }, + isInvitedUser: { + type: Boolean, + required: true, + }, }, computed: { actionButtonComponent() { @@ -53,5 +57,6 @@ export default { :member="member" :permissions="permissions" :is-current-user="isCurrentUser" + :is-invited-user="isInvitedUser" /> </template> diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue index 202f3aa89e1..de733ae75df 100644 --- a/app/assets/javascripts/members/components/table/members_table.vue +++ b/app/assets/javascripts/members/components/table/members_table.vue @@ -8,6 +8,7 @@ import initUserPopovers from '~/user_popovers'; import { FIELDS, ACTIVE_TAB_QUERY_PARAM_NAME, + TAB_QUERY_PARAM_VALUES, MEMBER_STATE_AWAITING, USER_STATE_BLOCKED_PENDING_APPROVAL, BADGE_LABELS_PENDING_OWNER_APPROVAL, @@ -82,6 +83,9 @@ export default { return paramName && currentPage && perPage && totalItems; }, + isInvitedUser() { + return this.tabQueryParamValue === TAB_QUERY_PARAM_VALUES.invite; + }, }, mounted() { initUserPopovers(this.$el.querySelectorAll('.js-user-link')); @@ -275,6 +279,7 @@ export default { <member-action-buttons :member-type="memberType" :is-current-user="isCurrentUser" + :is-invited-user="isInvitedUser" :permissions="permissions" :member="member" /> |