Merge branch '197343-iscompact' into 'master'

Fix unexpected behaviour of the commit form after committing in Web IDE

Closes #197343

See merge request gitlab-org/gitlab!23238

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

@@ -60,6 +60,11 @@ export default {
         );
       }
     },
+
+    lastCommitMsg() {
+      this.isCompact =
+        this.currentActivityView !== activityBarViews.commit && this.lastCommitMsg === '';
+    },
   },
   methods: {
     ...mapActions(['updateActivityBarView']),

changelogs/unreleased/197343-iscompact.yml

+---
+title: Fix unexpected behaviour of the commit form after committing in Web IDE
+merge_request: 23238
+author:
+type: fixed

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

@@ -76,6 +76,25 @@ describe('IDE commit form', () => {
         done();
       });
     });
+
+    it('collapses if lastCommitMsg is set to empty and current view is not commit view', done => {
+      store.state.lastCommitMsg = 'abc';
+      store.state.currentActivityView = activityBarViews.edit;
+
+      vm.$nextTick(() => {
+        // if commit message is set, form is uncollapsed
+        expect(vm.isCompact).toBe(false);
+
+        store.state.lastCommitMsg = '';
+
+        vm.$nextTick(() => {
+          // collapsed when set to empty
+          expect(vm.isCompact).toBe(true);
+
+          done();
+        });
+      });
+    });
   });
 
   describe('full', () => {