diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-22 18:07:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-22 18:07:25 +0300 |
commit | e01b61d83fd7c5d3aa9d87a65eac85e8c7ea9921 (patch) | |
tree | 90e1a1f3ebbeab0f2f8714f42211800a213a1002 /app/assets/javascripts/members | |
parent | 4220cf46a314ac1c4d88be13608752bc07bb28fb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/members')
-rw-r--r-- | app/assets/javascripts/members/components/table/members_table.vue | 10 | ||||
-rw-r--r-- | app/assets/javascripts/members/constants.js | 18 |
2 files changed, 28 insertions, 0 deletions
diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue index b4ba9aa36e7..0b97ce7e33e 100644 --- a/app/assets/javascripts/members/components/table/members_table.vue +++ b/app/assets/javascripts/members/components/table/members_table.vue @@ -5,6 +5,7 @@ import MembersTableCell from 'ee_else_ce/members/components/table/members_table_ import { canOverride, canRemove, canResend, canUpdate } from 'ee_else_ce/members/utils'; import { mergeUrlParams } from '~/lib/utils/url_utility'; import initUserPopovers from '~/user_popovers'; +import UserDate from '~/vue_shared/components/user_date.vue'; import { FIELD_KEY_ACTIONS, FIELDS, @@ -40,6 +41,7 @@ export default { RemoveGroupLinkModal, RemoveMemberModal, ExpirationDatepicker, + UserDate, LdapOverrideConfirmationModal: () => import('ee_component/members/components/ldap/ldap_override_confirmation_modal.vue'), }, @@ -287,6 +289,14 @@ export default { </members-table-cell> </template> + <template #cell(userCreatedAt)="{ item: member }"> + <user-date :date="member.user.createdAt" /> + </template> + + <template #cell(lastActivityOn)="{ item: member }"> + <user-date :date="member.user.lastActivityOn" /> + </template> + <template #cell(actions)="{ item: member }"> <members-table-cell #default="{ memberType, isCurrentUser, permissions }" :member="member"> <member-action-buttons diff --git a/app/assets/javascripts/members/constants.js b/app/assets/javascripts/members/constants.js index 49ce00a1689..c66a19c4765 100644 --- a/app/assets/javascripts/members/constants.js +++ b/app/assets/javascripts/members/constants.js @@ -9,6 +9,8 @@ export const FIELD_KEY_GRANTED = 'granted'; export const FIELD_KEY_INVITED = 'invited'; export const FIELD_KEY_REQUESTED = 'requested'; export const FIELD_KEY_MAX_ROLE = 'maxRole'; +export const FIELD_KEY_USER_CREATED_AT = 'userCreatedAt'; +export const FIELD_KEY_LAST_ACTIVITY_ON = 'lastActivityOn'; export const FIELD_KEY_EXPIRATION = 'expiration'; export const FIELD_KEY_LAST_SIGN_IN = 'lastSignIn'; export const FIELD_KEY_ACTIONS = 'actions'; @@ -67,6 +69,22 @@ export const FIELDS = [ tdClass: 'col-expiration', }, { + key: FIELD_KEY_USER_CREATED_AT, + label: __('Created on'), + sort: { + asc: 'oldest_created_user', + desc: 'recent_created_user', + }, + }, + { + key: FIELD_KEY_LAST_ACTIVITY_ON, + label: __('Last activity'), + sort: { + asc: 'oldest_last_activity', + desc: 'recent_last_activity', + }, + }, + { key: FIELD_KEY_LAST_SIGN_IN, label: __('Last sign-in'), sort: { |