Skip to content

Commit 0c21068

Browse files
jdaguiljdaguil
committed
Merge branch 'develop' into 88-jstree-lazy-loading
2 parents 0a6bccc + 570638f commit 0c21068

File tree

4 files changed

+76
-11
lines changed

4 files changed

+76
-11
lines changed

‎assets/js/aboutCodeDB.js‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,10 @@ class AboutCodeDB {
405405
packages_summary: AboutCodeDB.jsonDataType( "packages_summary"),
406406
packages_description: AboutCodeDB.jsonDataType( "packages_description"),
407407
packages_payload_type: AboutCodeDB.jsonDataType( "packages_payload_type"),
408-
packages_authors: AboutCodeDB.jsonDataType( "packages_authors"),
408+
packages_authors_type: AboutCodeDB.jsonDataType( "packages_authors_type"),
409+
packages_authors_name: AboutCodeDB.jsonDataType( "packages_authors_name"),
410+
packages_authors_email: AboutCodeDB.jsonDataType( "packages_authors_email"),
411+
packages_authors_url: AboutCodeDB.jsonDataType( "packages_authors_url"),
409412
packages_maintainers: AboutCodeDB.jsonDataType( "packages_maintainers"),
410413
packages_contributors: AboutCodeDB.jsonDataType( "packages_contributors"),
411414
packages_owners: AboutCodeDB.jsonDataType( "packages_owners"),
@@ -430,7 +433,10 @@ class AboutCodeDB {
430433
packages_vcs_revision: AboutCodeDB.jsonDataType( "packages_vcs_revision"),
431434
packages_copyright_top_level: AboutCodeDB.jsonDataType( "packages_copyright_top_level"),
432435
packages_copyrights: AboutCodeDB.jsonDataType( "packages_copyrights"),
433-
packages_asserted_licenses: AboutCodeDB.jsonDataType( "packages_asserted_licenses"),
436+
packages_asserted_licenses_license: AboutCodeDB.jsonDataType( "packages_asserted_licenses_license"),
437+
packages_asserted_licenses_url: AboutCodeDB.jsonDataType( "packages_asserted_licenses_url"),
438+
packages_asserted_licenses_text: AboutCodeDB.jsonDataType( "packages_asserted_licenses_text"),
439+
packages_asserted_licenses_notice: AboutCodeDB.jsonDataType( "packages_asserted_licenses_notice"),
434440
packages_legal_file_locations: AboutCodeDB.jsonDataType( "packages_legal_file_locations"),
435441
packages_license_expression: AboutCodeDB.jsonDataType( "packages_license_expression"),
436442
packages_license_texts: AboutCodeDB.jsonDataType( "packages_license_texts"),
@@ -501,7 +507,10 @@ class AboutCodeDB {
501507
packages_summary: AboutCodeDB.getValues(file.packages, "summary"),
502508
packages_description: AboutCodeDB.getValues(file.packages, "description"),
503509
packages_payload_type: AboutCodeDB.getValues(file.packages, "payload_type"),
504-
packages_authors: AboutCodeDB.getValues(file.packages, "authors"),
510+
packages_authors_type: AboutCodeDB.getNestedValues(file.packages, "authors", "type"),
511+
packages_authors_name: AboutCodeDB.getNestedValues(file.packages, "authors", "name"),
512+
packages_authors_email: AboutCodeDB.getNestedValues(file.packages, "authors", "email"),
513+
packages_authors_url: AboutCodeDB.getNestedValues(file.packages, "authors", "url"),
505514
packages_maintainers: AboutCodeDB.getValues(file.packages, "maintainers"),
506515
packages_contributors: AboutCodeDB.getValues(file.packages, "contributors"),
507516
packages_owners: AboutCodeDB.getValues(file.packages, "owners"),
@@ -526,7 +535,10 @@ class AboutCodeDB {
526535
packages_vcs_revision: AboutCodeDB.getValues(file.packages, "vcs_revision"),
527536
packages_copyright_top_level: AboutCodeDB.getValues(file.packages, "copyright_top_level"),
528537
packages_copyrights: AboutCodeDB.getValues(file.packages, "copyrights"),
529-
packages_asserted_licenses: AboutCodeDB.getValues(file.packages, "asserted_licenses"),
538+
packages_asserted_licenses_license: AboutCodeDB.getNestedValues(file.packages, "asserted_licenses", "license"),
539+
packages_asserted_licenses_url: AboutCodeDB.getNestedValues(file.packages, "asserted_licenses", "url"),
540+
packages_asserted_licenses_text: AboutCodeDB.getNestedValues(file.packages, "asserted_licenses", "text"),
541+
packages_asserted_licenses_notice: AboutCodeDB.getNestedValues(file.packages, "asserted_licenses", "notice"),
530542
packages_legal_file_locations: AboutCodeDB.getValues(file.packages, "legal_file_locations"),
531543
packages_license_expression: AboutCodeDB.getValues(file.packages, "license_expression"),
532544
packages_license_texts: AboutCodeDB.getValues(file.packages, "license_texts"),
@@ -547,6 +559,15 @@ class AboutCodeDB {
547559
return [elem[key] ? elem[key] : []];
548560
});
549561
}
562+
563+
// [{key: [{ nestedKey: val0}], {key: [ nestedKey: val1]}] => [val0, val1]
564+
static getNestedValues(array, key, nestedKey) {
565+
return $.map(array ? array : [], (elem, i) => {
566+
return $.map(elem[key] ? elem[key] : [], (nestedElem, i) => {
567+
return [nestedElem[nestedKey] ? nestedElem[nestedKey] : []]
568+
});
569+
});
570+
}
550571
}
551572

552573
module.exports = AboutCodeDB;

‎assets/js/aboutCodeDataTables.js‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,15 +457,46 @@ class AboutCodeDataTable {
457457
"name": "packages_type"
458458
},
459459
{
460-
"data": "packages_packaging",
461-
"title": "Packaging",
462-
"name": "packages_packaging"
460+
"data": "packages_name",
461+
"title": "Package Name",
462+
"name": "packages_name"
463+
},
464+
{
465+
"data": "packages_version",
466+
"title": "Package Version",
467+
"name": "packages_version"
468+
},
469+
{
470+
"data": "packages_asserted_licenses_license[<hr/>]",
471+
"title": "Package Asserted License",
472+
"name": "packages_asserted_licenses_license"
463473
},
464474
{
465475
"data": "packages_primary_language",
466476
"title": "Package Primary Language",
467477
"name": "packages_primary_language"
468-
}
478+
},
479+
{
480+
"data": "packages_authors_name[<hr/>]",
481+
"title": "Package Authors Name",
482+
"name": "packages_authors_name"
483+
},
484+
{
485+
"data": "packages_homepage_url",
486+
"title": "Package Homepage URL",
487+
"name": "packages_homepage_url"
488+
},
489+
{
490+
"data": function (row, type, val, meta) {
491+
return row.packages_download_urls.map(urls => {
492+
return urls.map(url => {
493+
return '<a href="'+url+'" target="_blank">'+url+'</a>';
494+
}).join("<br/>")
495+
}).join("<hr/>");
496+
},
497+
"title": "Package Download URLs",
498+
"name": "packages_download_urls"
499+
},
469500
];
470501
}
471502

‎test/data/flattened-scancode-results.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@
115115
"packages_summary": [ [] ],
116116
"packages_description": [ [] ],
117117
"packages_payload_type": [ [] ],
118-
"packages_authors": [ [] ],
118+
"packages_authors_name": ["jQuery Foundation and other contributors"],
119+
"packages_authors_type": ["person"],
120+
"packages_authors_email": [[]],
121+
"packages_authors_url": ["https://github.com/jquery/jquery/blob/3.1.0/AUTHORS.txt"],
119122
"packages_maintainers": [ [] ],
120123
"packages_contributors": [ [] ],
121124
"packages_owners": [ [] ],
@@ -140,7 +143,10 @@
140143
"packages_vcs_revision": [ [] ],
141144
"packages_copyright_top_level": [ [] ],
142145
"packages_copyrights": [ [] ],
143-
"packages_asserted_licenses": [ [] ],
146+
"packages_asserted_licenses_license": [],
147+
"packages_asserted_licenses_notice": [],
148+
"packages_asserted_licenses_text": [],
149+
"packages_asserted_licenses_url": [],
144150
"packages_legal_file_locations": [ [] ],
145151
"packages_license_expression": [ [] ],
146152
"packages_license_texts": [ [] ],

‎test/data/scancode-results.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,14 @@
8888
"summary": null,
8989
"description": null,
9090
"payload_type": null,
91-
"authors": [],
91+
"authors": [
92+
{
93+
"type": "person",
94+
"name": "jQuery Foundation and other contributors",
95+
"email": null,
96+
"url": "https://github.com/jquery/jquery/blob/3.1.0/AUTHORS.txt"
97+
}
98+
],
9299
"maintainers": [],
93100
"contributors": [],
94101
"owners": [],

0 commit comments

Comments
 (0)