diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js index 2a9f1dfc1c9930c72b0a7d3f1db552c1801859f0..00c2ee0863dc232e6462d6700856d5b842623bb5 100644 --- a/app/assets/javascripts/issues/list/constants.js +++ b/app/assets/javascripts/issues/list/constants.js @@ -15,6 +15,7 @@ import { TOKEN_TYPE_AUTHOR, TOKEN_TYPE_CONFIDENTIAL, TOKEN_TYPE_CONTACT, + TOKEN_TYPE_DRAFT, TOKEN_TYPE_EPIC, TOKEN_TYPE_HEALTH, TOKEN_TYPE_ITERATION, @@ -347,6 +348,16 @@ export const filtersMap = { }, }, }, + [TOKEN_TYPE_DRAFT]: { + [API_PARAM]: { + [NORMAL_FILTER]: 'draft', + }, + [URL_PARAM]: { + [OPERATOR_IS]: { + [NORMAL_FILTER]: 'draft', + }, + }, + }, [TOKEN_TYPE_ITERATION]: { [API_PARAM]: { [NORMAL_FILTER]: 'iterationId', diff --git a/app/assets/javascripts/issues/list/utils.js b/app/assets/javascripts/issues/list/utils.js index bdb31123686d6ca00d68e56636a842cad914b1ce..9629bef0eff29f6700781b7bfd31bbd6498da45c 100644 --- a/app/assets/javascripts/issues/list/utils.js +++ b/app/assets/javascripts/issues/list/utils.js @@ -10,6 +10,7 @@ import { OPERATORS_TO_GROUP, TOKEN_TYPE_ASSIGNEE, TOKEN_TYPE_AUTHOR, + TOKEN_TYPE_DRAFT, TOKEN_TYPE_CONFIDENTIAL, TOKEN_TYPE_ITERATION, TOKEN_TYPE_MILESTONE, @@ -321,9 +322,10 @@ const formatData = (token) => { if (requiresUpperCaseValue(token.type, token.value.data)) { return token.value.data.toUpperCase(); } - if (token.type === TOKEN_TYPE_CONFIDENTIAL) { + if ([TOKEN_TYPE_CONFIDENTIAL, TOKEN_TYPE_DRAFT].includes(token.type)) { return token.value.data === 'yes'; } + return token.value.data; }; 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 5d9136718719d422e56911fa63155e4e0020056e..ec55f2cf32ae743ee7826f2a885d48153396473c 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 @@ -1,4 +1,5 @@