fixed prev directory row not correctly having colspan

3 files changed, 9 insertions, 9 deletions

diff --git a/app/assets/javascripts/repo/components/repo_loading_file.vue b/app/assets/javascripts/repo/components/repo_loading_file.vue
index e2f7d3f5dbb..832b45b2b29 100644
--- a/app/assets/javascripts/repo/components/repo_loading_file.vue
+++ b/app/assets/javascripts/repo/components/repo_loading_file.vue
@@ -15,7 +15,9 @@
 
 <template>
   <tr
-    class="loading-file">
+    class="loading-file"
+    aria-label="Loading files"
+  >
     <td>
       <div
         class="animation-container animation-container-small">
diff --git a/app/assets/javascripts/repo/components/repo_prev_directory.vue b/app/assets/javascripts/repo/components/repo_prev_directory.vue
index f657276ad52..c4bf6dcdec2 100644
--- a/app/assets/javascripts/repo/components/repo_prev_directory.vue
+++ b/app/assets/javascripts/repo/components/repo_prev_directory.vue
@@ -1,7 +1,11 @@
 <script>
   import eventHub from '../event_hub';
+  import repoMixin from '../mixins/repo_mixin';
 
   export default {
+    mixins: [
+      repoMixin,
+    ],
     props: {
       prevUrl: {
         type: String,
diff --git a/app/assets/javascripts/repo/components/repo_sidebar.vue b/app/assets/javascripts/repo/components/repo_sidebar.vue
index 12d5432d1fe..da70dedf714 100644
--- a/app/assets/javascripts/repo/components/repo_sidebar.vue
+++ b/app/assets/javascripts/repo/components/repo_sidebar.vue
@@ -31,16 +31,10 @@ export default {
   data: () => Store,
   computed: {
     flattendFiles() {
-      const map = (arr) => {
-        if (arr && arr.files && arr.files.length === 0) {
-          return [];
-        }
-
-        return _.map(arr.files, a => [a, map(a)]);
-      };
+      const mapFiles = arr => (!arr.files.length ? [] : _.map(arr.files, a => [a, mapFiles(a)]));
 
       return _.chain(this.files)
-        .map(arr => [arr, map(arr)])
+        .map(arr => [arr, mapFiles(arr)])
         .flatten()
         .value();
     },