Fixing bug in zip visualization on the Solution Detail page.

Author: krulis-martin

src/components/Solutions/SolutionFiles/SolutionFiles.js

@@ -28,7 +28,7 @@ const SolutionFiles = ({
     <ResourceRenderer resource={files}>
       {files => {
         const filesSize = files.reduce((acc, { size }) => acc + size, 0);
-        const processedFiles = preprocessFiles(files);
+        const processedFiles = preprocessFiles(files, true); // true = keep zip files as well
         const canDisplayFiles = processedFiles.length <= 50;
 
         return (
@@ -104,7 +104,7 @@ const SolutionFiles = ({
                                       ? 'text-success fw-bold'
                                       : ''
                                 }>
-                                {file.name}
+                                {file.entryName || file.name}
                               </code>
 
                               {file.zipEntriesBadNames && (
@@ -138,7 +138,11 @@ const SolutionFiles = ({
                                     }>
                                     <Button
                                       onClick={() =>
-                                        openFile(file.parentId || file.id, file.name, file.parentId ? file.name : null)
+                                        openFile(
+                                          file.parentId || file.id,
+                                          file.entryName || file.name,
+                                          file.parentId ? file.entryName : null
+                                        )
                                       }
                                       size="xs"
                                       variant="secondary">
@@ -160,7 +164,7 @@ const SolutionFiles = ({
                                     }>
                                     <Button
                                       onClick={() =>
-                                        download(file.parentId || file.id, file.parentId ? file.name : null)
+                                        download(file.parentId || file.id, file.parentId ? file.entryName : null)
                                       }
                                       size="xs"
                                       variant="primary">

src/helpers/solutionFiles.js

@@ -8,8 +8,9 @@ const nameComparator = (a, b) => a.name.localeCompare(b.name, 'en');
  */
 const preprocessZipEntries = ({ zipEntries, ...file }) => {
   if (zipEntries) {
+    file.zipEntriesBadNames = zipEntries.reduce((bad, { name }) => bad || name.includes('\\'), false);
     file.zipEntries = zipEntries
-      .filter(({ name, size }) => !name.endsWith('/') || size !== 0)
+      .filter(({ name, size }) => !(name.endsWith('/') || name.endsWith('\\') || size === 0))
       .map(({ name, size }) => ({
         entryName: name,
         name: `${file.name}#${name}`,
@@ -25,12 +26,13 @@ const preprocessZipEntries = ({ zipEntries, ...file }) => {
 /**
  * Preprocess zip entries, consolidate, and sort by names.
  */
-export const preprocessFiles = lruMemoize(files =>
-  files
-    .sort(nameComparator)
-    .map(preprocessZipEntries)
-    .reduce((acc, file) => [...acc, ...(file.zipEntries || [file])], [])
-);
+export const preprocessFiles = lruMemoize((files, keepZipFiles = false) => {
+  const reducer = keepZipFiles
+    ? (acc, file) => [...acc, file, ...(file.zipEntries || [])]
+    : (acc, file) => [...acc, ...(file.zipEntries || [file]), file];
+
+  return files.sort(nameComparator).map(preprocessZipEntries).reduce(reducer, []);
+});
 
 export const filesCanBeDisplayed = files =>
   files &&