Fix relative path in files util (#853)

ShokoAnime · Apr 4, 2024 · f0a71ad · f0a71ad
1 parent 41b9a58
commit f0a71ad
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/src/components/Utilities/constants.tsx b/src/components/Utilities/constants.tsx
@@ -28,17 +28,21 @@ export const staticColumns: UtilityHeaderType<FileType>[] = [
     id: 'filename',
     name: 'Filename',
     className: 'line-clamp-2 grow basis-0 overflow-hidden',
-    item: file => (
-      <div className="flex flex-col" title={file.Locations[0]?.RelativePath.match(/[^\\]*$/)?.[0]}>
-        <span className="line-clamp-1 text-sm font-semibold opacity-65">
-          {file.Locations[0]?.RelativePath.match(/^(.*)\\/)?.[1] ?? 'Root Level'}
-        </span>
-        <span className="line-clamp-1">
-          {file.Locations[0]?.RelativePath?.split(/[/\\]/g)
-            .pop()}
-        </span>
-      </div>
-    ),
+    item: (file) => {
+      const path = file.Locations[0]?.RelativePath ?? '';
+      const match = /[/\\](?=[^/\\]*$)/g.exec(path);
+      const relativePath = match ? path?.substring(0, match.index) : 'Root Level';
+      return (
+        <div className="flex flex-col" title={path}>
+          <span className="line-clamp-1 text-sm font-semibold opacity-65">
+            {relativePath}
+          </span>
+          <span className="line-clamp-1">
+            {path?.split(/[/\\]/g).pop()}
+          </span>
+        </div>
+      );
+    },
   },
   {
     id: 'crc32',