fixed action name changes after rebase

fixed content not updating in editor when changing template

3 files changed, 18 insertions, 4 deletions

diff --git a/app/assets/javascripts/ide/components/file_templates/bar.vue b/app/assets/javascripts/ide/components/file_templates/bar.vue
index 8344b5440e9..d9cca3fe1f2 100644
--- a/app/assets/javascripts/ide/components/file_templates/bar.vue
+++ b/app/assets/javascripts/ide/components/file_templates/bar.vue
@@ -23,16 +23,20 @@ export default {
     this.setInitialType();
   },
   methods: {
-    ...mapActions('fileTemplates', ['setTemplateType', 'fetchTemplate']),
+    ...mapActions('fileTemplates', [
+      'setSelectedTemplateType',
+      'fetchTemplate',
+      'undoFileTemplate',
+    ]),
     setInitialType() {
       const type = this.templateTypes.find(t => t.name === this.activeFile.name);
 
       if (type) {
-        this.setTemplateType(type);
+        this.setSelectedTemplateType(type);
       }
     },
     selectTemplateType(type) {
-      this.setTemplateType(type);
+      this.setSelectedTemplateType(type);
     },
     selecteTemplate(template) {
       this.fetchTemplate(template);
@@ -69,6 +73,7 @@ export default {
         <button
           type="button"
           class="btn btn-default"
+          @click="undoFileTemplate"
         >
           {{ __('Undo') }}
         </button>
diff --git a/app/assets/javascripts/ide/components/file_templates/dropdown.vue b/app/assets/javascripts/ide/components/file_templates/dropdown.vue
index 914022d8764..11074c0c6de 100644
--- a/app/assets/javascripts/ide/components/file_templates/dropdown.vue
+++ b/app/assets/javascripts/ide/components/file_templates/dropdown.vue
@@ -77,11 +77,12 @@ export default {
   <div class="dropdown">
     <dropdown-button
       :toggle-text="label"
+      data-display="static"
     />
     <div class="dropdown-menu">
       <div
         v-if="title"
-        class="dropdown-title"
+        class="dropdown-title ml-0 mr-0"
       >
         {{ title }}
       </div>
@@ -95,6 +96,10 @@ export default {
           type="search"
           class="dropdown-input-field"
         />
+        <i
+          aria-hidden="true"
+          class="fa fa-search dropdown-input-search"
+        ></i>
       </div>
       <div class="dropdown-content">
         <loading-icon
diff --git a/app/assets/javascripts/ide/stores/modules/file_templates/actions.js b/app/assets/javascripts/ide/stores/modules/file_templates/actions.js
index 43237a29466..a4da2ac5c04 100644
--- a/app/assets/javascripts/ide/stores/modules/file_templates/actions.js
+++ b/app/assets/javascripts/ide/stores/modules/file_templates/actions.js
@@ -1,6 +1,7 @@
 import Api from '~/api';
 import { __ } from '~/locale';
 import * as types from './mutation_types';
+import eventHub from '../../../eventhub';
 
 export const requestTemplateTypes = ({ commit }) => commit(types.REQUEST_TEMPLATE_TYPES);
 export const receiveTemplateTypesError = ({ commit, dispatch }) => {
@@ -69,6 +70,7 @@ export const setFileTemplate = ({ dispatch, commit, rootGetters }, template) =>
     { root: true },
   );
   commit(types.SET_UPDATE_SUCCESS, true);
+  eventHub.$emit(`editor.update.model.new.content.${rootGetters.activeFile.key}`, template.content);
 };
 
 export const undoFileTemplate = ({ dispatch, commit, rootGetters }) => {
@@ -76,6 +78,8 @@ export const undoFileTemplate = ({ dispatch, commit, rootGetters }) => {
 
   dispatch('changeFileContent', { path: file.path, content: file.raw }, { root: true });
   commit(types.SET_UPDATE_SUCCESS, false);
+
+  eventHub.$emit(`editor.update.model.new.content.${file.key}`, file.raw);
 };
 
 // prevent babel-plugin-rewire from generating an invalid default during karma tests