Fixed #542 file icon being shown for empty directories

Signed-off-by: Omkar Phansopkar <[email protected]>
aboutcode-org · Oct 2, 2023 · a9c97e8 · a9c97e8
1 parent f39c86a
commit a9c97e8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -106,7 +106,7 @@
     "nock": "^13.3.0",
     "pg": "^8.10.0",
     "pg-hstore": "^2.3.4",
-    "rc-tree": "^5.7.0",
+    "rc-tree": "^5.7.12",
     "react": "^18.2.0",
     "react-bootstrap": "^2.5.0",
     "react-chartjs-2": "^5.2.0",

diff --git a/src/services/workbenchDB.ts b/src/services/workbenchDB.ts
@@ -247,6 +247,7 @@ export class WorkbenchDB {
         parent: file.getDataValue("parent"),
         name: file.getDataValue("name"),
         type: fileType,
+        isLeaf: fileType == "file",
         ...(fileType == "directory" && { children: [] }),
         // @TODO - Trial to fix rc-tree showing file icon instead of empty directory https://github.com/nexB/scancode-workbench/issues/542
         // isLeaf: fileType == "file",

diff --git a/tests/test-scans/fileTree/expectedFileTree.ts b/tests/test-scans/fileTree/expectedFileTree.ts
@@ -87,6 +87,7 @@ export const FileTreeSamples: {
         parent: "#",
         name: null,
         type: "directory",
+        isLeaf: false,
         children: [
           {
             id: 2,
@@ -96,6 +97,7 @@ export const FileTreeSamples: {
             parent: "manifests",
             name: null,
             type: "directory",
+            isLeaf: false,
             children: [
               {
                 id: 4,
@@ -105,6 +107,7 @@ export const FileTreeSamples: {
                 parent: "manifests/folder1",
                 name: null,
                 type: "directory",
+                isLeaf: false,
                 children: [
                   {
                     id: 5,
@@ -114,6 +117,7 @@ export const FileTreeSamples: {
                     parent: "manifests/folder1/folder2",
                     name: null,
                     type: "file",
+                    isLeaf: true,
                   },
                 ],
               },
@@ -125,6 +129,7 @@ export const FileTreeSamples: {
                 parent: "manifests/folder1",
                 name: null,
                 type: "file",
+                isLeaf: true,
               },
             ],
           },
@@ -136,6 +141,7 @@ export const FileTreeSamples: {
             parent: "manifests",
             name: null,
             type: "directory",
+            isLeaf: false,
             children: [
               {
                 id: 7,
@@ -145,6 +151,7 @@ export const FileTreeSamples: {
                 parent: "manifests/folder3",
                 name: null,
                 type: "file",
+                isLeaf: true,
               },
             ],
           },
@@ -156,6 +163,7 @@ export const FileTreeSamples: {
             parent: "manifests",
             name: null,
             type: "file",
+            isLeaf: true,
           },
           {
             id: 8,
@@ -165,6 +173,7 @@ export const FileTreeSamples: {
             parent: "manifests",
             name: null,
             type: "file",
+            isLeaf: true,
           },
         ],
       },
@@ -190,6 +199,7 @@ export const FileTreeSamples: {
         parent: "#",
         name: null,
         type: "directory",
+        isLeaf: false,
         children: [],
       },
     ],
@@ -214,6 +224,7 @@ export const FileTreeSamples: {
         parent: "#",
         name: null,
         type: "file",
+        isLeaf: true,
       },
     ],
   },