diff --git a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue index 93c9cebc912ebdde8b020c3dddc084cda0bb42bc..320980c851fc153157816d301ef1b05216044cd2 100644 --- a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue +++ b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue @@ -475,6 +475,9 @@ export default { resourceDropdownQueryVariables() { return { fullPath: this.fullPath }; }, + currentTabCount() { + return this.tabCounts[this.state] || 0; + }, }, watch: { $route(newValue, oldValue) { @@ -785,7 +788,7 @@ export default { with-local-storage /> - + diff --git a/app/assets/javascripts/merge_requests/list/components/more_actions_dropdown.vue b/app/assets/javascripts/merge_requests/list/components/more_actions_dropdown.vue index 29fa03ef89dd772447b2b74434bbe7487a18a2d3..daee5c47ff7cc91922fd9440ea6ae85a6d96a2e6 100644 --- a/app/assets/javascripts/merge_requests/list/components/more_actions_dropdown.vue +++ b/app/assets/javascripts/merge_requests/list/components/more_actions_dropdown.vue @@ -25,10 +25,17 @@ export default { provide: { showExportButton: true, }, - inject: ['isSignedIn', 'issuableType', 'issuableCount', 'email', 'exportCsvPath', 'rssUrl'], + inject: ['isSignedIn', 'issuableType', 'email', 'exportCsvPath', 'rssUrl'], + props: { + count: { + type: Number, + required: true, + }, + }, data() { return { isDropdownVisible: false, + exportCsvPathWithQuery: this.getExportCsvPathWithQuery(), }; }, computed: { @@ -42,6 +49,11 @@ export default { }; }, }, + watch: { + $route() { + this.exportCsvPathWithQuery = this.getExportCsvPathWithQuery(); + }, + }, methods: { showDropdown() { this.isDropdownVisible = true; @@ -49,6 +61,9 @@ export default { hideDropdown() { this.isDropdownVisible = false; }, + getExportCsvPathWithQuery() { + return `${this.exportCsvPath}${window.location.search}`; + }, }, i18n: { toggleText: __('Actions'), @@ -89,10 +104,9 @@ export default {