Merge pull request #2156 from github/robertbrignull/remoteResultsItemWithoutLogs

Introduce cancelledRemoteResultsItemWithoutLogs context value
This commit is contained in:
Robert
2023-03-10 10:39:26 +00:00
committed by GitHub
2 changed files with 10 additions and 5 deletions

View File

@@ -842,12 +842,12 @@
{
"command": "codeQLQueryHistory.removeHistoryItem",
"group": "7_queryHistory@0",
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledRemoteResultsItemWithoutLogs || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
},
{
"command": "codeQLQueryHistory.removeHistoryItem",
"group": "inline",
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledRemoteResultsItemWithoutLogs || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
},
{
"command": "codeQLQueryHistory.renameItem",

View File

@@ -111,9 +111,14 @@ export class HistoryTreeDataProvider
return "remoteResultsItem";
}
case QueryStatus.Failed:
return element.t === "local"
? "cancelledResultsItem"
: "cancelledRemoteResultsItem";
if (element.t === "local") {
return "cancelledResultsItem";
} else if (element.variantAnalysis.actionsWorkflowRunId === undefined) {
return "cancelledRemoteResultsItemWithoutLogs";
} else {
return "cancelledRemoteResultsItem";
}
default:
assertNever(element.status);
}