From b82b1667c4de0ee05840c1053b2349ac351040e6 Mon Sep 17 00:00:00 2001
From: Sam Bigelow <sbigelow@gitlab.com>
Date: Tue, 12 Feb 2019 15:06:30 -0500
Subject: Dont show file template options for new directory

---
 .../javascripts/ide/components/new_dropdown/modal.vue      | 14 ++++++++++----
 ...4-web-ide-new-directory-dialog-shows-file-templates.yml |  5 +++++
 spec/javascripts/ide/components/new_dropdown/modal_spec.js |  9 +++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/unreleased/57544-web-ide-new-directory-dialog-shows-file-templates.yml

diff --git a/app/assets/javascripts/ide/components/new_dropdown/modal.vue b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
index 04ecd4ba4e7..c9c4e9e86f8 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
@@ -51,8 +51,11 @@ export default {
 
       return __('Create file');
     },
-    isCreatingNew() {
-      return this.entryModal.type !== modalTypes.rename;
+    isCreatingNewFile() {
+      return this.entryModal.type === 'blob';
+    },
+    placeholder() {
+      return this.isCreatingNewFile ? 'dir/file_name' : 'dir/';
     },
   },
   methods: {
@@ -107,9 +110,12 @@ export default {
           v-model="entryName"
           type="text"
           class="form-control qa-full-file-path"
-          placeholder="/dir/file_name"
+          :placeholder="placeholder"
         />
-        <ul v-if="isCreatingNew" class="prepend-top-default list-inline qa-template-list">
+        <ul
+          v-if="isCreatingNewFile"
+          class="file-templates prepend-top-default list-inline qa-template-list"
+        >
           <li v-for="(template, index) in templateTypes" :key="index" class="list-inline-item">
             <button
               type="button"
diff --git a/changelogs/unreleased/57544-web-ide-new-directory-dialog-shows-file-templates.yml b/changelogs/unreleased/57544-web-ide-new-directory-dialog-shows-file-templates.yml
new file mode 100644
index 00000000000..9d9158ca4af
--- /dev/null
+++ b/changelogs/unreleased/57544-web-ide-new-directory-dialog-shows-file-templates.yml
@@ -0,0 +1,5 @@
+---
+title: Do not show file templates when creating a new directory in WebIDE
+merge_request: !25119
+author:
+type: fixed
diff --git a/spec/javascripts/ide/components/new_dropdown/modal_spec.js b/spec/javascripts/ide/components/new_dropdown/modal_spec.js
index 595a2f927e9..d94cc1a8faa 100644
--- a/spec/javascripts/ide/components/new_dropdown/modal_spec.js
+++ b/spec/javascripts/ide/components/new_dropdown/modal_spec.js
@@ -41,6 +41,15 @@ describe('new file modal component', () => {
         expect(vm.$el.querySelector('.label-bold').textContent.trim()).toBe('Name');
       });
 
+      it(`${type === 'tree' ? 'does not show' : 'shows'} file templates`, () => {
+        const templateFilesEl = vm.$el.querySelector('.file-templates');
+        if (type === 'tree') {
+          expect(templateFilesEl).toBeNull();
+        } else {
+          expect(templateFilesEl instanceof Element).toBeTruthy();
+        }
+      });
+
       describe('createEntryInStore', () => {
         it('$emits create', () => {
           spyOn(vm, 'createTempEntry');
-- 
cgit v1.2.1