Merge branch 'long-path-mr-bug' into 'master'

Fix infinite loop when rendering merge request file tree

See merge request gitlab-org/gitlab!34153

app/assets/javascripts/lib/utils/text_utility.js

@@ -90,6 +90,13 @@ export const truncatePathMiddleToLength = (text, maxWidth) => {
 
   while (returnText.length >= maxWidth) {
     const textSplit = returnText.split('/').filter(s => s !== ELLIPSIS_CHAR);
+
+    if (textSplit.length === 0) {
+      // There are n - 1 path separators for n segments, so 2n - 1 <= maxWidth
+      const maxSegments = Math.floor((maxWidth + 1) / 2);
+      return new Array(maxSegments).fill(ELLIPSIS_CHAR).join('/');
+    }
+
     const middleIndex = Math.floor(textSplit.length / 2);
 
     returnText = textSplit

changelogs/unreleased/long-path-mr-bug.yml

+---
+title: Fix rendering of very long paths in merge request file tree
+merge_request: 34153
+author:
+type: fixed

spec/frontend/lib/utils/text_utility_spec.js

@@ -192,6 +192,20 @@ describe('text_utility', () => {
         'app/…/…/diff',
       );
     });
+
+    describe('given a path too long for the maxWidth', () => {
+      it.each`
+        path          | maxWidth | result
+        ${'aa/bb/cc'} | ${1}     | ${'…'}
+        ${'aa/bb/cc'} | ${2}     | ${'…'}
+        ${'aa/bb/cc'} | ${3}     | ${'…/…'}
+        ${'aa/bb/cc'} | ${4}     | ${'…/…'}
+        ${'aa/bb/cc'} | ${5}     | ${'…/…/…'}
+      `('truncates ($path, $maxWidth) to $result', ({ path, maxWidth, result }) => {
+        expect(result.length).toBeLessThanOrEqual(maxWidth);
+        expect(textUtils.truncatePathMiddleToLength(path, maxWidth)).toEqual(result);
+      });
+    });
   });
 
   describe('slugifyWithUnderscore', () => {