fixed new file/directory modal using methods that no longer exist

[ci skip]

app/assets/javascripts/repo/components/new_dropdown/index.vue

@@ -24,43 +24,42 @@
 </script>
 
 <template>
-  <div class="breadcrumb repo-breadcrumb">
-    <div class="dropdown">
-      <button
-        type="button"
-        class="btn btn-default dropdown-toggle add-to-tree"
-        data-toggle="dropdown"
-        data-target=".add-to-tree-dropdown"
-      >
-        <i
-          class="fa fa-plus"
-          aria-hidden="true"
+  <div>
+    <ul class="breadcrumb repo-breadcrumb">
+      <li class="dropdown">
+        <button
+          type="button"
+          class="btn btn-default dropdown-toggle add-to-tree"
+          data-toggle="dropdown"
         >
-        </i>
-      </button>
-    </div>
-    <div class="add-to-tree-dropdown">
-      <ul class="dropdown-menu">
-        <li>
-          <a
-            href="#"
-            role="button"
-            @click.prevent="createNewItem('blob')"
+          <i
+            class="fa fa-plus"
+            aria-hidden="true"
           >
-            {{ __('New file') }}
-          </a>
-        </li>
-        <li>
-          <a
-            href="#"
-            role="button"
-            @click.prevent="createNewItem('tree')"
-          >
-            {{ __('New directory') }}
-          </a>
-        </li>
-      </ul>
-    </div>
+          </i>
+        </button>
+        <ul class="dropdown-menu">
+          <li>
+            <a
+              href="#"
+              role="button"
+              @click.prevent="createNewItem('blob')"
+            >
+              {{ __('New file') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="#"
+              role="button"
+              @click.prevent="createNewItem('tree')"
+            >
+              {{ __('New directory') }}
+            </a>
+          </li>
+        </ul>
+      </li>
+    </ul>
     <new-modal
       v-if="openModal"
       :type="modalType"

app/assets/javascripts/repo/components/new_dropdown/modal.vue

@@ -24,12 +24,13 @@
         if (this.entryName === '') return;
 
         const fileName = this.type === 'tree' ? '.gitkeep' : this.entryName;
-        let tree = null;
+        let tree = RepoStore;
 
         if (this.type === 'tree') {
-          tree = RepoHelper.serializeTree({
+          tree = RepoHelper.serializeRepoEntity('tree', {
             name: this.entryName,
             path: this.entryName,
+            icon: 'folder',
             tempFile: true,
           });
           RepoStore.files.push(tree);
@@ -37,17 +38,14 @@
           RepoHelper.setDirectoryOpen(tree, tree.name);
         }
 
-        const file = RepoHelper.serializeBlob({
+        const file = RepoHelper.serializeRepoEntity('blob', {
           name: fileName,
-          path: tree ? `${tree}/${fileName}` : fileName,
+          path: tree.path ? `${tree.path}/${fileName}` : fileName,
+          icon: 'file-text-o',
           tempFile: true,
-        });
+        }, (this.type === 'tree' ? tree.level + 1 : 0));
 
-        if (tree) {
-          RepoStore.addFilesToDirectory(tree, RepoStore.files, [file]);
-        } else {
-          RepoStore.addFilesToDirectory(tree, RepoStore.files, [...RepoStore.files, file]);
-        }
+        tree.files.push(file);
 
         RepoHelper.setFile(file, file);
         RepoStore.editMode = true;
@@ -82,6 +80,9 @@
         return __('File name');
       },
     },
+    mounted() {
+      this.$refs.fieldName.focus();
+    },
   };
 </script>
 
@@ -107,6 +108,7 @@
             type="text"
             class="form-control"
             v-model="entryName"
+            ref="fieldName"
           />
         </div>
       </fieldset>

app/assets/javascripts/repo/components/repo_tab.vue

@@ -30,7 +30,7 @@ const RepoTab = {
       Store.setActiveFiles(file);
     },
     closeTab(file) {
-      if (file.changed) return;
+      if (file.changed || file.tempFile) return;
 
       Store.removeFromOpenedFiles(file);
     },