diff --git a/media/riskManagement.css b/media/riskManagement.css index 4045452a6..31285885d 100644 --- a/media/riskManagement.css +++ b/media/riskManagement.css @@ -125,10 +125,6 @@ button:hover { filter: brightness(1.5); } -.disabled-result { - cursor: not-allowed; -} - svg { vertical-align: text-top; color: var(--cx-main-color); diff --git a/media/riskManagement.js b/media/riskManagement.js index d3369d2ec..81dd7d100 100644 --- a/media/riskManagement.js +++ b/media/riskManagement.js @@ -400,28 +400,17 @@ return results.results.map((result) => { const matchedScore = getMatchedScore(result, app.applicationID); - const isNA = - result.engine.toLowerCase() === "sca" || - result.engine.toLowerCase() === "kics"; - const tooltip = isNA - ? 'title="Coming soon..." data-bs-toggle="tooltip" data-bs-placement="top"' - : ""; - const resultElement = createResultElement( result, matchedScore, - isNA, - tooltip ); - if (!isNA) { resultElement.addEventListener("click", () => { vscode.postMessage({ command: "openVulnerabilityDetails", result: result, }); }); - } return resultElement; }); @@ -434,9 +423,9 @@ return matchedScore || result.riskScore; } - function createResultElement(result, score, isSCA, tooltip) { + function createResultElement(result, score) { const resultElement = document.createElement("div"); - resultElement.className = `result${isSCA ? " disabled-result" : ""}`; + resultElement.className = "result"; score = formatScore(score); @@ -445,7 +434,7 @@ ${icons[result.severity]} ${score} - ${ + ${ result.name } `; diff --git a/package-lock.json b/package-lock.json index d65fa9d32..e5fd2b81b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "ast-results", "version": "2.31.0", "dependencies": { - "@checkmarxdev/ast-cli-javascript-wrapper": "0.0.129", + "@checkmarxdev/ast-cli-javascript-wrapper": "0.0.130", "@popperjs/core": "^2.11.8", "@vscode/codicons": "^0.0.36", "axios": "^1.8.3", @@ -545,9 +545,9 @@ }, "node_modules/@checkmarxdev/ast-cli-javascript-wrapper": { "name": "@CheckmarxDev/ast-cli-javascript-wrapper", - "version": "0.0.129", - "resolved": "https://npm.pkg.github.com/download/@CheckmarxDev/ast-cli-javascript-wrapper/0.0.129/ccc033cbb163dd3fa5ca46e5b2629b67f41c2b31", - "integrity": "sha512-IOcOoS9zVXQC7Qo+75tGFrehEcttOA70gK0KuamuHw1XaLmzyQiDIdj1JLbpMLEDnc9fAM31ndN8vEZaM5xgWw==", + "version": "0.0.130", + "resolved": "https://npm.pkg.github.com/download/@CheckmarxDev/ast-cli-javascript-wrapper/0.0.130/1548e5513886c9ee49cf094704f656592a29880d", + "integrity": "sha512-R2VQZKt8im+5ZPHixf+VMTWck/YUOHh6w43skqhq4hOpEubTZhzAVz/DDqEcxQY+IbGdkyqpnb7TR1JCvFcftw==", "license": "ISC", "dependencies": { "log4js": "^6.9.1" diff --git a/package.json b/package.json index 926330ebe..d0a1845c0 100644 --- a/package.json +++ b/package.json @@ -953,7 +953,7 @@ "@popperjs/core": "^2.11.8", "@vscode/codicons": "^0.0.36", "axios": "^1.8.3", - "@checkmarxdev/ast-cli-javascript-wrapper": "0.0.129", + "@checkmarxdev/ast-cli-javascript-wrapper": "0.0.130", "copyfiles": "2.4.1", "dotenv": "^16.4.7", "eslint-config-prettier": "^9.1.0", diff --git a/src/commands/webViewCommand.ts b/src/commands/webViewCommand.ts index 42f95b761..82b55f2c1 100644 --- a/src/commands/webViewCommand.ts +++ b/src/commands/webViewCommand.ts @@ -17,6 +17,8 @@ import * as os from "os"; import { GptResult } from "../models/gptResult"; import { cx } from "../cx"; +const SYSTEM_NOT_FIND_PATH_ERROR = "The system cannot find the path specified."; + export class WebViewCommand { private thinkID: number; context: vscode.ExtensionContext; diff --git a/src/models/results.ts b/src/models/results.ts index ca7caf70e..dbd091ede 100644 --- a/src/models/results.ts +++ b/src/models/results.ts @@ -27,6 +27,7 @@ export class AstResult extends CxResult { language = ""; description = ""; descriptionHTML = ""; + alternateId = ""; similarityId = ""; declare data: any; state = ""; @@ -60,6 +61,7 @@ export class AstResult extends CxResult { : result.vulnerabilityDetails.cveName, result.id, result.status, + result.alternateId, result.similarityId, result.state, result.severity, diff --git a/src/views/riskManagementView/riskManagementView.ts b/src/views/riskManagementView/riskManagementView.ts index ad4221945..a8499ebd3 100644 --- a/src/views/riskManagementView/riskManagementView.ts +++ b/src/views/riskManagementView/riskManagementView.ts @@ -46,13 +46,11 @@ export class riskManagementView implements vscode.WebviewViewProvider { private async handleMessage(message: { command: string; - result?: { hash: string; engine: string }; + result?: { hash: string }; }): Promise { switch (message.command) { case "openVulnerabilityDetails": { - const hash = message.result.hash; - const type = message.result.engine; - const result = this.findResultByHash(hash, type); + const result = this.findResultByHash(message.result.hash); if (result) { const astResult = new AstResult(result); await vscode.commands.executeCommand(commands.newDetails, astResult); @@ -64,10 +62,8 @@ export class riskManagementView implements vscode.WebviewViewProvider { } } - private findResultByHash(hash: string, type: string): CxResult | undefined { - if (type === constants.sast) { - return this.cxResults.find((result) => result.data.resultHash === hash); - } + private findResultByHash(hash: string): CxResult | undefined { + return this.cxResults.find((result) => result.alternateId === hash); } public async updateContent(options?: {