little fixes

Author: Tim Etchells

dev/src/command/ProjectOverviewCmd.ts

@@ -163,7 +163,7 @@ async function onRequestEdit(type: ProjectOverview.Editable, project: Project):
         case ProjectOverview.Editable.APP_PORT: {
             userFriendlySetting = "application port";
             settingKey = "internalAppPort";
-            currentValue = project.ports.internalAppPort ? project.ports.internalAppPort.toString() : undefined;
+            currentValue = project.ports.internalPort ? project.ports.internalPort.toString() : undefined;
             break;
         }
         case ProjectOverview.Editable.DEBUG_PORT: {

dev/src/microclimate/connection/Connection.ts

@@ -193,7 +193,11 @@ export default class Connection implements vscode.QuickPickItem, vscode.Disposab
             this._projects = [];
         }
         this.needProjectUpdate = true;
-        this.updateProjects();
+        await this.updateProjects();
+        if (wipeProjects) {
+            // refresh whole tree
+            this.onChange();
+        }
     }
 
     /**

dev/src/microclimate/connection/SocketEvents.ts

@@ -53,7 +53,7 @@ namespace SocketEvents {
         readonly name: string;
         readonly status: string;
         readonly ports?: {
-            readonly internalAppPort?: string;
+            readonly internalPort?: string;
             readonly internalDebugPort?: string;
         };
         readonly error?: string;

dev/src/microclimate/project/Project.ts

@@ -33,7 +33,7 @@ const STRING_NS = StringNamespaces.PROJECT;
  */
 interface IProjectPorts {
     appPort: OptionalNumber;
-    internalAppPort: OptionalNumber;
+    internalPort: OptionalNumber;
     debugPort: OptionalNumber;
     internalDebugPort: OptionalNumber;
 }
@@ -102,7 +102,7 @@ export default class Project implements vscode.QuickPickItem {
         this._ports = {
             appPort: undefined,
             debugPort: undefined,
-            internalAppPort: undefined,
+            internalPort: undefined,
             internalDebugPort: undefined,
         };
 
@@ -222,7 +222,7 @@ export default class Project implements vscode.QuickPickItem {
         let changed = false;
         changed = this.setPort(ports.exposedPort, "appPort");
         changed = this.setPort(ports.exposedDebugPort, "debugPort") || changed;
-        changed = this.setPort(ports.internalPort, "internalAppPort") || changed;
+        changed = this.setPort(ports.internalPort, "internalPort") || changed;
         changed = this.setPort(ports.internalDebugPort, "internalDebugPort") || changed;
 
         return changed;
@@ -255,8 +255,8 @@ export default class Project implements vscode.QuickPickItem {
             changed = true;
         }
         if (event.ports) {
-            if (event.ports.internalAppPort) {
-                changed = this.setPort(event.ports.internalAppPort, "internalAppPort");
+            if (event.ports.internalPort) {
+                changed = this.setPort(event.ports.internalPort, "internalPort");
             }
             else if (event.ports.internalDebugPort) {
                 changed = this.setPort(event.ports.internalDebugPort, "internalDebugPort");
@@ -481,20 +481,24 @@ export default class Project implements vscode.QuickPickItem {
      * @returns true if at least one port was changed.
      */
     private setPort(newPort: OptionalString, portType: keyof IProjectPorts): boolean {
+        if (newPort === "") {
+            newPort = undefined;
+        }
         const newPortNumber = Number(newPort);
         const currentPort = this._ports[portType];
 
-        if (newPort != null && !MCUtil.isGoodPort(newPortNumber)) {
+        if (newPort && !MCUtil.isGoodPort(newPortNumber)) {
             Log.w(`Invalid ${portType} port ${newPort} given to project ${this.name}, ignoring it`);
             return false;
         }
-        else if (currentPort !== newPort) {
-            this._ports[portType] = newPortNumber;
-            if (newPortNumber !== currentPort) {
-                Log.d(`New ${portType} for ${this.name} is ${newPortNumber}`);
+        else if (currentPort !== newPortNumber) {
+            if (isNaN(newPortNumber)) {
+                this._ports[portType] = undefined;
+                // Log.d(`Unset ${portType} for ${this.name}`);
             }
-            else if (newPort == null) {
-                Log.d(`Unset ${portType} for ${this.name}`);
+            else if (newPortNumber !== currentPort) {
+                Log.d(`New ${portType} for ${this.name} is ${newPortNumber}`);
+                this._ports[portType] = newPortNumber;
             }
             // the third case is that (the new port === the old port) and neither are null - we don't log anything in this case.
             return true;

dev/src/microclimate/project/ProjectOverviewPage.ts

@@ -116,7 +116,7 @@ export function generateHtml(project: Project): string {
                 ${emptyRow}
                 ${buildRow("Exposed App Port", normalize(project.ports.appPort, notRunning))}
                 ${buildRow("Internal App Port",
-                    normalize(project.ports.internalAppPort, notAvailable),
+                    normalize(project.ports.internalPort, notAvailable),
                     undefined,
                     supportsEditableSettings ? Editable.APP_PORT : Editable.DISABLED)}
                 ${buildRow("Application Endpoint",

dev/src/microclimate/project/logs/MCLogManager.ts

@@ -57,7 +57,7 @@ export default class MCLogManager {
 
         appLogs.concat(buildLogs).forEach((newLogData) => {
             // skip useless container log
-            if (!(newLogData.logName === "-" || newLogData.logName === "container")) {
+            if (newLogData.logName === "-" || newLogData.logName === "container") {
                 return;
             }
 

dev/src/view/TreeItemFactory.ts

@@ -107,6 +107,7 @@ namespace TreeItemFactory {
             return [{
                 label: Translator.t(StringNamespaces.TREEVIEW, "disconnectedConnectionLabel"),
                 iconPath: Resources.getIconPaths(Resources.Icons.Disconnected),
+                contextValue: "nothing",        // anything truthy works
                 // Consider putting refresh as the command on this item
             }];
         }