diff options
Diffstat (limited to 'app/assets/javascripts/packages/list/stores')
5 files changed, 10 insertions, 19 deletions
diff --git a/app/assets/javascripts/packages/list/stores/actions.js b/app/assets/javascripts/packages/list/stores/actions.js index bbc11e3cf13..195117b9ddb 100644 --- a/app/assets/javascripts/packages/list/stores/actions.js +++ b/app/assets/javascripts/packages/list/stores/actions.js @@ -1,8 +1,7 @@ import Api from '~/api'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { DELETE_PACKAGE_ERROR_MESSAGE } from '~/packages/shared/constants'; -import * as types from './mutation_types'; import { FETCH_PACKAGES_LIST_ERROR_MESSAGE, DELETE_PACKAGE_SUCCESS_MESSAGE, @@ -11,11 +10,11 @@ import { MISSING_DELETE_PATH_ERROR, } from '../constants'; import { getNewPaginationPage } from '../utils'; +import * as types from './mutation_types'; export const setInitialState = ({ commit }, data) => commit(types.SET_INITIAL_STATE, data); export const setLoading = ({ commit }, data) => commit(types.SET_MAIN_LOADING, data); export const setSorting = ({ commit }, data) => commit(types.SET_SORTING, data); -export const setSelectedType = ({ commit }, data) => commit(types.SET_SELECTED_TYPE, data); export const setFilter = ({ commit }, data) => commit(types.SET_FILTER, data); export const receivePackagesListSuccess = ({ commit }, { data, headers }) => { @@ -29,9 +28,9 @@ export const requestPackagesList = ({ dispatch, state }, params = {}) => { const { page = DEFAULT_PAGE, per_page = DEFAULT_PAGE_SIZE } = params; const { sort, orderBy } = state.sorting; - const type = state.selectedType?.type?.toLowerCase(); - const nameFilter = state.filterQuery?.toLowerCase(); - const packageFilters = { package_type: type, package_name: nameFilter }; + const type = state.filter.find((f) => f.type === 'type'); + const name = state.filter.find((f) => f.type === 'filtered-search-term'); + const packageFilters = { package_type: type?.value?.data, package_name: name?.value?.data }; const apiMethod = state.config.isGroupPage ? 'groupPackages' : 'projectPackages'; diff --git a/app/assets/javascripts/packages/list/stores/getters.js b/app/assets/javascripts/packages/list/stores/getters.js index 85c489deda0..482c111b58b 100644 --- a/app/assets/javascripts/packages/list/stores/getters.js +++ b/app/assets/javascripts/packages/list/stores/getters.js @@ -1,5 +1,5 @@ -import { LIST_KEY_PROJECT } from '../constants'; import { beautifyPath } from '../../shared/utils'; +import { LIST_KEY_PROJECT } from '../constants'; export default (state) => state.packages.map((p) => ({ ...p, projectPathName: beautifyPath(p[LIST_KEY_PROJECT]) })); diff --git a/app/assets/javascripts/packages/list/stores/mutation_types.js b/app/assets/javascripts/packages/list/stores/mutation_types.js index a5a584ccf1f..561ad97f7e3 100644 --- a/app/assets/javascripts/packages/list/stores/mutation_types.js +++ b/app/assets/javascripts/packages/list/stores/mutation_types.js @@ -4,5 +4,4 @@ export const SET_PACKAGE_LIST_SUCCESS = 'SET_PACKAGE_LIST_SUCCESS'; export const SET_PAGINATION = 'SET_PAGINATION'; export const SET_MAIN_LOADING = 'SET_MAIN_LOADING'; export const SET_SORTING = 'SET_SORTING'; -export const SET_SELECTED_TYPE = 'SET_SELECTED_TYPE'; export const SET_FILTER = 'SET_FILTER'; diff --git a/app/assets/javascripts/packages/list/stores/mutations.js b/app/assets/javascripts/packages/list/stores/mutations.js index 2fe7981b3d9..4ce13cfcb29 100644 --- a/app/assets/javascripts/packages/list/stores/mutations.js +++ b/app/assets/javascripts/packages/list/stores/mutations.js @@ -1,6 +1,6 @@ -import * as types from './mutation_types'; import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; import { GROUP_PAGE_TYPE } from '../constants'; +import * as types from './mutation_types'; export default { [types.SET_INITIAL_STATE](state, config) { @@ -28,11 +28,7 @@ export default { state.sorting = { ...state.sorting, ...sorting }; }, - [types.SET_SELECTED_TYPE](state, type) { - state.selectedType = type; - }, - - [types.SET_FILTER](state, query) { - state.filterQuery = query; + [types.SET_FILTER](state, filter) { + state.filter = filter; }, }; diff --git a/app/assets/javascripts/packages/list/stores/state.js b/app/assets/javascripts/packages/list/stores/state.js index 18ab2390b87..60f02eddc9f 100644 --- a/app/assets/javascripts/packages/list/stores/state.js +++ b/app/assets/javascripts/packages/list/stores/state.js @@ -1,5 +1,3 @@ -import { PACKAGE_REGISTRY_TABS } from '../constants'; - export default () => ({ /** * Determine if the component is loading data from the API @@ -49,9 +47,8 @@ export default () => ({ /** * The search query that is used to filter packages by name */ - filterQuery: '', + filter: [], /** * The selected TAB of the package types tabs */ - selectedType: PACKAGE_REGISTRY_TABS[0], }); |