Move variant-analysis-filter-sort.ts to /variant-analysis

extensions/ql-vscode/src/common/commands.ts

@@ -4,7 +4,7 @@ import type { AstItem } from "../language-support";
 import type { DbTreeViewItem } from "../databases/ui/db-tree-view-item";
 import type { DatabaseItem } from "../databases/local-databases";
 import type { QueryHistoryInfo } from "../query-history/query-history-info";
-import type { RepositoriesFilterSortStateWithIds } from "../pure/variant-analysis-filter-sort";
+import type { RepositoriesFilterSortStateWithIds } from "../variant-analysis/variant-analysis-filter-sort";
 import type { TestTreeNode } from "../query-testing/test-tree-node";
 import type {
   VariantAnalysis,

extensions/ql-vscode/src/common/interface-types.ts

@@ -14,7 +14,7 @@ import {
 import {
   RepositoriesFilterSortState,
   RepositoriesFilterSortStateWithIds,
-} from "../pure/variant-analysis-filter-sort";
+} from "../variant-analysis/variant-analysis-filter-sort";
 import { ErrorLike } from "../common/errors";
 import { DataFlowPaths } from "../variant-analysis/shared/data-flow-paths";
 import { ExternalApiUsage } from "../data-extensions-editor/external-api-usage";

extensions/ql-vscode/src/config.ts

@@ -13,7 +13,7 @@ import {
   FilterKey,
   SortKey,
   defaultFilterSortState,
-} from "./pure/variant-analysis-filter-sort";
+} from "./variant-analysis/variant-analysis-filter-sort";
 
 export const ALL_SETTINGS: Setting[] = [];
 

extensions/ql-vscode/src/stories/variant-analysis/RepositoriesFilter.stories.tsx

@@ -4,7 +4,7 @@ import { useState } from "react";
 import { ComponentMeta } from "@storybook/react";
 
 import { RepositoriesFilter as RepositoriesFilterComponent } from "../../view/variant-analysis/RepositoriesFilter";
-import { FilterKey } from "../../pure/variant-analysis-filter-sort";
+import { FilterKey } from "../../variant-analysis/variant-analysis-filter-sort";
 
 export default {
   title: "Variant Analysis/Repositories Filter",

extensions/ql-vscode/src/stories/variant-analysis/RepositoriesSearchSortRow.stories.tsx

@@ -4,7 +4,7 @@ import { useState } from "react";
 import { ComponentMeta } from "@storybook/react";
 
 import { RepositoriesSearchSortRow as RepositoriesSearchSortRowComponent } from "../../view/variant-analysis/RepositoriesSearchSortRow";
-import { defaultFilterSortState } from "../../pure/variant-analysis-filter-sort";
+import { defaultFilterSortState } from "../../variant-analysis/variant-analysis-filter-sort";
 
 export default {
   title: "Variant Analysis/Repositories Search and Sort Row",

extensions/ql-vscode/src/stories/variant-analysis/RepositoriesSort.stories.tsx

@@ -4,7 +4,7 @@ import { useState } from "react";
 import { ComponentMeta } from "@storybook/react";
 
 import { RepositoriesSort as RepositoriesSortComponent } from "../../view/variant-analysis/RepositoriesSort";
-import { SortKey } from "../../pure/variant-analysis-filter-sort";
+import { SortKey } from "../../variant-analysis/variant-analysis-filter-sort";
 
 export default {
   title: "Variant Analysis/Repositories Sort",

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx

@@ -15,7 +15,7 @@ import { createMockRepositoryWithMetadata } from "../../../test/factories/varian
 import {
   defaultFilterSortState,
   RepositoriesFilterSortState,
-} from "../../pure/variant-analysis-filter-sort";
+} from "../../variant-analysis/variant-analysis-filter-sort";
 
 export default {
   title: "Variant Analysis/Variant Analysis Outcome Panels",

extensions/ql-vscode/src/variant-analysis/export-results.ts

@@ -26,7 +26,7 @@ import {
 import {
   filterAndSortRepositoriesWithResults,
   RepositoriesFilterSortStateWithIds,
-} from "../pure/variant-analysis-filter-sort";
+} from "./variant-analysis-filter-sort";
 import { Credentials } from "../common/authentication";
 import { AppCommandManager } from "../common/commands";
 

extensions/ql-vscode/src/variant-analysis/variant-analysis-filter-sort.ts

@@ -1,7 +1,4 @@
-import {
-  Repository,
-  RepositoryWithMetadata,
-} from "../variant-analysis/shared/repository";
+import { Repository, RepositoryWithMetadata } from "./shared/repository";
 import { parseDate } from "../common/date";
 import { assertNever } from "../common/helpers-pure";
 

extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts

@@ -57,7 +57,7 @@ import {
   defaultFilterSortState,
   filterAndSortRepositoriesWithResults,
   RepositoriesFilterSortStateWithIds,
-} from "../pure/variant-analysis-filter-sort";
+} from "./variant-analysis-filter-sort";
 import { URLSearchParams } from "url";
 import { DbManager } from "../databases/db-manager";
 import { App } from "../common/app";

extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts

@@ -3,7 +3,7 @@ import {
   VariantAnalysisScannedRepositoryState,
 } from "./shared/variant-analysis";
 import { AppCommandManager } from "../common/commands";
-import { RepositoriesFilterSortStateWithIds } from "../pure/variant-analysis-filter-sort";
+import { RepositoriesFilterSortStateWithIds } from "./variant-analysis-filter-sort";
 
 export interface VariantAnalysisViewInterface {
   variantAnalysisId: number;

extensions/ql-vscode/src/view/variant-analysis/RepositoriesFilter.tsx

@@ -3,7 +3,7 @@ import { useCallback } from "react";
 import styled from "styled-components";
 import { VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react";
 import { Codicon } from "../common";
-import { FilterKey } from "../../pure/variant-analysis-filter-sort";
+import { FilterKey } from "../../variant-analysis/variant-analysis-filter-sort";
 
 const Dropdown = styled(VSCodeDropdown)`
   width: 100%;

extensions/ql-vscode/src/view/variant-analysis/RepositoriesSearchSortRow.tsx

@@ -5,7 +5,7 @@ import {
   FilterKey,
   RepositoriesFilterSortState,
   SortKey,
-} from "../../pure/variant-analysis-filter-sort";
+} from "../../variant-analysis/variant-analysis-filter-sort";
 import { RepositoriesSearch } from "./RepositoriesSearch";
 import { RepositoriesSort } from "./RepositoriesSort";
 import { RepositoriesFilter } from "./RepositoriesFilter";

extensions/ql-vscode/src/view/variant-analysis/RepositoriesSort.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import { useCallback } from "react";
 import styled from "styled-components";
 import { VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react";
-import { SortKey } from "../../pure/variant-analysis-filter-sort";
+import { SortKey } from "../../variant-analysis/variant-analysis-filter-sort";
 import { Codicon } from "../common";
 
 const Dropdown = styled(VSCodeDropdown)`

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx

@@ -12,7 +12,7 @@ import { VariantAnalysisOutcomePanels } from "./VariantAnalysisOutcomePanels";
 import { VariantAnalysisLoading } from "./VariantAnalysisLoading";
 import { ToVariantAnalysisMessage } from "../../common/interface-types";
 import { vscode } from "../vscode-api";
-import { defaultFilterSortState } from "../../pure/variant-analysis-filter-sort";
+import { defaultFilterSortState } from "../../variant-analysis/variant-analysis-filter-sort";
 import { sendTelemetry, useTelemetryOnChange } from "../common/telemetry";
 
 export type VariantAnalysisProps = {

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisAnalyzedRepos.tsx

@@ -10,7 +10,7 @@ import {
 import {
   filterAndSortRepositoriesWithResultsByName,
   RepositoriesFilterSortState,
-} from "../../pure/variant-analysis-filter-sort";
+} from "../../variant-analysis/variant-analysis-filter-sort";
 
 const Container = styled.div`
   display: flex;

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisHeader.tsx

@@ -19,7 +19,7 @@ import {
   defaultFilterSortState,
   filterAndSortRepositoriesWithResults,
   RepositoriesFilterSortState,
-} from "../../pure/variant-analysis-filter-sort";
+} from "../../variant-analysis/variant-analysis-filter-sort";
 
 export type VariantAnalysisHeaderProps = {
   variantAnalysis: VariantAnalysis;

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx

@@ -17,7 +17,7 @@ import {
 import { VariantAnalysisAnalyzedRepos } from "./VariantAnalysisAnalyzedRepos";
 import { Alert } from "../common";
 import { VariantAnalysisSkippedRepositoriesTab } from "./VariantAnalysisSkippedRepositoriesTab";
-import { RepositoriesFilterSortState } from "../../pure/variant-analysis-filter-sort";
+import { RepositoriesFilterSortState } from "../../variant-analysis/variant-analysis-filter-sort";
 import { RepositoriesSearchSortRow } from "./RepositoriesSearchSortRow";
 import { FailureReasonAlert } from "./FailureReasonAlert";
 

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisSkippedRepositoriesTab.tsx

@@ -8,7 +8,7 @@ import {
   compareRepository,
   matchesFilter,
   RepositoriesFilterSortState,
-} from "../../pure/variant-analysis-filter-sort";
+} from "../../variant-analysis/variant-analysis-filter-sort";
 
 export type VariantAnalysisSkippedRepositoriesTabProps = {
   alertTitle: string;

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx

@@ -7,7 +7,10 @@ import {
 import { VariantAnalysis, VariantAnalysisProps } from "../VariantAnalysis";
 import { createMockVariantAnalysis } from "../../../../test/factories/variant-analysis/shared/variant-analysis";
 import { ToVariantAnalysisMessage } from "../../../common/interface-types";
-import { FilterKey, SortKey } from "../../../pure/variant-analysis-filter-sort";
+import {
+  FilterKey,
+  SortKey,
+} from "../../../variant-analysis/variant-analysis-filter-sort";
 import { postMessage } from "../../common/post-message";
 
 describe(VariantAnalysis.name, () => {

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx

@@ -13,7 +13,7 @@ import {
 import { createMockVariantAnalysis } from "../../../../test/factories/variant-analysis/shared/variant-analysis";
 import { createMockRepositoryWithMetadata } from "../../../../test/factories/variant-analysis/shared/repository";
 import { createMockScannedRepo } from "../../../../test/factories/variant-analysis/shared/scanned-repositories";
-import { SortKey } from "../../../pure/variant-analysis-filter-sort";
+import { SortKey } from "../../../variant-analysis/variant-analysis-filter-sort";
 import { permissiveFilterSortState } from "../../../../test/unit-tests/variant-analysis-filter-sort.test";
 
 describe(VariantAnalysisAnalyzedRepos.name, () => {

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx

@@ -16,7 +16,7 @@ import {
   createMockScannedRepo,
   createMockScannedRepos,
 } from "../../../../test/factories/variant-analysis/shared/scanned-repositories";
-import { defaultFilterSortState } from "../../../pure/variant-analysis-filter-sort";
+import { defaultFilterSortState } from "../../../variant-analysis/variant-analysis-filter-sort";
 
 describe(VariantAnalysisOutcomePanels.name, () => {
   const defaultVariantAnalysis = {

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisSkippedRepositoriesTab.spec.tsx

@@ -4,7 +4,7 @@ import {
   VariantAnalysisSkippedRepositoriesTab,
   VariantAnalysisSkippedRepositoriesTabProps,
 } from "../VariantAnalysisSkippedRepositoriesTab";
-import { SortKey } from "../../../pure/variant-analysis-filter-sort";
+import { SortKey } from "../../../variant-analysis/variant-analysis-filter-sort";
 import { permissiveFilterSortState } from "../../../../test/unit-tests/variant-analysis-filter-sort.test";
 
 describe(VariantAnalysisSkippedRepositoriesTab.name, () => {

extensions/ql-vscode/test/unit-tests/variant-analysis-filter-sort.test.ts

@@ -6,7 +6,7 @@ import {
   FilterKey,
   matchesFilter,
   SortKey,
-} from "../../src/pure/variant-analysis-filter-sort";
+} from "../../src/variant-analysis/variant-analysis-filter-sort";
 
 /** A filterSortState that matches everything */
 export const permissiveFilterSortState = {

extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts

@@ -36,7 +36,7 @@ import {
 import { createTimestampFile } from "../../../../src/run-queries-shared";
 import { createMockVariantAnalysisRepoTask } from "../../../factories/variant-analysis/gh-api/variant-analysis-repo-task";
 import { VariantAnalysisRepoTask } from "../../../../src/variant-analysis/gh-api/variant-analysis";
-import { SortKey } from "../../../../src/pure/variant-analysis-filter-sort";
+import { SortKey } from "../../../../src/variant-analysis/variant-analysis-filter-sort";
 import { DbManager } from "../../../../src/databases/db-manager";
 import { App } from "../../../../src/common/app";
 import { ExtensionApp } from "../../../../src/common/vscode/vscode-app";