diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-30 15:08:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-30 15:08:15 +0300 |
commit | bfa1adf9773ba7ea7cde546ea545b72721d36faa (patch) | |
tree | 79155d8617972eaccf3f97be90a511f5fddf1672 /app/assets/javascripts/ref | |
parent | e820415ceab5819ea8a29174543f9246b608b5fd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ref')
5 files changed, 16 insertions, 1 deletions
diff --git a/app/assets/javascripts/ref/components/ref_selector.vue b/app/assets/javascripts/ref/components/ref_selector.vue index 9826124912b..9a84726d42f 100644 --- a/app/assets/javascripts/ref/components/ref_selector.vue +++ b/app/assets/javascripts/ref/components/ref_selector.vue @@ -42,6 +42,11 @@ export default { required: false, default: '', }, + queryParams: { + type: Object, + required: false, + default: () => {}, + }, refType: { type: String, required: false, @@ -93,6 +98,7 @@ export default { matches: (state) => state.matches, lastQuery: (state) => state.query, selectedRef: (state) => state.selectedRef, + params: (state) => state.params, }), ...mapGetters(['isLoading', 'isQueryPossiblyASha']), i18n() { @@ -186,6 +192,7 @@ export default { this.debouncedSearch = debounce(this.search, SEARCH_DEBOUNCE_MS); this.setProjectId(this.projectId); + this.setParams(this.queryParams); this.$watch( 'enabledRefTypes', @@ -206,6 +213,7 @@ export default { ...mapActions([ 'setEnabledRefTypes', 'setUseSymbolicRefNames', + 'setParams', 'setProjectId', 'setSelectedRef', ]), diff --git a/app/assets/javascripts/ref/stores/actions.js b/app/assets/javascripts/ref/stores/actions.js index a6019f21e73..3d6b46abf52 100644 --- a/app/assets/javascripts/ref/stores/actions.js +++ b/app/assets/javascripts/ref/stores/actions.js @@ -5,6 +5,8 @@ import * as types from './mutation_types'; export const setEnabledRefTypes = ({ commit }, refTypes) => commit(types.SET_ENABLED_REF_TYPES, refTypes); +export const setParams = ({ commit }, params) => commit(types.SET_PARAMS, params); + export const setUseSymbolicRefNames = ({ commit }, useSymbolicRefNames) => commit(types.SET_USE_SYMBOLIC_REF_NAMES, useSymbolicRefNames); @@ -29,7 +31,7 @@ export const search = ({ state, dispatch, commit }, query) => { export const searchBranches = ({ commit, state }) => { commit(types.REQUEST_START); - Api.branches(state.projectId, state.query) + Api.branches(state.projectId, state.query, state.params) .then((response) => { commit(types.RECEIVE_BRANCHES_SUCCESS, response); }) diff --git a/app/assets/javascripts/ref/stores/mutation_types.js b/app/assets/javascripts/ref/stores/mutation_types.js index 4c602908cae..6178106fe00 100644 --- a/app/assets/javascripts/ref/stores/mutation_types.js +++ b/app/assets/javascripts/ref/stores/mutation_types.js @@ -1,5 +1,6 @@ export const SET_ENABLED_REF_TYPES = 'SET_ENABLED_REF_TYPES'; export const SET_USE_SYMBOLIC_REF_NAMES = 'SET_USE_SYMBOLIC_REF_NAMES'; +export const SET_PARAMS = 'SET_PARAMS'; export const SET_PROJECT_ID = 'SET_PROJECT_ID'; export const SET_SELECTED_REF = 'SET_SELECTED_REF'; diff --git a/app/assets/javascripts/ref/stores/mutations.js b/app/assets/javascripts/ref/stores/mutations.js index 9846ac0adb7..43c4318ad6c 100644 --- a/app/assets/javascripts/ref/stores/mutations.js +++ b/app/assets/javascripts/ref/stores/mutations.js @@ -10,6 +10,9 @@ export default { [types.SET_USE_SYMBOLIC_REF_NAMES](state, useSymbolicRefNames) { state.useSymbolicRefNames = useSymbolicRefNames; }, + [types.SET_PARAMS](state, params) { + state.params = params; + }, [types.SET_PROJECT_ID](state, projectId) { state.projectId = projectId; }, diff --git a/app/assets/javascripts/ref/stores/state.js b/app/assets/javascripts/ref/stores/state.js index 3affa8f8d03..1619b43c02e 100644 --- a/app/assets/javascripts/ref/stores/state.js +++ b/app/assets/javascripts/ref/stores/state.js @@ -15,5 +15,6 @@ export default () => ({ commits: createRefTypeState(), }, selectedRef: null, + params: null, requestCount: 0, }); |