Skip to content

Commit c0f3adc

Browse files
Merge pull request #2156 from github/robertbrignull/remoteResultsItemWithoutLogs
Introduce cancelledRemoteResultsItemWithoutLogs context value
2 parents 103017d + 0ab482a commit c0f3adc

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

extensions/ql-vscode/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -842,12 +842,12 @@
842842
{
843843
"command": "codeQLQueryHistory.removeHistoryItem",
844844
"group": "7_queryHistory@0",
845-
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
845+
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledRemoteResultsItemWithoutLogs || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
846846
},
847847
{
848848
"command": "codeQLQueryHistory.removeHistoryItem",
849849
"group": "inline",
850-
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
850+
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledRemoteResultsItemWithoutLogs || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
851851
},
852852
{
853853
"command": "codeQLQueryHistory.renameItem",

extensions/ql-vscode/src/query-history/history-tree-data-provider.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,14 @@ export class HistoryTreeDataProvider
111111
return "remoteResultsItem";
112112
}
113113
case QueryStatus.Failed:
114-
return element.t === "local"
115-
? "cancelledResultsItem"
116-
: "cancelledRemoteResultsItem";
114+
if (element.t === "local") {
115+
return "cancelledResultsItem";
116+
} else if (element.variantAnalysis.actionsWorkflowRunId === undefined) {
117+
return "cancelledRemoteResultsItemWithoutLogs";
118+
} else {
119+
return "cancelledRemoteResultsItem";
120+
}
121+
117122
default:
118123
assertNever(element.status);
119124
}

0 commit comments

Comments
 (0)