Merge pull request #625 from nexB/improve/depth-based-tableview-sort

Sorts the files in tableview by their depth in directory tree

Author: OmkarPh

src/pages/TableView/TableView.tsx

@@ -73,6 +73,7 @@ const TableView = () => {
               ],
             },
           },
+          order: ["level", "id"],
         })
       )
       .then((fileModels) => fileModels.map((fileModel) => fileModel.toJSON()))

src/pages/TableView/columnDefs.ts

@@ -55,7 +55,6 @@ interface COLUMNS_LIST {
   [key: string]: ColDef;
 
   // Rest for IDE intellisense in column groups
-
   path: ColDef;
   type: ColDef;
   name: ColDef;
@@ -112,7 +111,7 @@ export const ALL_COLUMNS: COLUMNS_LIST = {
     field: "type",
     colId: "type",
     headerName: "Type",
-    initialWidth: 120,
+    initialWidth: 85,
   },
   name: {
     field: "name",

src/services/models/flatFile.ts

@@ -18,6 +18,7 @@ import path from "path";
 import { Sequelize, DataTypes, Model } from "sequelize";
 import { jsonDataType, parentPath } from "./databaseUtils";
 import { LicensePolicy, Resource } from "../importedJsonTypes";
+import { getPathDepth } from "../../utils/paths";
 
 export interface InfoFlatFileAttributes {
   type: string;
@@ -110,6 +111,7 @@ export interface FlatFileAttributes
   id: number;
   fileId: number;
   path: string;
+  level: number;
   parent: string;
 }
 
@@ -129,6 +131,7 @@ export default function flatFileModel(sequelize: Sequelize) {
         unique: true,
         allowNull: false,
       },
+      level: DataTypes.INTEGER,
       parent: { type: DataTypes.STRING, defaultValue: "" },
       copyright_statements: jsonDataType("copyright_statements", []),
       copyright_holders: jsonDataType("copyright_holders", []),
@@ -245,6 +248,7 @@ interface FlattenedFile {
   fileId: number;
   path: string;
   parent: string;
+  level: number;
   copyright_statements: unknown[];
   copyright_holders: unknown[];
   copyright_authors: unknown[];
@@ -314,11 +318,13 @@ interface FlattenedFile {
   package_data_dependencies: unknown[];
   package_data_related_packages: unknown[];
 }
+
 export function flattenFile(file: Resource): FlattenedFile {
   return {
     id: file.id,
     fileId: file.id,
     path: file.path,
+    level: getPathDepth(file.path),
     parent: parentPath(file.path),
     copyright_statements: getCopyrightValues(file.copyrights, "copyright"),
     copyright_holders: getCopyrightValues(file.holders, "holder"),

src/utils/paths.ts

@@ -1,2 +1,8 @@
 export const figureOutDefaultSqliteFilePath = (jsonFilePath: string) =>
   jsonFilePath.substring(0, jsonFilePath.lastIndexOf(".")) + ".sqlite";
+
+export function getPathDepth(filePath: string) {
+  const separatorRegExp = /[\\/]/g;
+  const depth = (filePath.match(separatorRegExp) || []).length;
+  return depth;
+}