Remove modules Folder from Feature Flags Store

The modules folder ended up being useless for organization once the
stores were split up.

app/assets/javascripts/feature_flags/components/form.vue

@@ -28,7 +28,7 @@ import {
   NEW_VERSION_FLAG,
   LEGACY_FLAG,
 } from '../constants';
-import { createNewEnvironmentScope } from '../store/modules/helpers';
+import { createNewEnvironmentScope } from '../store/helpers';
 
 export default {
   components: {

app/assets/javascripts/feature_flags/components/new_feature_flag.vue

@@ -9,7 +9,7 @@ import {
   NEW_FLAG_ALERT,
   ROLLOUT_STRATEGY_ALL_USERS,
 } from '../constants';
-import { createNewEnvironmentScope } from '../store/modules/helpers';
+import { createNewEnvironmentScope } from '../store/helpers';
 
 import featureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 

app/assets/javascripts/feature_flags/edit.js

 import Vue from 'vue';
 import Vuex from 'vuex';
 import { parseBoolean } from '~/lib/utils/common_utils';
-import createStore from './store/modules/edit';
+import createStore from './store/edit';
 import EditFeatureFlag from './components/edit_feature_flag.vue';
 
 Vue.use(Vuex);

app/assets/javascripts/feature_flags/index.js

@@ -2,7 +2,7 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import csrf from '~/lib/utils/csrf';
 import FeatureFlagsComponent from './components/feature_flags.vue';
-import createStore from './store/modules/index';
+import createStore from './store/index';
 
 Vue.use(Vuex);
 

app/assets/javascripts/feature_flags/new.js

 import Vue from 'vue';
 import Vuex from 'vuex';
 import { parseBoolean } from '~/lib/utils/common_utils';
-import createStore from './store/modules/new';
+import createStore from './store/new';
 import NewFeatureFlag from './components/new_feature_flag.vue';
 
 Vue.use(Vuex);

app/assets/javascripts/feature_flags/store/modules/edit/actions.js → app/assets/javascripts/feature_flags/store/edit/actions.js

@@ -3,7 +3,7 @@ import axios from '~/lib/utils/axios_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import { __ } from '~/locale';
-import { NEW_VERSION_FLAG } from '../../../constants';
+import { NEW_VERSION_FLAG } from '../../constants';
 import { mapFromScopesViewModel, mapStrategiesToRails } from '../helpers';
 
 /**

app/assets/javascripts/feature_flags/store/modules/edit/mutations.js → app/assets/javascripts/feature_flags/store/edit/mutations.js

 import * as types from './mutation_types';
 import { mapToScopesViewModel, mapStrategiesToViewModel } from '../helpers';
-import { LEGACY_FLAG } from '../../../constants';
+import { LEGACY_FLAG } from '../../constants';
 
 export default {
   [types.REQUEST_FEATURE_FLAG](state) {

app/assets/javascripts/feature_flags/store/modules/edit/state.js → app/assets/javascripts/feature_flags/store/edit/state.js

-import { LEGACY_FLAG } from '../../../constants';
+import { LEGACY_FLAG } from '../../constants';
 
 export default ({ path, endpoint }) => ({
   endpoint,

app/assets/javascripts/feature_flags/store/modules/helpers.js → app/assets/javascripts/feature_flags/store/helpers.js

@@ -10,7 +10,7 @@ import {
   fetchPercentageParams,
   fetchUserIdParams,
   LEGACY_FLAG,
-} from '../../constants';
+} from '../constants';
 
 /**
  * Converts raw scope objects fetched from the API into an array of scope

app/assets/javascripts/feature_flags/store/modules/index/mutations.js → app/assets/javascripts/feature_flags/store/index/mutations.js

 import Vue from 'vue';
 import * as types from './mutation_types';
 import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
-import { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE } from '../../../constants';
+import { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE } from '../../constants';
 import { mapToScopesViewModel } from '../helpers';
 
 const mapFlag = flag => ({ ...flag, scopes: mapToScopesViewModel(flag.scopes || []) });

app/assets/javascripts/feature_flags/store/modules/index/state.js → app/assets/javascripts/feature_flags/store/index/state.js

-import { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE } from '../../../constants';
+import { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE } from '../../constants';
 
 export default ({ endpoint, projectId, unleashApiInstanceId, rotateInstanceIdPath }) => ({
   [FEATURE_FLAG_SCOPE]: [],

app/assets/javascripts/feature_flags/store/modules/new/actions.js → app/assets/javascripts/feature_flags/store/new/actions.js

 import * as types from './mutation_types';
 import axios from '~/lib/utils/axios_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
-import { NEW_VERSION_FLAG } from '../../../constants';
+import { NEW_VERSION_FLAG } from '../../constants';
 import { mapFromScopesViewModel, mapStrategiesToRails } from '../helpers';
 
 /**

spec/frontend/feature_flags/components/edit_feature_flag_spec.js

@@ -6,7 +6,7 @@ import { TEST_HOST } from 'spec/test_constants';
 import { mockTracking } from 'helpers/tracking_helper';
 import { LEGACY_FLAG, NEW_VERSION_FLAG, NEW_FLAG_ALERT } from '~/feature_flags/constants';
 import Form from '~/feature_flags/components/form.vue';
-import createStore from '~/feature_flags/store/modules/edit';
+import createStore from '~/feature_flags/store/edit';
 import EditFeatureFlag from '~/feature_flags/components/edit_feature_flag.vue';
 import axios from '~/lib/utils/axios_utils';
 

spec/frontend/feature_flags/components/feature_flags_spec.js

@@ -4,7 +4,7 @@ import MockAdapter from 'axios-mock-adapter';
 import { GlEmptyState, GlLoadingIcon } from '@gitlab/ui';
 import { TEST_HOST } from 'spec/test_constants';
 import Api from '~/api';
-import createStore from '~/feature_flags/store/modules/index';
+import createStore from '~/feature_flags/store/index';
 import FeatureFlagsTab from '~/feature_flags/components/feature_flags_tab.vue';
 import FeatureFlagsComponent from '~/feature_flags/components/feature_flags.vue';
 import FeatureFlagsTable from '~/feature_flags/components/feature_flags_table.vue';

spec/frontend/feature_flags/components/new_feature_flag_spec.js

@@ -4,7 +4,7 @@ import MockAdapter from 'axios-mock-adapter';
 import { GlAlert } from '@gitlab/ui';
 import { TEST_HOST } from 'spec/test_constants';
 import Form from '~/feature_flags/components/form.vue';
-import createStore from '~/feature_flags/store/modules/new';
+import createStore from '~/feature_flags/store/new';
 import NewFeatureFlag from '~/feature_flags/components/new_feature_flag.vue';
 import {
   ROLLOUT_STRATEGY_ALL_USERS,

spec/frontend/feature_flags/store/edit/actions_spec.js

@@ -11,18 +11,15 @@ import {
   receiveFeatureFlagSuccess,
   receiveFeatureFlagError,
   toggleActive,
-} from '~/feature_flags/store/modules/edit/actions';
-import state from '~/feature_flags/store/modules/edit/state';
-import {
-  mapStrategiesToRails,
-  mapFromScopesViewModel,
-} from '~/feature_flags/store/modules/helpers';
+} from '~/feature_flags/store/edit/actions';
+import state from '~/feature_flags/store/edit/state';
+import { mapStrategiesToRails, mapFromScopesViewModel } from '~/feature_flags/store/helpers';
 import {
   NEW_VERSION_FLAG,
   LEGACY_FLAG,
   ROLLOUT_STRATEGY_ALL_USERS,
 } from '~/feature_flags/constants';
-import * as types from '~/feature_flags/store/modules/edit/mutation_types';
+import * as types from '~/feature_flags/store/edit/mutation_types';
 import axios from '~/lib/utils/axios_utils';
 
 jest.mock('~/lib/utils/url_utility');

spec/frontend/feature_flags/store/edit/mutations_spec.js

-import state from '~/feature_flags/store/modules/edit/state';
-import mutations from '~/feature_flags/store/modules/edit/mutations';
-import * as types from '~/feature_flags/store/modules/edit/mutation_types';
+import state from '~/feature_flags/store/edit/state';
+import mutations from '~/feature_flags/store/edit/mutations';
+import * as types from '~/feature_flags/store/edit/mutation_types';
 
 describe('Feature flags Edit Module Mutations', () => {
   let stateCopy;

spec/frontend/feature_flags/store/helpers_spec.js

@@ -5,7 +5,7 @@ import {
   createNewEnvironmentScope,
   mapStrategiesToViewModel,
   mapStrategiesToRails,
-} from '~/feature_flags/store/modules/helpers';
+} from '~/feature_flags/store/helpers';
 import {
   ROLLOUT_STRATEGY_ALL_USERS,
   ROLLOUT_STRATEGY_PERCENT_ROLLOUT,

spec/frontend/feature_flags/store/index/actions_spec.js

@@ -23,10 +23,10 @@ import {
   deleteUserList,
   receiveDeleteUserListError,
   clearAlert,
-} from '~/feature_flags/store/modules/index/actions';
-import { mapToScopesViewModel } from '~/feature_flags/store/modules/helpers';
-import state from '~/feature_flags/store/modules/index/state';
-import * as types from '~/feature_flags/store/modules/index/mutation_types';
+} from '~/feature_flags/store/index/actions';
+import { mapToScopesViewModel } from '~/feature_flags/store/helpers';
+import state from '~/feature_flags/store/index/state';
+import * as types from '~/feature_flags/store/index/mutation_types';
 import axios from '~/lib/utils/axios_utils';
 import { getRequestData, rotateData, featureFlag, userList } from '../../mock_data';
 

spec/frontend/feature_flags/store/index/mutations_spec.js

-import state from '~/feature_flags/store/modules/index/state';
-import mutations from '~/feature_flags/store/modules/index/mutations';
-import * as types from '~/feature_flags/store/modules/index/mutation_types';
-import { mapToScopesViewModel } from '~/feature_flags/store/modules/helpers';
+import state from '~/feature_flags/store/index/state';
+import mutations from '~/feature_flags/store/index/mutations';
+import * as types from '~/feature_flags/store/index/mutation_types';
+import { mapToScopesViewModel } from '~/feature_flags/store/helpers';
 import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
 import { getRequestData, rotateData, featureFlag, userList } from '../../mock_data';
 

spec/frontend/feature_flags/store/new/actions_spec.js

@@ -6,19 +6,16 @@ import {
   requestCreateFeatureFlag,
   receiveCreateFeatureFlagSuccess,
   receiveCreateFeatureFlagError,
-} from '~/feature_flags/store/modules/new/actions';
-import state from '~/feature_flags/store/modules/new/state';
-import * as types from '~/feature_flags/store/modules/new/mutation_types';
+} from '~/feature_flags/store/new/actions';
+import state from '~/feature_flags/store/new/state';
+import * as types from '~/feature_flags/store/new/mutation_types';
 import {
   ROLLOUT_STRATEGY_ALL_USERS,
   ROLLOUT_STRATEGY_PERCENT_ROLLOUT,
   LEGACY_FLAG,
   NEW_VERSION_FLAG,
 } from '~/feature_flags/constants';
-import {
-  mapFromScopesViewModel,
-  mapStrategiesToRails,
-} from '~/feature_flags/store/modules/helpers';
+import { mapFromScopesViewModel, mapStrategiesToRails } from '~/feature_flags/store/helpers';
 import axios from '~/lib/utils/axios_utils';
 
 jest.mock('~/lib/utils/url_utility');

spec/frontend/feature_flags/store/new/mutations_spec.js

-import state from '~/feature_flags/store/modules/new/state';
-import mutations from '~/feature_flags/store/modules/new/mutations';
-import * as types from '~/feature_flags/store/modules/new/mutation_types';
+import state from '~/feature_flags/store/new/state';
+import mutations from '~/feature_flags/store/new/mutations';
+import * as types from '~/feature_flags/store/new/mutation_types';
 
 describe('Feature flags New Module Mutations', () => {
   let stateCopy;