diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index df30eae5e..fbe551278 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -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", diff --git a/extensions/ql-vscode/src/query-history/history-tree-data-provider.ts b/extensions/ql-vscode/src/query-history/history-tree-data-provider.ts index 3fe435e09..74d6f5798 100644 --- a/extensions/ql-vscode/src/query-history/history-tree-data-provider.ts +++ b/extensions/ql-vscode/src/query-history/history-tree-data-provider.ts @@ -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); }