made path prop in dropdown optional

added computed prop for showing loading indicator

5 files changed, 9 insertions, 7 deletions

diff --git a/app/assets/javascripts/ide/components/ide_tree.vue b/app/assets/javascripts/ide/components/ide_tree.vue
index 7dbedaf2cb2..569d55d28ac 100644
--- a/app/assets/javascripts/ide/components/ide_tree.vue
+++ b/app/assets/javascripts/ide/components/ide_tree.vue
@@ -26,7 +26,6 @@ export default {
       <new-dropdown
         :project-id="currentProject.name_with_namespace"
         :branch="currentBranchId"
-        path=""
       />
     </template>
   </ide-tree-list>
diff --git a/app/assets/javascripts/ide/components/ide_tree_list.vue b/app/assets/javascripts/ide/components/ide_tree_list.vue
index 56baba05b74..e64a09fcc90 100644
--- a/app/assets/javascripts/ide/components/ide_tree_list.vue
+++ b/app/assets/javascripts/ide/components/ide_tree_list.vue
@@ -31,6 +31,9 @@ export default {
   computed: {
     ...mapState(['currentBranchId']),
     ...mapGetters(['currentProject', 'currentTree']),
+    showLoading() {
+      return !this.currentTree || this.currentTree.loading;
+    },
   },
   mounted() {
     this.updateViewer(this.viewerType);
@@ -45,7 +48,7 @@ export default {
   <div
     class="ide-file-list"
   >
-    <template v-if="!currentTree || currentTree.loading">
+    <template v-if="showLoading">
       <div
         class="multi-file-loading-container"
         v-for="n in 3"
diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue
index b1b5c0d4a28..a0ce1c9dac7 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/index.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue
@@ -17,7 +17,8 @@ export default {
     },
     path: {
       type: String,
-      required: true,
+      required: false,
+      default: '',
     },
   },
   data() {
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue
index 6b7245bdbc1..23d584b62c4 100644
--- a/app/assets/javascripts/ide/components/repo_editor.vue
+++ b/app/assets/javascripts/ide/components/repo_editor.vue
@@ -24,7 +24,7 @@ export default {
     ...mapGetters([
       'currentMergeRequest',
       'getStagedFile',
-      'isReviewModeActive',
+      'isEditModeActive',
       'isCommitModeActive',
     ]),
     shouldHideEditor() {
@@ -191,8 +191,7 @@ export default {
     <div class="ide-mode-tabs clearfix" >
       <ul
         class="nav-links pull-left"
-        v-if="!shouldHideEditor"
-        v-show="!isReviewModeActive && !isCommitModeActive"
+        v-if="!shouldHideEditor && isEditModeActive"
       >
         <li :class="editTabCSS">
           <a
diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index 0a5371fd5bb..8dd3b9a66a2 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -54,7 +54,7 @@ export const allBlobs = state =>
 
 export const getStagedFile = state => path => state.stagedFiles.find(f => f.path === path);
 
-export const isReviewModeActive = state => state.currentActivityView === activityBarViews.review;
+export const isEditModeActive = state => state.currentActivityView === activityBarViews.edit;
 export const isCommitModeActive = state => state.currentActivityView === activityBarViews.commit;
 
 // prevent babel-plugin-rewire from generating an invalid default during karma tests