Merge comments

Author: norascheuch

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

@@ -2,17 +2,22 @@
 
 export interface DbConfig {
   databases: DbConfigDatabases;
-  selected?: SelectedDb;
+  selected?: SelectedDbItem;
 }
 
 export interface DbConfigDatabases {
   remote: RemoteDbConfig;
   local: LocalDbConfig;
 }
 
-export interface SelectedDb {
-  kind: string;
-  path: string;
+export interface SelectedDbItem {
+  kind: SelectedDbKind;
+  value: string;
+}
+
+export enum SelectedDbKind {
+  ConfigDefined = 'configDefined',
+  RemoteSystemDefinedList = 'remoteSystemDefinedList',
 }
 
 export interface RemoteDbConfig {
@@ -64,7 +69,7 @@ export function cloneDbConfig(config: DbConfig): DbConfig {
     },
     selected: config.selected ? {
       kind: config.selected.kind,
-      path: config.selected.path
+      value: config.selected.value,
     } : undefined
   };
 }

extensions/ql-vscode/test/pure-tests/databases/data/workspace-databases.json

@@ -46,7 +46,7 @@
     }
   },
   "selected": {
-    "kind": "foo",
-    "path": "bar"
+    "kind": "configDefined",
+    "value": "path.to.database"
   }
 }

extensions/ql-vscode/test/pure-tests/databases/db-config-store.test.ts

@@ -80,12 +80,12 @@ describe('db config store', async () => {
       storagePath: '/path/to/database/',
     });
     expect(config.selected).to.deep.equal({
-      kind: 'foo',
-      path: 'bar',
+      kind: 'configDefined',
+      value: 'path.to.database',
     });
   });
 
-  it('should load an existing config and accept no selected', async () => {
+  it('should load an existing config without selected db', async () => {
     const testDataStoragePathWithout = path.join(__dirname, 'data', 'without-selected');
 
     const configStore = new DbConfigStore(testDataStoragePathWithout, extensionPath);

extensions/ql-vscode/workspace-databases-schema.json

@@ -125,13 +125,14 @@
       "type": "object",
       "properties": {
         "kind": {
-          "type": "string"
+          "type": "string",
+          "enum": ["configDefined", "remoteSystemDefinedList"]
         },
-        "path": {
+        "value": {
           "type": "string"
         }
       },
-      "required": ["kind", "path"],
+      "required": ["kind", "value"],
       "additionalProperties": false
     }
   },