From e967f9eb5f4055548f047f18bee8bcecf767b3c6 Mon Sep 17 00:00:00 2001 From: Alok Kumar Date: Sat, 11 Jan 2025 16:34:38 +0530 Subject: [PATCH] rename dependencies resolved to pinned Signed-off-by: Alok Kumar --- .../dependency-info-dashboard.rst | 2 +- docs/source/ui-reference/package-explorer.rst | 2 +- ...scan-results-without-text-referendces.json | 6 +- ...12.262-sources.jar-v32rc4results-todo.json | 68 +++++++++--------- samples/hazelcast-3293_v32.0.0rc3.json | 30 ++++---- ...scancode-32.0.0rc4_python_sample-wref.json | 70 +++++++++---------- .../zjsonpatch-0.3.0.jar-v32rc4results.json | 18 ++--- .../DependenciesTableCols.ts.ts | 2 +- .../DependencyEntity.tsx | 2 +- .../DependencyInfoDash/DependencyInfoDash.tsx | 14 ++-- .../DependencySummaryTableCols.tsx | 6 +- src/pages/Packages/Packages.tsx | 4 +- src/pages/Packages/filters.ts | 6 +- tests/test-scans/headers/expectedHeaders.ts | 8 +-- tests/test-scans/headers/minimal.json | 2 +- tests/test-scans/headers/withOptions.json | 2 +- .../licenses/withLicenses_legacy.json | 2 +- .../withPackagesAndDeps.json | 12 ++-- tests/test-scans/todos/minimal.json | 32 ++++----- 19 files changed, 144 insertions(+), 144 deletions(-) diff --git a/docs/source/ui-reference/dependency-info-dashboard.rst b/docs/source/ui-reference/dependency-info-dashboard.rst index 7c500aa5..1c5e8dc6 100644 --- a/docs/source/ui-reference/dependency-info-dashboard.rst +++ b/docs/source/ui-reference/dependency-info-dashboard.rst @@ -13,7 +13,7 @@ Summary of Dependencys: - Total number of Dependencies detected - Summary table - - Dependencies per Scope (Runtime, Optional, Resolved) for each Package Type + - Dependencies per Scope (Runtime, Optional, Pinned) for each Package Type - Pie charts - Dependencies for each Package type diff --git a/docs/source/ui-reference/package-explorer.rst b/docs/source/ui-reference/package-explorer.rst index 8f2372eb..d180c0fb 100644 --- a/docs/source/ui-reference/package-explorer.rst +++ b/docs/source/ui-reference/package-explorer.rst @@ -24,7 +24,7 @@ Packages and dependencies are organised in a hierarchical structure as shown bel User can select different filters: - Data sources - ``maven_pom``, ``go_mod``, ``npm_package_lock_json``, etc -- Dependency flags - ``Runtime``, ``Resolved``, ``Optional`` +- Dependency flags - ``Runtime``, ``Pinned``, ``Optional`` Tip - You can click on the tag on the right side of the dependency to toggle that flag. diff --git a/samples/anglesharp.css.0.16.4-scan-results-without-text-referendces.json b/samples/anglesharp.css.0.16.4-scan-results-without-text-referendces.json index 5e2925b2..002bea94 100644 --- a/samples/anglesharp.css.0.16.4-scan-results-without-text-referendces.json +++ b/samples/anglesharp.css.0.16.4-scan-results-without-text-referendces.json @@ -17,7 +17,7 @@ "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/scancode-toolkit/ for support and download.", "start_timestamp": "2023-06-15T124439.682008", "end_timestamp": "2023-06-15T124447.640208", - "output_format_version": "3.0.0", + "output_format_version": "4.0.0", "duration": 7.958212375640869, "message": null, "errors": [], @@ -152,7 +152,7 @@ "scope": "dependency", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:nuget/AngleSharp?uuid=76c0ce8f-168b-4c20-bede-8cb1c7ad0832", @@ -429,7 +429,7 @@ "scope": "dependency", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} } diff --git a/samples/aws-java-sdk-core-1.12.262-sources.jar-v32rc4results-todo.json b/samples/aws-java-sdk-core-1.12.262-sources.jar-v32rc4results-todo.json index cbde9d64..a43e7836 100644 --- a/samples/aws-java-sdk-core-1.12.262-sources.jar-v32rc4results-todo.json +++ b/samples/aws-java-sdk-core-1.12.262-sources.jar-v32rc4results-todo.json @@ -25,7 +25,7 @@ "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/scancode-toolkit/ for support and download.", "start_timestamp": "2023-04-21T000539.824192", "end_timestamp": "2023-04-21T000617.628200", - "output_format_version": "3.0.0", + "output_format_version": "4.0.0", "duration": 37.80401682853699, "message": null, "errors": [], @@ -56,7 +56,7 @@ "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/scancode-toolkit/ for support and download.", "start_timestamp": "2023-04-25T214059.789270", "end_timestamp": "2023-04-25T214101.183122", - "output_format_version": "3.0.0", + "output_format_version": "4.0.0", "duration": 1.3938610553741455, "message": null, "errors": [], @@ -176,7 +176,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/commons-logging/commons-logging?uuid=0d875b4b-f9da-4e92-a7bc-d130f8e81caf", @@ -190,7 +190,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/commons-codec/commons-codec?uuid=2fab08d6-9fd0-434a-9e8d-3907226e560b", @@ -204,7 +204,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/org.apache.httpcomponents/httpclient?uuid=87eeb2c4-e8a4-494b-b5f8-6ceddb732405", @@ -218,7 +218,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/software.amazon.ion/ion-java?uuid=6473e0ec-6b6f-4e77-a128-e82da092e95e", @@ -232,7 +232,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/com.fasterxml.jackson.core/jackson-databind?uuid=eb1452dd-a1f8-46aa-82f8-749dfea6b336", @@ -246,7 +246,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/com.fasterxml.jackson.dataformat/jackson-dataformat-cbor?uuid=32ead870-ecd6-46f8-a6f8-ff59467b66b4", @@ -260,7 +260,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/joda-time/joda-time?uuid=572bfb67-8133-4547-b9cd-05477a080c08", @@ -274,7 +274,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/junit/junit?uuid=8e6cea4f-5611-476d-ae63-8bac585f6355", @@ -288,7 +288,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/com.github.tomakehurst/wiremock?uuid=fbaab5c5-e10a-44c3-894f-c525606dc803", @@ -302,7 +302,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/log4j/log4j?uuid=1d883fbe-72a9-4c85-8195-b85dc7055ac9", @@ -316,7 +316,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/org.hamcrest/hamcrest-all?uuid=50b38b98-7f0b-4997-865a-f91f6df5cfe0", @@ -330,7 +330,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/org.easymock/easymock?uuid=cf162a88-df4f-412e-a243-203d04eff67e", @@ -344,7 +344,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/commons-io/commons-io?uuid=2eba8b3f-9ed6-4ede-be68-317d5c1af0d7", @@ -358,7 +358,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/org.mockito/mockito-all?uuid=0fe91971-3efb-4d48-b53f-8828bf9a2504", @@ -372,7 +372,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/nl.jqno.equalsverifier/equalsverifier?uuid=0231961d-6baf-495b-b64f-b4dc8627c5a1", @@ -386,7 +386,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/org.unitils/unitils-core?uuid=c68928ea-3153-41c1-abb1-ab3bba0a5678", @@ -49764,7 +49764,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49774,7 +49774,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49784,7 +49784,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49794,7 +49794,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49804,7 +49804,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49814,7 +49814,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49824,7 +49824,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49834,7 +49834,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49844,7 +49844,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49854,7 +49854,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49864,7 +49864,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49874,7 +49874,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49884,7 +49884,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49894,7 +49894,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49904,7 +49904,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -49914,7 +49914,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} } diff --git a/samples/hazelcast-3293_v32.0.0rc3.json b/samples/hazelcast-3293_v32.0.0rc3.json index 05a8e30a..a13370fe 100644 --- a/samples/hazelcast-3293_v32.0.0rc3.json +++ b/samples/hazelcast-3293_v32.0.0rc3.json @@ -22,7 +22,7 @@ "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/scancode-toolkit/ for support and download.", "start_timestamp": "2023-03-28T142348.229364", "end_timestamp": "2023-03-28T142438.730921", - "output_format_version": "3.0.0", + "output_format_version": "4.0.0", "duration": 50.501567363739014, "message": null, "errors": [], @@ -230,7 +230,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/com.hazelcast/hazelcast@5.1.5?uuid=7a5d3666-4da3-4ac4-80d2-24a54f41d3e2", @@ -244,7 +244,7 @@ "scope": "provided", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/javax.annotation/javax.annotation-api@1.3.2?uuid=28f3e66e-4d6b-4b97-83dc-63280c09a25a", @@ -258,7 +258,7 @@ "scope": "provided", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/org.springframework/spring-context@5.3.16?uuid=b924e0c1-1012-4484-ba84-5e5211e19075", @@ -272,7 +272,7 @@ "scope": "provided", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/org.springframework/spring-tx@5.3.16?uuid=094ecbab-aa90-4a21-bacc-5e4cbb0b8767", @@ -286,7 +286,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/com.hazelcast/hazelcast@5.1.5?uuid=3fad2bb4-49d5-403e-abed-45fb68fdbcab", @@ -300,7 +300,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/org.apache.httpcomponents/httpclient?uuid=95726e06-8a88-4501-8a85-61f4a0894e53", @@ -314,7 +314,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/org.apache.maven/maven-artifact@3.6.3?uuid=74198439-6db1-49c8-bb7b-1b8d05aca9b4", @@ -5135,7 +5135,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {} }, @@ -5145,7 +5145,7 @@ "scope": "provided", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {} }, @@ -5155,7 +5155,7 @@ "scope": "provided", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {} }, @@ -5165,7 +5165,7 @@ "scope": "provided", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {} }, @@ -5175,7 +5175,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {} }, @@ -5185,7 +5185,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -5195,7 +5195,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {} } diff --git a/samples/scancode-32.0.0rc4_python_sample-wref.json b/samples/scancode-32.0.0rc4_python_sample-wref.json index 73b941b2..a270d222 100644 --- a/samples/scancode-32.0.0rc4_python_sample-wref.json +++ b/samples/scancode-32.0.0rc4_python_sample-wref.json @@ -21,7 +21,7 @@ "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/scancode-toolkit/ for support and download.", "start_timestamp": "2023-05-10T095453.613306", "end_timestamp": "2023-05-10T095509.574964", - "output_format_version": "3.0.0", + "output_format_version": "4.0.0", "duration": 15.961700916290283, "message": null, "errors": [], @@ -256,7 +256,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -281,7 +281,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -306,7 +306,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -331,7 +331,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -356,7 +356,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -381,7 +381,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -406,7 +406,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -431,7 +431,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -456,7 +456,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:pypi/commoncode?uuid=908aa69e-aee6-44cf-bc98-a2a8a2d10bc5", @@ -470,7 +470,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:pypi/plugincode?uuid=73dae5ed-0046-4cdc-9cb5-9fac460ce25c", @@ -484,7 +484,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:pypi/typecode?uuid=7349581c-1dbf-4bb6-a906-3171b6724e80", @@ -498,7 +498,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:pypi/extractcode?uuid=28ac376c-1267-4b5a-9621-f97fcbebd879", @@ -512,7 +512,7 @@ "scope": "python", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:generic/python?uuid=3b63106f-e86c-4f5f-a3d3-63a71521de56", @@ -526,7 +526,7 @@ "scope": "packages", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:pypi/rpm-inspector-rpm?uuid=1b7c69a6-33e3-4254-912d-99fb865f3dcf", @@ -540,7 +540,7 @@ "scope": "packages", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:pypi/regipy?uuid=8c4146e2-a053-45eb-85ff-75999de500d7", @@ -554,7 +554,7 @@ "scope": "packages", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:pypi/packagedcode-msitools?uuid=b97a7072-2072-44c7-8061-92f165c1801f", @@ -568,7 +568,7 @@ "scope": "dev", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:pypi/pytest?uuid=69555008-2b63-4c30-9b28-fd78f799d25d", @@ -2714,7 +2714,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -2735,7 +2735,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -2756,7 +2756,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -3059,7 +3059,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -3080,7 +3080,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -3101,7 +3101,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -3122,7 +3122,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -3143,7 +3143,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -3626,7 +3626,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -3636,7 +3636,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -3646,7 +3646,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -3656,7 +3656,7 @@ "scope": "install", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -3666,7 +3666,7 @@ "scope": "python", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -3676,7 +3676,7 @@ "scope": "packages", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -3686,7 +3686,7 @@ "scope": "packages", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -3696,7 +3696,7 @@ "scope": "packages", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -3706,7 +3706,7 @@ "scope": "dev", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} } diff --git a/samples/zjsonpatch-0.3.0.jar-v32rc4results.json b/samples/zjsonpatch-0.3.0.jar-v32rc4results.json index d9f12735..4f66f75d 100644 --- a/samples/zjsonpatch-0.3.0.jar-v32rc4results.json +++ b/samples/zjsonpatch-0.3.0.jar-v32rc4results.json @@ -25,7 +25,7 @@ "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/scancode-toolkit/ for support and download.", "start_timestamp": "2023-04-21T022056.303886", "end_timestamp": "2023-04-21T022058.560930", - "output_format_version": "3.0.0", + "output_format_version": "4.0.0", "duration": 2.2570528984069824, "message": null, "errors": [], @@ -183,7 +183,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.3.2?uuid=dff01326-9e0c-44b8-96c3-afb5f438da12", @@ -197,7 +197,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/com.fasterxml.jackson.core/jackson-core@2.3.2?uuid=f76cd879-abb8-4813-9f33-d89506ab9d02", @@ -211,7 +211,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/commons-io/commons-io@2.4?uuid=7064523b-58bc-436a-af3e-34046b6f563a", @@ -225,7 +225,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {}, "dependency_uid": "pkg:maven/junit/junit@4.8.2?uuid=d4bc0cac-4afa-4d5c-a632-bdbea3b35d67", @@ -2177,7 +2177,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {} }, @@ -2187,7 +2187,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {} }, @@ -2197,7 +2197,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {} }, @@ -2207,7 +2207,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": {} } diff --git a/src/components/PackagesEntityDetails/DependenciesTableCols.ts.ts b/src/components/PackagesEntityDetails/DependenciesTableCols.ts.ts index 523e4015..9ac32dc1 100644 --- a/src/components/PackagesEntityDetails/DependenciesTableCols.ts.ts +++ b/src/components/PackagesEntityDetails/DependenciesTableCols.ts.ts @@ -32,7 +32,7 @@ export const DependenciesTableCols: DepsColDef[] = [ width: 160, }, { - headerName: "Resolved", + headerName: "Pinned", field: "is_pinned", cellRenderer: TickRenderer, maxWidth: 92, diff --git a/src/components/PackagesEntityDetails/DependencyEntity.tsx b/src/components/PackagesEntityDetails/DependencyEntity.tsx index e0545d47..4070d562 100644 --- a/src/components/PackagesEntityDetails/DependencyEntity.tsx +++ b/src/components/PackagesEntityDetails/DependencyEntity.tsx @@ -39,7 +39,7 @@ const DependencyEntity = (props: DependencyEntityProps) => { )} {dependency.is_pinned && ( - Resolved + Pinned )}
diff --git a/src/pages/DependencyInfoDash/DependencyInfoDash.tsx b/src/pages/DependencyInfoDash/DependencyInfoDash.tsx index fea23b45..19824b5d 100644 --- a/src/pages/DependencyInfoDash/DependencyInfoDash.tsx +++ b/src/pages/DependencyInfoDash/DependencyInfoDash.tsx @@ -38,7 +38,7 @@ const DependencyInfoDash = () => { const [runtimeDependenciesData, setRuntimeDependenciesData] = useState< FormattedEntry[] | null >(null); - const [resolvedDependenciesData, setResolvedDependenciesData] = useState< + const [PinnedDependenciesData, setPinnedDependenciesData] = useState< FormattedEntry[] | null >(null); const [optionalDependenciesData, setOptionalDependenciesData] = useState< @@ -70,7 +70,7 @@ const DependencyInfoDash = () => { title: packageDataType, total: 0, }, - resolved: 0, + pinned: 0, runtime: 0, optional: 0, }); @@ -79,7 +79,7 @@ const DependencyInfoDash = () => { packageTypeToSummaryMapping.get(packageDataType); packageTypeSummary.packageTypeDetails.total += deps.length; - packageTypeSummary.resolved += deps.reduce((counter, curr) => { + packageTypeSummary.pinned += deps.reduce((counter, curr) => { return counter + (curr.is_pinned ? 1 : 0); }, 0); packageTypeSummary.runtime += deps.reduce((counter, curr) => { @@ -145,11 +145,11 @@ const DependencyInfoDash = () => { // Prepare chart for resolved dependencies const resolvedDependencies = dependencies.map((dependency) => - dependency.getDataValue("is_pinned") ? "Resolved" : "Unresolved" + dependency.getDataValue("is_pinned") ? "Pinned" : "Unpinned" ); - const { chartData: resolvedDependenciesChartData } = + const { chartData: pinnedDependenciesChartData } = formatPieChartData(resolvedDependencies); - setResolvedDependenciesData(resolvedDependenciesChartData); + setPinnedDependenciesData(pinnedDependenciesChartData); // Prepare chart for optional dependencies const optionalDependencies = dependencies.map((dependency) => @@ -277,7 +277,7 @@ const DependencyInfoDash = () => {
Resolved dependencies
{ bg="success" onClick={(e) => toggleDepTagFilter( - DepFilterTags.RESOLVED, + DepFilterTags.PINNED, e ) } > - Resolved + PINNED )} diff --git a/src/pages/Packages/filters.ts b/src/pages/Packages/filters.ts index 0d67e084..5e15e3d5 100644 --- a/src/pages/Packages/filters.ts +++ b/src/pages/Packages/filters.ts @@ -10,15 +10,15 @@ export interface DepFilterTag { } export const DepFilterTags: Record< - "RUNTIME" | "RESOLVED" | "OPTIONAL", + "RUNTIME" | "PINNED" | "OPTIONAL", DepFilterTag > = { RUNTIME: { value: "runtime", label: "Runtime", flag: "is_runtime" }, - RESOLVED: { value: "resolved", label: "Resolved", flag: "is_pinned" }, + PINNED: { value: "pinned", label: "Pinned", flag: "is_pinned" }, OPTIONAL: { value: "optional", label: "Optional", flag: "is_optional" }, }; export const DepFilterTagsList = [ DepFilterTags.RUNTIME, - DepFilterTags.RESOLVED, + DepFilterTags.PINNED, DepFilterTags.OPTIONAL, ]; diff --git a/tests/test-scans/headers/expectedHeaders.ts b/tests/test-scans/headers/expectedHeaders.ts index 9b6ee047..3ade9928 100644 --- a/tests/test-scans/headers/expectedHeaders.ts +++ b/tests/test-scans/headers/expectedHeaders.ts @@ -44,7 +44,7 @@ export const HeaderSamples: { optionsMap: new Map(), input: [], files_count: 0, - output_format_version: "3.0.0", + output_format_version: "4.0.0", spdx_license_list_version: "3.20", operating_system: "linux", cpu_architecture: "64", @@ -55,7 +55,7 @@ export const HeaderSamples: { workbench_notice: 'Exported from ScanCode Workbench and provided on an "AS IS" BASIS, WITHOUT WARRANTIES\\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\\nScanCode Workbench should be considered or used as legal advice. Consult an Attorney\\nfor any legal advice.\\nScanCode Workbench is a free software analysis application from nexB Inc. and others.\\nVisit https://github.com/aboutcode-org/scancode-workbench/ for support and download.', raw_header_content: - '{\n "tool_name": "scancode-toolkit",\n "tool_version": "32.0.0rc3",\n "notice": "Generated with ScanCode and provided on an \\"AS IS\\" BASIS, WITHOUT WARRANTIES.",\n "start_timestamp": "2023-04-03T075922.014902",\n "end_timestamp": "2023-04-03T075941.622685",\n "output_format_version": "3.0.0",\n "duration": 25,\n "extra_data": {\n "system_environment": {\n "operating_system": "linux",\n "cpu_architecture": "64",\n "platform": "Linux-5.14.0-1059-oem-x86_64-with-glibc2.29",\n "platform_version": "#67-Ubuntu SMP Mon Mar 13 14:22:10 UTC 2023",\n "python_version": "3.8.10 (default, Mar 13 2023, 10:26:41) \\n[GCC 9.4.0]"\n },\n "spdx_license_list_version": "3.20"\n }\n}', + '{\n "tool_name": "scancode-toolkit",\n "tool_version": "32.0.0rc3",\n "notice": "Generated with ScanCode and provided on an \\"AS IS\\" BASIS, WITHOUT WARRANTIES.",\n "start_timestamp": "2023-04-03T075922.014902",\n "end_timestamp": "2023-04-03T075941.622685",\n "output_format_version": "4.0.0",\n "duration": 25,\n "extra_data": {\n "system_environment": {\n "operating_system": "linux",\n "cpu_architecture": "64",\n "platform": "Linux-5.14.0-1059-oem-x86_64-with-glibc2.29",\n "platform_version": "#67-Ubuntu SMP Mon Mar 13 14:22:10 UTC 2023",\n "python_version": "3.8.10 (default, Mar 13 2023, 10:26:41) \\n[GCC 9.4.0]"\n },\n "spdx_license_list_version": "3.20"\n }\n}', errors: [], }, }, @@ -86,7 +86,7 @@ export const HeaderSamples: { ]), input: ["hazelcast-spring-5.1.5-sources/"], files_count: 39, - output_format_version: "2.0.0", + output_format_version: "4.0.0", spdx_license_list_version: "3.10", operating_system: "linux", cpu_architecture: "64", @@ -97,7 +97,7 @@ export const HeaderSamples: { workbench_notice: 'Exported from ScanCode Workbench and provided on an "AS IS" BASIS, WITHOUT WARRANTIES\\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\\nScanCode Workbench should be considered or used as legal advice. Consult an Attorney\\nfor any legal advice.\\nScanCode Workbench is a free software analysis application from nexB Inc. and others.\\nVisit https://github.com/aboutcode-org/scancode-workbench/ for support and download.', raw_header_content: - '{\n "tool_name": "scancode-toolkit",\n "tool_version": "32.0.0rc3",\n "options": {\n "--classify": true,\n "--copyright": true,\n "--json-pp": "hazelcast-v32.0.0rc3-wref.json",\n "--license-text": true,\n "--processes": "12",\n "--url": true\n },\n "notice": "Generated with ScanCode and provided on an \\"AS IS\\" BASIS, WITHOUT WARRANTIES.",\n "start_timestamp": "2023-04-03T075922.014902",\n "end_timestamp": "2023-04-03T075941.622685",\n "output_format_version": "2.0.0",\n "duration": 19.607794523239136,\n "message": null,\n "errors": [],\n "warnings": [],\n "extra_data": {\n "system_environment": {\n "operating_system": "linux",\n "cpu_architecture": "64",\n "platform": "Linux-5.14.0-1059-oem-x86_64-with-glibc2.29",\n "platform_version": "#67-Ubuntu SMP Mon Mar 13 14:22:10 UTC 2023",\n "python_version": "3.8.10 (default, Mar 13 2023, 10:26:41) \\n[GCC 9.4.0]"\n },\n "spdx_license_list_version": "3.10",\n "files_count": 39\n }\n}', + '{\n "tool_name": "scancode-toolkit",\n "tool_version": "32.0.0rc3",\n "options": {\n "--classify": true,\n "--copyright": true,\n "--json-pp": "hazelcast-v32.0.0rc3-wref.json",\n "--license-text": true,\n "--processes": "12",\n "--url": true\n },\n "notice": "Generated with ScanCode and provided on an \\"AS IS\\" BASIS, WITHOUT WARRANTIES.",\n "start_timestamp": "2023-04-03T075922.014902",\n "end_timestamp": "2023-04-03T075941.622685",\n "output_format_version": "4.0.0",\n "duration": 19.607794523239136,\n "message": null,\n "errors": [],\n "warnings": [],\n "extra_data": {\n "system_environment": {\n "operating_system": "linux",\n "cpu_architecture": "64",\n "platform": "Linux-5.14.0-1059-oem-x86_64-with-glibc2.29",\n "platform_version": "#67-Ubuntu SMP Mon Mar 13 14:22:10 UTC 2023",\n "python_version": "3.8.10 (default, Mar 13 2023, 10:26:41) \\n[GCC 9.4.0]"\n },\n "spdx_license_list_version": "3.10",\n "files_count": 39\n }\n}', errors: [], }, }, diff --git a/tests/test-scans/headers/minimal.json b/tests/test-scans/headers/minimal.json index c5b62f4e..2b33effb 100644 --- a/tests/test-scans/headers/minimal.json +++ b/tests/test-scans/headers/minimal.json @@ -6,7 +6,7 @@ "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES.", "start_timestamp": "2023-04-03T075922.014902", "end_timestamp": "2023-04-03T075941.622685", - "output_format_version": "3.0.0", + "output_format_version": "4.0.0", "duration": 25, "extra_data": { "system_environment": { diff --git a/tests/test-scans/headers/withOptions.json b/tests/test-scans/headers/withOptions.json index 72e4abcf..a9de3889 100644 --- a/tests/test-scans/headers/withOptions.json +++ b/tests/test-scans/headers/withOptions.json @@ -15,7 +15,7 @@ "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES.", "start_timestamp": "2023-04-03T075922.014902", "end_timestamp": "2023-04-03T075941.622685", - "output_format_version": "2.0.0", + "output_format_version": "4.0.0", "duration": 19.607794523239136, "message": null, "errors": [], diff --git a/tests/test-scans/licenses/withLicenses_legacy.json b/tests/test-scans/licenses/withLicenses_legacy.json index 8651664c..2099f53c 100644 --- a/tests/test-scans/licenses/withLicenses_legacy.json +++ b/tests/test-scans/licenses/withLicenses_legacy.json @@ -547,7 +547,7 @@ "scope": "dependency", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} } diff --git a/tests/test-scans/packages_dependencies/withPackagesAndDeps.json b/tests/test-scans/packages_dependencies/withPackagesAndDeps.json index f565dfab..724f7cae 100644 --- a/tests/test-scans/packages_dependencies/withPackagesAndDeps.json +++ b/tests/test-scans/packages_dependencies/withPackagesAndDeps.json @@ -103,7 +103,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -128,7 +128,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -153,7 +153,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -284,7 +284,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -305,7 +305,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, @@ -326,7 +326,7 @@ "scope": "development", "is_runtime": false, "is_optional": true, - "is_resolved": true, + "is_pinned": true, "resolved_package": {}, "extra_data": { "is_editable": false, diff --git a/tests/test-scans/todos/minimal.json b/tests/test-scans/todos/minimal.json index a00f09ce..5bd7dadf 100644 --- a/tests/test-scans/todos/minimal.json +++ b/tests/test-scans/todos/minimal.json @@ -453,7 +453,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -463,7 +463,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -473,7 +473,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -483,7 +483,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -493,7 +493,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -503,7 +503,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -513,7 +513,7 @@ "scope": "compile", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -523,7 +523,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -533,7 +533,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -543,7 +543,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -553,7 +553,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -563,7 +563,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -573,7 +573,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -583,7 +583,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -593,7 +593,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }, @@ -603,7 +603,7 @@ "scope": "test", "is_runtime": false, "is_optional": true, - "is_resolved": false, + "is_pinned": false, "resolved_package": {}, "extra_data": {} }