diff options
Diffstat (limited to 'app/assets/javascripts/ref')
4 files changed, 27 insertions, 2 deletions
diff --git a/app/assets/javascripts/ref/components/ref_results_section.vue b/app/assets/javascripts/ref/components/ref_results_section.vue index 4fa2a92ff03..52d1ed96b21 100644 --- a/app/assets/javascripts/ref/components/ref_results_section.vue +++ b/app/assets/javascripts/ref/components/ref_results_section.vue @@ -74,6 +74,11 @@ export default { required: false, default: '', }, + shouldShowCheck: { + type: Boolean, + required: false, + default: true, + }, }, computed: { totalCountText() { @@ -82,6 +87,9 @@ export default { }, methods: { showCheck(item) { + if (!this.shouldShowCheck) { + return false; + } return item.name === this.selectedRef || item.value === this.selectedRef; }, }, diff --git a/app/assets/javascripts/ref/components/ref_selector.vue b/app/assets/javascripts/ref/components/ref_selector.vue index b75958e2ced..10967fb84ed 100644 --- a/app/assets/javascripts/ref/components/ref_selector.vue +++ b/app/assets/javascripts/ref/components/ref_selector.vue @@ -15,6 +15,8 @@ import { REF_TYPE_BRANCHES, REF_TYPE_TAGS, REF_TYPE_COMMITS, + BRANCH_REF_TYPE, + TAG_REF_TYPE, } from '../constants'; import createStore from '../stores'; import RefResultsSection from './ref_results_section.vue'; @@ -50,6 +52,11 @@ export default { required: false, default: '', }, + refType: { + type: String, + required: false, + default: null, + }, projectId: { type: String, required: true, @@ -146,6 +153,12 @@ export default { buttonText() { return this.selectedRefForDisplay || this.i18n.noRefSelected; }, + isTagRefType() { + return this.refType === TAG_REF_TYPE; + }, + isBranchRefType() { + return this.refType === BRANCH_REF_TYPE; + }, }, watch: { // Keep the Vuex store synchronized if the parent @@ -273,6 +286,7 @@ export default { :show-header="showSectionHeaders" data-testid="branches-section" data-qa-selector="branches_section" + :should-show-check="!useSymbolicRefNames || isBranchRefType" @selected="selectRef($event)" /> @@ -289,6 +303,7 @@ export default { :error-message="i18n.tagsErrorMessage" :show-header="showSectionHeaders" data-testid="tags-section" + :should-show-check="!useSymbolicRefNames || isTagRefType" @selected="selectRef($event)" /> diff --git a/app/assets/javascripts/ref/constants.js b/app/assets/javascripts/ref/constants.js index 397e3ed2ac8..f4faa535166 100644 --- a/app/assets/javascripts/ref/constants.js +++ b/app/assets/javascripts/ref/constants.js @@ -5,6 +5,8 @@ export const REF_TYPE_BRANCHES = 'REF_TYPE_BRANCHES'; export const REF_TYPE_TAGS = 'REF_TYPE_TAGS'; export const REF_TYPE_COMMITS = 'REF_TYPE_COMMITS'; export const ALL_REF_TYPES = Object.freeze([REF_TYPE_BRANCHES, REF_TYPE_TAGS, REF_TYPE_COMMITS]); +export const BRANCH_REF_TYPE = 'heads'; +export const TAG_REF_TYPE = 'tags'; export const X_TOTAL_HEADER = 'x-total'; diff --git a/app/assets/javascripts/ref/stores/mutations.js b/app/assets/javascripts/ref/stores/mutations.js index e078d3333d4..9846ac0adb7 100644 --- a/app/assets/javascripts/ref/stores/mutations.js +++ b/app/assets/javascripts/ref/stores/mutations.js @@ -1,5 +1,5 @@ import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import httpStatusCodes from '~/lib/utils/http_status'; +import { HTTP_STATUS_NOT_FOUND } from '~/lib/utils/http_status'; import { X_TOTAL_HEADER } from '../constants'; import * as types from './mutation_types'; @@ -86,7 +86,7 @@ export default { // 404's are expected when the search query doesn't match any commits // and shouldn't be treated as an actual error - error: error.response?.status !== httpStatusCodes.NOT_FOUND ? error : null, + error: error.response?.status !== HTTP_STATUS_NOT_FOUND ? error : null, }; }, [types.RESET_COMMIT_MATCHES](state) { |