summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/members/components/table
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/members/components/table')
-rw-r--r--app/assets/javascripts/members/components/table/member_actions.vue (renamed from app/assets/javascripts/members/components/table/member_action_buttons.vue)2
-rw-r--r--app/assets/javascripts/members/components/table/members_table.vue13
-rw-r--r--app/assets/javascripts/members/components/table/role_dropdown.vue3
3 files changed, 11 insertions, 7 deletions
diff --git a/app/assets/javascripts/members/components/table/member_action_buttons.vue b/app/assets/javascripts/members/components/table/member_actions.vue
index 6ec7be608ba..61a6f37687a 100644
--- a/app/assets/javascripts/members/components/table/member_action_buttons.vue
+++ b/app/assets/javascripts/members/components/table/member_actions.vue
@@ -6,7 +6,7 @@ import InviteActionButtons from '../action_buttons/invite_action_buttons.vue';
import UserActionDropdown from '../action_dropdowns/user_action_dropdown.vue';
export default {
- name: 'MemberActionButtons',
+ name: 'MemberActions',
components: {
UserActionDropdown,
GroupActionButtons,
diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue
index 8f03a298e63..c973d58fcd2 100644
--- a/app/assets/javascripts/members/components/table/members_table.vue
+++ b/app/assets/javascripts/members/components/table/members_table.vue
@@ -26,7 +26,7 @@ import RemoveGroupLinkModal from '../modals/remove_group_link_modal.vue';
import RemoveMemberModal from '../modals/remove_member_modal.vue';
import CreatedAt from './created_at.vue';
import ExpirationDatepicker from './expiration_datepicker.vue';
-import MemberActionButtons from './member_action_buttons.vue';
+import MemberActions from './member_actions.vue';
import MemberAvatar from './member_avatar.vue';
import MemberSource from './member_source.vue';
import MemberActivity from './member_activity.vue';
@@ -42,7 +42,7 @@ export default {
CreatedAt,
MembersTableCell,
MemberSource,
- MemberActionButtons,
+ MemberActions,
RoleDropdown,
RemoveGroupLinkModal,
RemoveMemberModal,
@@ -51,7 +51,7 @@ export default {
DisableTwoFactorModal: () =>
import('ee_component/members/components/modals/disable_two_factor_modal.vue'),
LdapOverrideConfirmationModal: () =>
- import('ee_component/members/components/ldap/ldap_override_confirmation_modal.vue'),
+ import('ee_component/members/components/modals/ldap_override_confirmation_modal.vue'),
},
inject: ['namespace', 'currentUserId', 'canManageMembers'],
props: {
@@ -135,7 +135,10 @@ export default {
tbodyTrAttr(member) {
return {
...this.tableAttrs.tr,
- ...(member?.id && { 'data-testid': `members-table-row-${member.id}` }),
+ ...(member?.id && {
+ 'data-testid': `members-table-row-${member.id}`,
+ 'data-qa-selector': 'member_row',
+ }),
};
},
paginationLinkGenerator(page) {
@@ -299,7 +302,7 @@ export default {
<template #cell(actions)="{ item: member }">
<members-table-cell #default="{ memberType, isCurrentUser, permissions }" :member="member">
- <member-action-buttons
+ <member-actions
:member-type="memberType"
:is-current-user="isCurrentUser"
:permissions="permissions"
diff --git a/app/assets/javascripts/members/components/table/role_dropdown.vue b/app/assets/javascripts/members/components/table/role_dropdown.vue
index 70808587d56..e066b023fbb 100644
--- a/app/assets/javascripts/members/components/table/role_dropdown.vue
+++ b/app/assets/javascripts/members/components/table/role_dropdown.vue
@@ -11,7 +11,8 @@ export default {
components: {
GlDropdown,
GlDropdownItem,
- LdapDropdownItem: () => import('ee_component/members/components/ldap/ldap_dropdown_item.vue'),
+ LdapDropdownItem: () =>
+ import('ee_component/members/components/action_dropdowns/ldap_dropdown_item.vue'),
},
inject: ['namespace', 'group'],
props: {