Adding new Package attributes #81

* Updated DataTable to show new attributes * Updated Flattened File Model with new attributes * Added getNestedValues method which gets keys from an object that is nested two levels deep * Updated tests Signed-off-by: Jillian Daguil <jdaguil@nexb.com>
aboutcode-org · May 20, 2017 · 22b2c6f · 22b2c6f
1 parent 7f62b2e
commit 22b2c6f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 8 deletions.
diff --git a/assets/js/aboutCodeDB.js b/assets/js/aboutCodeDB.js
@@ -409,7 +409,7 @@ class AboutCodeDB {
             packages_summary: AboutCodeDB.jsonDataType( "packages_summary"),
             packages_description: AboutCodeDB.jsonDataType( "packages_description"),
             packages_payload_type: AboutCodeDB.jsonDataType( "packages_payload_type"),
-            packages_authors: AboutCodeDB.jsonDataType( "packages_authors"),
+            packages_authors_name: AboutCodeDB.jsonDataType( "packages_authors_name"),
             packages_maintainers: AboutCodeDB.jsonDataType( "packages_maintainers"),
             packages_contributors: AboutCodeDB.jsonDataType( "packages_contributors"),
             packages_owners: AboutCodeDB.jsonDataType( "packages_owners"),
@@ -505,7 +505,7 @@ class AboutCodeDB {
             packages_summary: AboutCodeDB.getValues(file.packages, "summary"),
             packages_description: AboutCodeDB.getValues(file.packages, "description"),
             packages_payload_type: AboutCodeDB.getValues(file.packages, "payload_type"),
-            packages_authors: AboutCodeDB.getValues(file.packages, "authors"),
+            packages_authors_name: AboutCodeDB.getNestedValues(file.packages, "authors", "name"),
             packages_maintainers: AboutCodeDB.getValues(file.packages, "maintainers"),
             packages_contributors: AboutCodeDB.getValues(file.packages, "contributors"),
             packages_owners: AboutCodeDB.getValues(file.packages, "owners"),
@@ -530,7 +530,7 @@ class AboutCodeDB {
             packages_vcs_revision: AboutCodeDB.getValues(file.packages, "vcs_revision"),
             packages_copyright_top_level: AboutCodeDB.getValues(file.packages, "copyright_top_level"),
             packages_copyrights: AboutCodeDB.getValues(file.packages, "copyrights"),
-            packages_asserted_licenses: AboutCodeDB.getValues(file.packages, "asserted_licenses"),
+            packages_asserted_licenses: AboutCodeDB.getNestedValues(file.packages, "asserted_licenses", "license"),
             packages_legal_file_locations: AboutCodeDB.getValues(file.packages, "legal_file_locations"),
             packages_license_expression: AboutCodeDB.getValues(file.packages, "license_expression"),
             packages_license_texts: AboutCodeDB.getValues(file.packages, "license_texts"),
@@ -551,6 +551,15 @@ class AboutCodeDB {
             return [elem[key] ? elem[key] : []];
         });
     }
+
+    // [{key: [{ nestedKey: val0}], {key: [ nestedKey: val1]}] => [val0, val1]
+    static getNestedValues(array, key, nestedKey) {
+        return $.map(array ? array : [], (elem, i) => {
+            return $.map(elem[key] ? elem[key] : [], (nestedElem, i) => {
+                return [nestedElem[nestedKey] ? nestedElem[nestedKey] : []]
+            });
+        });
+    }
 }
 
 module.exports = AboutCodeDB;
diff --git a/assets/js/aboutCodeDataTables.js b/assets/js/aboutCodeDataTables.js
@@ -457,14 +457,39 @@ class AboutCodeDataTable {
                 "name": "packages_type"
             },
             {
-                "data": "packages_packaging",
-                "title": "Packaging",
-                "name": "packages_packaging"
+                "data": "packages_name",
+                "title": "Package Name",
+                "name": "packages_name"
+            },
+            {
+                "data": "packages_version",
+                "title": "Package Version",
+                "name": "packages_version"
             },
             {
                 "data": "packages_primary_language",
                 "title": "Package Primary Language",
                 "name": "packages_primary_language"
+            },
+            {
+                "data": "packages_packaging",
+                "title": "Packaging",
+                "name": "packages_packaging"
+            },
+            {
+                "data": "packages_authors_name[<hr/>]",
+                "title": "Package Authors Name",
+                "name": "packages_authors_name"
+            },
+            {
+                "data": "packages_homepage_url",
+                "title": "Package Homepage URL",
+                "name": "packages_homepage_url"
+            },
+            {
+                "data": "packages_asserted_licenses[<hr/>]",
+                "title": "Package Asserted License",
+                "name": "packages_asserted_licenses"
             }
         ];
     }

diff --git a/test/data/flattened-scancode-results.json b/test/data/flattened-scancode-results.json
@@ -115,7 +115,7 @@
     "packages_summary": [ [] ],
     "packages_description": [ [] ],
     "packages_payload_type": [ [] ],
-    "packages_authors": [ [] ],
+    "packages_authors_name": [],
     "packages_maintainers": [ [] ],
     "packages_contributors": [ [] ],
     "packages_owners": [ [] ],
@@ -140,7 +140,7 @@
     "packages_vcs_revision": [ [] ],
     "packages_copyright_top_level": [ [] ],
     "packages_copyrights": [ [] ],
-    "packages_asserted_licenses": [ [] ],
+    "packages_asserted_licenses": [],
     "packages_legal_file_locations": [ [] ],
     "packages_license_expression": [ [] ],
     "packages_license_texts": [ [] ],