diff options
Diffstat (limited to 'app/assets/javascripts/vue_shared/mixins')
-rw-r--r-- | app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js | 14 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js b/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js index c93b3d37a63..a740a3fa6b9 100644 --- a/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js +++ b/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js @@ -5,6 +5,7 @@ * Components need to have `scope`, `page` and `requestData` */ import { historyPushState, buildUrlWithCurrentLocation } from '../../lib/utils/common_utils'; +import { validateParams } from '~/pipelines/utils'; export default { methods: { @@ -35,18 +36,7 @@ export default { }, onChangeWithFilter(params) { - const { username, ref } = this.requestData; - const paramsData = params; - - if (username) { - paramsData.username = username; - } - - if (ref) { - paramsData.ref = ref; - } - - return paramsData; + return { ...params, ...validateParams(this.requestData) }; }, updateInternalState(parameters) { diff --git a/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js b/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js index 4fad34d22d8..c628a67f7f5 100644 --- a/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js +++ b/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js @@ -144,7 +144,9 @@ const mixins = { return 'merge-request-status closed issue-token-state-icon-closed'; } - return this.isOpen ? 'issue-token-state-icon-open' : 'issue-token-state-icon-closed'; + return this.isOpen + ? 'issue-token-state-icon-open gl-text-green-500' + : 'issue-token-state-icon-closed gl-text-blue-500'; }, computedLinkElementType() { return this.path.length > 0 ? 'a' : 'span'; |