Merge branch 'ide-file-templates-clear' into 'master'

Fixed file templates not clearing in Web IDE

Closes #52487

See merge request gitlab-org/gitlab-ce!22357

3 files changed, 14 insertions, 0 deletions

diff --git a/app/assets/javascripts/ide/stores/modules/file_templates/mutations.js b/app/assets/javascripts/ide/stores/modules/file_templates/mutations.js
index d519c033769..25a65b047f1 100644
--- a/app/assets/javascripts/ide/stores/modules/file_templates/mutations.js
+++ b/app/assets/javascripts/ide/stores/modules/file_templates/mutations.js
@@ -13,6 +13,7 @@ export default {
   },
   [types.SET_SELECTED_TEMPLATE_TYPE](state, type) {
     state.selectedTemplateType = type;
+    state.templates = [];
   },
   [types.SET_UPDATE_SUCCESS](state, success) {
     state.updateSuccess = success;
diff --git a/changelogs/unreleased/ide-file-templates-clear.yml b/changelogs/unreleased/ide-file-templates-clear.yml
new file mode 100644
index 00000000000..7878f2231a7
--- /dev/null
+++ b/changelogs/unreleased/ide-file-templates-clear.yml
@@ -0,0 +1,5 @@
+---
+title: Clear fetched file templates when changing template type in Web IDE
+merge_request:
+author:
+type: fixed
diff --git a/spec/javascripts/ide/stores/modules/file_templates/mutations_spec.js b/spec/javascripts/ide/stores/modules/file_templates/mutations_spec.js
index a51527d699f..8e0e3ae99a1 100644
--- a/spec/javascripts/ide/stores/modules/file_templates/mutations_spec.js
+++ b/spec/javascripts/ide/stores/modules/file_templates/mutations_spec.js
@@ -49,6 +49,14 @@ describe('IDE file templates mutations', () => {
 
       expect(state.selectedTemplateType).toBe('type');
     });
+
+    it('clears templates', () => {
+      state.templates = ['test'];
+
+      mutations[types.SET_SELECTED_TEMPLATE_TYPE](state, 'type');
+
+      expect(state.templates).toEqual([]);
+    });
   });
 
   describe(types.SET_UPDATE_SUCCESS, () => {