Merge branch 'integrate-new-feature-flags--vuex' into 'master'

Add Version and Strategies to FF Edit State

See merge request gitlab-org/gitlab!26895

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

@@ -20,6 +20,8 @@ export default {
     state.iid = response.iid;
     state.active = response.active;
     state.scopes = mapToScopesViewModel(response.scopes);
+    state.strategies = response.strategies || [];
+    state.version = response.version || 1;
   },
   [types.RECEIVE_FEATURE_FLAG_ERROR](state) {
     state.isLoading = false;

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

@@ -11,4 +11,6 @@ export default () => ({
   hasError: false,
   iid: null,
   active: true,
+  strategies: [],
+  version: 1,
 });

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

@@ -45,6 +45,8 @@ describe('Feature flags Edit Module Mutations', () => {
       description: 'All environments',
       scopes: [{ id: 1 }],
       iid: 5,
+      version: 2,
+      strategies: [{ scopes: [], type: 'default', paramters: {} }],
     };
 
     beforeEach(() => {
@@ -74,6 +76,14 @@ describe('Feature flags Edit Module Mutations', () => {
     it('should set the iid to the provided one', () => {
       expect(stateCopy.iid).toEqual(data.iid);
     });
+
+    it('should set the version to the provided one', () => {
+      expect(stateCopy.version).toBe(2);
+    });
+
+    it('should set the strategies to the provided one', () => {
+      expect(stateCopy.strategies).toEqual([{ scopes: [], type: 'default', paramters: {} }]);
+    });
   });
 
   describe('RECEIVE_FEATURE_FLAG_ERROR', () => {