Move query history files to new folders

This commit is contained in:
Nora
2023-01-24 17:04:25 +00:00
parent 8ed826c78c
commit 76a35deb66
23 changed files with 103 additions and 102 deletions

View File

@@ -17,7 +17,7 @@ import {
import resultsDiff from "./resultsDiff";
import { CompletedLocalQueryInfo } from "../query-results";
import { assertNever, getErrorMessage } from "../pure/helpers-pure";
import { HistoryItemLabelProvider } from "../history-item-label-provider";
import { HistoryItemLabelProvider } from "../query-history/history-item-label-provider";
import { AbstractWebview, WebviewPanelConfig } from "../abstract-webview";
import { telemetryListener } from "../telemetry";

View File

@@ -83,7 +83,7 @@ import {
ProgressReporter,
queryServerLogger,
} from "./common";
import { QueryHistoryManager } from "./query-history";
import { QueryHistoryManager } from "./query-history/query-history";
import { CompletedLocalQueryInfo, LocalQueryInfo } from "./query-results";
import { QueryServerClient as LegacyQueryServerClient } from "./legacy-query-server/queryserver-client";
import { QueryServerClient } from "./query-server/queryserver-client";
@@ -110,7 +110,7 @@ import {
handleDownloadPacks,
handleInstallPackDependencies,
} from "./packaging";
import { HistoryItemLabelProvider } from "./history-item-label-provider";
import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider";
import {
exportRemoteQueryResults,
exportSelectedRemoteQueryResults,

View File

@@ -64,7 +64,7 @@ import {
} from "./pure/bqrs-cli-types";
import { AbstractWebview, WebviewPanelConfig } from "./abstract-webview";
import { PAGE_SIZE } from "./config";
import { HistoryItemLabelProvider } from "./history-item-label-provider";
import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider";
import { telemetryListener } from "./telemetry";
/**

View File

@@ -1,7 +1,7 @@
import { Diagnostic, DiagnosticSeverity, languages, Range, Uri } from "vscode";
import { DisposableObject } from "../pure/disposable-object";
import { QueryHistoryManager } from "../query-history";
import { QueryHistoryInfo } from "../query-history-info";
import { QueryHistoryManager } from "../query-history/query-history";
import { QueryHistoryInfo } from "../query-history/query-history-info";
import {
EvaluationLogProblemReporter,
EvaluationLogScannerSet,

View File

@@ -1,17 +1,17 @@
import { env } from "vscode";
import { basename } from "path";
import { QueryHistoryConfig } from "./config";
import { LocalQueryInfo } from "./query-results";
import { QueryHistoryConfig } from "../config";
import { LocalQueryInfo } from "../query-results";
import {
buildRepoLabel,
getRawQueryName,
QueryHistoryInfo,
} from "./query-history-info";
import { RemoteQueryHistoryItem } from "./remote-queries/remote-query-history-item";
import { VariantAnalysisHistoryItem } from "./remote-queries/variant-analysis-history-item";
import { assertNever } from "./pure/helpers-pure";
import { pluralize } from "./pure/word";
import { humanizeQueryStatus } from "./query-status";
import { RemoteQueryHistoryItem } from "../remote-queries/remote-query-history-item";
import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
import { assertNever } from "../pure/helpers-pure";
import { pluralize } from "../pure/word";
import { humanizeQueryStatus } from "../query-status";
interface InterpolateReplacements {
t: string; // Start time

View File

@@ -1,12 +1,12 @@
import { RemoteQueryHistoryItem } from "./remote-queries/remote-query-history-item";
import { VariantAnalysisHistoryItem } from "./remote-queries/variant-analysis-history-item";
import { LocalQueryInfo } from "./query-results";
import { assertNever } from "./pure/helpers-pure";
import { pluralize } from "./pure/word";
import { RemoteQueryHistoryItem } from "../remote-queries/remote-query-history-item";
import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
import { LocalQueryInfo } from "../query-results";
import { assertNever } from "../pure/helpers-pure";
import { pluralize } from "../pure/word";
import {
hasRepoScanCompleted,
getActionsWorkflowRunUrl as getVariantAnalysisActionsWorkflowRunUrl,
} from "./remote-queries/shared/variant-analysis";
} from "../remote-queries/shared/variant-analysis";
export type QueryHistoryInfo =
| LocalQueryInfo

View File

@@ -2,7 +2,7 @@ import { pathExists, readdir, stat, remove, readFile } from "fs-extra";
import { EOL } from "os";
import { join } from "path";
import { Disposable, ExtensionContext } from "vscode";
import { extLogger } from "./common";
import { extLogger } from "../common";
import { QueryHistoryManager } from "./query-history";
const LAST_SCRUB_TIME_KEY = "lastScrubTime";

View File

@@ -17,58 +17,58 @@ import {
window,
workspace,
} from "vscode";
import { QueryHistoryConfig } from "./config";
import { QueryHistoryConfig } from "../config";
import {
showAndLogErrorMessage,
showAndLogInformationMessage,
showAndLogWarningMessage,
showBinaryChoiceDialog,
showInformationMessageWithAction,
} from "./helpers";
import { extLogger } from "./common";
} from "../helpers";
import { extLogger } from "../common";
import { URLSearchParams } from "url";
import { DisposableObject } from "./pure/disposable-object";
import { commandRunner } from "./commandRunner";
import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from "./pure/time";
import { DisposableObject } from "../pure/disposable-object";
import { commandRunner } from "../commandRunner";
import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from "../pure/time";
import {
assertNever,
getErrorMessage,
getErrorStack,
} from "./pure/helpers-pure";
import { CompletedLocalQueryInfo, LocalQueryInfo } from "./query-results";
} from "../pure/helpers-pure";
import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";
import {
getActionsWorkflowRunUrl,
getQueryId,
getQueryText,
QueryHistoryInfo,
} from "./query-history-info";
import { DatabaseManager } from "./databases";
import { DatabaseManager } from "../databases";
import { registerQueryHistoryScrubber } from "./query-history-scrubber";
import {
QueryStatus,
variantAnalysisStatusToQueryStatus,
} from "./query-status";
} from "../query-status";
import {
deserializeQueryHistory,
serializeQueryHistory,
} from "./query-serialization";
} from "../query-serialization";
import { pathExists } from "fs-extra";
import { CliVersionConstraint } from "./cli";
import { CliVersionConstraint } from "../cli";
import { HistoryItemLabelProvider } from "./history-item-label-provider";
import { Credentials } from "./authentication";
import { cancelRemoteQuery } from "./remote-queries/gh-api/gh-actions-api-client";
import { RemoteQueriesManager } from "./remote-queries/remote-queries-manager";
import { RemoteQueryHistoryItem } from "./remote-queries/remote-query-history-item";
import { ResultsView } from "./interface";
import { WebviewReveal } from "./interface-utils";
import { EvalLogViewer } from "./eval-log-viewer";
import EvalLogTreeBuilder from "./eval-log-tree-builder";
import { EvalLogData, parseViewerData } from "./pure/log-summary-parser";
import { QueryWithResults } from "./run-queries-shared";
import { QueryRunner } from "./queryRunner";
import { VariantAnalysisManager } from "./remote-queries/variant-analysis-manager";
import { VariantAnalysisHistoryItem } from "./remote-queries/variant-analysis-history-item";
import { getTotalResultCount } from "./remote-queries/shared/variant-analysis";
import { Credentials } from "../authentication";
import { cancelRemoteQuery } from "../remote-queries/gh-api/gh-actions-api-client";
import { RemoteQueriesManager } from "../remote-queries/remote-queries-manager";
import { RemoteQueryHistoryItem } from "../remote-queries/remote-query-history-item";
import { ResultsView } from "../interface";
import { WebviewReveal } from "../interface-utils";
import { EvalLogViewer } from "../eval-log-viewer";
import EvalLogTreeBuilder from "../eval-log-tree-builder";
import { EvalLogData, parseViewerData } from "../pure/log-summary-parser";
import { QueryWithResults } from "../run-queries-shared";
import { QueryRunner } from "../queryRunner";
import { VariantAnalysisManager } from "../remote-queries/variant-analysis-manager";
import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
import { getTotalResultCount } from "../remote-queries/shared/variant-analysis";
/**
* query-history.ts
@@ -1705,6 +1705,7 @@ the file in the file explorer and dragging it into the workspace.`,
throw new Error("No other queries available to compare with.");
}
const choice = await window.showQuickPick(comparableQueryLabels);
return choice?.query;
}

View File

@@ -1,5 +1,5 @@
import { QueryStatus } from "../query-status";
import { VariantAnalysis } from "./shared/variant-analysis";
import { VariantAnalysis } from "../remote-queries/shared/variant-analysis";
/**
* Information about a variant analysis.

View File

@@ -8,7 +8,7 @@ import {
getErrorStack,
} from "./pure/helpers-pure";
import { CompletedQueryInfo, LocalQueryInfo } from "./query-results";
import { QueryHistoryInfo } from "./query-history-info";
import { QueryHistoryInfo } from "./query-history/query-history-info";
import { QueryStatus } from "./query-status";
import { QueryEvaluationInfo } from "./run-queries-shared";
import { QueryResultType } from "./pure/legacy-messages";

View File

@@ -13,7 +13,7 @@ import { Credentials } from "../authentication";
import { ProgressCallback, UserCancellationException } from "../commandRunner";
import { showInformationMessageWithAction } from "../helpers";
import { extLogger } from "../common";
import { QueryHistoryManager } from "../query-history";
import { QueryHistoryManager } from "../query-history/query-history";
import { createGist } from "./gh-api/gh-api-client";
import { RemoteQueriesManager } from "./remote-queries-manager";
import {

View File

@@ -28,7 +28,7 @@ import {
} from "./shared/remote-query-result";
import { showAndLogWarningMessage } from "../helpers";
import { URLSearchParams } from "url";
import { SHOW_QUERY_TEXT_MSG } from "../query-history";
import { SHOW_QUERY_TEXT_MSG } from "../query-history/query-history";
import { AnalysesResultsManager } from "./analyses-results-manager";
import { AnalysisResults } from "./shared/analysis-result";
import { humanizeUnit } from "../pure/time";

View File

@@ -1,7 +1,7 @@
import { TextDocumentContentProvider, Uri } from "vscode";
import { URLSearchParams } from "url";
import { showAndLogWarningMessage } from "../helpers";
import { SHOW_QUERY_TEXT_MSG } from "../query-history";
import { SHOW_QUERY_TEXT_MSG } from "../query-history/query-history";
import { VariantAnalysisManager } from "./variant-analysis-manager";
export const createVariantAnalysisContentProvider = (

View File

@@ -1,7 +1,7 @@
import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item";
import { VariantAnalysisHistoryItem } from "../../../src/query-history/variant-analysis-history-item";
import { QueryStatus } from "../../../src/query-status";
import { VariantAnalysisStatus } from "../../../src/remote-queries/shared/variant-analysis";
import { createMockVariantAnalysis } from "./shared/variant-analysis";
import { createMockVariantAnalysis } from "../remote-queries/shared/variant-analysis";
export function createMockVariantAnalysisHistoryItem({
historyItemStatus = QueryStatus.InProgress,

View File

@@ -1,9 +1,9 @@
import { env } from "vscode";
import { QueryHistoryConfig } from "../../../src/config";
import { HistoryItemLabelProvider } from "../../../src/history-item-label-provider";
import { createMockLocalQueryInfo } from "../../factories/local-queries/local-query-history-item";
import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item";
import { QueryStatus } from "../../../src/query-status";
import { QueryHistoryConfig } from "../../../../src/config";
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
import { createMockLocalQueryInfo } from "../../../factories/query-history/local-query-history-item";
import { createMockRemoteQueryHistoryItem } from "../../../factories/query-history/remote-query-history-item";
import { QueryStatus } from "../../../../src/query-status";
describe("HistoryItemLabelProvider", () => {
let labelProvider: HistoryItemLabelProvider;

View File

@@ -1,20 +1,20 @@
import { QueryStatus } from "../../../src/query-status";
import { QueryStatus } from "../../../../src/query-status";
import {
buildRepoLabel,
getActionsWorkflowRunUrl,
getQueryId,
getQueryText,
getRawQueryName,
} from "../../../src/query-history-info";
import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item";
import { createMockVariantAnalysis } from "../../factories/remote-queries/shared/variant-analysis";
import { createMockScannedRepos } from "../../factories/remote-queries/shared/scanned-repositories";
import { createMockLocalQueryInfo } from "../../factories/local-queries/local-query-history-item";
import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item";
} from "../../../../src/query-history/query-history-info";
import { VariantAnalysisHistoryItem } from "../../../../src/query-history/variant-analysis-history-item";
import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis";
import { createMockScannedRepos } from "../../../factories/remote-queries/shared/scanned-repositories";
import { createMockLocalQueryInfo } from "../../../factories/query-history/local-query-history-item";
import { createMockRemoteQueryHistoryItem } from "../../../factories/query-history/remote-query-history-item";
import {
VariantAnalysisRepoStatus,
VariantAnalysisStatus,
} from "../../../src/remote-queries/shared/variant-analysis";
} from "../../../../src/remote-queries/shared/variant-analysis";
describe("Query history info", () => {
const date = new Date("2022-01-01T00:00:00.000Z");

View File

@@ -2,50 +2,50 @@ import { readdirSync, mkdirSync, writeFileSync } from "fs-extra";
import { join } from "path";
import * as vscode from "vscode";
import { extLogger } from "../../../src/common";
import { registerQueryHistoryScrubber } from "../../../src/query-history-scrubber";
import { extLogger } from "../../../../src/common";
import { registerQueryHistoryScrubber } from "../../../../src/query-history/query-history-scrubber";
import {
HistoryTreeDataProvider,
QueryHistoryManager,
SortOrder,
} from "../../../src/query-history";
} from "../../../../src/query-history/query-history";
import {
QueryHistoryConfig,
QueryHistoryConfigListener,
} from "../../../src/config";
import { LocalQueryInfo } from "../../../src/query-results";
import { DatabaseManager } from "../../../src/databases";
} from "../../../../src/config";
import { LocalQueryInfo } from "../../../../src/query-results";
import { DatabaseManager } from "../../../../src/databases";
import { dirSync } from "tmp-promise";
import {
ONE_DAY_IN_MS,
ONE_HOUR_IN_MS,
THREE_HOURS_IN_MS,
TWO_HOURS_IN_MS,
} from "../../../src/pure/time";
import { tmpDir } from "../../../src/helpers";
import { HistoryItemLabelProvider } from "../../../src/history-item-label-provider";
import { RemoteQueriesManager } from "../../../src/remote-queries/remote-queries-manager";
import { ResultsView } from "../../../src/interface";
import { EvalLogViewer } from "../../../src/eval-log-viewer";
import { QueryRunner } from "../../../src/queryRunner";
import { VariantAnalysisManager } from "../../../src/remote-queries/variant-analysis-manager";
import { QueryHistoryInfo } from "../../../src/query-history-info";
} from "../../../../src/pure/time";
import { tmpDir } from "../../../../src/helpers";
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
import { RemoteQueriesManager } from "../../../../src/remote-queries/remote-queries-manager";
import { ResultsView } from "../../../../src/interface";
import { EvalLogViewer } from "../../../../src/eval-log-viewer";
import { QueryRunner } from "../../../../src/queryRunner";
import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager";
import { QueryHistoryInfo } from "../../../../src/query-history/query-history-info";
import {
createMockLocalQueryInfo,
createMockQueryWithResults,
} from "../../factories/local-queries/local-query-history-item";
import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item";
import { RemoteQueryHistoryItem } from "../../../src/remote-queries/remote-query-history-item";
import { shuffleHistoryItems } from "../utils/query-history-helpers";
import { createMockVariantAnalysisHistoryItem } from "../../factories/remote-queries/variant-analysis-history-item";
import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item";
import { QueryStatus } from "../../../src/query-status";
import { VariantAnalysisStatus } from "../../../src/remote-queries/shared/variant-analysis";
import * as ghActionsApiClient from "../../../src/remote-queries/gh-api/gh-actions-api-client";
import { Credentials } from "../../../src/authentication";
} from "../../../factories/query-history/local-query-history-item";
import { createMockRemoteQueryHistoryItem } from "../../../factories/query-history/remote-query-history-item";
import { RemoteQueryHistoryItem } from "../../../../src/remote-queries/remote-query-history-item";
import { shuffleHistoryItems } from "../../utils/query-history-helpers";
import { createMockVariantAnalysisHistoryItem } from "../../../factories/query-history/variant-analysis-history-item";
import { VariantAnalysisHistoryItem } from "../../../../src/query-history/variant-analysis-history-item";
import { QueryStatus } from "../../../../src/query-status";
import { VariantAnalysisStatus } from "../../../../src/remote-queries/shared/variant-analysis";
import * as ghActionsApiClient from "../../../../src/remote-queries/gh-api/gh-actions-api-client";
import { Credentials } from "../../../../src/authentication";
import { QuickPickItem, TextEditor } from "vscode";
import { WebviewReveal } from "../../../src/interface-utils";
import * as helpers from "../../../src/helpers";
import { WebviewReveal } from "../../../../src/interface-utils";
import * as helpers from "../../../../src/helpers";
describe("query-history", () => {
const mockExtensionLocation = join(tmpDir.name, "mock-extension-location");

View File

@@ -20,13 +20,13 @@ import {
import { QueryHistoryConfig } from "../../../../src/config";
import { DatabaseManager } from "../../../../src/databases";
import { tmpDir, walkDirectory } from "../../../../src/helpers";
import { QueryHistoryManager } from "../../../../src/query-history";
import { QueryHistoryManager } from "../../../../src/query-history/query-history";
import { Credentials } from "../../../../src/authentication";
import { AnalysesResultsManager } from "../../../../src/remote-queries/analyses-results-manager";
import { RemoteQueryResult } from "../../../../src/remote-queries/shared/remote-query-result";
import { DisposableBucket } from "../../disposable-bucket";
import { testDisposeHandler } from "../../test-dispose-handler";
import { HistoryItemLabelProvider } from "../../../../src/history-item-label-provider";
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
import { RemoteQueriesManager } from "../../../../src/remote-queries/remote-queries-manager";
import { ResultsView } from "../../../../src/interface";
import { EvalLogViewer } from "../../../../src/eval-log-viewer";

View File

@@ -12,10 +12,10 @@ import { commands, ExtensionContext, Uri } from "vscode";
import { QueryHistoryConfig } from "../../../../src/config";
import { DatabaseManager } from "../../../../src/databases";
import { tmpDir, walkDirectory } from "../../../../src/helpers";
import { QueryHistoryManager } from "../../../../src/query-history";
import { QueryHistoryManager } from "../../../../src/query-history/query-history";
import { DisposableBucket } from "../../disposable-bucket";
import { testDisposeHandler } from "../../test-dispose-handler";
import { HistoryItemLabelProvider } from "../../../../src/history-item-label-provider";
import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
import { RemoteQueriesManager } from "../../../../src/remote-queries/remote-queries-manager";
import { ResultsView } from "../../../../src/interface";
import { EvalLogViewer } from "../../../../src/eval-log-viewer";

View File

@@ -12,10 +12,10 @@ import { tmpDir } from "../../../src/helpers";
import { QueryResultType } from "../../../src/pure/legacy-messages";
import { QueryInProgress } from "../../../src/legacy-query-server/run-queries";
import { RemoteQueryHistoryItem } from "../../../src/remote-queries/remote-query-history-item";
import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item";
import { QueryHistoryInfo } from "../../../src/query-history-info";
import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item";
import { createMockVariantAnalysisHistoryItem } from "../../factories/remote-queries/variant-analysis-history-item";
import { VariantAnalysisHistoryItem } from "../../../src/query-history/variant-analysis-history-item";
import { QueryHistoryInfo } from "../../../src/query-history/query-history-info";
import { createMockRemoteQueryHistoryItem } from "../../factories/query-history/remote-query-history-item";
import { createMockVariantAnalysisHistoryItem } from "../../factories/query-history/variant-analysis-history-item";
describe("serialize and deserialize", () => {
let infoSuccessRaw: LocalQueryInfo;

View File

@@ -1,4 +1,4 @@
import { QueryHistoryInfo } from "../../../src/query-history-info";
import { QueryHistoryInfo } from "../../../src/query-history/query-history-info";
export function shuffleHistoryItems(history: QueryHistoryInfo[]) {
return history.sort(() => Math.random() - 0.5);