diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index fe47c2046a8..b913a588b7d 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -606e33fd67ccb40becec0638fff387caf6dfc035 +7acf563cecc93e6c26c0c77151993e6ff0c17318 diff --git a/app/assets/javascripts/members/components/members_tabs.vue b/app/assets/javascripts/members/components/members_tabs.vue index 431f027936c..166b3f970f6 100644 --- a/app/assets/javascripts/members/components/members_tabs.vue +++ b/app/assets/javascripts/members/components/members_tabs.vue @@ -95,7 +95,12 @@ export default { {{ tab.title }} {{ getTabCount(tab) }} - + +import { GlPagination } from '@gitlab/ui'; +import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { ACTIVE_TAB_QUERY_PARAM_NAME } from '~/members/constants'; + +export default { + name: 'MembersPagination', + components: { GlPagination }, + props: { + pagination: { + type: Object, + required: true, + }, + tabQueryParamValue: { + type: String, + required: true, + }, + }, + computed: { + isPaginationShown() { + const { paramName, currentPage, perPage, totalItems } = this.pagination; + return paramName && currentPage && perPage && totalItems; + }, + }, + methods: { + paginationLinkGenerator(page) { + const { params = {}, paramName } = this.pagination; + + return mergeUrlParams( + { + ...params, + [ACTIVE_TAB_QUERY_PARAM_NAME]: + this.tabQueryParamValue !== '' ? this.tabQueryParamValue : null, + [paramName]: page, + }, + window.location.href, + ); + }, + }, +}; + + diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue index 1bf7181af6f..8496a4d9e2c 100644 --- a/app/assets/javascripts/members/components/table/members_table.vue +++ b/app/assets/javascripts/members/components/table/members_table.vue @@ -1,5 +1,5 @@