Added package asserted licenses attributes #81

* Added additional asserted license attributes (url, text, notice) to Package Model * Rearranged DataTable columns * Removed Packaging column from DataTable view * Updated test file Signed-off-by: Jillian Daguil <jdaguil@nexb.com>
aboutcode-org · May 21, 2017 · 984480f · 984480f
1 parent 3dbfb86
commit 984480f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/assets/js/aboutCodeDB.js b/assets/js/aboutCodeDB.js
@@ -437,7 +437,10 @@ class AboutCodeDB {
             packages_vcs_revision: AboutCodeDB.jsonDataType( "packages_vcs_revision"),
             packages_copyright_top_level: AboutCodeDB.jsonDataType( "packages_copyright_top_level"),
             packages_copyrights: AboutCodeDB.jsonDataType( "packages_copyrights"),
-            packages_asserted_licenses: AboutCodeDB.jsonDataType( "packages_asserted_licenses"),
+            packages_asserted_licenses_license: AboutCodeDB.jsonDataType( "packages_asserted_licenses_license"),
+            packages_asserted_licenses_url: AboutCodeDB.jsonDataType( "packages_asserted_licenses_url"),
+            packages_asserted_licenses_text: AboutCodeDB.jsonDataType( "packages_asserted_licenses_text"),
+            packages_asserted_licenses_notice: AboutCodeDB.jsonDataType( "packages_asserted_licenses_notice"),
             packages_legal_file_locations: AboutCodeDB.jsonDataType( "packages_legal_file_locations"),
             packages_license_expression: AboutCodeDB.jsonDataType( "packages_license_expression"),
             packages_license_texts: AboutCodeDB.jsonDataType( "packages_license_texts"),
@@ -536,7 +539,10 @@ 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.getNestedValues(file.packages, "asserted_licenses", "license"),
+            packages_asserted_licenses_license: AboutCodeDB.getNestedValues(file.packages, "asserted_licenses", "license"),
+            packages_asserted_licenses_url: AboutCodeDB.getNestedValues(file.packages, "asserted_licenses", "url"),
+            packages_asserted_licenses_text: AboutCodeDB.getNestedValues(file.packages, "asserted_licenses", "text"),
+            packages_asserted_licenses_notice: AboutCodeDB.getNestedValues(file.packages, "asserted_licenses", "notice"),
             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"),

diff --git a/assets/js/aboutCodeDataTables.js b/assets/js/aboutCodeDataTables.js
@@ -466,16 +466,16 @@ class AboutCodeDataTable {
                 "title": "Package Version",
                 "name": "packages_version"
             },
+            {
+                "data": "packages_asserted_licenses_license[<hr/>]",
+                "title": "Package Asserted License",
+                "name": "packages_asserted_licenses_license"
+            },
             {
                 "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",
@@ -487,10 +487,14 @@ class AboutCodeDataTable {
                 "name": "packages_homepage_url"
             },
             {
-                "data": "packages_asserted_licenses[<hr/>]",
-                "title": "Package Asserted License",
-                "name": "packages_asserted_licenses"
-            }
+                "data": function (row, type, val, meta) {
+                    return row.packages_download_urls.map(urls => {
+                        return urls.join("<br/>")
+                    }).join("<hr/>");
+                },
+                "title": "Package Download URL",
+                "name": "packages_download_urls"
+            },
         ];
     }
 

diff --git a/test/data/flattened-scancode-results.json b/test/data/flattened-scancode-results.json
@@ -143,7 +143,10 @@
     "packages_vcs_revision": [ [] ],
     "packages_copyright_top_level": [ [] ],
     "packages_copyrights": [ [] ],
-    "packages_asserted_licenses": [],
+    "packages_asserted_licenses_license": [],
+    "packages_asserted_licenses_notice": [],
+    "packages_asserted_licenses_text": [],
+    "packages_asserted_licenses_url": [],
     "packages_legal_file_locations": [ [] ],
     "packages_license_expression": [ [] ],
     "packages_license_texts": [ [] ],