Skip to content

Commit 78e01e6

Browse files
chariskcharisk
authored
Rename db config terms to use 'variant analysis' instead of remote (#1960)
1 parent 4ae7735 commit 78e01e6

32 files changed

Lines changed: 315 additions & 283 deletions

‎extensions/ql-vscode/src/databases/config/db-config-store.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { ValueResult } from "../../common/value-result";
2626
import {
2727
LocalDatabaseDbItem,
2828
LocalListDbItem,
29-
RemoteUserDefinedListDbItem,
29+
VariantAnalysisUserDefinedListDbItem,
3030
DbItem,
3131
DbItemKind,
3232
} from "../db-item";
@@ -111,7 +111,7 @@ export class DbConfigStore extends DisposableObject {
111111
case DbItemKind.LocalList:
112112
config = removeLocalList(this.config, dbItem.listName);
113113
break;
114-
case DbItemKind.RemoteUserDefinedList:
114+
case DbItemKind.VariantAnalysisUserDefinedList:
115115
config = removeRemoteList(this.config, dbItem.listName);
116116
break;
117117
case DbItemKind.LocalDatabase:
@@ -159,7 +159,7 @@ export class DbConfigStore extends DisposableObject {
159159

160160
const config = cloneDbConfig(this.config);
161161
if (parentList) {
162-
const parent = config.databases.remote.repositoryLists.find(
162+
const parent = config.databases.variantAnalysis.repositoryLists.find(
163163
(list) => list.name === parentList,
164164
);
165165
if (!parent) {
@@ -168,7 +168,7 @@ export class DbConfigStore extends DisposableObject {
168168
parent.repositories.push(repoNwo);
169169
}
170170
} else {
171-
config.databases.remote.repositories.push(repoNwo);
171+
config.databases.variantAnalysis.repositories.push(repoNwo);
172172
}
173173
await this.writeConfig(config);
174174
}
@@ -187,7 +187,7 @@ export class DbConfigStore extends DisposableObject {
187187
}
188188

189189
const config = cloneDbConfig(this.config);
190-
config.databases.remote.owners.push(owner);
190+
config.databases.variantAnalysis.owners.push(owner);
191191

192192
await this.writeConfig(config);
193193
}
@@ -216,7 +216,7 @@ export class DbConfigStore extends DisposableObject {
216216
this.validateRemoteListName(listName);
217217

218218
const config = cloneDbConfig(this.config);
219-
config.databases.remote.repositoryLists.push({
219+
config.databases.variantAnalysis.repositoryLists.push({
220220
name: listName,
221221
repositories: [],
222222
});
@@ -244,7 +244,7 @@ export class DbConfigStore extends DisposableObject {
244244
}
245245

246246
public async renameRemoteList(
247-
currentDbItem: RemoteUserDefinedListDbItem,
247+
currentDbItem: VariantAnalysisUserDefinedListDbItem,
248248
newName: string,
249249
) {
250250
if (!this.config) {
@@ -288,7 +288,7 @@ export class DbConfigStore extends DisposableObject {
288288
throw Error("Cannot check remote list existence if config is not loaded");
289289
}
290290

291-
return this.config.databases.remote.repositoryLists.some(
291+
return this.config.databases.variantAnalysis.repositoryLists.some(
292292
(l) => l.name === listName,
293293
);
294294
}
@@ -326,12 +326,12 @@ export class DbConfigStore extends DisposableObject {
326326
}
327327

328328
if (listName) {
329-
return this.config.databases.remote.repositoryLists.some(
329+
return this.config.databases.variantAnalysis.repositoryLists.some(
330330
(l) => l.name === listName && l.repositories.includes(dbName),
331331
);
332332
}
333333

334-
return this.config.databases.remote.repositories.includes(dbName);
334+
return this.config.databases.variantAnalysis.repositories.includes(dbName);
335335
}
336336

337337
public doesRemoteOwnerExist(owner: string): boolean {
@@ -341,7 +341,7 @@ export class DbConfigStore extends DisposableObject {
341341
);
342342
}
343343

344-
return this.config.databases.remote.owners.includes(owner);
344+
return this.config.databases.variantAnalysis.owners.includes(owner);
345345
}
346346

347347
private async writeConfig(config: DbConfig): Promise<void> {
@@ -451,7 +451,7 @@ export class DbConfigStore extends DisposableObject {
451451
private createEmptyConfig(): DbConfig {
452452
return {
453453
databases: {
454-
remote: {
454+
variantAnalysis: {
455455
repositoryLists: [],
456456
owners: [],
457457
repositories: [],

‎extensions/ql-vscode/src/databases/config/db-config-validator.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export class DbConfigValidator {
5757
}
5858

5959
const duplicateRemoteDbLists = findDuplicateStrings(
60-
dbConfig.databases.remote.repositoryLists.map((n) => n.name),
60+
dbConfig.databases.variantAnalysis.repositoryLists.map((n) => n.name),
6161
);
6262
if (duplicateRemoteDbLists.length > 0) {
6363
errors.push(buildError(duplicateRemoteDbLists));
@@ -83,7 +83,7 @@ export class DbConfigValidator {
8383
}
8484

8585
const duplicateRemoteDbs = findDuplicateStrings(
86-
dbConfig.databases.remote.repositories,
86+
dbConfig.databases.variantAnalysis.repositories,
8787
);
8888
if (duplicateRemoteDbs.length > 0) {
8989
errors.push(buildError(duplicateRemoteDbs));
@@ -111,7 +111,7 @@ export class DbConfigValidator {
111111
}
112112
}
113113

114-
for (const list of dbConfig.databases.remote.repositoryLists) {
114+
for (const list of dbConfig.databases.variantAnalysis.repositoryLists) {
115115
const dups = findDuplicateStrings(list.repositories);
116116
if (dups.length > 0) {
117117
errors.push(buildError(list.name, dups));
@@ -124,7 +124,9 @@ export class DbConfigValidator {
124124
private validateOwners(dbConfig: DbConfig): DbConfigValidationError[] {
125125
const errors: DbConfigValidationError[] = [];
126126

127-
const dups = findDuplicateStrings(dbConfig.databases.remote.owners);
127+
const dups = findDuplicateStrings(
128+
dbConfig.databases.variantAnalysis.owners,
129+
);
128130
if (dups.length > 0) {
129131
errors.push({
130132
kind: DbConfigValidationErrorKind.DuplicateNames,

‎extensions/ql-vscode/src/databases/config/db-config.ts‎

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ export interface DbConfig {
66
}
77

88
export interface DbConfigDatabases {
9-
remote: RemoteDbConfig;
9+
variantAnalysis: RemoteDbConfig;
1010
local: LocalDbConfig;
1111
}
1212

1313
export type SelectedDbItem =
1414
| SelectedLocalUserDefinedList
1515
| SelectedLocalDatabase
1616
| SelectedRemoteSystemDefinedList
17-
| SelectedRemoteUserDefinedList
17+
| SelectedVariantAnalysisUserDefinedList
1818
| SelectedRemoteOwner
1919
| SelectedRemoteRepository;
2020

2121
export enum SelectedDbItemKind {
2222
LocalUserDefinedList = "localUserDefinedList",
2323
LocalDatabase = "localDatabase",
24-
RemoteSystemDefinedList = "remoteSystemDefinedList",
25-
RemoteUserDefinedList = "remoteUserDefinedList",
26-
RemoteOwner = "remoteOwner",
27-
RemoteRepository = "remoteRepository",
24+
VariantAnalysisSystemDefinedList = "variantAnalysisSystemDefinedList",
25+
VariantAnalysisUserDefinedList = "variantAnalysisUserDefinedList",
26+
VariantAnalysisOwner = "variantAnalysisOwner",
27+
VariantAnalysisRepository = "variantAnalysisRepository",
2828
}
2929

3030
export interface SelectedLocalUserDefinedList {
@@ -39,22 +39,22 @@ export interface SelectedLocalDatabase {
3939
}
4040

4141
export interface SelectedRemoteSystemDefinedList {
42-
kind: SelectedDbItemKind.RemoteSystemDefinedList;
42+
kind: SelectedDbItemKind.VariantAnalysisSystemDefinedList;
4343
listName: string;
4444
}
4545

46-
export interface SelectedRemoteUserDefinedList {
47-
kind: SelectedDbItemKind.RemoteUserDefinedList;
46+
export interface SelectedVariantAnalysisUserDefinedList {
47+
kind: SelectedDbItemKind.VariantAnalysisUserDefinedList;
4848
listName: string;
4949
}
5050

5151
export interface SelectedRemoteOwner {
52-
kind: SelectedDbItemKind.RemoteOwner;
52+
kind: SelectedDbItemKind.VariantAnalysisOwner;
5353
ownerName: string;
5454
}
5555

5656
export interface SelectedRemoteRepository {
57-
kind: SelectedDbItemKind.RemoteRepository;
57+
kind: SelectedDbItemKind.VariantAnalysisRepository;
5858
repositoryName: string;
5959
listName?: string;
6060
}
@@ -90,15 +90,15 @@ export interface LocalDatabase {
9090
export function cloneDbConfig(config: DbConfig): DbConfig {
9191
return {
9292
databases: {
93-
remote: {
94-
repositoryLists: config.databases.remote.repositoryLists.map(
93+
variantAnalysis: {
94+
repositoryLists: config.databases.variantAnalysis.repositoryLists.map(
9595
(list) => ({
9696
name: list.name,
9797
repositories: [...list.repositories],
9898
}),
9999
),
100-
owners: [...config.databases.remote.owners],
101-
repositories: [...config.databases.remote.repositories],
100+
owners: [...config.databases.variantAnalysis.owners],
101+
repositories: [...config.databases.variantAnalysis.repositories],
102102
},
103103
local: {
104104
lists: config.databases.local.lists.map((list) => ({
@@ -147,8 +147,9 @@ export function renameRemoteList(
147147
list.name = newListName;
148148

149149
if (
150-
config.selected?.kind === SelectedDbItemKind.RemoteUserDefinedList ||
151-
config.selected?.kind === SelectedDbItemKind.RemoteRepository
150+
config.selected?.kind ===
151+
SelectedDbItemKind.VariantAnalysisUserDefinedList ||
152+
config.selected?.kind === SelectedDbItemKind.VariantAnalysisRepository
152153
) {
153154
if (config.selected.listName === currentListName) {
154155
config.selected.listName = newListName;
@@ -225,17 +226,19 @@ export function removeRemoteList(
225226
): DbConfig {
226227
const config = cloneDbConfig(originalConfig);
227228

228-
config.databases.remote.repositoryLists =
229-
config.databases.remote.repositoryLists.filter(
229+
config.databases.variantAnalysis.repositoryLists =
230+
config.databases.variantAnalysis.repositoryLists.filter(
230231
(list) => list.name !== listName,
231232
);
232233

233-
if (config.selected?.kind === SelectedDbItemKind.RemoteUserDefinedList) {
234+
if (
235+
config.selected?.kind === SelectedDbItemKind.VariantAnalysisUserDefinedList
236+
) {
234237
config.selected = undefined;
235238
}
236239

237240
if (
238-
config.selected?.kind === SelectedDbItemKind.RemoteRepository &&
241+
config.selected?.kind === SelectedDbItemKind.VariantAnalysisRepository &&
239242
config.selected?.listName === listName
240243
) {
241244
config.selected = undefined;
@@ -286,12 +289,14 @@ export function removeRemoteRepo(
286289
(r) => r !== repoFullName,
287290
);
288291
} else {
289-
config.databases.remote.repositories =
290-
config.databases.remote.repositories.filter((r) => r !== repoFullName);
292+
config.databases.variantAnalysis.repositories =
293+
config.databases.variantAnalysis.repositories.filter(
294+
(r) => r !== repoFullName,
295+
);
291296
}
292297

293298
if (
294-
config.selected?.kind === SelectedDbItemKind.RemoteRepository &&
299+
config.selected?.kind === SelectedDbItemKind.VariantAnalysisRepository &&
295300
config.selected?.repositoryName === repoFullName &&
296301
config.selected?.listName === parentListName
297302
) {
@@ -307,12 +312,11 @@ export function removeRemoteOwner(
307312
): DbConfig {
308313
const config = cloneDbConfig(originalConfig);
309314

310-
config.databases.remote.owners = config.databases.remote.owners.filter(
311-
(o) => o !== ownerName,
312-
);
315+
config.databases.variantAnalysis.owners =
316+
config.databases.variantAnalysis.owners.filter((o) => o !== ownerName);
313317

314318
if (
315-
config.selected?.kind === SelectedDbItemKind.RemoteOwner &&
319+
config.selected?.kind === SelectedDbItemKind.VariantAnalysisOwner &&
316320
config.selected?.ownerName === ownerName
317321
) {
318322
config.selected = undefined;
@@ -334,24 +338,24 @@ function cloneDbConfigSelectedItem(selected: SelectedDbItem): SelectedDbItem {
334338
databaseName: selected.databaseName,
335339
listName: selected.listName,
336340
};
337-
case SelectedDbItemKind.RemoteSystemDefinedList:
341+
case SelectedDbItemKind.VariantAnalysisSystemDefinedList:
338342
return {
339-
kind: SelectedDbItemKind.RemoteSystemDefinedList,
343+
kind: SelectedDbItemKind.VariantAnalysisSystemDefinedList,
340344
listName: selected.listName,
341345
};
342-
case SelectedDbItemKind.RemoteUserDefinedList:
346+
case SelectedDbItemKind.VariantAnalysisUserDefinedList:
343347
return {
344-
kind: SelectedDbItemKind.RemoteUserDefinedList,
348+
kind: SelectedDbItemKind.VariantAnalysisUserDefinedList,
345349
listName: selected.listName,
346350
};
347-
case SelectedDbItemKind.RemoteOwner:
351+
case SelectedDbItemKind.VariantAnalysisOwner:
348352
return {
349-
kind: SelectedDbItemKind.RemoteOwner,
353+
kind: SelectedDbItemKind.VariantAnalysisOwner,
350354
ownerName: selected.ownerName,
351355
};
352-
case SelectedDbItemKind.RemoteRepository:
356+
case SelectedDbItemKind.VariantAnalysisRepository:
353357
return {
354-
kind: SelectedDbItemKind.RemoteRepository,
358+
kind: SelectedDbItemKind.VariantAnalysisRepository,
355359
repositoryName: selected.repositoryName,
356360
listName: selected.listName,
357361
};
@@ -372,7 +376,7 @@ function getRemoteList(
372376
config: DbConfig,
373377
listName: string,
374378
): RemoteRepositoryList {
375-
const list = config.databases.remote.repositoryLists.find(
379+
const list = config.databases.variantAnalysis.repositoryLists.find(
376380
(l) => l.name === listName,
377381
);
378382

‎extensions/ql-vscode/src/databases/db-item-expansion.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export type ExpandedDbItem =
44
| RootLocalExpandedDbItem
55
| LocalUserDefinedListExpandedDbItem
66
| RootRemoteExpandedDbItem
7-
| RemoteUserDefinedListExpandedDbItem;
7+
| VariantAnalysisUserDefinedListExpandedDbItem;
88

99
export enum ExpandedDbItemKind {
1010
RootLocal = "rootLocal",
@@ -26,7 +26,7 @@ export interface RootRemoteExpandedDbItem {
2626
kind: ExpandedDbItemKind.RootRemote;
2727
}
2828

29-
export interface RemoteUserDefinedListExpandedDbItem {
29+
export interface VariantAnalysisUserDefinedListExpandedDbItem {
3030
kind: ExpandedDbItemKind.RemoteUserDefinedList;
3131
listName: string;
3232
}
@@ -89,7 +89,7 @@ function mapDbItemToExpandedDbItem(dbItem: DbItem): ExpandedDbItem {
8989
};
9090
case DbItemKind.RootRemote:
9191
return { kind: ExpandedDbItemKind.RootRemote };
92-
case DbItemKind.RemoteUserDefinedList:
92+
case DbItemKind.VariantAnalysisUserDefinedList:
9393
return {
9494
kind: ExpandedDbItemKind.RemoteUserDefinedList,
9595
listName: dbItem.listName,
@@ -113,7 +113,7 @@ function isDbItemEqualToExpandedDbItem(
113113
);
114114
case DbItemKind.RootRemote:
115115
return expandedDbItem.kind === ExpandedDbItemKind.RootRemote;
116-
case DbItemKind.RemoteUserDefinedList:
116+
case DbItemKind.VariantAnalysisUserDefinedList:
117117
return (
118118
expandedDbItem.kind === ExpandedDbItemKind.RemoteUserDefinedList &&
119119
expandedDbItem.listName === dbItem.listName

‎extensions/ql-vscode/src/databases/db-item-naming.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export function getDbItemName(dbItem: DbItem): string | undefined {
66
case DbItemKind.RootRemote:
77
return undefined;
88
case DbItemKind.LocalList:
9-
case DbItemKind.RemoteUserDefinedList:
9+
case DbItemKind.VariantAnalysisUserDefinedList:
1010
case DbItemKind.RemoteSystemDefinedList:
1111
return dbItem.listName;
1212
case DbItemKind.RemoteOwner:

0 commit comments

Comments
 (0)