Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 21 deletions

diff --git a/app/assets/javascripts/frequent_items/constants.js b/app/assets/javascripts/frequent_items/constants.js
index 5af107d9083..9e1dcf70aa5 100644
--- a/app/assets/javascripts/frequent_items/constants.js
+++ b/app/assets/javascripts/frequent_items/constants.js
@@ -37,15 +37,16 @@ export const TRANSLATION_KEYS = {
   },
 };
 
-export const FREQUENT_ITEMS_DROPDOWNS = [
-  {
-    namespace: 'projects',
-    key: 'project',
-    vuexModule: 'frequentProjects',
-  },
-  {
-    namespace: 'groups',
-    key: 'group',
-    vuexModule: 'frequentGroups',
-  },
-];
+export const FREQUENT_ITEMS_PROJECTS = {
+  namespace: 'projects',
+  key: 'project',
+  vuexModule: 'frequentProjects',
+};
+
+export const FREQUENT_ITEMS_GROUPS = {
+  namespace: 'groups',
+  key: 'group',
+  vuexModule: 'frequentGroups',
+};
+
+export const FREQUENT_ITEMS_DROPDOWNS = [FREQUENT_ITEMS_PROJECTS, FREQUENT_ITEMS_GROUPS];
diff --git a/app/assets/javascripts/frequent_items/store/index.js b/app/assets/javascripts/frequent_items/store/index.js
index 47fad112297..1faacff84e5 100644
--- a/app/assets/javascripts/frequent_items/store/index.js
+++ b/app/assets/javascripts/frequent_items/store/index.js
@@ -13,14 +13,16 @@ export const createFrequentItemsModule = (initState = {}) => ({
   state: state(initState),
 });
 
+export const createStoreOptions = () => ({
+  modules: FREQUENT_ITEMS_DROPDOWNS.reduce(
+    (acc, { namespace, vuexModule }) =>
+      Object.assign(acc, {
+        [vuexModule]: createFrequentItemsModule({ dropdownType: namespace }),
+      }),
+    {},
+  ),
+});
+
 export const createStore = () => {
-  return new Vuex.Store({
-    modules: FREQUENT_ITEMS_DROPDOWNS.reduce(
-      (acc, { namespace, vuexModule }) =>
-        Object.assign(acc, {
-          [vuexModule]: createFrequentItemsModule({ dropdownType: namespace }),
-        }),
-      {},
-    ),
-  });
+  return new Vuex.Store(createStoreOptions());
 };