From 94ec2cabb15a85fa683af74602859019ebddeb90 Mon Sep 17 00:00:00 2001 From: fraxken Date: Sat, 25 Nov 2023 14:11:17 +0100 Subject: [PATCH 1/2] feat: add color to scorecard menu --- public/css/components/package/navigation.css | 17 +++++++++++++++++ .../js/components/package/pannels/scorecard.js | 17 +++++++++++++++++ src/http-server/endpoints/ossf-scorecard.js | 6 +++++- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/public/css/components/package/navigation.css b/public/css/components/package/navigation.css index 87897e33..a31ac327 100644 --- a/public/css/components/package/navigation.css +++ b/public/css/components/package/navigation.css @@ -88,3 +88,20 @@ section#package-info>.package-navigation>div>.signal { section#package-info>.package-navigation>div#scorecard-menu { display: none; } + +section#package-info>.package-navigation>div#scorecard-menu.red { + border: 2px solid #EF5350; + color: #FF80AB; +} +section#package-info>.package-navigation>div#scorecard-menu.orange { + border: 2px solid #FDD835; + color: #FFD740; +} +section#package-info>.package-navigation>div#scorecard-menu.blue { + border: 2px solid #2962FF; + color: #BBDEFB; +} +section#package-info>.package-navigation>div#scorecard-menu.green { + border: 2px solid #00E676; + color: #B2FF59; +} diff --git a/public/js/components/package/pannels/scorecard.js b/public/js/components/package/pannels/scorecard.js index 597a4d81..ed1cdd59 100644 --- a/public/js/components/package/pannels/scorecard.js +++ b/public/js/components/package/pannels/scorecard.js @@ -62,6 +62,20 @@ export class Scorecard { }); } + getScoreColor(score) { + if (score < 4) { + return "red"; + } + if (score < 6.5) { + return "orange"; + } + if (score < 8.5) { + return "blue"; + } + + return "green"; + } + renderScorecard(data, repoName) { const { score, checks } = data; @@ -74,6 +88,9 @@ export class Scorecard { } document.getElementById('ossf-score').innerText = score; + document.getElementById('scorecard-menu').classList.add( + this.getScoreColor(score) + ); document.getElementById('head-score').innerText = score; document .querySelector(".score-header .visualizer a") diff --git a/src/http-server/endpoints/ossf-scorecard.js b/src/http-server/endpoints/ossf-scorecard.js index 7ce6773b..e1779a17 100644 --- a/src/http-server/endpoints/ossf-scorecard.js +++ b/src/http-server/endpoints/ossf-scorecard.js @@ -14,6 +14,10 @@ export async function get(req, res) { } catch (error) { - return send(res, error.statusCode ?? 404, { error: error.statusMessage ?? "Not Found" }); + return send( + res, + error.statusCode ?? 404, + { error: error.statusMessage ?? "Not Found" } + ); } } From 34bc35703c62737d73c9846e58f261529b95261e Mon Sep 17 00:00:00 2001 From: fraxken Date: Sat, 25 Nov 2023 14:35:24 +0100 Subject: [PATCH 2/2] chore: rollback scorecard to v2.0.0 --- package.json | 2 +- test/helpers/cliCommandRunner.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c2960266..3b55ed36 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "@nodesecure/flags": "^2.4.0", "@nodesecure/i18n": "^3.2.2", "@nodesecure/npm-registry-sdk": "^1.6.1", - "@nodesecure/ossf-scorecard-sdk": "^3.0.0", + "@nodesecure/ossf-scorecard-sdk": "^2.0.0", "@nodesecure/rc": "^1.5.0", "@nodesecure/scanner": "^5.0.1", "@nodesecure/utils": "^1.1.0", diff --git a/test/helpers/cliCommandRunner.js b/test/helpers/cliCommandRunner.js index 54326e78..18880631 100644 --- a/test/helpers/cliCommandRunner.js +++ b/test/helpers/cliCommandRunner.js @@ -3,7 +3,7 @@ import { fork } from "node:child_process"; import { createInterface } from "node:readline"; // Import Third-party Dependencies -import { MockAgent, setGlobalDispatcher } from "@myunisoft/httpie"; +import { MockAgent, setGlobalDispatcher } from "undici"; import stripAnsi from "strip-ansi"; export async function* runProcess(options) {