Fix command enablement

Connections are filtered by active-ness when appropriate
If Starting projects are accepted, so are Starting - Debug projects
Refresh command now wipes cached projects

Author: Tim Etchells

dev/src/command/CommandUtil.ts

@@ -1,10 +1,10 @@
 import * as vscode from "vscode";
 
-import { Log } from "../Logger";
+import Log from "../Logger";
 import Project from "../microclimate/project/Project";
 import Connection from "../microclimate/connection/Connection";
 import ConnectionManager from "../microclimate/connection/ConnectionManager";
-import { ProjectState } from "../microclimate/project/ProjectState";
+import ProjectState from "../microclimate/project/ProjectState";
 
 import Commands from "../constants/Commands";
 
@@ -84,7 +84,7 @@ export function createCommands(): vscode.Disposable[] {
  * @param acceptableStates - If at least one state is passed, only projects in one of these states will be presented to the user.
  */
 export async function promptForProject(...acceptableStates: ProjectState.AppStates[]): Promise<Project | undefined> {
-    const project = await promptForResourceInner(false, true, ...acceptableStates);
+    const project = await promptForResourceInner(false, true, false, ...acceptableStates);
     if (project instanceof Project) {
         return project as Project;
     }
@@ -97,12 +97,16 @@ export async function promptForProject(...acceptableStates: ProjectState.AppStat
     return undefined;
 }
 
-export async function promptForConnection(): Promise<Connection | undefined> {
+export async function promptForConnection(activeOnly: boolean): Promise<Connection | undefined> {
     if (ConnectionManager.instance.connections.length === 1) {
-        return ConnectionManager.instance.connections[0];
+        const onlyConnection = ConnectionManager.instance.connections[0];
+        if (onlyConnection.isConnected || !activeOnly) {
+            return onlyConnection;
+        }
+        // else continue to promptForResource, which will report if there are no suitable connections.
     }
 
-    const connection = await promptForResourceInner(true, false);
+    const connection = await promptForResourceInner(true, false, activeOnly);
     if (connection instanceof Connection) {
         return connection as Connection;
     }
@@ -115,38 +119,56 @@ export async function promptForConnection(): Promise<Connection | undefined> {
     return undefined;
 }
 
-export async function promptForResource(...acceptableStates: ProjectState.AppStates[]): Promise<Project | Connection | undefined> {
-    return promptForResourceInner(true, true, ...acceptableStates);
+export async function promptForResource(activeConnectionsOnly: boolean, ...acceptableStates: ProjectState.AppStates[]):
+                                        Promise<Project | Connection | undefined> {
+
+    return promptForResourceInner(true, true, activeConnectionsOnly, ...acceptableStates);
 }
 
-async function promptForResourceInner(includeConnections: boolean, includeProjects: boolean, ...acceptableStates: ProjectState.AppStates[]):
-        Promise<Project | Connection | undefined> {
+/**
+ * If !includeConnections, activeConnectionsOnly is ignored.
+ * If !includeProjects, acceptableStates is ignored.
+ */
+async function promptForResourceInner(includeConnections: boolean, includeProjects: boolean, activeConnectionsOnly: boolean,
+                                      ...acceptableStates: ProjectState.AppStates[]):
+                                      Promise<Project | Connection | undefined> {
 
     if (!includeConnections && !includeProjects) {
         // One of these must always be set
         Log.e("Neither connection or projects are to be included!");
         return undefined;
     }
     else if (!includeProjects && acceptableStates.length > 0) {
-        // This is a misuse of this function
+        // This doesn't actually matter, but we're going to log this misuse anyway
         Log.e("Not including projects, but acceptable states were specified!");
         acceptableStates = [];
     }
+    else if (!includeConnections && activeConnectionsOnly) {
+        // This doesn't actually matter, but we're going to log this misuse anyway
+        Log.e("Not including connections, but activeConnectionsOnly is set!");
+    }
 
     const choices: vscode.QuickPickItem[] = [];
 
     const connections = ConnectionManager.instance.connections;
     if (includeConnections) {
-        // Convert each Connected Connection into a QuickPickItem
-        // choices.push(... (connections.filter( (conn) => conn.isConnected)));
-        choices.push(...connections);
+        if (activeConnectionsOnly) {
+            choices.push(...(connections.filter( (conn) => conn.isConnected)));
+        }
+        else {
+            choices.push(...connections);
+        }
     }
 
     if (includeProjects) {
         // for now, assume if they want Started, they also accept Debugging. This may change.
         if (acceptableStates.includes(ProjectState.AppStates.STARTED) && !acceptableStates.includes(ProjectState.AppStates.DEBUGGING)) {
             acceptableStates.push(ProjectState.AppStates.DEBUGGING);
         }
+        // same for Starting / Starting - Debug
+        if (acceptableStates.includes(ProjectState.AppStates.STARTING) && !acceptableStates.includes(ProjectState.AppStates.DEBUG_STARTING)) {
+            acceptableStates.push(ProjectState.AppStates.DEBUG_STARTING);
+        }
 
         // Logger.log("Accept states", acceptableStates);
 

dev/src/command/NewMCProjectCmd.ts

@@ -9,7 +9,7 @@ import Endpoints from "../constants/Endpoints";
 export default async function newMCProjectCmd(connection: Connection): Promise<void> {
     Log.d("newMCProjectCmd invoked");
     if (connection == null) {
-        const selected = await promptForConnection();
+        const selected = await promptForConnection(true);
         if (selected == null) {
             Log.d("User cancelled prompt for resource");
             // user cancelled

dev/src/command/OpenInBrowserCmd.ts

@@ -14,7 +14,7 @@ const STRING_NS = StringNamespaces.CMD_OPEN_IN_BROWSER;
 export default async function openInBrowserCmd(resource: Project | Connection): Promise<void> {
     Log.d("OpenInBrowserCmd invoked");
     if (resource == null) {
-        const selected = await promptForResource(ProjectState.AppStates.STARTED);
+        const selected = await promptForResource(true, ProjectState.AppStates.STARTED);
         if (selected == null) {
             Log.d("User cancelled prompt for resource");
             // user cancelled

dev/src/command/OpenWorkspaceFolderCmd.ts

@@ -11,7 +11,7 @@ import StringNamespaces from "../constants/strings/StringNamespaces";
 export default async function openWorkspaceFolderCmd(resource: Project | Connection): Promise<void> {
     Log.d(`Go to folder command invoked on ${resource}`);
     if (resource == null) {
-        const selected = await promptForResource();
+        const selected = await promptForResource(false);
         if (selected == null) {
             Log.d("User cancelled prompt for resource");
             // user cancelled

dev/src/command/RefreshConnectionCmd.ts

@@ -9,7 +9,7 @@ import StringNamespaces from "../constants/strings/StringNamespaces";
 export default async function refreshConnectionCmd(connection: Connection): Promise<void> {
     Log.d("refreshConnectionCmd");
     if (connection == null) {
-        const selected = await promptForConnection();
+        const selected = await promptForConnection(true);
         if (selected == null) {
             // user cancelled
             Log.d("User cancelled project prompt");
@@ -19,5 +19,5 @@ export default async function refreshConnectionCmd(connection: Connection): Prom
     }
 
     vscode.window.showInformationMessage(Translator.t(StringNamespaces.CMD_MISC, "refreshingConnection", { uri: connection.mcUri }));
-    return connection.forceUpdateProjectList();
+    return connection.forceUpdateProjectList(true);
 }

dev/src/command/RemoveConnectionCmd.ts

@@ -10,7 +10,7 @@ import StringNamespaces from "../constants/strings/StringNamespaces";
 export default async function removeConnectionCmd(connection: Connection): Promise<void> {
     Log.d("removeConnectionCmd invoked");
     if (connection == null) {
-        const selected = await promptForConnection();
+        const selected = await promptForConnection(false);
         if (selected == null) {
             // user cancelled
             Log.d("User cancelled project prompt");

dev/src/microclimate/connection/Connection.ts

@@ -84,6 +84,7 @@ export default class Connection implements ITreeItemAdaptable, vscode.QuickPickI
         }
         this.connected = true;
         Log.d(`${this} is now connected`);
+        await this.forceUpdateProjectList();
         this.logManager.onConnectionReconnect();
 
         this.onChange();
@@ -96,6 +97,7 @@ export default class Connection implements ITreeItemAdaptable, vscode.QuickPickI
             return;
         }
         this.connected = false;
+        this.projects = [];
         Log.d(`${this} is now disconnected`);
         this.logManager.onConnectionDisconnect();
 
@@ -192,8 +194,12 @@ export default class Connection implements ITreeItemAdaptable, vscode.QuickPickI
         return Connection.CONTEXT_ID;
     }
 
-    public async forceUpdateProjectList(): Promise<void> {
+    public async forceUpdateProjectList(wipeProjects: boolean = false): Promise<void> {
         Log.d("forceUpdateProjectList");
+        if (wipeProjects) {
+            Log.d(`Wiping ${this.projects.length} projects`);
+            this.projects = [];
+        }
         this.needProjectUpdate = true;
         this.getProjects();
     }