From f8d542d1415efe250f1279c8930997ee5a0dad3e Mon Sep 17 00:00:00 2001 From: shati-patel <42641846+shati-patel@users.noreply.github.com> Date: Thu, 24 Aug 2023 12:32:24 +0100 Subject: [PATCH] Only show the "result format" dropdown for (path-)problem queries --- .../RepositoriesSearchSortRow.stories.tsx | 3 +++ .../RepositoriesSearchSortRow.tsx | 21 +++++++++++++++---- .../VariantAnalysisOutcomePanels.tsx | 2 ++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/extensions/ql-vscode/src/stories/variant-analysis/RepositoriesSearchSortRow.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/RepositoriesSearchSortRow.stories.tsx index 0ce6ac094..3cac59ec3 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/RepositoriesSearchSortRow.stories.tsx +++ b/extensions/ql-vscode/src/stories/variant-analysis/RepositoriesSearchSortRow.stories.tsx @@ -28,12 +28,15 @@ export const RepositoriesSearchSortRow = () => { ResultFormat.Alerts, ); + const variantAnalysisQueryKind = "problem"; + return ( ); }; diff --git a/extensions/ql-vscode/src/view/variant-analysis/RepositoriesSearchSortRow.tsx b/extensions/ql-vscode/src/view/variant-analysis/RepositoriesSearchSortRow.tsx index 6e1c10518..557501d2b 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/RepositoriesSearchSortRow.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/RepositoriesSearchSortRow.tsx @@ -17,6 +17,7 @@ type Props = { resultFormatValue: ResultFormat; onFilterSortChange: Dispatch>; onResultFormatChange: Dispatch>; + variantAnalysisQueryKind: string | undefined; }; const Container = styled.div` @@ -43,11 +44,21 @@ const RepositoriesResultFormatColumn = styled(RepositoriesResultFormat)` flex: 1; `; +function showResultFormatColumn( + variantAnalysisQueryKind: string | undefined, +): boolean { + return ( + variantAnalysisQueryKind === "problem" || + variantAnalysisQueryKind === "path-problem" + ); +} + export const RepositoriesSearchSortRow = ({ filterSortValue, resultFormatValue, onFilterSortChange, onResultFormatChange, + variantAnalysisQueryKind, }: Props) => { const handleSearchValueChange = useCallback( (searchValue: string) => { @@ -100,10 +111,12 @@ export const RepositoriesSearchSortRow = ({ value={filterSortValue.sortKey} onChange={handleSortKeyChange} /> - + {showResultFormatColumn(variantAnalysisQueryKind) && ( + + )} ); }; diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx index 1ce075e2b..ca21115e8 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx @@ -129,6 +129,7 @@ export const VariantAnalysisOutcomePanels = ({ resultFormatValue={resultFormat} onFilterSortChange={setFilterSortState} onResultFormatChange={setResultFormat} + variantAnalysisQueryKind={variantAnalysis.query.kind} /> {scannedReposCount > 0 && (