Rename query history top level DTOs

Author: charisk

extensions/ql-vscode/src/query-history/store/data-mapper.ts

@@ -16,7 +16,7 @@ import {
   SortedResultSetInfoDto,
   RawResultsSortStateDto,
 } from "./query-history-local-query-dto";
-import { QueryHistoryDataItem } from "./query-history-data";
+import { QueryHistoryItemDto } from "./query-history-dto";
 import {
   InterpretedResultsSortState,
   RawResultsSortState,
@@ -27,7 +27,7 @@ import {
 // Maps Query History Data Models to Domain Models
 
 export function mapQueryHistoryToDomainModels(
-  queries: QueryHistoryDataItem[],
+  queries: QueryHistoryItemDto[],
 ): QueryHistoryInfo[] {
   return queries.map((d) => {
     if (d.t === "variant-analysis") {

extensions/ql-vscode/src/query-history/store/domain-mapper.ts

@@ -14,7 +14,7 @@ import {
   SortedResultSetInfoDto,
   SortDirectionDto,
 } from "./query-history-local-query-dto";
-import { QueryHistoryDataItem } from "./query-history-data";
+import { QueryHistoryItemDto } from "./query-history-dto";
 import { QueryHistoryVariantAnalysisDto } from "./query-history-variant-analysis-dto";
 import {
   RawResultsSortState,
@@ -26,7 +26,7 @@ import {
 
 export function mapQueryHistoryToDataModels(
   queries: QueryHistoryInfo[],
-): QueryHistoryDataItem[] {
+): QueryHistoryItemDto[] {
   return queries.map((q) => {
     if (q.t === "variant-analysis") {
       const query: QueryHistoryVariantAnalysisDto = q;

…uery-history/store/query-history-data.ts …query-history/store/query-history-dto.tsextensions/ql-vscode/src/query-history/store/query-history-data.ts renamed to extensions/ql-vscode/src/query-history/store/query-history-dto.ts extensions/ql-vscode/src/query-history/store/query-history-data.ts renamed to extensions/ql-vscode/src/query-history/store/query-history-dto.ts

@@ -6,11 +6,11 @@ import { QueryHistoryVariantAnalysisDto } from "./query-history-variant-analysis
 
 export const ALLOWED_QUERY_HISTORY_VERSIONS = [1, 2];
 
-export interface QueryHistoryData {
+export interface QueryHistoryDto {
   version: number;
-  queries: QueryHistoryDataItem[];
+  queries: QueryHistoryItemDto[];
 }
 
-export type QueryHistoryDataItem =
+export type QueryHistoryItemDto =
   | QueryHistoryLocalQueryDto
   | QueryHistoryVariantAnalysisDto;

extensions/ql-vscode/src/query-history/store/query-history-store.ts

@@ -12,9 +12,9 @@ import { QueryHistoryInfo } from "../query-history-info";
 import { redactableError } from "../../pure/errors";
 import {
   ALLOWED_QUERY_HISTORY_VERSIONS,
-  QueryHistoryData,
-  QueryHistoryDataItem,
-} from "./query-history-data";
+  QueryHistoryDto,
+  QueryHistoryItemDto,
+} from "./query-history-dto";
 import { mapQueryHistoryToDomainModels } from "./data-mapper";
 import { mapQueryHistoryToDataModels } from "./domain-mapper";
 
@@ -26,7 +26,7 @@ export async function readQueryHistoryFromFile(
       return [];
     }
 
-    const obj: QueryHistoryData = await readJson(fsPath, {
+    const obj: QueryHistoryDto = await readJson(fsPath, {
       encoding: "utf8",
     });
 
@@ -40,7 +40,7 @@ export async function readQueryHistoryFromFile(
     const queries = obj.queries;
     // Remove remote queries, which are not supported anymore.
     const parsedQueries = queries.filter(
-      (q: QueryHistoryDataItem | { t: "remote" }) => q.t !== "remote",
+      (q: QueryHistoryItemDto | { t: "remote" }) => q.t !== "remote",
     );
 
     // Map the data models to the domain models.