Skip to content

Move query history files to new folders #2002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
norascheuch merged 1 commit into from
Jan 25, 2023
Merged

Move query history files to new folders #2002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/compare/compare-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions extensions/ql-vscode/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ import {
ProgressReporter,
queryServerLogger,
} from "./common";
import { QueryHistoryManager } from "./query-history";
import { QueryHistoryManager } from "./query-history/query-history";
Copy link
Copy Markdown
Member

@koesie10 koesie10 Jan 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be a good candidate for creating an index.ts file in the query-history directory so we can just import from ./query-history instead of ./query-history/query-history, but that's something better done in a follow-up PR if we want to do this.

Copy link
Copy Markdown
Contributor Author

@norascheuch norascheuch Jan 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

import { CompletedLocalQueryInfo, LocalQueryInfo } from "./query-results";
import { QueryServerClient as LegacyQueryServerClient } from "./legacy-query-server/queryserver-client";
import { QueryServerClient } from "./query-server/queryserver-client";
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
4 changes: 2 additions & 2 deletions extensions/ql-vscode/src/log-insights/log-scanner-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
14 changes: 7 additions & 7 deletions ...vscode/src/history-item-label-provider.ts → ...ry-history/history-item-label-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions ...sions/ql-vscode/src/query-history-info.ts → ...e/src/query-history/query-history-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...s/ql-vscode/src/query-history-scrubber.ts → ...c/query-history/query-history-scrubber.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
53 changes: 27 additions & 26 deletions extensions/ql-vscode/src/query-history.ts → ...vscode/src/query-history/query-history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion ...-queries/variant-analysis-history-item.ts → ...-history/variant-analysis-history-item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/query-serialization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/remote-queries/export-results.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/remote-queries/remote-queries-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/remote-queries/variant-analysis-content-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = (
Expand Down
0 ...local-queries/local-query-history-item.ts → ...query-history/local-query-history-item.ts
View file
Open in desktop
File renamed without changes.
0 ...mote-queries/remote-query-history-item.ts → ...uery-history/remote-query-history-item.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...-queries/variant-analysis-history-item.ts → ...-history/variant-analysis-history-item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
10 changes: 5 additions & 5 deletions ...space/history-item-label-provider.test.ts → ...story/history-item-label-provider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
16 changes: 8 additions & 8 deletions ...s/no-workspace/query-history-info.test.ts → .../query-history/query-history-info.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
54 changes: 27 additions & 27 deletions ...-tests/no-workspace/query-history.test.ts → ...space/query-history/query-history.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions ...mote-queries/remote-query-history.test.ts → ...uery-history/remote-query-history.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading