Revert "formatApiPath / formatAssetPath - Implement smart functionali…

…ty to detect double subpath" (#3001) Reverts #2777
Unleash · Jan 26, 2023 · 8efd0f8 · 8efd0f8
1 parent cdc1f26
commit 8efd0f8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/frontend/src/utils/formatPath.test.ts b/frontend/src/utils/formatPath.test.ts
@@ -28,7 +28,6 @@ test('formatAssetPath', () => {
     expect(formatAssetPath('/a', '/x')).toEqual('/x/a');
     expect(formatAssetPath('/a/', '/x/')).toEqual('/x/a');
     expect(formatAssetPath('a/b/', 'x/y/')).toEqual('/x/y/a/b');
-    expect(formatAssetPath('x/y/', 'x/y/')).toEqual('/x/y');
     expect(formatAssetPath('//a//b//', '//x//y//')).toEqual('/x/y/a/b');
 });
 
@@ -43,7 +42,6 @@ test('formatApiPath', () => {
     expect(formatApiPath('/', '/')).toEqual('');
     expect(formatApiPath('a', 'x')).toEqual('/x/a');
     expect(formatApiPath('/a', '/x')).toEqual('/x/a');
-    expect(formatApiPath('/a', '/x/a')).toEqual('/x/a');
     expect(formatApiPath('/a/', '/x/')).toEqual('/x/a');
     expect(formatApiPath('a/b/', 'x/y/')).toEqual('/x/y/a/b');
     expect(formatApiPath('//a//b//', '//x//y//')).toEqual('/x/y/a/b');

diff --git a/frontend/src/utils/formatPath.ts b/frontend/src/utils/formatPath.ts
@@ -23,14 +23,7 @@ export const parseBasePath = (value = basePathMetaTagContent()): string => {
 
 // Join paths with a leading separator and without a trailing separator.
 const joinPaths = (...paths: string[]): string => {
-    const filteredPaths = paths.filter(path => {
-        return !paths.some(
-            currentPath => currentPath !== path && currentPath.includes(path)
-        );
-    });
-    const uniquePaths = [...new Set(filteredPaths)];
-
-    return ['', ...uniquePaths]
+    return ['', ...paths]
         .join('/')
         .replace(/\/+$/g, '') // Remove trailing separators.
         .replace(/\/+/g, '/'); // Collapse repeated separators.