Merge branch 'afontaine/remove-legacy-flags-frontend-new' into 'master'

Remove Frontend to Create Legacy Flags

See merge request gitlab-org/gitlab!64004

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

 <script>
 import { GlAlert } from '@gitlab/ui';
 import { mapState, mapActions } from 'vuex';
-import axios from '~/lib/utils/axios_utils';
 import featureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import { NEW_VERSION_FLAG, ROLLOUT_STRATEGY_ALL_USERS } from '../constants';
-import { createNewEnvironmentScope } from '../store/helpers';
+import { ROLLOUT_STRATEGY_ALL_USERS } from '../constants';
 import FeatureFlagForm from './form.vue';
 
 export default {
@@ -13,48 +11,14 @@ export default {
     GlAlert,
   },
   mixins: [featureFlagsMixin()],
-  inject: {
-    showUserCallout: {},
-    userCalloutId: {
-      default: '',
-    },
-    userCalloutsPath: {
-      default: '',
-    },
-  },
-  data() {
-    return {
-      userShouldSeeNewFlagAlert: this.showUserCallout,
-    };
-  },
   computed: {
     ...mapState(['error', 'path']),
-    scopes() {
-      return [
-        createNewEnvironmentScope(
-          {
-            environmentScope: '*',
-            active: true,
-          },
-          this.glFeatures.featureFlagsPermissions,
-        ),
-      ];
-    },
-    version() {
-      return NEW_VERSION_FLAG;
-    },
     strategies() {
       return [{ name: ROLLOUT_STRATEGY_ALL_USERS, parameters: {}, scopes: [] }];
     },
   },
   methods: {
     ...mapActions(['createFeatureFlag']),
-    dismissNewVersionFlagAlert() {
-      this.userShouldSeeNewFlagAlert = false;
-      axios.post(this.userCalloutsPath, {
-        feature_name: this.userCalloutId,
-      });
-    },
   },
 };
 </script>
@@ -69,9 +33,7 @@ export default {
     <feature-flag-form
       :cancel-path="path"
       :submit-text="s__('FeatureFlags|Create feature flag')"
-      :scopes="scopes"
       :strategies="strategies"
-      :version="version"
       @handleSubmit="(data) => createFeatureFlag(data)"
     />
   </div>

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

 import axios from '~/lib/utils/axios_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
-import { NEW_VERSION_FLAG } from '../../constants';
-import { mapFromScopesViewModel, mapStrategiesToRails } from '../helpers';
+import { mapStrategiesToRails } from '../helpers';
 import * as types from './mutation_types';
 
 /**
@@ -17,12 +16,7 @@ export const createFeatureFlag = ({ state, dispatch }, params) => {
   dispatch('requestCreateFeatureFlag');
 
   return axios
-    .post(
-      state.endpoint,
-      params.version === NEW_VERSION_FLAG
-        ? mapStrategiesToRails(params)
-        : mapFromScopesViewModel(params),
-    )
+    .post(state.endpoint, mapStrategiesToRails(params))
     .then(() => {
       dispatch('receiveCreateFeatureFlagSuccess');
       visitUrl(state.path);

spec/frontend/feature_flags/components/new_feature_flag_spec.js

@@ -4,7 +4,6 @@ import Vuex from 'vuex';
 import { TEST_HOST } from 'spec/test_constants';
 import Form from '~/feature_flags/components/form.vue';
 import NewFeatureFlag from '~/feature_flags/components/new_feature_flag.vue';
-import { ROLLOUT_STRATEGY_ALL_USERS, DEFAULT_PERCENT_ROLLOUT } from '~/feature_flags/constants';
 import createStore from '~/feature_flags/store/new';
 import { allUsersStrategy } from '../mock_data';
 
@@ -71,18 +70,6 @@ describe('New feature flag form', () => {
     expect(wrapper.find(Form).exists()).toEqual(true);
   });
 
-  it('should render default * row', () => {
-    const defaultScope = {
-      id: expect.any(String),
-      environmentScope: '*',
-      active: true,
-      rolloutStrategy: ROLLOUT_STRATEGY_ALL_USERS,
-      rolloutPercentage: DEFAULT_PERCENT_ROLLOUT,
-      rolloutUserIds: '',
-    };
-    expect(wrapper.vm.scopes).toEqual([defaultScope]);
-  });
-
   it('has an all users strategy by default', () => {
     const strategies = wrapper.find(Form).props('strategies');
 

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

 import MockAdapter from 'axios-mock-adapter';
 import testAction from 'helpers/vuex_action_helper';
-import { TEST_HOST } from 'spec/test_constants';
-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/helpers';
+import { ROLLOUT_STRATEGY_ALL_USERS, NEW_VERSION_FLAG } from '~/feature_flags/constants';
+import { mapStrategiesToRails } from '~/feature_flags/store/helpers';
+
 import {
   createFeatureFlag,
   requestCreateFeatureFlag,
@@ -24,33 +19,13 @@ describe('Feature flags New Module Actions', () => {
   let mockedState;
 
   beforeEach(() => {
-    mockedState = state({ endpoint: 'feature_flags.json', path: '/feature_flags' });
+    mockedState = state({ endpoint: '/feature_flags.json', path: '/feature_flags' });
   });
 
   describe('createFeatureFlag', () => {
     let mock;
 
-    const actionParams = {
-      name: 'name',
-      description: 'description',
-      active: true,
-      version: LEGACY_FLAG,
-      scopes: [
-        {
-          id: 1,
-          environmentScope: 'environmentScope',
-          active: true,
-          canUpdate: true,
-          protected: true,
-          shouldBeDestroyed: false,
-          rolloutStrategy: ROLLOUT_STRATEGY_ALL_USERS,
-          rolloutPercentage: ROLLOUT_STRATEGY_PERCENT_ROLLOUT,
-        },
-      ],
-    };
-
     beforeEach(() => {
-      mockedState.endpoint = `${TEST_HOST}/endpoint.json`;
       mock = new MockAdapter(axios);
     });
 
@@ -60,29 +35,7 @@ describe('Feature flags New Module Actions', () => {
 
     describe('success', () => {
       it('dispatches requestCreateFeatureFlag and receiveCreateFeatureFlagSuccess ', (done) => {
-        const convertedActionParams = mapFromScopesViewModel(actionParams);
-
-        mock.onPost(`${TEST_HOST}/endpoint.json`, convertedActionParams).replyOnce(200);
-
-        testAction(
-          createFeatureFlag,
-          actionParams,
-          mockedState,
-          [],
-          [
-            {
-              type: 'requestCreateFeatureFlag',
-            },
-            {
-              type: 'receiveCreateFeatureFlagSuccess',
-            },
-          ],
-          done,
-        );
-      });
-
-      it('sends strategies for new style feature flags', (done) => {
-        const newVersionFlagParams = {
+        const actionParams = {
           name: 'name',
           description: 'description',
           active: true,
@@ -97,13 +50,11 @@ describe('Feature flags New Module Actions', () => {
             },
           ],
         };
-        mock
-          .onPost(`${TEST_HOST}/endpoint.json`, mapStrategiesToRails(newVersionFlagParams))
-          .replyOnce(200);
+        mock.onPost(mockedState.endpoint, mapStrategiesToRails(actionParams)).replyOnce(200);
 
         testAction(
           createFeatureFlag,
-          newVersionFlagParams,
+          actionParams,
           mockedState,
           [],
           [
@@ -121,10 +72,23 @@ describe('Feature flags New Module Actions', () => {
 
     describe('error', () => {
       it('dispatches requestCreateFeatureFlag and receiveCreateFeatureFlagError ', (done) => {
-        const convertedActionParams = mapFromScopesViewModel(actionParams);
-
+        const actionParams = {
+          name: 'name',
+          description: 'description',
+          active: true,
+          version: NEW_VERSION_FLAG,
+          strategies: [
+            {
+              name: ROLLOUT_STRATEGY_ALL_USERS,
+              parameters: {},
+              id: 1,
+              scopes: [{ id: 1, environmentScope: 'environmentScope', shouldBeDestroyed: false }],
+              shouldBeDestroyed: false,
+            },
+          ],
+        };
         mock
-          .onPost(`${TEST_HOST}/endpoint.json`, convertedActionParams)
+          .onPost(mockedState.endpoint, mapStrategiesToRails(actionParams))
           .replyOnce(500, { message: [] });
 
         testAction(