Fix rename that went too far (#1988)

Author: charisk

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

@@ -26,7 +26,7 @@ import { ValueResult } from "../../common/value-result";
 import {
   LocalDatabaseDbItem,
   LocalListDbItem,
-  VariantAnalysisUserDefinedListDbItem,
+  RemoteUserDefinedListDbItem,
   DbItem,
   DbItemKind,
 } from "../db-item";
@@ -113,7 +113,7 @@ export class DbConfigStore extends DisposableObject {
       case DbItemKind.LocalList:
         config = removeLocalList(this.config, dbItem.listName);
         break;
-      case DbItemKind.VariantAnalysisUserDefinedList:
+      case DbItemKind.RemoteUserDefinedList:
         config = removeRemoteList(this.config, dbItem.listName);
         break;
       case DbItemKind.LocalDatabase:
@@ -246,7 +246,7 @@ export class DbConfigStore extends DisposableObject {
   }
 
   public async renameRemoteList(
-    currentDbItem: VariantAnalysisUserDefinedListDbItem,
+    currentDbItem: RemoteUserDefinedListDbItem,
     newName: string,
   ) {
     if (!this.config) {

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

@@ -4,7 +4,7 @@ export type ExpandedDbItem =
   | RootLocalExpandedDbItem
   | LocalUserDefinedListExpandedDbItem
   | RootRemoteExpandedDbItem
-  | VariantAnalysisUserDefinedListExpandedDbItem;
+  | RemoteUserDefinedListExpandedDbItem;
 
 export enum ExpandedDbItemKind {
   RootLocal = "rootLocal",
@@ -26,7 +26,7 @@ export interface RootRemoteExpandedDbItem {
   kind: ExpandedDbItemKind.RootRemote;
 }
 
-export interface VariantAnalysisUserDefinedListExpandedDbItem {
+export interface RemoteUserDefinedListExpandedDbItem {
   kind: ExpandedDbItemKind.RemoteUserDefinedList;
   listName: string;
 }
@@ -89,7 +89,7 @@ function mapDbItemToExpandedDbItem(dbItem: DbItem): ExpandedDbItem {
       };
     case DbItemKind.RootRemote:
       return { kind: ExpandedDbItemKind.RootRemote };
-    case DbItemKind.VariantAnalysisUserDefinedList:
+    case DbItemKind.RemoteUserDefinedList:
       return {
         kind: ExpandedDbItemKind.RemoteUserDefinedList,
         listName: dbItem.listName,
@@ -113,7 +113,7 @@ function isDbItemEqualToExpandedDbItem(
       );
     case DbItemKind.RootRemote:
       return expandedDbItem.kind === ExpandedDbItemKind.RootRemote;
-    case DbItemKind.VariantAnalysisUserDefinedList:
+    case DbItemKind.RemoteUserDefinedList:
       return (
         expandedDbItem.kind === ExpandedDbItemKind.RemoteUserDefinedList &&
         expandedDbItem.listName === dbItem.listName

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

@@ -6,7 +6,7 @@ export function getDbItemName(dbItem: DbItem): string | undefined {
     case DbItemKind.RootRemote:
       return undefined;
     case DbItemKind.LocalList:
-    case DbItemKind.VariantAnalysisUserDefinedList:
+    case DbItemKind.RemoteUserDefinedList:
     case DbItemKind.RemoteSystemDefinedList:
       return dbItem.listName;
     case DbItemKind.RemoteOwner:

extensions/ql-vscode/src/databases/db-item-selection.ts

@@ -33,7 +33,7 @@ function extractSelected(
         }
       }
       break;
-    case DbItemKind.VariantAnalysisUserDefinedList:
+    case DbItemKind.RemoteUserDefinedList:
       for (const repo of dbItem.repos) {
         if (repo.selected) {
           return repo;
@@ -59,7 +59,7 @@ export function mapDbItemToSelectedDbItem(
         listName: dbItem.listName,
       };
 
-    case DbItemKind.VariantAnalysisUserDefinedList:
+    case DbItemKind.RemoteUserDefinedList:
       return {
         kind: SelectedDbItemKind.VariantAnalysisUserDefinedList,
         listName: dbItem.listName,

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

@@ -6,15 +6,15 @@ export enum DbItemKind {
   LocalDatabase = "LocalDatabase",
   RootRemote = "RootRemote",
   RemoteSystemDefinedList = "RemoteSystemDefinedList",
-  VariantAnalysisUserDefinedList = "VariantAnalysisUserDefinedList",
+  RemoteUserDefinedList = "RemoteUserDefinedList",
   RemoteOwner = "RemoteOwner",
   RemoteRepo = "RemoteRepo",
 }
 
 export const remoteDbKinds = [
   DbItemKind.RootRemote,
   DbItemKind.RemoteSystemDefinedList,
-  DbItemKind.VariantAnalysisUserDefinedList,
+  DbItemKind.RemoteUserDefinedList,
   DbItemKind.RemoteOwner,
   DbItemKind.RemoteRepo,
 ];
@@ -70,7 +70,7 @@ export type DbItem =
 
 export type RemoteDbItem =
   | RemoteSystemDefinedListDbItem
-  | VariantAnalysisUserDefinedListDbItem
+  | RemoteUserDefinedListDbItem
   | RemoteOwnerDbItem
   | RemoteRepoDbItem;
 
@@ -82,8 +82,8 @@ export interface RemoteSystemDefinedListDbItem {
   listDescription: string;
 }
 
-export interface VariantAnalysisUserDefinedListDbItem {
-  kind: DbItemKind.VariantAnalysisUserDefinedList;
+export interface RemoteUserDefinedListDbItem {
+  kind: DbItemKind.RemoteUserDefinedList;
   expanded: boolean;
   selected: boolean;
   listName: string;
@@ -109,10 +109,10 @@ export function isRemoteSystemDefinedListDbItem(
   return dbItem.kind === DbItemKind.RemoteSystemDefinedList;
 }
 
-export function isVariantAnalysisUserDefinedListDbItem(
+export function isRemoteUserDefinedListDbItem(
   dbItem: DbItem,
-): dbItem is VariantAnalysisUserDefinedListDbItem {
-  return dbItem.kind === DbItemKind.VariantAnalysisUserDefinedList;
+): dbItem is RemoteUserDefinedListDbItem {
+  return dbItem.kind === DbItemKind.RemoteUserDefinedList;
 }
 
 export function isRemoteOwnerDbItem(
@@ -145,7 +145,7 @@ const SelectableDbItemKinds = [
   DbItemKind.LocalList,
   DbItemKind.LocalDatabase,
   DbItemKind.RemoteSystemDefinedList,
-  DbItemKind.VariantAnalysisUserDefinedList,
+  DbItemKind.RemoteUserDefinedList,
   DbItemKind.RemoteOwner,
   DbItemKind.RemoteRepo,
 ];
@@ -165,7 +165,7 @@ export function flattenDbItems(dbItems: DbItem[]): DbItem[] {
       case DbItemKind.RootRemote:
         allItems.push(...flattenDbItems(dbItem.children));
         break;
-      case DbItemKind.VariantAnalysisUserDefinedList:
+      case DbItemKind.RemoteUserDefinedList:
         allItems.push(...dbItem.repos);
         break;
       case DbItemKind.LocalDatabase:

extensions/ql-vscode/src/databases/db-manager.ts

@@ -8,7 +8,7 @@ import {
   DbListKind,
   LocalDatabaseDbItem,
   LocalListDbItem,
-  VariantAnalysisUserDefinedListDbItem,
+  RemoteUserDefinedListDbItem,
 } from "./db-item";
 import {
   updateExpandedItem,
@@ -123,14 +123,12 @@ export class DbManager {
   }
 
   public async renameList(
-    currentDbItem: LocalListDbItem | VariantAnalysisUserDefinedListDbItem,
+    currentDbItem: LocalListDbItem | RemoteUserDefinedListDbItem,
     newName: string,
   ): Promise<void> {
     if (currentDbItem.kind === DbItemKind.LocalList) {
       await this.dbConfigStore.renameLocalList(currentDbItem, newName);
-    } else if (
-      currentDbItem.kind === DbItemKind.VariantAnalysisUserDefinedList
-    ) {
+    } else if (currentDbItem.kind === DbItemKind.RemoteUserDefinedList) {
       await this.dbConfigStore.renameRemoteList(currentDbItem, newName);
     }
 

extensions/ql-vscode/src/databases/db-tree-creator.ts

@@ -12,7 +12,7 @@ import {
   RemoteOwnerDbItem,
   RemoteRepoDbItem,
   RemoteSystemDefinedListDbItem,
-  VariantAnalysisUserDefinedListDbItem,
+  RemoteUserDefinedListDbItem,
   RootLocalDbItem,
   RootRemoteDbItem,
 } from "./db-item";
@@ -102,7 +102,7 @@ function createVariantAnalysisUserDefinedList(
   list: RemoteRepositoryList,
   dbConfig: DbConfig,
   expandedItems: ExpandedDbItem[],
-): VariantAnalysisUserDefinedListDbItem {
+): RemoteUserDefinedListDbItem {
   const selected =
     dbConfig.selected &&
     dbConfig.selected.kind ===
@@ -116,7 +116,7 @@ function createVariantAnalysisUserDefinedList(
   );
 
   return {
-    kind: DbItemKind.VariantAnalysisUserDefinedList,
+    kind: DbItemKind.RemoteUserDefinedList,
     listName: list.name,
     repos: list.repositories.map((r) => createRepoItem(r, dbConfig, list.name)),
     selected: !!selected,

extensions/ql-vscode/src/databases/ui/db-item-mapper.ts

@@ -34,7 +34,7 @@ export function mapDbItemToTreeViewItem(dbItem: DbItem): DbTreeViewItem {
         dbItem.listDescription,
       );
 
-    case DbItemKind.VariantAnalysisUserDefinedList:
+    case DbItemKind.RemoteUserDefinedList:
       return createDbTreeViewItemUserDefinedList(
         dbItem,
         dbItem.listName,

extensions/ql-vscode/src/databases/ui/db-panel.ts

@@ -23,7 +23,7 @@ import {
   LocalDatabaseDbItem,
   LocalListDbItem,
   remoteDbKinds,
-  VariantAnalysisUserDefinedListDbItem,
+  RemoteUserDefinedListDbItem,
 } from "../db-item";
 import { getDbItemName } from "../db-item-naming";
 import { DbManager } from "../db-manager";
@@ -124,7 +124,7 @@ export class DbPanel extends DisposableObject {
   private async addNewRemoteDatabase(): Promise<void> {
     const highlightedItem = await this.getHighlightedDbItem();
 
-    if (highlightedItem?.kind === DbItemKind.VariantAnalysisUserDefinedList) {
+    if (highlightedItem?.kind === DbItemKind.RemoteUserDefinedList) {
       await this.addNewRemoteRepo(highlightedItem.listName);
     } else if (
       highlightedItem?.kind === DbItemKind.RemoteRepo &&
@@ -313,7 +313,7 @@ export class DbPanel extends DisposableObject {
       case DbItemKind.LocalDatabase:
         await this.renameLocalDatabaseItem(dbItem, newName);
         break;
-      case DbItemKind.VariantAnalysisUserDefinedList:
+      case DbItemKind.RemoteUserDefinedList:
         await this.renameVariantAnalysisUserDefinedListItem(dbItem, newName);
         break;
       default:
@@ -354,7 +354,7 @@ export class DbPanel extends DisposableObject {
   }
 
   private async renameVariantAnalysisUserDefinedListItem(
-    dbItem: VariantAnalysisUserDefinedListDbItem,
+    dbItem: RemoteUserDefinedListDbItem,
     newName: string,
   ): Promise<void> {
     if (dbItem.listName === newName) {

extensions/ql-vscode/src/databases/ui/db-tree-view-item-action.ts

@@ -27,15 +27,15 @@ export function getDbItemActions(dbItem: DbItem): DbTreeViewItemAction[] {
 
 const dbItemKindsThatCanBeRemoved = [
   DbItemKind.LocalList,
-  DbItemKind.VariantAnalysisUserDefinedList,
+  DbItemKind.RemoteUserDefinedList,
   DbItemKind.LocalDatabase,
   DbItemKind.RemoteRepo,
   DbItemKind.RemoteOwner,
 ];
 
 const dbItemKindsThatCanBeRenamed = [
   DbItemKind.LocalList,
-  DbItemKind.VariantAnalysisUserDefinedList,
+  DbItemKind.RemoteUserDefinedList,
   DbItemKind.LocalDatabase,
 ];