Merge branch 'cwoolley-commit-sidebar-actions-fix' into 'master'

Web IDE commit sidebar should preserve action

Closes #212276

See merge request gitlab-org/gitlab!27876

app/assets/javascripts/ide/components/commit_sidebar/actions.vue

@@ -36,7 +36,9 @@ export default {
     },
   },
   mounted() {
-    this.updateSelectedCommitAction();
+    if (!this.commitAction) {
+      this.updateSelectedCommitAction();
+    }
   },
   methods: {
     ...mapCommitActions(['updateCommitAction']),

app/assets/javascripts/ide/stores/modules/commit/state.js

 export default () => ({
   commitMessage: '',
-  commitAction: '1',
+  commitAction: null,
   newBranchName: '',
   submitCommitLoading: false,
   shouldCreateMR: true,

spec/javascripts/ide/components/commit_sidebar/actions_spec.js

@@ -85,6 +85,13 @@ describe('IDE commit sidebar actions', () => {
       expect(vm.$store.dispatch).not.toHaveBeenCalled();
     });
 
+    it('is not called on mount if there is already a selected commitAction', () => {
+      store.state.commitAction = '1';
+      createComponent({ currentBranchId: null });
+
+      expect(vm.$store.dispatch).not.toHaveBeenCalled();
+    });
+
     it('calls again after staged changes', done => {
       createComponent({ currentBranchId: null });