mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Inline some rendering in AlertTablePathNodeRow

Browse Source
This commit is contained in:
Robert
2023-08-16 13:38:03 +01:00
parent 91e69c93be
commit 443c9ac56c
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
extensions/ql-vscode/src/view/results/AlertTablePathNodeRow.tsx
View File

@@ -37,29 +37,6 @@ export function AlertTablePathNodeRow(props: Props) {
pathIndex,
pathNodeIndex,
};
const msg =
step.location !== undefined && step.location.message !== undefined ? (
<SarifLocation
text={step.location.message.text}
loc={step.location}
sourceLocationPrefix={sourceLocationPrefix}
databaseUri={databaseUri}
onClick={updateSelectionCallback(pathNodeKey)}
/>
) : (
"[no location]"
);
const additionalMsg =
step.location !== undefined ? (
<SarifLocation
loc={step.location}
sourceLocationPrefix={sourceLocationPrefix}
databaseUri={databaseUri}
onClick={updateSelectionCallback(pathNodeKey)}
/>
) : (
""
);
const isSelected = Keys.equalsNotUndefined(selectedItem, pathNodeKey);
const stepIndex = pathNodeIndex + 1; // Convert to 1-based
const zebraIndex = resultIndex + stepIndex;
@@ -83,7 +60,19 @@ export function AlertTablePathNodeRow(props: Props) {
>
{stepIndex}
</td>
<td {...selectableZebraStripe(isSelected, zebraIndex)}>{msg} </td>
<td {...selectableZebraStripe(isSelected, zebraIndex)}>
{step.location && step.location.message ? (
<SarifLocation
text={step.location.message.text}
loc={step.location}
sourceLocationPrefix={sourceLocationPrefix}
databaseUri={databaseUri}
onClick={updateSelectionCallback(pathNodeKey)}
/>
) : (
"[no location]"
)}
</td>
<td
{...selectableZebraStripe(
isSelected,
@@ -91,7 +80,14 @@ export function AlertTablePathNodeRow(props: Props) {
"vscode-codeql__location-cell",
)}
>
{additionalMsg}
{step.location && (
<SarifLocation
loc={step.location}
sourceLocationPrefix={sourceLocationPrefix}
databaseUri={databaseUri}
onClick={updateSelectionCallback(pathNodeKey)}
/>
)}
</td>
</tr>
);