Commit b9c74295 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'fix-groups-search-dropdown' into 'master'

Fix group search in groups dropdown

See merge request gitlab-org/gitlab!20535
parents 69fb15b2 29d2261b
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
}); });
}, },
[types.RECEIVE_SEARCHED_ITEMS_SUCCESS](state, results) { [types.RECEIVE_SEARCHED_ITEMS_SUCCESS](state, results) {
const rawItems = results.data; const rawItems = results.data ? results.data : results; // Api.groups returns array, Api.projects returns object
Object.assign(state, { Object.assign(state, {
items: rawItems.map(rawItem => ({ items: rawItems.map(rawItem => ({
id: rawItem.id, id: rawItem.id,
......
---
title: Fix group search in groups dropdown
merge_request: 20535
author:
type: fixed
...@@ -68,7 +68,7 @@ export const mockFrequentGroups = [ ...@@ -68,7 +68,7 @@ export const mockFrequentGroups = [
}, },
]; ];
export const mockSearchedGroups = { data: [mockRawGroup] }; export const mockSearchedGroups = [mockRawGroup];
export const mockProcessedSearchedGroups = [mockGroup]; export const mockProcessedSearchedGroups = [mockGroup];
export const mockProject = { export const mockProject = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment